@rancher/shell 0.3.4 → 0.3.6

package/dialog/ForceMachineRemoveDialog.vue

@@ -83,7 +83,7 @@ export default {
       class="pl-10 pr-10"
     >
       <span
-        v-html="t('promptForceRemove.removeWarning', { nameToMatch }, true)"
+        v-clean-html="t('promptForceRemove.removeWarning', { nameToMatch }, true)"
       />
       <div class="mt-10 mb-10">
         {{ t('promptForceRemove.confirmName') }}

package/dialog/GenericPrompt.vue

@@ -3,6 +3,7 @@ import AsyncButton from '@shell/components/AsyncButton';
 import { Card } from '@components/Card';
 import { Banner } from '@components/Banner';
 import { exceptionToErrorsArray } from '@shell/utils/error';
+import { decodeHtml } from '@shell/utils/string';
 
 export default {
   components: {
@@ -26,28 +27,39 @@ export default {
     body: {
       type:    String,
       default: ''
-    }
+    },
+
+    /**
+     * Callback to identify response of the prompt
+     */
+    confirm: {
+      type:    Function,
+      default: () => { }
+    },
   },
   data() {
     return { errors: [] };
   },
 
   methods: {
+    decodeHtml,
     close() {
-      this.$emit('close');
+      this.confirm(false);
+      this.$emit('close', false);
     },
 
     async apply(buttonDone) {
       try {
         await this.applyAction(buttonDone);
-        this.close();
+        this.confirm(true);
+        this.$emit('close', true);
       } catch (err) {
         console.error(err); // eslint-disable-line
         this.errors = exceptionToErrorsArray(err);
         buttonDone(false);
       }
     }
-  }
+  },
 };
 </script>
 
