Skip to content

Launch experience satisfaction questionnaire survey #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 27, 2024
Merged

Launch experience satisfaction questionnaire survey #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,10 @@
"command": "alicloud.api.removeSubscriptions",
"icon": "$(notebook-delete-cell)",
"title": "取消订阅"
},
{
"command": "alicloud.api.updateCloseQuestionnaire",
"title": "刷新体验问卷弹出设置"
}
],
"keybindings": [
Expand Down
8 changes: 8 additions & 0 deletions src/commands.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,14 @@ export class AlicloudApiCommands {
new AlicloudAPIWebview().openTab(context.extensionUri, config);
});

// 刷新问卷调查弹窗过期设置
vscode.commands.registerCommand("alicloud.api.updateCloseQuestionnaire", () => {
const lastPromptKey = "lastPromptTime";
const globalState = context.globalState;
globalState.update(lastPromptKey, undefined);
console.log("update last prompt key to",globalState.get(lastPromptKey))
});

vscode.commands.registerCommand("alicloud.api.restart", async () => {
await vscode.window.withProgress(
{
Expand Down
88 changes: 61 additions & 27 deletions src/explorer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ export class PontAPITreeItem extends vscode.TreeItem {
}

export class PontAPIExplorer {
static getProductItems(products:Array<Product>, element:PontAPITreeItem = null){
return products?.map(product=>{
static getProductItems(products: Array<Product>, element: PontAPITreeItem = null) {
return products?.map((product) => {
return {
specName: product.code,
modName: "",
Expand All @@ -38,12 +38,12 @@ export class PontAPIExplorer {
{
specName: product.code,
modName: "clickItem",
label: product.name
label: product.name,
},
],
},
};
})
});
}
static getDirItems(spec: PontSpec, element = null) {
const dirs = element?.children || spec?.ext?.directories || [];
Expand Down Expand Up @@ -230,19 +230,19 @@ export class AlicloudApiExplorer implements vscode.TreeDataProvider<PontChangeTr
stagedDiffs: any[] = [];
allDiffs: any[] = [];

getCNNameOfProduct(products: Array<Product>, code:string){
getCNNameOfProduct(products: Array<Product>, code: string) {
const findProduct = products?.find((product) => product.code === code);
return `${findProduct?.name ? findProduct?.name : findProduct?.code}`;
}

getAPIManagerChildren(element?: PontAPITreeItem): vscode.ProviderResult<PontAPITreeItem[]> {
if(element.contextValue === "alicloudProducts"){
if (element.contextValue === "alicloudProducts") {
const productExplorer = getProductRequestInstance();
const productGroups = _.groupBy(productExplorer?.products, (product) => product.group)
return (Object.keys(productGroups || {}))?.map((group) => {
const productGroups = _.groupBy(productExplorer?.products, (product) => product.group);
return Object.keys(productGroups || {})?.map((group) => {
return {
specName: group,
contextValue: 'productGroup',
contextValue: "productGroup",
label: `${group}`,
modName: group,
collapsibleState: vscode.TreeItemCollapsibleState.Collapsed,
Expand All @@ -258,8 +258,8 @@ export class AlicloudApiExplorer implements vscode.TreeDataProvider<PontChangeTr
const productExplorer = getProductRequestInstance();

return this.pontManager.localPontSpecs.map((spec) => {
const [specName, version] = spec.name.split("::")
const [specName, version] = spec.name.split("::");

return {
specName: spec.name,
contextValue: "Spec",
Expand Down Expand Up @@ -306,12 +306,11 @@ export class AlicloudApiExplorer implements vscode.TreeDataProvider<PontChangeTr
});
} else if (element.contextValue === "Dir" && spec) {
return PontAPIExplorer.getDirItems(spec, element);
} else if (element.contextValue === "productGroup"){
} else if (element.contextValue === "productGroup") {
const productExplorer = getProductRequestInstance();
const productGroups = _.groupBy(productExplorer?.products, (product) => product.group)
return PontAPIExplorer.getProductItems(productGroups[element?.modName?.toString()],element)
}
else {
const productGroups = _.groupBy(productExplorer?.products, (product) => product.group);
return PontAPIExplorer.getProductItems(productGroups[element?.modName?.toString()], element);
} else {
return PontAPIExplorer.getDirItems(spec);
}
}
Expand Down Expand Up @@ -364,10 +363,42 @@ export class AlicloudApiExplorer implements vscode.TreeDataProvider<PontChangeTr
this.updatePontManager(newManager);
this.updateDiffs();
vscode.window.showInformationMessage("订阅成功");
this.launchExperienceQuestionnaire();
}
}
}

async launchExperienceQuestionnaire() {
const globalState = this.context.globalState;
const lastPromptKey = "lastPromptTime";
const experienceQuestionnaireKey = "questionnaireExpiration";
const questionnaireExpiration = globalState.get(experienceQuestionnaireKey) as any;
// 检查上次提示的时间
const lastPromptTime = globalState.get(lastPromptKey) as any;
// 选择关闭 1天 后执行订阅相关操作会再次触发，选择去反馈或30天内不再弹出则 30 天后才会再次触发
if (!lastPromptTime || Date.now() - lastPromptTime > (questionnaireExpiration || 0) * 24 * 60 * 60 * 1000) {
// 显示信息弹窗
let result = await vscode.window.showInformationMessage(
"您在使用插件期间是否遇到问题？欢迎吐槽或点赞，您的反馈对我们十分重要！",
"去反馈",
"关闭",
"30天内不再弹出",
);
if (result === "去反馈") {
vscode.env.openExternal(
vscode.Uri.parse("https://g.alicdn.com/aes/tracker-survey-preview/0.0.13/survey.html?pid=fePxMy&id=3486"),
);
globalState.update(experienceQuestionnaireKey, 30);
}
else if (result === "30天内不再弹出") {
globalState.update(experienceQuestionnaireKey, 30);
}else {
globalState.update(experienceQuestionnaireKey, 1);
}
globalState.update(lastPromptKey, Date.now());
}
}

async removeSubscriptions(specName: string) {
const pontxConfig = await findAlicloudAPIConfig(this.context);
const newOrigins = pontxConfig?.origins?.filter((item) => item.name !== specName) || [];
Expand All @@ -388,6 +419,7 @@ export class AlicloudApiExplorer implements vscode.TreeDataProvider<PontChangeTr

await this.updatePontManager(newManager);
vscode.window.showInformationMessage("取消订阅成功");
this.launchExperienceQuestionnaire();
}
}

Expand All @@ -409,17 +441,17 @@ export class AlicloudApiExplorer implements vscode.TreeDataProvider<PontChangeTr
this.updateDiffs();
}
const service = alicloudAPIMessageService;
vscode.commands.registerCommand("alicloud.api.addSubscription", async (element)=>{
if (element.modName === 'clickItem') {
vscode.commands.registerCommand("alicloud.api.addSubscription", async (element) => {
if (element.modName === "clickItem") {
// 取消订阅
let result = await vscode.window.showInformationMessage(`是否订阅${element.label}?`, "Yes", "No");
if (result === "No") {
return
return;
}
}
const productExplorer = getProductRequestInstance()
const productExplorer = getProductRequestInstance();
const selectedProduct = productExplorer?.products?.find((item) => item?.code === element?.specName);
const pickItem = AlicloudApiCommands.getPickProductItems(selectedProduct)
const pickItem = AlicloudApiCommands.getPickProductItems(selectedProduct);
if (pickItem.versions?.length > 1) {
vscode.window
.showQuickPick(pickItem.versions, {
Expand All @@ -432,11 +464,12 @@ export class AlicloudApiExplorer implements vscode.TreeDataProvider<PontChangeTr
} else {
this.subscribeProduct(pickItem.code, (pickItem.versions[0] as any).key);
}
})
});
vscode.commands.registerCommand("alicloud.api.addSubscriptions", async () => {
// 搜索+订阅功能
const productExplorer = getProductRequestInstance()
const items = productExplorer?.products?.map((item) => {
const productExplorer = getProductRequestInstance();
const items = productExplorer?.products
?.map((item) => {
return AlicloudApiCommands.getPickProductItems(item);
})
.reduce((pre, next) => pre.concat(next), []);
Expand Down Expand Up @@ -467,8 +500,9 @@ export class AlicloudApiExplorer implements vscode.TreeDataProvider<PontChangeTr

vscode.commands.registerCommand("alicloud.api.searchProducts", async () => {
// 搜索+订阅功能
const productExplorer = getProductRequestInstance()
const items = productExplorer?.products?.map((item) => {
const productExplorer = getProductRequestInstance();
const items = productExplorer?.products
?.map((item) => {
return AlicloudApiCommands.getPickProductItems(item);
})
.reduce((pre, next) => pre.concat(next), []);
Expand Down Expand Up @@ -496,7 +530,7 @@ export class AlicloudApiExplorer implements vscode.TreeDataProvider<PontChangeTr
}
});
});

vscode.commands.registerCommand("alicloud.api.removeSubscriptions", async (meta) => {
if (meta.specName) {
// 取消订阅
Expand Down
19 changes: 17 additions & 2 deletions src/extension.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { AlicloudAPIPontParserPlugin } from "./plugins/parser";

import { AlicloudApiMetaGeneratePlugin } from "./plugins/generate";
import { getProductRequestInstance } from "./productExplorer";
import autoCompletion from './provider/autoCompletion'
import autoCompletion from "./provider/autoCompletion";
import autofix from "./provider/autofix";

export async function activate(context: vscode.ExtensionContext) {
Expand Down Expand Up @@ -46,6 +46,21 @@ export async function activate(context: vscode.ExtensionContext) {
},
};

const globalState = context.globalState;
const lastPromptKey = "lastPromptTime";
const currentVersion = vscode.extensions.getExtension("alibabacloud-openapi.vscode-alicloud-api").packageJSON.version
const storedVersion = globalState.get("extensionVersion");
const experienceQuestionnaireKey = "questionnaireExpiration";
// 检查是否是第一次启动新版本，新版本更新后，需要重新开启问卷调查
if (storedVersion !== currentVersion) {
// 刷新问卷调查弹窗过期设置
globalState.update(lastPromptKey, undefined);
// 问卷调查弹窗弹出频率初始化为 1 天
globalState.update(experienceQuestionnaireKey, 1);
// 更新 globalState 中的版本号
globalState.update("extensionVersion", currentVersion);
}

try {
const pontManager = await PontManager.constructorFromPontConfigAndPlugins(
pontxConfig,
Expand All @@ -65,7 +80,7 @@ export async function activate(context: vscode.ExtensionContext) {
// 自动补全
autoCompletion(context);
// 自动修复
autofix(context);
autofix(context);
}
} catch (e) {
vscode.window.showErrorMessage(e.message);
Expand Down