dashboard-shell-shell 3.0.2-rc.105 → 3.0.5-test.1

package/edit/workload/index.vue

@@ -20,19 +20,10 @@ export default {
     },
   },
   data() {
-    return { selectedName: null, closedErrorMessages: [] };
+    return { selectedName: null, errors: [] };
   },
-  computed: {
-    ...mapGetters({ t: 'i18n/t' }),
-    errorMessages() {
-      if (!this.type) {
-        return [];
-      }
-
-      return this.fvUnreportedValidationErrors.filter((e) => !this.closedErrorMessages.includes(e));
-    }
-  },
-  methods: {
+  computed: { ...mapGetters({ t: 'i18n/t' }) },
+  methods:  {
     changed(tab) {
       const key = this.idKey;
 
@@ -94,7 +85,7 @@ export default {
       :selected-subtype="type"
       :resource="value"
       :mode="mode"
-      :errors="errorMessages"
+      :errors="errors"
       :done-route="doneRoute"
       :subtypes="workloadSubTypes"
       :apply-hooks="applyHooks"
@@ -102,7 +93,7 @@ export default {
       :errors-map="getErrorsMap(fvUnreportedValidationErrors)"
       @finish="save"
       @select-type="selectType"
-      @error="(_, closedError) => closedErrorMessages.push(closedError)"
+      @error="e=>errors = e"
     >
       <NameNsDescription
         :value="value"
@@ -163,6 +154,7 @@ export default {
         :show-tabs-add-remove="true"
         :default-tab="defaultTab"
         :flat="true"
+        :use-hash="useTabbedHash"
         data-testid="workload-horizontal-tabs"
         @changed="changed"
       >
@@ -178,6 +170,7 @@ export default {
             :side-tabs="true"
             :weight="99"
             :data-testid="`workload-container-tabs-${i}`"
+            :use-hash="useTabbedHash"
           >
             <Tab
               :label="t('workload.container.titles.general')"
@@ -266,6 +259,7 @@ export default {
                     v-stripped-aria-label="t('workload.container.ports.toolTip')"
                     class="icon icon-info"
                     tabindex="0"
+                    role="tooltip"
                   />
                 </h3>
                 <p class="padded">
@@ -373,6 +367,7 @@ export default {
           <Tabbed
             data-testid="workload-general-tabs"
             :side-tabs="true"
+            :use-hash="useTabbedHash"
           >
             <Tab
               name="labels"
@@ -414,6 +409,7 @@ export default {
           <Tabbed
             data-testid="workload-pod-tabs"
             :side-tabs="true"
+            :use-hash="useTabbedHash"
           >
             <Tab
               :label="t('workload.storage.title')"
@@ -668,7 +664,7 @@ export default {
 .deployment-tabs {
   > .tabs.horizontal {
     border-bottom: 1px solid var(--border);
-    margin-bottom: 10px;
+    margin-bottom: 20px;
   }
 }
 .padded {

package/edit/workload/mixins/workload.js

@@ -52,8 +52,6 @@ import { TYPES as SECRET_TYPES } from '@shell/models/secret';
 import { defaultContainer } from '@shell/models/workload';
 import { allHash } from '@shell/utils/promise';
 
-import { harvesterhci2cloud, cloud2harvesterhci } from '@shell/utils/router'
-
 const TAB_WEIGHT_MAP = {
   general:              99,
   healthCheck:          98,

package/list/{cis.cattle.io.clusterscan.vue → compliance.cattle.io.clusterscan.vue}

@@ -3,7 +3,7 @@ import ResourceTable from '@shell/components/ResourceTable';
 import { AGE } from '@shell/config/table-headers';
 import ResourceFetch from '@shell/mixins/resource-fetch';
 import { allHash } from '@shell/utils/promise';
-import { fetchSpecsScheduledScanConfig } from '@shell/models/cis.cattle.io.clusterscan';
+import { fetchSpecsScheduledScanConfig } from '@shell/models/compliance.cattle.io.clusterscan';
 
 export default {
   components: { ResourceTable },
@@ -40,7 +40,7 @@ export default {
   },
 
   computed: {
-    // warning state and scheduling added in the same version of cis so a check for one is a check for the other
+    // warning state and scheduling added in the same version of compliance so a check for one is a check for the other
     hasWarningState() {
       return this.hasScheduledScanConfig;
     },

package/list/fleet.cattle.io.gitrepo.vue

@@ -65,7 +65,7 @@ export default {
 
       }, this.$store);
 
-      this.hasWorkspaces = !!hash.workspaces;
+      this.hasWorkspaces = (hash.workspaces || []).length > 0;
     } catch (e) {
     }
 

package/list/fleet.cattle.io.helmop.vue

@@ -0,0 +1,108 @@
+<script>
+import FleetHelmOps from '@shell/components/fleet/FleetHelmOps.vue';
+import Masthead from '@shell/components/ResourceList/Masthead';
+import FleetNoWorkspaces from '@shell/components/fleet/FleetNoWorkspaces.vue';
+import { FLEET } from '@shell/config/types';
+import ResourceFetch from '@shell/mixins/resource-fetch';
+import { checkPermissions, checkSchemasForFindAllHash } from '@shell/utils/auth';
+
+export default {
+  name:       'ListHelmOps',
+  components: {
+    FleetHelmOps,
+    Masthead,
+    FleetNoWorkspaces,
+  },
+  mixins: [ResourceFetch],
+  props:  {
+    schema: {
+      type:     Object,
+      required: true,
+    },
+
+    resource: {
+      type:     String,
+      required: true,
+    },
+
+    loadIndeterminate: {
+      type:    Boolean,
+      default: false
+    },
+
+    incrementalLoadingIndicator: {
+      type:    Boolean,
+      default: false
+    },
+
+    useQueryParamsForSimpleFiltering: {
+      type:    Boolean,
+      default: false
+    }
+  },
+
+  async fetch() {
+    try {
+      const hash = await checkSchemasForFindAllHash({
+        cluster: {
+          inStoreType: 'management',
+          type:        FLEET.CLUSTER
+        },
+        clusterGroups: {
+          inStoreType: 'management',
+          type:        FLEET.CLUSTER_GROUP
+        },
+
+        helmOps: {
+          inStoreType: 'management',
+          type:        FLEET.HELM_OP
+        },
+
+        workspaces: {
+          inStoreType: 'management',
+          type:        FLEET.WORKSPACE
+        },
+
+      }, this.$store);
+
+      this.hasWorkspaces = (hash.workspaces || []).length > 0;
+    } catch (e) {
+    }
+
+    try {
+      const permissions = await checkPermissions({ workspaces: { type: FLEET.WORKSPACE }, helmOps: { type: FLEET.HELM_OP } }, this.$store.getters);
+
+      this.permissions = permissions;
+    } catch (e) {
+    }
+    await this.$fetchType(this.resource);
+  },
+
+  data() {
+    return { hasWorkspaces: false, permissions: {} };
+  },
+};
+</script>
+
+<template>
+  <div v-if="hasWorkspaces">
+    <Masthead
+      :schema="schema"
+      :resource="resource"
+      :show-incremental-loading-indicator="incrementalLoadingIndicator"
+      :load-resources="loadResources"
+      :load-indeterminate="loadIndeterminate"
+      :create-button-label="t('fleet.helmOp.actions.add')"
+    />
+    <FleetHelmOps
+      :rows="rows"
+      :schema="schema"
+      :loading="loading"
+      :use-query-params-for-simple-filtering="useQueryParamsForSimpleFiltering"
+      :force-update-live-and-delayed="forceUpdateLiveAndDelayed"
+    />
+  </div>
+  <div v-else>
+    <FleetNoWorkspaces :can-view="permissions.workspaces" />
+  </div>
+</template>

package/list/harvesterhci.io.management.cluster.vue

@@ -119,7 +119,6 @@ export default {
       :resource="resource"
       :is-creatable="false"
       :type-display="typeDisplay"
-      :main-button-visible="!rows || !rows.length"
     >
       <template #typeDescription>
         <TypeDescription :resource="hResource" />
@@ -145,23 +144,7 @@ export default {
       :is-creatable="true"
       :namespaced="false"
       :use-query-params-for-simple-filtering="useQueryParamsForSimpleFiltering"
-    
-      :resource="resource"
-      :main-button-visible="true"
     >
-
-      <template
-        v-if="canCreateCluster"
-        slot="extraActions"
-      >
-        <n-link
-          :to="importLocation"
-          class="btn role-primary"
-        >
-          {{ t('cluster.importAction') }}1451414651
-        </n-link>
-      </template>
-
       <template #col:name="{row}">
         <td>
           <span class="cluster-link">

package/list/management.cattle.io.feature.vue

@@ -1,27 +1,13 @@
 <script>
-import { mapState, mapGetters } from 'vuex';
-import AsyncButton from '@shell/components/AsyncButton';
-import AppModal from '@shell/components/AppModal';
-import { Card } from '@components/Card';
+import { mapGetters } from 'vuex';
 import ResourceTable from '@shell/components/ResourceTable';
-import { Banner } from '@components/Banner';
-import { LabeledInput } from '@components/Form/LabeledInput';
 import { MANAGEMENT } from '@shell/config/types';
-import { SETTING } from '@shell/config/settings';
 import ResourceFetch from '@shell/mixins/resource-fetch';
-import { getVendor } from '@shell/config/private-label';
 
 export default {
-  components: {
-    AsyncButton,
-    Banner,
-    Card,
-    ResourceTable,
-    LabeledInput,
-    AppModal,
-  },
-  mixins: [ResourceFetch],
-  props:  {
+  components: { ResourceTable },
+  mixins:     [ResourceFetch],
+  props:      {
     resource: {
       type:     String,
       required: true,
@@ -40,46 +26,15 @@ export default {
 
   async fetch() {
     await this.$fetchType(this.resource);
-
-    this.serverUrlSetting = this.$store.getters['management/byId'](MANAGEMENT.SETTING, SETTING.SERVER_URL);
-
-    if (this.serverUrlSetting?.value) {
-      this.serverUrl = this.serverUrlSetting.value;
-    } else {
-      this.noUrlSet = true;
-      this.serverUrl = window.location.origin;
-    }
-  },
-
-  data() {
-    return {
-      update:           [],
-      updateMode:       'activate',
-      error:            null,
-      enabling:         false,
-      restart:          false,
-      waiting:          false,
-      timer:            null,
-      serverUrlSetting: {},
-      serverUrl:        '',
-      noUrlSet:         false,
-      showModal:        false,
-      vendor:           getVendor(),
-    };
   },
 
   computed: {
-    ...mapState('action-menu', ['showPromptUpdate', 'toUpdate']),
     ...mapGetters({ t: 'i18n/t' }),
 
     filteredRows() {
       return this.rows.filter((x) => x.name !== 'fleet');
     },
 
-    promptForUrl() {
-      return this.update?.id === 'multi-cluster-management' && this.noUrlSet;
-    },
-
     enableRowActions() {
       const schema = this.$store.getters[`management/schemaFor`](MANAGEMENT.FEATURE);
 
@@ -90,109 +45,6 @@ export default {
   $loadingResources() {
     // results are filtered so we wouldn't get the correct count on indicator...
     return { loadIndeterminate: true };
-  },
-
-  watch: {
-    showPromptUpdate(show) {
-      if (show) {
-        // Clear last error
-        this.error = null;
-
-        this.showModal = true;
-      } else {
-        this.showModal = false;
-      }
-    },
-
-    toUpdate(neu) {
-      // Only support updating one at a time - bulk does not make sense, as they may
-      // be in different states and with different restart values
-      this.update = Array.isArray(neu) ? neu[0] : neu;
-      if (this.update) {
-        this.restart = this.update.restartRequired;
-        // If the value is currently false, then we will be enabling it
-        this.enabling = !this.update.enabled;
-        this.updateMode = this.enabling ? 'activate' : 'deactivate';
-      }
-    }
-  },
-
-  methods: {
-    close() {
-      this.$store.commit('action-menu/togglePromptUpdate');
-
-      if (this.timer) {
-        clearTimeout(this.timer);
-        this.timer = null;
-      }
-    },
-
-    toggleFlag(btnCB) {
-      if (this.restart) {
-        this.doToggleWithRestart(btnCB);
-      } else {
-        this.doToggle(btnCB);
-      }
-    },
-
-    async doToggle(btnCB) {
-      this.error = null;
-      try {
-        this.update.spec.value = !this.update.enabled;
-        await this.update.save();
-        btnCB(true);
-        this.close();
-      } catch (err) {
-        // An error occurred, so toggle back the value - the call failed, so the change was not made
-        this.update.spec.value = !this.update.enabled;
-        this.error = err.message || err;
-        btnCB(false);
-      }
-    },
-
-    doToggleWithRestart(btnCB) {
-      this.error = null;
-      try {
-        this.update.spec.value = !this.update.enabled;
-        // await can go back in when backend returns from the save before restarting
-        this.update.save();
-      } catch (err) {}
-
-      this.waitForBackend(btnCB, this.update.id);
-      this.waiting = true;
-    },
-
-    waitForBackend(btnCB, id) {
-      const url = `/v3/features/${ id }`;
-
-      this.timer = setTimeout(async() => {
-        try {
-          const response = await this.$axios.get(url, { timeout: 5000 });
-
-          if (response?.status === 200) {
-            await this.$store.dispatch('management/findAll', { type: this.resource, opt: { force: true } });
-            btnCB(true);
-            this.close();
-            this.waiting = false;
-          }
-        } catch (e) {}
-
-        if (this.waiting) {
-          this.waitForBackend(btnCB, id);
-        }
-      }, 5000);
-    },
-
-    async saveUrl(btnCB) {
-      try {
-        this.serverUrlSetting.value = this.serverUrl;
-        await this.serverUrlSetting.save();
-        btnCB(true);
-      } catch (err) {
-        this.error = err;
-        btnCB(false);
-      }
-    },
   }
 };
 </script>
@@ -217,146 +69,10 @@ export default {
         </div>
       </template>
     </ResourceTable>
-    <app-modal
-      v-if="showModal"
-      class="update-modal"
-      name="toggleFlag"
-      :width="450"
-      height="auto"
-      styles="max-height: 100vh;"
-      :click-to-close="!restart || !waiting"
-      :trigger-focus-trap="true"
-      @close="close"
-    >
-      <Card
-        v-if="!waiting"
-        class="prompt-update"
-        :show-highlight-border="false"
-      >
-        <template #title>
-          <h4 class="text-default-text">
-            {{ t('featureFlags.title') }}
-          </h4>
-        </template>
-        <template #body>
-          <div
-            v-if="update"
-            class="mb-10"
-          >
-            <div v-if="enabling">
-              <span>
-                {{ t('featureFlags.promptActivate', {flag: update.id}) }}
-              </span>
-              <div
-                v-if="promptForUrl"
-                class="mt-10"
-              >
-                <span> {{ t('featureFlags.requiresSetting') }}</span>
-                <div
-                  :style="{'align-items':'center'}"
-                  class="row mt-10"
-                >
-                  <LabeledInput
-                    v-model:value="serverUrl"
-                    :label="t('setup.serverUrl.label')"
-                  />
-                  <div class="col pl-5">
-                    <AsyncButton @click="saveUrl" />
-                  </div>
-                </div>
-              </div>
-            </div>
-            <span v-else>
-              {{ t('featureFlags.promptDeactivate', {flag: update.id}) }}
-            </span>
-            <Banner
-              v-if="restart"
-              color="error"
-              :label="t('featureFlags.restartRequired', vendor)"
-            />
-          </div>
-          <div class="text-error mb-10">
-            {{ error }}
-          </div>
-        </template>
-        <template #actions>
-          <button
-            class="btn role-secondary"
-            @click="close"
-          >
-            {{ t('generic.cancel') }}
-          </button>
-          <AsyncButton
-            :disabled="promptForUrl && !serverUrlSetting.value"
-            :mode="updateMode"
-            class="btn bg-error ml-10"
-            @click="toggleFlag"
-          />
-        </template>
-      </Card>
-      <Card
-        v-else
-        class="prompt-update"
-        :show-highlight-border="false"
-      >
-        <template #title>
-          <h4 class="text-default-text">
-            {{ t('featureFlags.restart.title') }}
-          </h4>
-        </template>
-        <template #body>
-          <div class="waiting">
-            <p>{{ t('featureFlags.restart.wait') }}</p>
-            <span class="restarting-icon">
-              <i class=" icon icon-spinner icon-spin" />
-            </span>
-          </div>
-        </template>
-        <template #actions>
-          <button
-            class="btn role-secondary"
-            @click="close"
-          >
-            {{ t('generic.cancel') }}
-          </button>
-        </template>
-      </Card>
-    </app-modal>
   </div>
 </template>
 
 <style lang='scss' scoped>
-  .prompt-update {
-    &.card-container {
-      box-shadow: none;
-    }
-
-    :deep() .card-actions {
-      display: flex;
-      justify-content: center;
-    }
-  }
-
-  .waiting {
-    text-align: center;
-    font-size: 14px;
-    margin: 10px 0;
-
-    p {
-      line-height: 20px;;
-    }
-  }
-
-  .restarting-icon {
-    display: flex;
-    justify-content: center;
-    margin-top: 10px;
-
-    > I {
-    font-size: 24px;
-    }
-  }
-
   .feature-name {
     align-items: center;
     display: flex;

package/list/management.cattle.io.oidcclient.vue

@@ -0,0 +1,108 @@
+<script>
+import { MANAGEMENT } from '@shell/config/types';
+import { SETTING } from '@shell/config/settings';
+import PaginatedResourceTable from '@shell/components/PaginatedResourceTable';
+import CopyToClipboardText from '@shell/components/CopyToClipboardText';
+
+export default {
+  name:       'ListOidcClients',
+  components: {
+    CopyToClipboardText,
+    PaginatedResourceTable,
+  },
+
+  props: {
+    resource: {
+      type:     String,
+      required: true,
+    },
+
+    schema: {
+      type:     Object,
+      required: true,
+    },
+    useQueryParamsForSimpleFiltering: {
+      type:    Boolean,
+      default: false
+    }
+  },
+
+  data() {
+    const baseUrl = this.$store.getters['management/byId'](MANAGEMENT.SETTING, SETTING.SERVER_URL)?.value;
+
+    return {
+      issuerURL:         `${ baseUrl }/oidc`,
+      discoveryDocument: `${ baseUrl }/oidc/.well-known/openid-configuration`,
+      jwksURI:           `${ baseUrl }/oidc/.well-known/jwks.json`
+    };
+  },
+};
+</script>
+
+<template>
+  <div>
+    <div class="oidc-application-list-header-data">
+      <h3>{{ t('oidcclient.oidcEndpoints') }}</h3>
+      <div>
+        <label>{{ t('oidcclient.issuerURL') }}: </label>
+        <CopyToClipboardText
+          :aria-label="t('oidcclient.a11y.copyText.issuerURL')"
+          :text="issuerURL"
+          data-testid="oidc-clients-copy-clipboard-issuer-url"
+        />
+      </div>
+      <div>
+        <label>{{ t('oidcclient.discoveryDocument') }}: </label>
+        <CopyToClipboardText
+          :aria-label="t('oidcclient.a11y.copyText.discoveryDocument')"
+          :text="discoveryDocument"
+          data-testid="oidc-clients-copy-clipboard-discovery-document"
+        />
+      </div>
+      <div>
+        <label>{{ t('oidcclient.jwksUri') }}: </label>
+        <CopyToClipboardText
+          :aria-label="t('oidcclient.a11y.copyText.jwksUri')"
+          :text="jwksURI"
+          data-testid="oidc-clients-copy-clipboard-jwks-uri"
+        />
+      </div>
+    </div>
+    <PaginatedResourceTable
+      :schema="schema"
+      :use-query-params-for-simple-filtering="useQueryParamsForSimpleFiltering"
+      data-testid="oidc-clients-list"
+    />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.oidc-application-list-header-data {
+  align-items: center;
+  padding: 10px 0px;
+  display: flex;
+  margin-bottom: 24px;
+  flex-direction: column;
+  align-items: start;
+
+  > div:not(:last-child) {
+    margin-bottom: 18px;
+  }
+
+  h3 {
+    margin-bottom: 18px;
+  }
+
+  label {
+    display: block;
+  }
+
+  a {
+    font-weight: bold;
+  }
+
+  &>*:not(:last-child) {
+    margin-right: 40px;
+  }
+}
+</style>