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

package/edit/logging.banzaicloud.io.output/providers/syslog.vue

@@ -67,15 +67,15 @@ export default {
       </div>
     </div>
     <div class="row">
-      <div class="col span-8">
-        <LabeledInput
-          v-model:value="value.host"
-          :mode="mode"
-          :disabled="disabled"
-          :label="t('logging.syslog.host')"
+      <div class="col span-6">
+        <LabeledInput
+          v-model:value="value.host"
+          :mode="mode"
+          :disabled="disabled"
+          :label="t('logging.syslog.host')"
         />
       </div>
-      <div class="col span-4">
+      <div class="col span-6">
         <LabeledInput
           v-model:value="port"
           :mode="mode"
@@ -92,7 +92,7 @@ export default {
         <h3>{{ t('logging.output.sections.certificate') }}</h3>
       </div>
     </div>
-    <div class="row mb-10">
+    <div class="row">
       <div class="col span-6">
         <LabeledSelect
           v-model:value="value.transport"
@@ -103,16 +103,16 @@ export default {
         />
       </div>
       <div class="col span-6 insecure">
-        <Checkbox
-          v-model:value="value.insecure"
-          :mode="mode"
-          :disabled="disabled"
-          :label="t('logging.syslog.insecure')"
+        <Checkbox
+          v-model:value="value.insecure"
+          :mode="mode"
+          :disabled="disabled"
+          :label="t('logging.syslog.insecure')"
         />
       </div>
     </div>
-    <div class="row mb-10">
-      <div class="col span-6">
+    <div class="row">
+      <div class="col span-12">
         <SecretSelector
           v-model:value="value.trusted_ca_path"
           mount-key="mountFrom"
@@ -130,7 +130,7 @@ export default {
         <h3>{{ t('logging.syslog.format.title') }}</h3>
       </div>
     </div>
-    <div class="row mb-10">
+    <div class="row">
       <div class="col span-6">
         <LabeledSelect
           v-model:value="value.format.type"
@@ -149,21 +149,21 @@ export default {
     </div>
     <div class="row mb-20">
       <div class="col span-6">
-        <LabeledInput
-          v-model:value="value.buffer.tags"
-          :mode="mode"
-          :disabled="disabled"
-          :label="t('logging.syslog.buffer.tags')"
+        <LabeledInput
+          v-model:value="value.buffer.tags"
+          :mode="mode"
+          :disabled="disabled"
+          :label="t('logging.syslog.buffer.tags')"
         />
       </div>
     </div>
-    <div class="row mb-10">
+    <div class="row">
       <div class="col span-6">
-        <LabeledInput
-          v-model:value="value.buffer.chunk_limit_size"
-          :mode="mode"
-          :disabled="disabled"
-          :label="t('logging.syslog.buffer.chunkLimitSize')"
+        <LabeledInput
+          v-model:value="value.buffer.chunk_limit_size"
+          :mode="mode"
+          :disabled="disabled"
+          :label="t('logging.syslog.buffer.chunkLimitSize')"
         />
       </div>
       <div class="col span-6">
@@ -178,49 +178,49 @@ export default {
     </div>
     <div class="row mb-20">
       <div class="col span-6">
-        <LabeledInput
-          v-model:value="value.buffer.total_limit_size"
-          :mode="mode"
-          :disabled="disabled"
-          :label="t('logging.syslog.buffer.totalLimitSize')"
+        <LabeledInput
+          v-model:value="value.buffer.total_limit_size"
+          :mode="mode"
+          :disabled="disabled"
+          :label="t('logging.syslog.buffer.totalLimitSize')"
         />
       </div>
     </div>
     <div class="row mb-20">
       <div class="col span-6">
-        <LabeledInput
-          v-model:value="value.buffer.flush_interval"
-          :mode="mode"
-          :disabled="disabled"
-          :label="t('logging.syslog.buffer.flushInterval')"
+        <LabeledInput
+          v-model:value="value.buffer.flush_interval"
+          :mode="mode"
+          :disabled="disabled"
+          :label="t('logging.syslog.buffer.flushInterval')"
         />
       </div>
     </div>
-    <div class="row mb-10">
+    <div class="row">
       <div class="col span-6">
-        <LabeledInput
-          v-model:value="value.buffer.timekey"
-          :mode="mode"
-          :disabled="disabled"
-          :label="t('logging.syslog.buffer.timekey')"
+        <LabeledInput
+          v-model:value="value.buffer.timekey"
+          :mode="mode"
+          :disabled="disabled"
+          :label="t('logging.syslog.buffer.timekey')"
         />
       </div>
       <div class="col span-6">
-        <LabeledInput
-          v-model:value="value.buffer.timekey_wait"
-          :mode="mode"
-          :disabled="disabled"
-          :label="t('logging.syslog.buffer.timekeyWait')"
+        <LabeledInput
+          v-model:value="value.buffer.timekey_wait"
+          :mode="mode"
+          :disabled="disabled"
+          :label="t('logging.syslog.buffer.timekeyWait')"
         />
       </div>
     </div>
-    <div class="row mb-10">
+    <div class="row">
       <div class="col span-6">
-        <Checkbox
-          v-model:value="value.buffer.timekey_use_utc"
-          :mode="mode"
-          :disabled="disabled"
-          :label="t('logging.syslog.buffer.timekeyUseUTC')"
+        <Checkbox
+          v-model:value="value.buffer.timekey_use_utc"
+          :mode="mode"
+          :disabled="disabled"
+          :label="t('logging.syslog.buffer.timekeyUseUTC')"
         />
       </div>
     </div>

package/edit/management.cattle.io.fleetworkspace.vue

@@ -1,10 +1,12 @@
 <script>
+import { _CREATE } from '@shell/config/query-params';
 import CreateEditView from '@shell/mixins/create-edit-view';
 import CruResource from '@shell/components/CruResource';
 import Labels from '@shell/components/form/Labels';
 import Loading from '@shell/components/Loading';
 import NameNsDescription from '@shell/components/form/NameNsDescription';
 import { FLEET, MANAGEMENT, SCHEMA } from '@shell/config/types';
+import { FLEET as FLEET_ANNOTATIONS } from '@shell/config/labels-annotations';
 // import RoleBindings from '@shell/components/RoleBindings';
 import Tabbed from '@shell/components/Tabbed';
 import Tab from '@shell/components/Tabbed/Tab';
@@ -16,6 +18,7 @@ import { LAST_NAMESPACE, WORKSPACE } from '@shell/store/prefs';
 import { exceptionToErrorsArray } from '@shell/utils/error';
 import Banner from '@components/Banner/Banner.vue';
 import ArrayList from '@shell/components/form/ArrayList.vue';
+import FleetOCIStorageSecret from '@shell/components/fleet/FleetOCIStorageSecret.vue';
 
 export default {
   name: 'FleetCruWorkspace',
@@ -25,6 +28,7 @@ export default {
   inheritAttrs: false,
   components:   {
     CruResource,
+    FleetOCIStorageSecret,
     Labels,
     Loading,
     NameNsDescription,
@@ -126,6 +130,10 @@ export default {
         this.errors = exceptionToErrorsArray(err);
       }
     },
+
+    updateDefaultOCIStorageSecret(secretName) {
+      this.value.metadata.annotations[FLEET_ANNOTATIONS.OCI_STORAGE_SECRET_DEFAULT] = secretName;
+    }
   },
 
   computed: {
@@ -145,6 +153,14 @@ export default {
       }
     },
 
+    defaultOCIStorageSecret() {
+      return this.value.metadata?.annotations?.[FLEET_ANNOTATIONS.OCI_STORAGE_SECRET_DEFAULT];
+    },
+
+    isCreate() {
+      return this.mode === _CREATE;
+    },
+
     SCOPE_NAMESPACE() {
       return SCOPE_NAMESPACE;
     },
@@ -184,6 +200,7 @@ export default {
     <Tabbed
       :side-tabs="true"
       default-tab="members"
+      :use-hash="useTabbedHash"
     >
       <!-- <Tab name="members" label-key="generic.members" :weight="2">
         <RoleBindings
@@ -198,19 +215,10 @@ export default {
         />
       </Tab> -->
 
-      <Tab
-        name="labels"
-        label-key="generic.labelsAndAnnotations"
-      >
-        <Labels
-          :value="value"
-          :mode="mode"
-          @update:value="$emit('input', $event)"
-        />
-      </Tab>
       <Tab
         name="allowedtargetnamespaces"
         label-key="fleet.workspaces.tabs.restrictions"
+        :weight="3"
       >
         <Banner
           color="info"
@@ -240,6 +248,32 @@ export default {
           :value-can-be-empty="true"
         />
       </Tab>
+      <Tab
+        v-if="!isCreate"
+        name="ociRegistries"
+        label-key="fleet.workspaces.tabs.ociRegistry"
+        :weight="2"
+      >
+        <FleetOCIStorageSecret
+          data-testid="default-oci-storage-secret"
+          :secret="defaultOCIStorageSecret"
+          :workspace="value.metadata.name"
+          :mode="mode"
+          :allow-default="false"
+          @update:value="updateDefaultOCIStorageSecret"
+        />
+      </Tab>
+      <Tab
+        name="labels"
+        label-key="generic.labelsAndAnnotations"
+        :weight="1"
+      >
+        <Labels
+          :value="value"
+          :mode="mode"
+          @update:value="$emit('input', $event)"
+        />
+      </Tab>
     </Tabbed>
   </CruResource>
 </template>

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

@@ -0,0 +1,162 @@
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+import CreateEditView from '@shell/mixins/create-edit-view';
+import ArrayList from '@shell/components/form/ArrayList.vue';
+import UnitInput from '@shell/components/form/UnitInput.vue';
+import CruResource from '@shell/components/CruResource.vue';
+import FormValidation from '@shell/mixins/form-validation';
+import NameNsDescription from '@shell/components/form/NameNsDescription.vue';
+
+const DEFAULT_REF_TOKEN_EXP = 3600;
+const DEFAULT_TOKEN_EXP = 600;
+
+export default defineComponent({
+  name: 'EditOidcClient',
+
+  emits: ['input'],
+
+  inheritAttrs: false,
+
+  components: {
+    CruResource,
+    NameNsDescription,
+    ArrayList,
+    UnitInput,
+  },
+
+  mixins: [
+    CreateEditView,
+    FormValidation
+  ],
+
+  created() {
+    // setup the data for creation scenario
+    if (this.isCreate) {
+      this.value.spec = {
+        refreshTokenExpirationSeconds: DEFAULT_REF_TOKEN_EXP,
+        tokenExpirationSeconds:        DEFAULT_TOKEN_EXP
+      };
+    }
+  },
+
+  data() {
+    return {
+      fvFormRuleSets: [
+        { path: 'metadata.name', rules: ['required'] },
+        { path: 'spec.redirectURIs', rules: ['required', 'genericUrl'] },
+        { path: 'spec.refreshTokenExpirationSeconds', rules: ['required'] },
+        { path: 'spec.tokenExpirationSeconds', rules: ['required'] },
+      ],
+    };
+  },
+
+  computed: {
+    finishButtonMode(): string {
+      return this.isCreate ? 'registerApplication' : 'saveApplication';
+    },
+
+    doneLocationOverride() {
+      if (this.isCreate) {
+        const afterCreateRoute = Object.assign({}, this.value.detailLocation);
+
+        afterCreateRoute.state = { displaySecret: 'true' };
+
+        return afterCreateRoute;
+      }
+
+      return undefined;
+    },
+  },
+});
+</script>
+
+<template>
+  <CruResource
+    :mode="mode"
+    :resource="value"
+    :doneLocationOverride="doneLocationOverride"
+    class="create-edit"
+    :finish-button-mode="finishButtonMode"
+    :errors="errors"
+    :validation-passed="fvFormIsValid"
+    @finish="save"
+    @error="e=>errors=e"
+  >
+    <div class="mb-10">
+      <!-- app name, app description -->
+      <div class="row mt-20">
+        <div class="col span-12">
+          <NameNsDescription
+            :value="value"
+            :mode="mode"
+            :namespaced="false"
+            :name-placeholder="'oidcclient.appName.placeholder'"
+            :description-key="'spec.description'"
+            :description-placeholder="'oidcclient.appDescription.placeholder'"
+            :rules="{ name: fvGetAndReportPathRules('metadata.name'), description: [] }"
+            @update:value="$emit('input', $event)"
+          />
+        </div>
+      </div>
+      <!-- cb urls, tokens -->
+      <div class="row ">
+        <div class="col span-6">
+          <ArrayList
+            v-model:value="value.spec.redirectURIs"
+            class="mt-20"
+            :mode="mode"
+            :title="t('oidcclient.redirectURIs.label')"
+            :a11y-label="t('oidcclient.redirectURIs.label')"
+            :add-label="t('oidcclient.redirectURIs.addLabel')"
+            :required="true"
+            :protip="false"
+            :showHeader="true"
+            :rules="fvGetAndReportPathRules('spec.redirectURIs')"
+            :value-label="''"
+            data-testid="oidc-client-cb-urls-list"
+          />
+        </div>
+      </div>
+      <h3 class="mt-40">
+        {{ t('oidcclient.tokenExpirationSeconds.label') }}
+      </h3>
+      <div class="row mt-20 mb-20">
+        <div
+          class="col span-3"
+          data-testid="oidc-client-token-exp-input"
+        >
+          <UnitInput
+            v-model:value="value.spec.tokenExpirationSeconds"
+            :mode="mode"
+            :increment="1"
+            :required="true"
+            base-unit="s"
+            :positive="true"
+            :rules="fvGetAndReportPathRules('spec.tokenExpirationSeconds')"
+            :label="t('oidcclient.tokenExpirationSeconds.label')"
+            :sub-label="t('oidcclient.tokenExpirationSeconds.placeholder')"
+            :aria-label="t('oidcclient.tokenExpirationSeconds.label')"
+          />
+        </div>
+        <div
+          class="col span-3"
+          data-testid="oidc-client-ref-token-exp-input"
+        >
+          <UnitInput
+            v-model:value="value.spec.refreshTokenExpirationSeconds"
+            :mode="mode"
+            :increment="1"
+            :required="true"
+            base-unit="s"
+            :positive="true"
+            :rules="fvGetAndReportPathRules('spec.refreshTokenExpirationSeconds')"
+            :label="t('oidcclient.refreshTokenExpirationSeconds.label')"
+            :sub-label="t('oidcclient.refreshTokenExpirationSeconds.placeholder')"
+            :aria-label="t('oidcclient.refreshTokenExpirationSeconds.label')"
+          />
+        </div>
+      </div>
+    </div>
+  </CruResource>
+</template>

package/edit/management.cattle.io.project.vue

@@ -195,7 +195,10 @@ export default {
       :rules="{ name: fvGetAndReportPathRules('spec.displayName'), namespace: [], description: [] }"
       @update:value="$emit('input', $event)"
     />
-    <Tabbed :side-tabs="true">
+    <Tabbed
+      :side-tabs="true"
+      :use-hash="useTabbedHash"
+    >
       <Tab
         v-if="canViewMembers"
         name="members"

package/edit/monitoring.coreos.com.alertmanagerconfig/index.vue

@@ -203,7 +203,7 @@ export default {
       @input="$emit('input', $event)"
     />
 
-    <Tabbed>
+    <Tabbed :use-hash="useTabbedHash">
       <Tab
         :label="t('monitoring.route.label')"
         :weight="1"

package/edit/monitoring.coreos.com.alertmanagerconfig/receiverConfig.vue

@@ -101,6 +101,10 @@ export default {
       type:     Function,
       required: true
     },
+    useTabbedHash: {
+      type:    Boolean,
+      default: undefined
+    }
   },
 
   mixins: [CreateEditView, FormValidation],
@@ -300,6 +304,7 @@ export default {
       ref="tabbed"
       :side-tabs="true"
       default-tab="overview"
+      :use-hash="useTabbedHash"
       @changed="tabChanged"
     >
       <Tab

package/edit/monitoring.coreos.com.prometheusrule/index.vue

@@ -154,6 +154,7 @@ export default {
         v-if="filteredGroups.length > 0"
         :side-tabs="true"
         :show-tabs-add-remove="mode !== 'view'"
+        :use-hash="useTabbedHash"
         @addTab="addRuleGroup"
         @removeTab="removeGroupRule"
       >

package/edit/monitoring.coreos.com.receiver/auth.vue

@@ -84,7 +84,7 @@ export default {
         <LabeledSelect
           v-model:value="authType"
           :options="authOptions"
-          label="验证类型"
+          label="Auth Type"
           @update:value="initializeType(authOptions, authType)"
         />
       </div>
@@ -106,7 +106,7 @@ export default {
           :mode="mode"
           :label="t('monitoringReceiver.auth.password')"
           type="password"
-          autocomplete="password"
+          autocomplete="current-password"
         />
       </div>
     </div>
@@ -121,7 +121,7 @@ export default {
           :label="t('monitoringReceiver.auth.bearerToken.label')"
           :placeholder="t('monitoringReceiver.auth.bearerToken.placeholder')"
           type="password"
-          autocomplete="password"
+          autocomplete="current-password"
         />
       </div>
     </div>

package/edit/monitoring.coreos.com.receiver/index.vue

@@ -219,6 +219,7 @@ export default {
       ref="tabbed"
       :side-tabs="true"
       default-tab="overview"
+      :use-hash="useTabbedHash"
       @changed="tabChanged"
     >
       <Tab

package/edit/monitoring.coreos.com.receiver/types/email.vue

@@ -116,7 +116,7 @@ export default {
           :mode="mode"
           label="密码"
           type="password"
-          autocomplete="password"
+          autocomplete="current-password"
         />
       </div>
     </div>

package/edit/monitoring.coreos.com.route.vue

@@ -103,6 +103,7 @@ export default {
       ref="tabbed"
       :side-tabs="true"
       default-tab="overview"
+      :use-hash="useTabbedHash"
     >
       <Tab
         label="Receiver"

package/edit/namespace.vue

@@ -11,7 +11,6 @@ import Tab from '@shell/components/Tabbed/Tab';
 import ResourceTabs from '@shell/components/form/ResourceTabs/index.vue';
 import CruResource from '@shell/components/CruResource';
 import { PROJECT_ID, _VIEW, FLAT_VIEW, _CREATE } from '@shell/config/query-params';
-import MoveModal from '@shell/components/MoveModal';
 import ResourceQuota from '@shell/components/form/ResourceQuota/Namespace';
 import Loading from '@shell/components/Loading';
 import { HARVESTER_TYPES, RANCHER_TYPES } from '@shell/components/form/ResourceQuota/shared';
@@ -31,8 +30,7 @@ export default {
     PodSecurityAdmission,
     ResourceQuota,
     Tab,
-    ResourceTabs,
-    MoveModal
+    ResourceTabs
   },
 
   mixins:       [CreateEditView],
@@ -203,6 +201,7 @@ export default {
       :value="value"
       :mode="mode"
       :side-tabs="true"
+      :use-hash="useTabbedHash"
       @update:value="$emit('input', $event)"
     >
       <Tab
@@ -276,6 +275,5 @@ export default {
         />
       </Tab>
     </ResourceTabs>
-    <MoveModal v-if="projects" />
   </CruResource>
 </template>

package/edit/networking.istio.io.destinationrule/index.vue

@@ -66,7 +66,10 @@ export default {
     </div>
 
     <div class="mb-20">
-      <Tabbed :side-tabs="true">
+      <Tabbed
+        :side-tabs="true"
+        :use-hash="useTabbedHash"
+      >
         <Tab
           name="subsets"
           :label="t('istio.destinationRule.subsets.label')"