@rancher/shell 3.0.2-rc.5 → 3.0.2

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

@@ -19,13 +19,18 @@ import NameNsDescription from '@shell/components/form/NameNsDescription';
 import YamlEditor from '@shell/components/YamlEditor';
 import { base64Decode, base64Encode } from '@shell/utils/crypto';
 import SelectOrCreateAuthSecret from '@shell/components/form/SelectOrCreateAuthSecret';
-import { _CREATE } from '@shell/config/query-params';
+import { _CREATE, _EDIT, _VIEW } from '@shell/config/query-params';
 import { isHarvesterCluster } from '@shell/utils/cluster';
 import { CAPI, CATALOG, FLEET as FLEET_LABELS } from '@shell/config/labels-annotations';
 import { SECRET_TYPES } from '@shell/config/secret';
 import { checkSchemasForFindAllHash } from '@shell/utils/auth';
 import Checkbox from '@components/Form/Checkbox/Checkbox.vue';
 import FormValidation from '@shell/mixins/form-validation';
+import UnitInput from '@shell/components/form/UnitInput';
+import { toSeconds } from '@shell/utils/duration';
+
+const MINIMUM_POLLING_INTERVAL = 15;
+const DEFAULT_POLLING_INTERVAL = 60;
 
 const _VERIFY = 'verify';
 const _SKIP = 'skip';
@@ -51,6 +56,7 @@ export default {
     NameNsDescription,
     YamlEditor,
     SelectOrCreateAuthSecret,
+    UnitInput,
   },
 
   mixins: [CreateEditView, FormValidation],
