fix: disable welcome app when disable by user

fixes: #960
fabric8-launcher · Aug 16, 2019 · cda5c81 · cda5c81
1 parent e3a7959
commit cda5c81
Show file tree

Hide file tree

Showing 2 changed files with 73 additions and 2 deletions.
diff --git a/frontend/packages/launcher-app/src/flows/launcher-client-adapters.ts b/frontend/packages/launcher-app/src/flows/launcher-client-adapters.ts
@@ -47,9 +47,11 @@ export function buildDownloadNewAppPayload(app: NewApp) {
   if (parts.length > 1) {
     parts = [
       ...parts.map(p => ({...p, subFolderName: p.category})),
-      {category: 'support', subFolderName: 'support', capabilities: [{module: 'capability-welcome'}]}
+      {category: 'support', subFolderName: 'support', capabilities: [
+        app.welcomeApp.selected ? { module: 'capability-welcome' } : {}
+      ]}
     ];
-  } else {
+  } else if (app.welcomeApp.selected) {
     parts[0].capabilities.push({module: 'capability-welcome'});
   }
 

diff --git a/...nd/packages/launcher-app/src/pickers/__tests__/__snapshots__/cluster-picker.spec.tsx.snap b/...nd/packages/launcher-app/src/pickers/__tests__/__snapshots__/cluster-picker.spec.tsx.snap
@@ -33,11 +33,80 @@ exports[`<ClusterPicker /> should display "No Active Clusters Found" when cluste
     <a
       aria-disabled="false"
       class="pf-c-button pf-m-primary"
+      href="https://manage.openshift.com/"
       target="_blank"
     >
       activate a cluster
     </a>
   </div>
+  <article
+    class="pf-c-card"
+  >
+    <div
+      class="pf-c-card__header pf-c-title pf-m-md"
+    >
+      Or add your cluster url and token below
+    </div>
+    <div
+      class="pf-c-card__body"
+    >
+      <form
+        class="pf-c-form"
+        novalidate=""
+      >
+        <div
+          class="pf-c-form__group"
+        >
+          <label
+            class="pf-c-form__label"
+            for="cluster-url-picker"
+          >
+            <span
+              class="pf-c-form__label-text"
+            >
+              Cluster API Url
+            </span>
+          </label>
+          <input
+            aria-invalid="false"
+            aria-label="Cluster url"
+            class="pf-c-form-control"
+            id="cluster-url-picker"
+            name="cluster-url-picker"
+            placeholder="Type the cluster api url"
+            required=""
+            type="text"
+            value=""
+          />
+        </div>
+        <div
+          class="pf-c-form__group"
+        >
+          <label
+            class="pf-c-form__label"
+            for="cluster-token-picker"
+          >
+            <span
+              class="pf-c-form__label-text"
+            >
+              Cluster Token
+            </span>
+          </label>
+          <input
+            aria-invalid="false"
+            aria-label="Cluster token"
+            class="pf-c-form-control"
+            id="cluster-token-picker"
+            name="cluster-token-picker"
+            placeholder="Type the api token"
+            required=""
+            type="text"
+            value=""
+          />
+        </div>
+      </form>
+    </div>
+  </article>
 </DocumentFragment>
 `;