@@ -58,16 +70,16 @@ export default {
   >
     <h4
       slot="title"
+      v-clean-html="title"
       class="text-default-text"
-      v-html="title"
     />
 
     <template slot="body">
       <slot name="body">
         <div
+          v-clean-html="decodeHtml(body)"
           class="pl-10 pr-10"
           style="min-height: 50px; display: flex;"
-          v-html="body"
         />
       </slot>
     </template>

package/dialog/RotateEncryptionKeyDialog.vue

@@ -124,8 +124,8 @@ export default {
   >
     <h4
       slot="title"
+      v-clean-html="t('promptRotateEncryptionKey.title')"
       class="text-default-text"
-      v-html="t('promptRotateEncryptionKey.title')"
     />
 
     <div

package/dialog/SaveAsRKETemplateDialog.vue

@@ -74,8 +74,8 @@ export default {
   >
     <h4
       slot="title"
+      v-clean-html="t('promptSaveAsRKETemplate.title', { cluster: cluster.displayName }, true)"
       class="text-default-text"
-      v-html="t('promptSaveAsRKETemplate.title', { cluster: cluster.displayName }, true)"
     />
 
     <div

package/dialog/ScaleMachineDownDialog.vue

@@ -116,7 +116,7 @@ export default {
           <span
             v-for="i in ignored"
             :key="i.name"
-            v-html="t('promptScaleMachineDown.retainedMachine2', { name: i.name }, true)"
+            v-clean-html="t('promptScaleMachineDown.retainedMachine2', { name: i.name }, true)"
           />
         </div>
       </div>

package/edit/auth/github.vue

@@ -187,9 +187,9 @@ export default {
           class="step-box"
         >
           <ul class="step-list">
-            <li v-html="t(`authConfig.${NAME}.form.prefix.1`, tArgs, true)" />
-            <li v-html="t(`authConfig.${NAME}.form.prefix.2`, tArgs, true)" />
-            <li v-html="t(`authConfig.${NAME}.form.prefix.3`, tArgs, true)" />
+            <li v-clean-html="t(`authConfig.${NAME}.form.prefix.1`, tArgs, true)" />
+            <li v-clean-html="t(`authConfig.${NAME}.form.prefix.2`, tArgs, true)" />
+            <li v-clean-html="t(`authConfig.${NAME}.form.prefix.3`, tArgs, true)" />
           </ul>
         </InfoBox>
         <InfoBox
@@ -200,7 +200,7 @@ export default {
             <li>
               {{ t(`authConfig.${NAME}.form.instruction`, tArgs, true) }}
               <ul class="mt-10">
-                <li><b>{{ t(`authConfig.${NAME}.form.app.label`) }}</b>: <span v-html="t(`authConfig.${NAME}.form.app.value`, tArgs, true)" /></li>
+                <li><b>{{ t(`authConfig.${NAME}.form.app.label`) }}</b>: <span v-clean-html="t(`authConfig.${NAME}.form.app.value`, tArgs, true)" /></li>
                 <li>
                   <b>{{ t(`authConfig.${NAME}.form.homepage.label`) }}</b>: {{ serverUrl }} <CopyToClipboard
                     label-as="tooltip"
@@ -209,7 +209,7 @@ export default {
                     action-color="bg-transparent"
                   />
                 </li>
-                <li><b>{{ t(`authConfig.${NAME}.form.description.label`) }}</b>: <span v-html="t(`authConfig.${NAME}.form.description.value`, tArgs, true)" /></li>
+                <li><b>{{ t(`authConfig.${NAME}.form.description.label`) }}</b>: <span v-clean-html="t(`authConfig.${NAME}.form.description.value`, tArgs, true)" /></li>
                 <li>
                   <b>{{ t(`authConfig.${NAME}.form.callback.label`) }}</b>: {{ serverUrl }} <CopyToClipboard
                     :text="serverUrl"
@@ -227,8 +227,8 @@ export default {
           class="mb-20"
         >
           <ul class="step-list">
-            <li v-html="t(`authConfig.${NAME}.form.suffix.1`, tArgs, true)" />
-            <li v-html="t(`authConfig.${NAME}.form.suffix.2`, tArgs, true)" />
+            <li v-clean-html="t(`authConfig.${NAME}.form.suffix.1`, tArgs, true)" />
+            <li v-clean-html="t(`authConfig.${NAME}.form.suffix.2`, tArgs, true)" />
           </ul>
         </InfoBox>
 
@@ -255,8 +255,8 @@ export default {
         >
           <div class="col span-12">
             <Banner
+              v-clean-html="t('authConfig.associatedWarning', tArgs, true)"
               color="info"
-              v-html="t('authConfig.associatedWarning', tArgs, true)"
             />
           </div>
         </div>

package/edit/auth/googleoauth.vue

@@ -141,7 +141,7 @@ export default {
           :step="1"
           class=" mt-20 mb-20"
         >
-          <h3 v-html="t('authConfig.googleoauth.steps.1.title', tArgs, true)" />
+          <h3 v-clean-html="t('authConfig.googleoauth.steps.1.title', tArgs, true)" />
           <ul class="mt-0 step-list">
             <li>{{ t('authConfig.googleoauth.steps.1.body.1', {}, true) }} </li>
             <li>
@@ -165,7 +165,7 @@ export default {
           class="mb-20"
         >
           <div class="row">
-            <h3 v-html="t('authConfig.googleoauth.steps.2.title', tArgs, true)" />
+            <h3 v-clean-html="t('authConfig.googleoauth.steps.2.title', tArgs, true)" />
           </div>
           <div class="row">
             <div class="col span-6">
@@ -211,11 +211,11 @@ export default {
           class="mb-20"
         >
           <div class="row">
-            <h3 v-html="t('authConfig.googleoauth.steps.3.title', tArgs, true)" />
+            <h3 v-clean-html="t('authConfig.googleoauth.steps.3.title', tArgs, true)" />
           </div>
           <div class="row">
             <div class="col span-6">
-              <div v-html="t('authConfig.googleoauth.steps.3.introduction', tArgs, true)" />
+              <div v-clean-html="t('authConfig.googleoauth.steps.3.introduction', tArgs, true)" />
               <ul class="mt-10 step-list">
                 <li>{{ t('authConfig.googleoauth.steps.3.body.1', {}, true) }} </li>
                 <li>{{ t('authConfig.googleoauth.steps.3.body.2', {}, true) }} </li>
@@ -248,8 +248,8 @@ export default {
         >
           <div class="col span-12 google">
             <Banner
+              v-clean-html="t('authConfig.associatedWarning', tArgs, true)"
               color="info"
-              v-html="t('authConfig.associatedWarning', tArgs, true)"
             />
           </div>
         </div>

package/edit/auth/ldap/index.vue

@@ -148,8 +148,8 @@ export default {
       >
         <div class="col span-12">
           <Banner
+            v-clean-html="t('authConfig.associatedWarning', tArgs, true)"
             color="info"
-            v-html="t('authConfig.associatedWarning', tArgs, true)"
           />
         </div>
       </div>

package/edit/auth/oidc.vue

@@ -277,8 +277,8 @@ export default {
       >
         <div class="col span-12">
           <Banner
+            v-clean-html="t('authConfig.associatedWarning', tArgs, true)"
             color="info"
-            v-html="t('authConfig.associatedWarning', tArgs, true)"
           />
         </div>
       </div>

package/edit/auth/saml.vue

@@ -257,8 +257,8 @@ export default {
       >
         <div class="col span-12">
           <Banner
+            v-clean-html="t('authConfig.associatedWarning', tArgs, true)"
             color="info"
-            v-html="t('authConfig.associatedWarning', tArgs, true)"
           />
         </div>
       </div>

package/edit/cis.cattle.io.clusterscan.vue

@@ -322,7 +322,7 @@ export default {
                 class="mt-0"
                 :color="hasAlertManager ? 'info' : 'warning'"
               >
-                <span v-html="t('cis.alertNeeded', {link: monitoringUrl}, true)" />
+                <span v-clean-html="t('cis.alertNeeded', {link: monitoringUrl}, true)" />
               </banner>
               <Checkbox
                 v-model="scanAlertRule.alertOnComplete"

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

@@ -27,7 +27,9 @@ export default {
   mixins: [CreateEditView],
 
   async fetch() {
-    this.allClusters = await this.$store.dispatch('management/findAll', { type: FLEET.CLUSTER });
+    if (this.$store.getters['management/schemaFor']( FLEET.CLUSTER )) {
+      this.allClusters = await this.$store.getters['management/all'](FLEET.CLUSTER);
+    }
     this.allWorkspaces = await this.$store.dispatch('management/findAll', { type: FLEET.WORKSPACE });
 
     if ( !this.value.spec?.selector ) {
@@ -146,15 +148,15 @@ export default {
     >
       <span
         v-if="matchingClusters.isAll"
-        v-html="t('fleet.clusterGroup.selector.matchesAll', matchingClusters)"
+        v-clean-html="t('fleet.clusterGroup.selector.matchesAll', matchingClusters)"
       />
       <span
         v-else-if="matchingClusters.isNone"
-        v-html="t('fleet.clusterGroup.selector.matchesNone', matchingClusters)"
+        v-clean-html="t('fleet.clusterGroup.selector.matchesNone', matchingClusters)"
       />
       <span
         v-else
-        v-html="t('fleet.clusterGroup.selector.matchesSome', matchingClusters)"
+        v-clean-html="t('fleet.clusterGroup.selector.matchesSome', matchingClusters)"
       />
     </Banner>
 

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

@@ -23,6 +23,8 @@ import { _CREATE } from '@shell/config/query-params';
 import { isHarvesterCluster } from '@shell/utils/cluster';
 import { CAPI, CATALOG } 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';
 
 const _VERIFY = 'verify';
 const _SKIP = 'skip';
@@ -32,6 +34,7 @@ export default {
   name: 'CruGitRepo',
 
   components: {
+    Checkbox,
     ArrayList,
     Banner,
     CruResource,
@@ -48,8 +51,20 @@ export default {
   mixins: [CreateEditView],
 
   async fetch() {
-    this.allClusters = await this.$store.dispatch('management/findAll', { type: FLEET.CLUSTER });
-    this.allClusterGroups = await this.$store.dispatch('management/findAll', { type: FLEET.CLUSTER_GROUP });
+    const hash = await checkSchemasForFindAllHash({
+      allClusters: {
+        inStoreType: 'management',
+        type:        FLEET.CLUSTER
+      },
+
+      allClusterGroups: {
+        inStoreType: 'management',
+        type:        FLEET.CLUSTER_GROUP
+      }
+    }, this.$store);
+
+    this.allClusters = hash.allClusters || [];
+    this.allClusterGroups = hash.allClusterGroups || [];
 
     let tls = _VERIFY;
 
@@ -412,7 +427,7 @@ export default {
       await secret.save();
 
       await this.$nextTick(() => {
-        this.updateAuth(secret.id, name);
+        this.updateAuth(secret.metadata.name, name);
       });
 
       return secret;
@@ -588,7 +603,20 @@ export default {
         </div>
       </template>
       <div class="spacer" />
-
+      <h2 v-t="'fleet.gitRepo.resources.label'" />
+      <Checkbox
+        v-model="value.spec.keepResources"
+        class="check"
+        type="checkbox"
+        label-key="fleet.gitRepo.resources.keepResources"
+        :mode="mode"
+      />
+      <Banner
+        color="info"
+      >
+        {{ t('fleet.gitRepo.resources.resourceBanner') }}
+      </Banner>
+      <div class="spacer" />
       <h2 v-t="'fleet.gitRepo.paths.label'" />
       <ArrayList
         v-model="value.spec.paths"

package/edit/helm.cattle.io.projecthelmchart.vue

@@ -48,6 +48,10 @@ export default {
   },
 
   data() {
+    if (!this.value.spec.values) {
+      this.$set(this.value.spec, 'values', {});
+    }
+
     return {
       systemNamespaces: null,
       namespaces:       [],
@@ -128,7 +132,7 @@ export default {
           :side-tabs="true"
         >
           <Questions
-            v-model="value"
+            v-model="value.spec.values"
             tabbed="multiple"
             :target-namespace="value.metadata.namespace"
             :source="selectedNamespaceQuestions"

package/edit/logging.banzaicloud.io.output/index.vue

@@ -100,9 +100,6 @@ export default {
     }
   },
 
-  created() {
-    this.registerBeforeHook(this.willSave, 'willSave');
-  },
   methods: {
     getComponent(name) {
       return require(`./providers/${ name }`).default;
@@ -110,7 +107,22 @@ export default {
     launch(provider) {
       this.$refs.tabbed.select(provider.name);
     },
-    willSave() {
+    saveSettings(done) {
+      const t = this.$store.getters['i18n/t'];
+
+      if (this.selectedProvider === 'loki') {
+        const urlCheck = ['https://', 'http://'].some(checkValue => this.value.spec['loki'].url.toLowerCase().startsWith(checkValue));
+        const isLokiHttps = this.value.spec['loki'].url ? urlCheck : undefined;
+
+        if (!isLokiHttps) {
+          this.errors = [t('logging.loki.urlInvalid')];
+
+          return done(false);
+        }
+      }
+
+      this.errors = [];
+
       this.value.spec = { [this.selectedProvider]: this.value.spec[this.selectedProvider] };
 
       const bufferJson = jsyaml.load(this.bufferYaml);
@@ -120,6 +132,7 @@ export default {
       } else {
         this.$delete(this.value.spec[this.selectedProvider], 'buffer');
       }
+      this.save(done);
     },
     tabChanged({ tab }) {
       if ( tab.name === 'buffer' ) {
@@ -151,7 +164,7 @@ export default {
       :errors="errors"
       :can-yaml="true"
       @error="e=>errors = e"
-      @finish="save"
+      @finish="saveSettings"
       @cancel="done"
     >
       <NameNsDescription

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

@@ -47,6 +47,7 @@ export default {
           :mode="mode"
           :disabled="disabled"
           class="url"
+          placeholder="https://127.0.0.1:8000"
           :label="t('logging.loki.url')"
         />
       </div>

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

@@ -4,12 +4,18 @@ 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 } from '@shell/config/types';
+import { FLEET, MANAGEMENT, SCHEMA } from '@shell/config/types';
 // import RoleBindings from '@shell/components/RoleBindings';
 import Tabbed from '@shell/components/Tabbed';
 import Tab from '@shell/components/Tabbed/Tab';
 import { SCOPE_NAMESPACE, SCOPE_CLUSTER } from '@shell/components/RoleBindings.vue';
 import { NAME as FLEET_NAME } from '@shell/config/product/fleet';
+// import KeyValue from '@shell/components/form/KeyValue.vue';
+import { mapState } from 'vuex';
+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';
 
 export default {
   name: 'FleetCruWorkspace',
@@ -19,26 +25,123 @@ export default {
     Labels,
     Loading,
     NameNsDescription,
-    // RoleBindings,
     Tabbed,
     Tab,
+    Banner,
+    ArrayList
   },
 
   mixins: [CreateEditView],
 
   async fetch() {
     this.rancherClusters = await this.$store.dispatch('management/findAll', { type: MANAGEMENT.CLUSTER });
-    this.fleetClusters = await this.$store.dispatch('management/findAll', { type: FLEET.CLUSTER });
+
+    if (this.$store.getters['management/schemaFor']( FLEET.CLUSTER )) {
+      this.fleetClusters = await this.$store.dispatch('management/findAll', { type: FLEET.CLUSTER });
+    }
+
+    if (this.hasRepoRestrictionSchema) {
+      const restrictions = await this.$store.dispatch('management/findAll', { type: FLEET.GIT_REPO_RESTRICTION });
+
+      const workSpaceRestriction = restrictions.find((item) => {
+        return item.metadata.namespace === this.value.metadata.name && item.metadata.name.startsWith(`restriction-${ this.value.metadata.name }`);
+      });
+
+      if (workSpaceRestriction) {
+        this.workSpaceRestriction = workSpaceRestriction;
+      }
+    }
+
+    this.restrictionsOptions = await this.$store.getters[`type-map/optionsFor`](FLEET.GIT_REPO_RESTRICTION);
+    this.restrictionsSchema = await this.$store.getters[`management/schemaFor`](FLEET.GIT_REPO_RESTRICTION);
   },
 
   data() {
+    this.$set(this.value, 'spec', this.value.spec || {});
+
     return {
-      fleetClusters:   null,
-      rancherClusters: null,
+      fleetClusters:            null,
+      rancherClusters:          null,
+      workSpaceRestriction:     null,
+      restrictions:             [],
+      targetNamespaces:         [],
+      restrictionsSchema:       { spec: {} },
+      namespace:                this.$store.getters['prefs/get'](LAST_NAMESPACE),
+      hasRepoRestrictionSchema: !!this.$store.getters['management/schemaFor']( FLEET.GIT_REPO_RESTRICTION )
     };
   },
 
+  methods: {
+    async saveAll(buttonCb) {
+      // Anyone who can edit workspace
+
+      try {
+        await this.value.save();
+
+        // IF there is a restriction update it
+        if (this.workSpaceRestriction) {
+          await this.workSpaceRestriction.save();
+        }
+
+        // If there is no restriction and targetnamespace is set then create it.
+        if (!this.workSpaceRestriction && this.targetNamespaces.length) {
+          // For users with more limited permissions the gitreporestriction schema may not be visible until they create a workspace
+          if (!this.hasRepoRestrictionSchema) {
+            await this.$store.dispatch('management/find', { type: SCHEMA, id: FLEET.GIT_REPO_RESTRICTION }, { force: true });
+          }
+          const model = await this.$store.dispatch(`management/create`, {
+            type:                    FLEET.GIT_REPO_RESTRICTION,
+            allowedTargetNamespaces: this.targetNamespaces,
+            metadata:                {
+              // restriction- prefix is added to the workspace name
+              // to identify automatically created GitRepoRestrictions
+              // when adding targetNamespaces at the point of workspace creation
+              name:      `restriction-${ this.value.metadata.name }-${ Date.now() }`,
+              namespace: this.value.metadata.name // what the user types
+            }
+          });
+
+          await model.save();
+        }
+
+        await this.value.waitForWorkspaceSchema(20000, (schema) => {
+          // For standard user if there are no workspaces, user can't list workspaces
+          // Therefore wait for it.
+          return schema.collectionMethods?.includes('GET');
+        });
+
+        await this.$store.dispatch( 'management/findAll', { type: FLEET.WORKSPACE });
+
+        this.$store.commit('updateWorkspace', { value: this.value.metadata.name, getters: this.$store.getters } );
+        this.$store.dispatch('prefs/set', { key: WORKSPACE, value: this.value.metadata.name });
+
+        buttonCb(true);
+        this.done();
+      } catch (err) {
+        console.error(err) ; // eslint-disable-line no-console
+        buttonCb(false);
+        this.errors = exceptionToErrorsArray(err);
+      }
+    },
+  },
+
   computed: {
+    ...mapState(['allWorkspaces', 'workspace']),
+
+    allowedTargetNamespaces: {
+      get() {
+        return this.workSpaceRestriction?.allowedTargetNamespaces || [];
+      },
+
+      set(value) {
+        if (this.workSpaceRestriction) {
+          this.workSpaceRestriction.allowedTargetNamespaces = value;
+        }
+
+        this.targetNamespaces = value;
+      }
+    },
+
     SCOPE_NAMESPACE() {
       return SCOPE_NAMESPACE;
     },
@@ -65,7 +168,7 @@ export default {
     :validation-passed="true"
     :errors="errors"
     @error="e=>errors = e"
-    @finish="save"
+    @finish="saveAll"
     @cancel="done"
   >
     <NameNsDescription
@@ -100,6 +203,38 @@ export default {
           :mode="mode"
         />
       </Tab>
+      <Tab
+        name="allowedtargetnamespaces"
+        label-key="fleet.workspaces.tabs.restrictions"
+      >
+        <Banner
+          color="info"
+        >
+          <div>
+            <t
+              k="fleet.restrictions.banner"
+              :count="allowedTargetNamespaces.length"
+              :raw="true"
+            />
+            <a
+              v-if="!!allowedTargetNamespaces.length"
+              @click="workSpaceRestriction.goToDetail()"
+            >
+              {{ t('generic.here') }}
+            </a>
+          </div>
+        </Banner>
+
+        <ArrayList
+          key="labels"
+          v-model="allowedTargetNamespaces"
+          :add-label="t('fleet.restrictions.addLabel')"
+          :mode="mode"
+          :title="t('fleet.restrictions.addTitle')"
+          :read-allowed="false"
+          :value-can-be-empty="true"
+        />
+      </Tab>
     </Tabbed>
   </CruResource>
 </template>

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

@@ -86,15 +86,18 @@ export default (Vue as VueConstructor<Vue & InstanceType<typeof CreateEditView>>
     :resource="value"
     :errors="errors"
     :cancel-event="true"
+    :done-route="doneRoute"
     @error="setErrors"
     @finish="save"
-    @cancel="done()"
+    @cancel="done"
   >
     <NameNsDescription
       :value="value"
       :namespaced="false"
       :mode="mode"
+      description-key="description"
     />
+
     <PodSecurityAdmission
       :labels="defaults"
       :labels-always-active="true"

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

@@ -122,8 +122,8 @@ export default {
 
     <h5
       v-if="editHelp"
+      v-clean-html="editHelp"
       class="edit-help"
-      v-html="editHelp"
     />
 
     <div class="edit-change mt-20">