dashboard-shell-shell 1.0.122 → 1.0.1000000081

package/pages/auth copy/verify.vue

@@ -0,0 +1,203 @@
+<script>
+import {
+  GITHUB_CODE, GITHUB_NONCE, BACK_TO, IS_SLO, _FLAGGED
+} from '@shell/config/query-params';
+import { get } from '@shell/utils/object';
+import { base64Decode } from '@shell/utils/crypto';
+import loadPlugins from '@shell/plugins/plugin';
+import { LOGIN_ERRORS } from '@shell/store/auth';
+
+const samlProviders = ['ping', 'adfs', 'keycloak', 'okta', 'shibboleth'];
+
+const oauthProviders = ['github', 'googleoauth', 'azuread'];
+
+function reply(err, code) {
+  try {
+    window.opener.window.onAuthTest(err, code);
+    setTimeout(() => {
+      window.close();
+    }, 250);
+  } catch (e) {
+    window.close();
+  }
+}
+
+function isSaml($route) {
+  const { query } = $route;
+  const configQuery = get(query, 'config');
+
+  return samlProviders.includes(configQuery);
+}
+
+export default {
+  async fetch() {
+    const code = this.$route.query[GITHUB_CODE];
+    const stateStr = this.$route.query[GITHUB_NONCE];
+    const {
+      error, error_description: errorDescription, errorCode, errorMsg
+    } = this.$route.query;
+
+    if (error || errorDescription || errorCode || errorMsg) {
+      let out = errorDescription || error || errorCode;
+
+      if (this.isSlo) {
+        console.error('Failed to log out of auth provider', error, errorDescription, errorCode, errorMsg); // eslint-disable-line no-console
+
+        let out = this.$store.getters['i18n/withFallback'](`logout.specificError.unknown`);
+
+        if (errorCode) {
+          out = this.$store.getters['i18n/withFallback'](`logout.specificError.${ errorCode }`, null, out);
+        }
+
+        this.$router.replace(`/auth/login?${ IS_SLO }&err=${ escape(out) }`);
+
+        return;
+      } else {
+        if (errorMsg) {
+          out = this.$store.getters['i18n/withFallback'](`login.serverError.${ errorMsg }`, null, errorMsg);
+        }
+
+        this.$router.replace(`/auth/login?err=${ escape(out) }`);
+
+        return;
+      }
+    }
+
+    // check for existence of IS_SLO query param to differentiate between a login and a logout
+    if (this.isSlo) {
+      this.$store.dispatch('auth/uiLogout');
+
+      return;
+    }
+
+    let parsed;
+
+    try {
+      parsed = JSON.parse(base64Decode((stateStr)));
+    } catch (err) {
+      if (isSaml(this.$route)) {
+        // This is an ok failure. SAML has no state string so a failure is fine (see similar check in mounted).
+        // This whole file could be re-written with that in mind, but this change keeps things simple and fixes a breaking addition
+        return;
+      }
+      const out = this.$store.getters['i18n/t'](`login.error`);
+
+      console.error('Failed to parse nonce', stateStr, err); // eslint-disable-line no-console
+
+      this.$router.replace(`/auth/login?err=${ escape(out) }`);
+
+      return;
+    }
+
+    const { test, provider, nonce } = parsed;
+
+    if (test) {
+      return;
+    }
+
+    try {
+      const res = await this.$store.dispatch('auth/verifyOAuth', {
+        code,
+        nonce,
+        provider
+      });
+
+      if ( res._status === 200) {
+        const backTo = this.$route.query[BACK_TO] || '/';
+
+        // Load plugins
+        await loadPlugins({
+          app:     this.$store.app,
+          store:   this.$store,
+          $plugin: this.$store.$plugin
+        });
+
+        this.$router.replace(backTo);
+      } else {
+        this.$router.replace(`/auth/login?err=${ escape(res) }`);
+      }
+    } catch (err) {
+      let errCode = err;
+
+      // If the provider is OAUTH, then the client error is not that the credentials are wrong, but that the user is not authorized
+      if (oauthProviders.includes(provider) && err === LOGIN_ERRORS.CLIENT_UNAUTHORIZED) {
+        errCode = LOGIN_ERRORS.USER_UNAUTHORIZED;
+      }
+
+      this.$router.replace(`/auth/login?err=${ escape(errCode) }`);
+    }
+  },
+
+  data() {
+    return {
+      testing: null,
+      isSlo:   null,
+    };
+  },
+
+  created() {
+    const stateJSON = this.$route.query[GITHUB_NONCE] || '';
+
+    let parsed = {};
+
+    try {
+      parsed = JSON.parse(base64Decode(stateJSON));
+    } catch {
+    }
+
+    const { test } = parsed;
+
+    this.testing = test;
+    this.isSlo = this.$route.query[IS_SLO] === _FLAGGED;
+  },
+
+  mounted() {
+    if ( this.testing ) {
+      try {
+        const {
+          error: respError, error_description: respErrorDescription, [GITHUB_CODE]: code, errorMsg
+        } = this.$route.query;
+
+        let error = respErrorDescription || respError || (!code ? 'No code supplied by auth provider' : null);
+
+        if (errorMsg) {
+          error = this.$store.getters['i18n/withFallback'](`login.serverError.${ errorMsg }`, null, errorMsg);
+        }
+
+        reply(error, code );
+      } catch (e) {
+        window.close();
+      }
+    } else {
+      if ( window.opener ) {
+        if (isSaml(this.$route)) {
+          if ( window.opener.window.onAuthTest ) {
+            reply(null, null);
+          } else {
+            reply({ err: 'failure' });
+          }
+        }
+      }
+    }
+  }
+};
+</script>
+
+<template>
+  <main
+    class="main-layout"
+    :aria-label="t('layouts.verify')"
+  >
+    <h1 class="text-center mt-50">
+      <span v-if="testing">
+        Testing Configuration&hellip;
+      </span>
+      <span v-else-if="isSlo">
+        Logging Out&hellip;
+      </span>
+      <span v-else>
+        Logging In&hellip;
+      </span>
+    </h1>
+  </main>
+</template>

