Fix #508 (#509)

formulahendry · web-flow · commit 6b2b5dab4e5f · 2019-10-29T12:43:33.000+08:00
* Fix #508 * update
diff --git a/assets/marketplace/index.html b/assets/marketplace/index.html
@@ -70,7 +70,7 @@ <h1>Result for {{ searchInput }} ({{ this.filteredModules.length }})</h1>
                         </div>
                         <div class="action">
                             <button v-on:click="importModule()">Import</button>
-                            <button v-on:click="selectedModule.id=''">Cancel</button>
+                            <button v-on:click="selectedModule.id='';selectedPlan=''">Cancel</button>
                         </div>
                         <div class="term-of-use">
                             I agree to the provider's <a :href="selectedModule.legalTermsUri">Term of Use</a> and <a :href="selectedModule.privacyPolicyUri">Privacy
diff --git a/assets/marketplace/main.js b/assets/marketplace/main.js
@@ -110,10 +110,12 @@ const app = new Vue({
         }
     },
     watch: {
-        selectedPlan: async function (newSelectedPlan, old) {
-            const metadata = await this.getModuleMetadata(newSelectedPlan);
-            this.selectedModule.metadata = metadata;
-            this.selectedTag = this.selectedModule.metadata.defaultTag;
+        selectedPlan: async function (newSelectedPlan) {
+            if (newSelectedPlan) {
+                const metadata = await this.getModuleMetadata(newSelectedPlan);
+                this.selectedModule.metadata = metadata;
+                this.selectedTag = this.selectedModule.metadata.defaultTag;
+            }
         }
     }
 });
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "azure-iot-edge",
   "displayName": "Azure IoT Edge",
   "description": "Develop, deploy, debug, and manage your IoT Edge solution",
-  "version": "1.18.0-rc",
+  "version": "1.18.0-rc2",
   "publisher": "vsciot-vscode",
   "aiKey": "95b20d64-f54f-4de3-8ad5-165a75a6c6fe",
   "icon": "logo.png",

Original file line number	Diff line number	Diff line change
`@@ -110,10 +110,12 @@ const app = new Vue({`
`110`	`110`	`}`
`111`	`111`	`},`
`112`	`112`	`watch: {`
`113`		`- selectedPlan: async function (newSelectedPlan, old) {`
`114`		`- const metadata = await this.getModuleMetadata(newSelectedPlan);`
`115`		`- this.selectedModule.metadata = metadata;`
`116`		`- this.selectedTag = this.selectedModule.metadata.defaultTag;`
	`113`	`+ selectedPlan: async function (newSelectedPlan) {`
	`114`	`+ if (newSelectedPlan) {`
	`115`	`+ const metadata = await this.getModuleMetadata(newSelectedPlan);`
	`116`	`+ this.selectedModule.metadata = metadata;`
	`117`	`+ this.selectedTag = this.selectedModule.metadata.defaultTag;`
	`118`	`+ }`
`117`	`119`	`}`
`118`	`120`	`}`
`119`	`121`	`});`