hotfix: scaffolds is empty (#611)

* fix: scaffold is empty * fix: welcome page auto show logic * docs: changelog for iceworks app * fix: material sources duplicated (#613) * fix: material sources duplicated * chore: changelog * fix: comment Co-authored-by: Hengchang Lu <44047106+luhc228@users.noreply.github.com>
apptools-lab · Oct 13, 2020 · 2d2595c · 2d2595c
1 parent b2f0b83
commit 2d2595c
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 12 deletions.
diff --git a/extensions/iceworks-app/CHANGELOG.md b/extensions/iceworks-app/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Change Log
 
+## 0.5.5
+
+- fix: disable auto show welcome page when the application is new
+
 ## 0.5.4
 
 - chore: sorting of quick entry

diff --git a/extensions/iceworks-app/package.json b/extensions/iceworks-app/package.json
@@ -3,7 +3,7 @@
   "displayName": "Iceworks Application Viewer",
   "description": "Quick view your Universal Application(React/Rax/Vue, etc).",
   "publisher": "iceworks-team",
-  "version": "0.5.4",
+  "version": "0.5.5",
   "engines": {
     "vscode": "^1.41.0"
   },

diff --git a/extensions/iceworks-app/src/extension.ts b/extensions/iceworks-app/src/extension.ts
@@ -20,15 +20,15 @@ import { showExtensionsQuickPickCommandId, projectExistsTime } from './constants
 import showEntriesQuickPick from './quickPicks/showEntriesQuickPick';
 import createEditorMenuAction from './utils/createEditorMenuAction';
 import createExtensionsStatusBar from './statusBar/createExtensionsStatusBar';
-import autoStart, { didShowWelcomePageBySidebarStateKey } from './utils/autoStart';
+import autoStart from './utils/autoStart';
 import i18n from './i18n';
 
 // eslint-disable-next-line
 const { name, version } = require('../package.json');
 const recorder = new Recorder(name, version);
 
 export async function activate(context: vscode.ExtensionContext) {
-  const { subscriptions, extensionPath, globalState } = context;
+  const { subscriptions, extensionPath } = context;
 
   // auto set configuration & context
   initExtension(context, name);
@@ -159,15 +159,14 @@ export async function activate(context: vscode.ExtensionContext) {
     await createEditorMenuAction();
   }
 
-  // auto start welcome page when the application is new
+  // TODO auto start welcome page when the application is new
   const isNotTargetProject = await checkIsNotTarget();
-  // get showWelcomePage configuration from settings.json
   const isShowWelcomePage = await getDataFromSettingJson('showWelcomePage', true);
   if (projectPath && !isNotTargetProject && isShowWelcomePage && !vscode.window.activeTextEditor) {
     const curProjectExistsTime = getFolderExistsTime(projectPath);
     if (projectExistsTime > curProjectExistsTime) {
-      vscode.commands.executeCommand('iceworksApp.welcome.start');
-      globalState.update(didShowWelcomePageBySidebarStateKey, true);
+      // vscode.commands.executeCommand('iceworksApp.welcome.start');
+      // globalState.update(didShowWelcomePageBySidebarStateKey, true);
     }
   }
 }
diff --git a/extensions/iceworks-project-creator/CHANGELOG.md b/extensions/iceworks-project-creator/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Change Log
 
+## 0.3.15
+
+- fix: material sources display duplicated
+- fix: scaffold is empty
+
 ## 0.3.14
 
 - feat: custom material sources will be at first in the material sources list

diff --git a/extensions/iceworks-project-creator/package.json b/extensions/iceworks-project-creator/package.json
@@ -3,7 +3,7 @@
   "displayName": "Iceworks Application Creator",
   "description": "Quick create a Universal Application(React/Rax/Vue, etc).",
   "publisher": "iceworks-team",
-  "version": "0.3.14",
+  "version": "0.3.15",
   "engines": {
     "vscode": "^1.41.0"
   },

diff --git a/.../iceworks-project-creator/web/src/pages/CreateProject/components/ScaffoldMarket/index.tsx b/.../iceworks-project-creator/web/src/pages/CreateProject/components/ScaffoldMarket/index.tsx
@@ -181,7 +181,7 @@ const ScaffoldMarket = ({
                         }
                         content={item.description}
                         media={item.screenshot}
-                        selected={curProjectField.scaffold.name === item.name}
+                        selected={curProjectField.scaffold && curProjectField.scaffold.name === item.name}
                         onClick={() => onScaffoldClick(item)}
                       />
                     );
@@ -226,7 +226,7 @@ const ScaffoldMarket = ({
                             }
                             content={item.description}
                             media={item.screenshot}
-                            selected={curProjectField.scaffold.name === item.name}
+                            selected={curProjectField.scaffold && curProjectField.scaffold.name === item.name}
                             onClick={() => onScaffoldClick(item)}
                           />
                         );

diff --git a/packages/material-service/package.json b/packages/material-service/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@iceworks/material-service",
-  "version": "0.1.14",
+  "version": "0.1.15",
   "description": "Iceworks material service for VSCode extension.",
   "files": [
     "lib"

diff --git a/packages/material-service/src/index.ts b/packages/material-service/src/index.ts
@@ -63,7 +63,7 @@ export const getSourcesByProjectType = async function () {
   return getSources(type);
 };
 
-export const getOfficalMaterialSources = () => OFFICAL_MATERIAL_SOURCES;
+export const getOfficalMaterialSources = () => [].concat(OFFICAL_MATERIAL_SOURCES);
 
 export const getUserSources = () => getDataFromSettingJson(CONFIGURATION_KEY_MATERIAL_SOURCES);