package/pages/c/_cluster/_product/namespaces.vue

@@ -29,8 +29,8 @@ export default {
   computed: {
     headers() {
       return [
-        STATE,
         NAME,
+        STATE,
         AGE
       ];
     },
@@ -63,13 +63,13 @@ export default {
       :rows="rows"
       :groupable="false"
       group-tooltip="resourceTable.groupBy.project"
-      key-field="_key"
+      key-field="_key"
     >
       <template #cell:project="{row}">
         <span v-if="row.project">{{ row.project.nameDisplay }}</span>
-        <span
-          v-else
-          class="text-muted"
+        <span
+          v-else
+          class="text-muted"
         >&ndash;</span>
       </template>
     </ResourceTable>

package/pages/c/_cluster/apps/charts/chart.vue

@@ -69,7 +69,7 @@ export default {
         return {
           id:   m.name,
           text: m.name,
-          url:  `mailto:${ m.email }`
+          url:  m.email ? `mailto:${ m.email }` : m.url
         };
       });
     },

package/pages/c/_cluster/apps/charts/install.vue

@@ -32,7 +32,9 @@ import {
 import { CATALOG as CATALOG_ANNOTATIONS, PROJECT } from '@shell/config/labels-annotations';
 
 import { exceptionToErrorsArray } from '@shell/utils/error';
-import { clone, diff, get, set } from '@shell/utils/object';
+import {
+  clone, diff, get, mergeWithReplace, set
+} from '@shell/utils/object';
 import { ignoreVariables } from './install.helpers';
 import { findBy, insertAt } from '@shell/utils/array';
 import { saferDump } from '@shell/utils/create-yaml';
@@ -45,6 +47,22 @@ const VALUES_STATE = {
   DIFF: 'DIFF'
 };
 
+/**
+ * Helm CLI options that are not persisted on the back end,
+ * but are used for the final install/upgrade operation.
+ */
+const defaultCmdOpts = {
+  cleanupOnFail: false,
+  crds:          true,
+  hooks:         true,
+  force:         false,
+  resetValues:   false,
+  openApi:       true,
+  wait:          true,
+  timeout:       600,
+  historyMax:    5,
+};
+
 function isPlainLayout(query) {
   return Object.keys(query).includes(HIDE_SIDE_NAV);
 }
@@ -312,15 +330,11 @@ export default {
       */
       this.removeGlobalValuesFrom(userValues);
 
-      /*
-        The merge() method is used to merge two or more objects
-        starting with the left-most to the right-most to create a
-        parent mapping object. When two keys are the same, the
-        generated object will have value for the rightmost key.
-        In this case, any values in userValues override any
-        matching values in versionInfo.
-      */
-      this.chartValues = merge(merge({}, this.versionInfo?.values || {}), userValues);
+      this.chartValues = mergeWithReplace(
+        merge({}, this.versionInfo?.values || {}),
+        userValues,
+        { replaceObjectProps: true }
+      );
 
       if (this.showCustomRegistry) {
         /**
@@ -359,20 +373,6 @@ export default {
   },
 
   data() {
-    /* Helm CLI options that are not persisted on the back end,
-    but are used for the final install/upgrade operation. */
-    const defaultCmdOpts = {
-      cleanupOnFail: false,
-      crds:          true,
-      hooks:         true,
-      force:         false,
-      resetValues:   false,
-      openApi:       true,
-      wait:          true,
-      timeout:       600,
-      historyMax:    5,
-    };
-
     return {
       defaultRegistrySetting: '',
       customRegistrySetting:  '',
@@ -1386,7 +1386,7 @@ export default {
               >
                 <template v-slot:option="opt">
                   <template v-if="opt.kind === 'divider'">
-                    <hr>
+                    <hr role="none">
                   </template>
                   <template v-else-if="opt.kind === 'label'">
                     <b style="position: relative; left: -2.5px;">{{ opt.label }}</b>
@@ -1858,7 +1858,7 @@ export default {
       }
 
       .namespace-create-banner {
-        margin-bottom: 70px;
+        margin-bottom: calc($footer-height + 10px);
       }
     }
     &__values {

package/pages/c/_cluster/auth/config/index.vue

@@ -7,6 +7,8 @@ import { authProvidersInfo } from '@shell/utils/auth';
 import { Banner } from '@components/Banner';
 import Loading from '@shell/components/Loading';
 
+const resource = MANAGEMENT.AUTH_CONFIG;
+
 export default {
   components: {
     SelectIconGrid, Banner, Loading
@@ -24,19 +26,7 @@ export default {
   },
 
   data() {
-    const resource = MANAGEMENT.AUTH_CONFIG;
-    const getters = this.$store.getters;
-    const inStore = getters['currentStore'](resource);
-    const hasListComponent = getters['type-map/hasCustomList'](resource);
-    const hasEditComponent = getters['type-map/hasCustomEdit'](resource);
-    const schema = getters[`${ inStore }/schemaFor`](resource);
-
     return {
-      resource,
-      schema,
-      hasListComponent,
-      hasEditComponent,
-
       // Provided by fetch later
       enabled:  false,
       nonLocal: null,
@@ -60,6 +50,14 @@ export default {
         }
       };
     },
+
+    inStore() {
+      return this.$store.getters['currentStore'](resource);
+    },
+
+    schema() {
+      return this.$store.getters[`${ this.inStore }/schemaFor`](resource);
+    }
   },
 
   methods: {

package/pages/c/_cluster/explorer/EventsTable.vue

@@ -7,32 +7,48 @@ import { STEVE_EVENT_OBJECT, STEVE_NAME_COL } from '@shell/config/pagination-tab
 import { headerFromSchemaColString } from '@shell/store/type-map.utils';
 import { NAME as EXPLORER } from '@shell/config/product/explorer';
 
+const reason = {
+  ...REASON,
+  ...{ canBeVariable: true },
+  width: 130,
+};
+
+const eventHeaders = [
+  reason,
+  OBJECT,
+  MESSAGE,
+  NAME, {
+    name:        'date',
+    label:       'Date',
+    labelKey:    'clusterIndexPage.sections.events.date.label',
+    value:       'timestamp',
+    sort:        'timestamp:desc',
+    formatter:   'Date',
+    width:       220,
+    defaultSort: true,
+  },
+];
+
 export default {
   components: { PaginatedResourceTable },
 
   data() {
-    const reason = {
-      ...REASON,
-      ...{ canBeVariable: true },
-      width: 130,
+    return {
+      schema:            null,
+      events:            [],
+      eventHeaders,
+      paginationHeaders: null,
+      allEventsLink:     {
+        name:   'c-cluster-product-resource',
+        params: {
+          product:  EXPLORER,
+          resource: EVENT,
+        }
+      }
     };
+  },
 
-    const eventHeaders = [
-      reason,
-      OBJECT,
-      MESSAGE,
-      NAME, {
-        name:        'date',
-        label:       'Date',
-        labelKey:    'clusterIndexPage.sections.events.date.label',
-        value:       'timestamp',
-        sort:        'timestamp:desc',
-        formatter:   'Date',
-        width:       220,
-        defaultSort: true,
-      },
-    ];
-
+  beforeMount() {
     const schema = this.$store.getters['cluster/schemaFor'](EVENT);
 
     const paginationHeaders = schema ? [
@@ -51,19 +67,8 @@ export default {
       headerFromSchemaColString('Count', schema, this.$store.getters, true),
     ] : [];
 
-    return {
-      schema,
-      events:        [],
-      eventHeaders,
-      paginationHeaders,
-      allEventsLink: {
-        name:   'c-cluster-product-resource',
-        params: {
-          product:  EXPLORER,
-          resource: EVENT,
-        }
-      }
-    };
+    this.schema = schema;
+    this.paginationHeaders = paginationHeaders;
   },
 
   mounted() {

package/pages/c/_cluster/explorer/index.vue

@@ -63,6 +63,19 @@ const CLUSTER_COMPONENTS = [
   'controller-manager',
 ];
 
+const nodeHeaders = [
+  STATE,
+  NAME,
+  ROLES,
+];
+
+const clusterServiceIcons = {
+  [STATES_ENUM.IN_PROGRESS]: 'icon-spinner icon-spin',
+  [STATES_ENUM.HEALTHY]:     'icon-checkmark',
+  [STATES_ENUM.WARNING]:     'icon-warning',
+  [STATES_ENUM.UNHEALTHY]:   'icon-warning',
+};
+
 export default {
   name: 'ClusterExplorerIndexPage',
 
@@ -118,20 +131,6 @@ export default {
   },
 
   data() {
-    const clusterCounts = this.$store.getters[`cluster/all`](COUNT);
-    const nodeHeaders = [
-      STATE,
-      NAME,
-      ROLES,
-    ];
-
-    const clusterServiceIcons = {
-      [STATES_ENUM.IN_PROGRESS]: 'icon-spinner icon-spin',
-      [STATES_ENUM.HEALTHY]:     'icon-checkmark',
-      [STATES_ENUM.WARNING]:     'icon-warning',
-      [STATES_ENUM.UNHEALTHY]:   'icon-warning',
-    };
-
     return {
       nodeHeaders,
       constraints:             [],
@@ -152,7 +151,6 @@ export default {
       ETCD_METRICS_DETAIL_URL,
       ETCD_METRICS_SUMMARY_URL,
       STATES_ENUM,
-      clusterCounts,
       selectedTab:             'cluster-events',
       extensionCards:          getApplicableExtensionEnhancements(this, ExtensionPoint.CARD, CardLocation.CLUSTER_DASHBOARD_CARD, this.$route),
       canViewEvents:           !!this.$store.getters['cluster/schemaFor'](EVENT),
@@ -188,6 +186,10 @@ export default {
     ...mapGetters(['currentCluster']),
     ...monitoringStatus(),
 
+    clusterCounts() {
+      return this.$store.getters[`cluster/all`](COUNT);
+    },
+
     nodes() {
       return this.$store.getters['cluster/all'](NODE);
     },

package/pages/c/_cluster/istio/index.vue

@@ -95,7 +95,7 @@ export default {
               <t k="istio.links.kiali.label" />
               <i class="icon icon-external-link pull-right" />
             </a>
-            <hr>
+            <hr role="none">
             <div class="description">
               <span v-clean-html="t('istio.links.kiali.description', {link: monitoringUrl}, true)" />
             </div>
@@ -131,7 +131,7 @@ export default {
               <t k="istio.links.jaeger.label" />
               <i class="icon icon-external-link pull-right" />
             </a>
-            <hr>
+            <hr role="none">
             <div class="description">
               <span v-clean-html="t('istio.links.jaeger.description', true)" />
             </div>

package/pages/c/_cluster/longhorn/index.vue

@@ -84,7 +84,7 @@ export default {
           <div class="link-content">
             <t :k="fel.label" />
             <i class="icon icon-external-link pull-right" />
-            <hr>
+            <hr role="none">
             <div class="description"><t :k="fel.description" /></div>
           </div>
         </a>

package/pages/c/_cluster/monitoring/index.vue

@@ -172,7 +172,7 @@ export default {
                   <i class="icon icon-external-link" />
                 </div>
               </div>
-              <hr>
+              <hr role="none">
               <div class="description">
                 <span>
                   <t :k="fel.description" />

package/pages/c/_cluster/monitoring/monitor/_namespace/_id.vue

@@ -7,9 +7,11 @@ export default {
   components: { ResourceDetail },
 
   data() {
-    const { query:{ resource } } = this.$route;
+    return { resource: null };
+  },
 
-    return { resource };
+  created() {
+    this.resource = this.$route.query.resource;
   }
 };
 </script>

package/pages/c/_cluster/monitoring/monitor/create.vue

@@ -15,9 +15,11 @@ export default {
   components: { ResourceDetail },
 
   data() {
-    const { query:{ resource } } = this.$route;
+    return { resource: null };
+  },
 
-    return { resource };
+  created() {
+    this.resource = this.$route.query.resource;
   }
 };
 </script>

package/pages/c/_cluster/monitoring/monitor/index.vue

@@ -52,14 +52,14 @@ export default {
   <div v-else>
     <div class="row header mb-40">
       <h1>  {{ t('monitoring.monitors') }}</h1>
-      <div>
+      <!-- <div>
         <button
           class="btn btn-lg role-primary float right"
           @click="$router.push(createRoute)"
         >
           {{ t('resourceList.head.createFromYaml') }}
         </button>
-      </div>
+      </div> -->
     </div>
     <Tabbed
       ref="tabs"

package/pages/c/_cluster/monitoring/route-receiver/_id.vue

@@ -15,9 +15,11 @@ export default {
   components: { ResourceDetail },
 
   data() {
-    const { query:{ resource } } = this.$route;
+    return { resource: null };
+  },
 
-    return { resource };
+  created() {
+    this.resource = this.$route.query.resource;
   }
 };
 </script>

package/pages/c/_cluster/monitoring/route-receiver/create.vue

@@ -7,10 +7,13 @@ export default {
   components: { ResourceDetail },
 
   data() {
-    const { query:{ resource } } = this.$route;
+    return { resource: null };
+  },
 
-    return { resource };
+  created() {
+    this.resource = this.$route.query.resource;
   }
+
 };
 </script>
 

package/pages/c/_cluster/neuvector/index.vue

@@ -65,7 +65,7 @@ export default {
           <div class="link-content">
             <t :k="fel.label" />
             <i class="icon icon-external-link pull-right" />
-            <hr>
+            <hr role="none">
             <div class="description"><t :k="fel.description" /></div>
           </div>
         </a>

package/pages/c/_cluster/settings/brand.vue

@@ -255,7 +255,7 @@ export default {
     </h1>
     <TypeDescription resource="branding" />
     <div>
-      <div class="row mb-20">
+      <div class="row">
         <div class="col span-6">
           <LabeledInput
             v-model:value="uiPLSetting.value"
@@ -544,7 +544,7 @@ export default {
         />
       </div>
 
-      <h3 class="mt-40 mb-5 pb-0">
+      <!-- <h3 class="mt-40 mb-5 pb-0">
         {{ t('branding.linkColor.label') }}
       </h3>
       <label class="text-label">
@@ -571,7 +571,7 @@ export default {
             {{ t('branding.linkColor.example') }}
           </a>
         </span>
-      </div>
+      </div> -->
     </div>
     <template
       v-for="(err, i) in errors"