@@ -92,6 +98,16 @@ export default {
   },
 
   data() {
+    let pollingInterval = toSeconds(this.value.spec.pollingInterval) || this.value.spec.pollingInterval;
+
+    if (!pollingInterval) {
+      if (this.realMode === _CREATE) {
+        pollingInterval = DEFAULT_POLLING_INTERVAL;
+      } else if (this.realMode === _EDIT || this.realMode === _VIEW) {
+        pollingInterval = MINIMUM_POLLING_INTERVAL;
+      }
+    }
+
     const targetInfo = this.value.targetInfo;
     const targetCluster = targetInfo.cluster;
     const targetClusterGroup = targetInfo.clusterGroup;
@@ -110,26 +126,6 @@ export default {
       targetMode = `group://${ targetClusterGroup }`;
     }
 
-    const stepRepoInfo = {
-      name:           'stepRepoInfo',
-      title:          this.t('fleet.gitRepo.add.steps.repoInfo.title'),
-      label:          this.t('fleet.gitRepo.add.steps.repoInfo.label'),
-      subtext:        this.t('fleet.gitRepo.add.steps.repoInfo.subtext'),
-      descriptionKey: 'fleet.gitRepo.add.steps.repoInfo.description',
-      ready:          false,
-      weight:         1
-    };
-
-    const stepTargetInfo = {
-      name:           'stepTargetInfo',
-      title:          this.t('fleet.gitRepo.add.steps.targetInfo.title'),
-      label:          this.t('fleet.gitRepo.add.steps.targetInfo.label'),
-      subtext:        this.t('fleet.gitRepo.add.steps.targetInfo.subtext'),
-      descriptionKey: 'fleet.gitRepo.steps.add.targetInfo.description',
-      ready:          true,
-      weight:         1
-    };
-
     return {
       allClusters:             [],
       allClusterGroups:        [],
@@ -144,14 +140,13 @@ export default {
       correctDriftEnabled:     false,
       targetAdvancedErrors:    null,
       matchingClusters:        null,
+      pollingInterval,
       ref,
       refValue,
       targetMode,
       targetCluster,
       targetClusterGroup,
       targetAdvanced,
-      stepRepoInfo,
-      stepTargetInfo,
       displayHelmRepoURLRegex: false,
       fvFormRuleSets:          [{
         path:  'spec.repo',
@@ -172,8 +167,42 @@ export default {
 
     steps() {
       return [
-        this.stepRepoInfo,
-        this.stepTargetInfo
+        {
+          name:           'stepMetadata',
+          title:          this.t('fleet.gitRepo.add.steps.metadata.title'),
+          label:          this.t('fleet.gitRepo.add.steps.metadata.label'),
+          subtext:        this.t('fleet.gitRepo.add.steps.metadata.subtext'),
+          descriptionKey: 'fleet.gitRepo.add.steps.metadata.description',
+          ready:          this.isView || !!this.value.metadata.name,
+          weight:         1
+        },
+        {
+          name:           'stepRepo',
+          title:          this.t('fleet.gitRepo.add.steps.repo.title'),
+          label:          this.t('fleet.gitRepo.add.steps.repo.label'),
+          subtext:        this.t('fleet.gitRepo.add.steps.repo.subtext'),
+          descriptionKey: 'fleet.gitRepo.add.steps.repo.description',
+          ready:          this.isView || (!!this.refValue && !!this.fvFormIsValid),
+          weight:         1
+        },
+        {
+          name:           'stepTarget',
+          title:          this.t('fleet.gitRepo.add.steps.targetInfo.title'),
+          label:          this.t('fleet.gitRepo.add.steps.targetInfo.label'),
+          subtext:        this.t('fleet.gitRepo.add.steps.targetInfo.subtext'),
+          descriptionKey: 'fleet.gitRepo.steps.add.targetInfo.description',
+          ready:          this.isView || !!this.fvFormIsValid,
+          weight:         1
+        },
+        {
+          name:           'stepAdvanced',
+          title:          this.t('fleet.gitRepo.add.steps.advanced.title'),
+          label:          this.t('fleet.gitRepo.add.steps.advanced.label'),
+          subtext:        this.t('fleet.gitRepo.add.steps.advanced.subtext'),
+          descriptionKey: 'fleet.gitRepo.add.steps.advanced.description',
+          ready:          !!this.fvFormIsValid,
+          weight:         1,
+        },
       ];
     },
 
@@ -185,6 +214,14 @@ export default {
       return !(this.value?.spec?.repo || '').startsWith('http://');
     },
 
+    isPollingEnabled() {
+      return !this.value.spec.disablePolling;
+    },
+
+    isWebhookConfigured() {
+      return !!this.value.status?.webhookCommit;
+    },
+
     targetOptions() {
       const out = [
         {
@@ -265,8 +302,8 @@ export default {
       ];
     },
 
-    stepOneRequires() {
-      return !!this.value.metadata.name && !!this.refValue && !!this.fvFormIsValid;
+    showPollingIntervalWarning() {
+      return !this.isView && this.isPollingEnabled && this.pollingInterval < MINIMUM_POLLING_INTERVAL;
     },
   },
 
@@ -278,8 +315,6 @@ export default {
     targetAdvanced:             'updateTargets',
     tlsMode:                    'updateTls',
     caBundle:                   'updateTls',
-    'value.metadata.name':      'stepOneReady',
-    'value.spec.repo':          'stepOneReady',
 
     workspace(neu) {
       if ( this.isCreate ) {
@@ -291,6 +326,7 @@ export default {
   created() {
     this.registerBeforeHook(this.cleanTLS, 'cleanTLS');
     this.registerBeforeHook(this.doCreateSecrets, `registerAuthSecrets${ new Date().getTime() }`, 99);
+    this.registerBeforeHook(this.updateBeforeSave);
   },
 
   methods: {
@@ -377,8 +413,6 @@ export default {
       } else {
         spec.targets = [];
       }
-
-      this.stepOneReady();
     },
 
     changeRef({ text, selected }) {
@@ -393,8 +427,6 @@ export default {
         delete spec.branch;
         spec.revision = text;
       }
-
-      this.stepOneReady();
     },
 
     async doCreateSecrets() {
@@ -481,10 +513,6 @@ export default {
       this.tlsMode = event;
     },
 
-    stepOneReady() {
-      this.stepRepoInfo['ready'] = this.stepOneRequires;
-    },
-
     updateTls() {
       const spec = this.value.spec;
 
@@ -512,10 +540,46 @@ export default {
       }
     },
 
-    onSave() {
+    enablePolling(value) {
+      if (value) {
+        delete this.value.spec.disablePolling;
+      } else {
+        this.value.spec.disablePolling = true;
+      }
+    },
+
+    updatePollingInterval(value) {
+      if (!value) {
+        this.pollingInterval = DEFAULT_POLLING_INTERVAL;
+        this.value.spec.pollingInterval = this.durationSeconds(DEFAULT_POLLING_INTERVAL);
+      } else if (value === MINIMUM_POLLING_INTERVAL) {
+        delete this.value.spec.pollingInterval;
+      } else {
+        this.value.spec.pollingInterval = this.durationSeconds(value);
+      }
+    },
+
+    scrollToBottom() {
+      this.$nextTick(() => {
+        const scrollable = document.getElementsByTagName('main')[0];
+
+        if (scrollable) {
+          scrollable.scrollTop = scrollable.scrollHeight;
+        }
+      });
+    },
+
+    updateBeforeSave() {
       this.value.spec['correctDrift'] = { enabled: this.correctDriftEnabled };
 
-      this.save();
+      if (this.mode === _CREATE) {
+        this.value.metadata.labels[FLEET_LABELS.CREATED_BY_USER_ID] = this.value.currentUser.id;
+        this.value.metadata.labels[FLEET_LABELS.CREATED_BY_USER_NAME] = this.value.currentUser.username;
+      }
+    },
+
+    durationSeconds(value) {
+      return `${ value }s`;
     }
   }
 };
@@ -537,17 +601,9 @@ export default {
     class="wizard"
     @cancel="done"
     @error="e=>errors = e"
-    @finish="onSave"
+    @finish="save"
   >
-    <template #noticeBanner>
-      <Banner
-        v-if="isLocal && mode === 'create'"
-        color="info"
-      >
-        {{ t('fleet.gitRepo.createLocalBanner') }}
-      </Banner>
-    </template>
-    <template #stepRepoInfo>
+    <template #stepMetadata>
       <NameNsDescription
         v-if="!isView"
         :value="value"
@@ -555,10 +611,17 @@ export default {
         :mode="mode"
         @update:value="$emit('input', $event)"
       />
-
+      <Labels
+        :value="value"
+        :mode="mode"
+        :display-side-by-side="false"
+        :add-icon="'icon-plus'"
+      />
+    </template>
+    <template #stepRepo>
       <h2 v-t="'fleet.gitRepo.repo.title'" />
       <div
-        class="row"
+        class="row mb-20"
         :class="{'mt-20': isView}"
       >
         <div class="col span-6">
@@ -587,10 +650,31 @@ export default {
         </div>
       </div>
 
-      <div class="spacer" />
+      <ArrayList
+        v-model:value="value.spec.paths"
+        data-testid="gitRepo-paths"
+        :title="t('fleet.gitRepo.paths.label')"
+        :mode="mode"
+        :initial-empty-row="false"
+        :value-placeholder="t('fleet.gitRepo.paths.placeholder')"
+        :add-label="t('fleet.gitRepo.paths.addLabel')"
+        :add-icon="'icon-plus'"
+        :protip="t('fleet.gitRepo.paths.empty')"
+      />
+    </template>
+
+    <template #stepAdvanced>
+      <Banner
+        v-if="!isView"
+        color="info"
+        label-key="fleet.gitRepo.add.steps.advanced.info"
+        data-testid="gitrepo-advanced-info"
+      />
+
       <h2 v-t="'fleet.gitRepo.auth.title'" />
 
       <SelectOrCreateAuthSecret
+        data-testid="gitrepo-git-auth"
         :value="value.spec.clientSecretName"
         :register-before-hook="registerBeforeHook"
         :namespace="value.metadata.namespace"
@@ -601,6 +685,7 @@ export default {
         generate-name="gitrepo-auth-"
         label-key="fleet.gitRepo.auth.git"
         :cache-secrets="true"
+        :show-ssh-known-hosts="true"
         @update:value="updateAuth($event, 'clientSecretName')"
         @inputauthval="updateCachedAuthVal($event, 'clientSecretName')"
       />
@@ -616,6 +701,7 @@ export default {
         label-key="fleet.gitRepo.auth.helm"
         :pre-select="tempCachedValues.helmSecretName"
         :cache-secrets="true"
+        :show-ssh-known-hosts="true"
         @update:value="updateAuth($event, 'helmSecretName')"
         @inputauthval="updateCachedAuthVal($event, 'helmSecretName')"
       />
@@ -667,7 +753,7 @@ export default {
         <Checkbox
           v-model:value="correctDriftEnabled"
           :tooltip="t('fleet.gitRepo.resources.correctDriftTooltip')"
-          data-testid="GitRepo-correctDrift-checkbox"
+          data-testid="gitRepo-correctDrift-checkbox"
           class="check"
           type="checkbox"
           label-key="fleet.gitRepo.resources.correctDrift"
@@ -676,26 +762,60 @@ export default {
         <Checkbox
           v-model:value="value.spec.keepResources"
           :tooltip="t('fleet.gitRepo.resources.keepResourcesTooltip')"
-          data-testid="GitRepo-keepResources-checkbox"
+          data-testid="gitRepo-keepResources-checkbox"
           class="check"
           type="checkbox"
           label-key="fleet.gitRepo.resources.keepResources"
           :mode="mode"
         />
       </div>
+
       <div class="spacer" />
-      <ArrayList
-        v-model:value="value.spec.paths"
-        data-testid="gitRepo-paths"
-        :title="t('fleet.gitRepo.paths.label')"
-        :mode="mode"
-        :initial-empty-row="false"
-        :value-placeholder="t('fleet.gitRepo.paths.placeholder')"
-        :add-label="t('fleet.gitRepo.paths.addLabel')"
-        :protip="t('fleet.gitRepo.paths.empty')"
-      />
+      <h2 v-t="'fleet.gitRepo.polling.label'" />
+      <div class="row polling">
+        <div class="col span-6">
+          <Checkbox
+            v-model:value="isPollingEnabled"
+            data-testid="gitRepo-enablePolling-checkbox"
+            class="check"
+            type="checkbox"
+            label-key="fleet.gitRepo.polling.enable"
+            :mode="mode"
+            @update:value="enablePolling"
+          />
+        </div>
+        <template v-if="isPollingEnabled">
+          <div class="col">
+            <Banner
+              v-if="showPollingIntervalWarning"
+              color="warning"
+              label-key="fleet.gitRepo.polling.pollingInterval.minimumValuewarning"
+              data-testid="gitRepo-pollingInterval-minimumValueWarning"
+            />
+            <Banner
+              v-if="isWebhookConfigured"
+              color="warning"
+              label-key="fleet.gitRepo.polling.pollingInterval.webhookWarning"
+              data-testid="gitRepo-pollingInterval-webhookWarning"
+            />
+          </div>
+          <div class="col span-6">
+            <UnitInput
+              v-model:value="pollingInterval"
+              data-testid="gitRepo-pollingInterval-input"
+              min="1"
+              :suffix="t('suffix.seconds', { count: pollingInterval })"
+              :label="t('fleet.gitRepo.polling.pollingInterval.label')"
+              :mode="mode"
+              tooltip-key="fleet.gitRepo.polling.pollingInterval.tooltip"
+              @update:value="updatePollingInterval"
+            />
+          </div>
+        </template>
+      </div>
     </template>
-    <template #stepTargetInfo>
+
+    <template #stepTarget>
       <h2 v-t="isLocal ? 'fleet.gitRepo.target.labelLocal' : 'fleet.gitRepo.target.label'" />
 
       <template v-if="!isLocal">
@@ -760,25 +880,31 @@ export default {
           />
         </div>
       </div>
-      <div class="spacer" />
-      <Labels
-        :value="value"
-        :mode="mode"
-        :display-side-by-side="false"
-      />
     </template>
   </CruResource>
 </template>
 
 <style lang="scss" scoped>
+  .spacer {
+    padding: 30px 0 0 0;
+  }
   :deep() .select-or-create-auth-secret {
     .row {
       margin-top: 10px !important;
     }
   }
+  :deep() .input-container .in-input.labeled-select {
+    min-width: 110px;
+    width: 20%;
+  }
   .resource-handling {
     display: flex;
     flex-direction: column;
-    gap: 5px
+    gap: 5px;
+  }
+  .polling {
+    display: flex;
+    flex-direction: column;
+    gap: 5px;
   }
 </style>

package/edit/logging-flow/Match.vue

@@ -117,27 +117,6 @@ export default {
         </div>
       </div>
       <div v-if="isClusterFlow">
-        <div class="spacer" />
-        <h3>
-          {{ value.select ? t('logging.flow.matches.containerNames.title.include') : t('logging.flow.matches.containerNames.title.exclude') }}
-        </h3>
-        <div class="row">
-          <div class="col span-12">
-            <Select
-              v-model:value="value.namespaces"
-              class="lg"
-              :options="namespaces"
-              :placeholder="t('logging.flow.matches.namespaces.placeholder')"
-              :multiple="true"
-              :taggable="true"
-              :clearable="true"
-              :searchable="true"
-              :close-on-select="false"
-              no-options-label-key="logging.flow.matches.containerNames.enter"
-              placement="top"
-            />
-          </div>
-        </div>
         <div class="spacer" />
         <h3>
           {{ value.select ? t('logging.flow.matches.namespaces.title.include') : t('logging.flow.matches.namespaces.title.exclude') }}

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

@@ -132,7 +132,7 @@ export default {
             });
           }
 
-          // // we allow users with permissions for projectroletemplatebindings to be able to manage members on projects
+          // We allow users with permissions for projectroletemplatebindings to be able to manage members on projects
           if (this.membershipUpdate.save) {
             const norman = await this.value.norman;
 

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

@@ -11,7 +11,7 @@ import { LabeledInput } from '@components/Form/LabeledInput';
 import LabeledSelect from '@shell/components/form/LabeledSelect';
 import UnitInput from '@shell/components/form/UnitInput';
 import { _VIEW } from '@shell/config/query-params';
-import { toMilliseconds } from './duration.js';
+import { toSeconds } from '@shell/utils/duration';
 
 const IGNORED_ANNOTATIONS = [
   'summary',
@@ -207,7 +207,10 @@ export default {
     waitToFireFor: {
       get() {
         if (![null, undefined].includes(this.value.for)) {
-          return Math.floor(toMilliseconds(this.value.for) / 1000);
+          // see:
+          // https://prometheus.io/docs/prometheus/latest/configuration/recording_rules/#rule
+          // https://prometheus.io/docs/prometheus/latest/configuration/configuration/#duration
+          return toSeconds(this.value.for);
         }
 
         return undefined;
@@ -308,7 +311,7 @@ export default {
         >
           <template #field>
             <CodeMirror
-              class="mt-20"
+              class="mt-20 promql-input"
               :value="value.expr"
               :options="{
                 mode: null,
@@ -524,4 +527,8 @@ export default {
   top: 0;
   right: 5px;
 }
+
+.promql-input {
+  width: 100%;
+}
 </style>

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

@@ -71,7 +71,7 @@ export default {
         >
           <template #field>
             <CodeMirror
-              class="mt-20"
+              class="mt-20 promql-input"
               :value="value.expr"
               :options="{
                 mode: null,
@@ -105,4 +105,8 @@ export default {
 .row {
   margin: 20px 0;
 }
+
+.promql-input {
+  width: 100%;
+}
 </style>

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

@@ -13,7 +13,7 @@ import { _CREATE, _VIEW } from '@shell/config/query-params';
 import isString from 'lodash/isString';
 import isEmpty from 'lodash/isEmpty';
 import GroupRules from './GroupRules';
-import { toMilliseconds } from './duration.js';
+import { toSeconds } from '@shell/utils/duration';
 
 export default {
   components: {
@@ -118,7 +118,10 @@ export default {
 
     getGroupInterval(interval) {
       if (![null, undefined].includes(interval)) {
-        return Math.floor(toMilliseconds(interval) / 1000);
+        // see:
+        // https://prometheus.io/docs/prometheus/latest/configuration/recording_rules/#rule
+        // https://prometheus.io/docs/prometheus/latest/configuration/configuration/#duration
+        return toSeconds(interval);
       }
     }
   },

package/edit/provisioning.cattle.io.cluster/CustomCommand.vue

@@ -262,6 +262,12 @@ export default {
       <template v-if="cluster.supportsWindows">
         <hr class="mt-20 mb-20">
         <h4 v-t="'cluster.custom.registrationCommand.windowsDetail'" />
+        <Banner
+          v-if="readyForWindows"
+          color="info"
+          label-key="cluster.custom.registrationCommand.windowsWorkersOnly"
+          data-testid="ready-for-windows"
+        />
         <Banner
           v-if="cluster.isRke1"
           color="warning"
@@ -288,7 +294,8 @@ export default {
         <Banner
           v-else
           color="info"
-          :label="t('cluster.custom.registrationCommand.windowsNotReady')"
+          label-key="cluster.custom.registrationCommand.windowsNotReady"
+          data-testid="windows-not-ready"
         />
       </template>
     </InfoBox>

package/edit/provisioning.cattle.io.cluster/SelectCredential.vue

@@ -194,6 +194,8 @@ export default {
         } catch (e) {
           this.errors = [e];
           btnCb(false);
+
+          return;
         }
       }
 

package/edit/provisioning.cattle.io.cluster/__tests__/Advanced.test.ts

@@ -45,8 +45,6 @@ describe('component: Advanced', () => {
         mountOptions
       );
 
-      // eslint-disable-next-line no-console
-      console.log(wrapper.html());
       const inputElem = wrapper.find('[data-testid="array-list-box0"]');
 
       expect(inputElem.exists()).toBe(false);