@rancher/shell 0.3.5 → 0.3.6

package/core/types.ts

@@ -1,3 +1,4 @@
+import { ProductFunction } from './plugin';
 import { RouteConfig } from 'vue-router';
 
 // package.json metadata
@@ -136,6 +137,255 @@ export type LocationConfig = {
   mode?: string[]
 };
 
+export interface ProductOptions {
+  /**
+   * The category this product belongs under. i.e. 'config'
+   */
+  category?: string;
+
+  /**
+   * Hide the Copy KubeConfig button in the header
+   */
+  hideCopyConfig?: boolean;
+
+  /**
+   * Hide the Download KubeConfig button in the header
+   */
+  hideKubeConfig?: boolean;
+
+  /**
+   * Hide the Kubectl Shell button in the header
+   */
+  hideKubeShell?: boolean;
+
+  /**
+   * Hide the Namespace location
+   */
+  hideNamespaceLocation?: boolean;
+
+  /**
+   * Hide the system resources
+   */
+
+  hideSystemResources?: boolean;
+  /**
+   * The icon that should be displayed beside this item in the navigation.
+   */
+  icon?: string,
+
+  /**
+   * Only load the product if the feature is present
+   */
+  ifFeature?: string | RegExp;
+
+  /**
+   * Only load the product if the type is present
+   */
+  ifHave?: string;
+
+  /**
+   * Only load the product if the group is present
+   */
+  ifHaveGroup?: string | RegExp;
+
+  /**
+   * Only load the product if the type is present
+   */
+  ifHaveType?: string | RegExp;
+
+  /**
+   * The vuex store that this product should use by default i.e. 'management'
+   */
+  inStore?: string;
+
+  /**
+   * Show the cluster switcher in the navigation
+   */
+  showClusterSwitcher?: boolean;
+
+  /**
+   * Show the namespace filter in the header
+   */
+  showNamespaceFilter?: boolean;
+
+  /**
+   * A number used to determine where in navigation this item will be placed. The highest number will be at the top of the list.
+   */
+  weight?: number;
+
+  /**
+   * Leaving these here for completeness but I don't think these should be advertised as useable to plugin creators.
+   */
+  // ifHaveVerb: string | RegExp;
+  // removable: string;
+  // showWorkspaceSwitcher: boolean;
+  // supportRoute: string;
+  // to: string;
+  // typeStoreMap: string;
+}
+
+export interface HeaderOptions {
+  /**
+   * Name of the header. This should be unique.
+   */
+  name?: string;
+
+  /**
+   * A translation key where the resulting string will show in the table column
+   */
+  labelKey?: string;
+
+  /**
+   * A string which represents the path to access the value from the row object i.e. `row.meta.value`.
+   */
+  value?: string;
+
+  /**
+   * A string which represents the path to access the value from the row object which we'll use to sort i.e. `row.meta.value`
+   */
+  sort?: string;
+
+  /**
+   * A string which represents the path to access the value from the row object which we'll use to search i.e. `row.meta.value`
+   */
+  search?: string;
+
+  /**
+   * Number of pixels the column should be in the table
+   */
+  width?: number;
+
+  /**
+   * The name of a custom formatter. The available formatters can bee seen in `@rancher/shell/components/formatter`
+   */
+  formatter?: string;
+
+  /**
+   * These options are dependent on the formatter that's chosen. Examples can be seen in `@rancher/shell/components/formatter` and `@rancher/shell/config/table-headers`
+   */
+  formatterOpts?: any;
+
+  /**
+   * Provide a function which accets a row and returns the value that should be displayed in the column
+   * @param row This can be any value which represents the row
+   * @returns Can return {@link string | number | null | undefined} to display in the column
+   */
+  getValue?: (row: any) => string | number | null | undefined;
+}
+
+export interface ConfigureTypeOptions {
+  /**
+   * The resource can edit/show yaml
+   */
+  canYaml?: boolean;
+
+  /**
+   * Modify the way the name looks when displayed
+   */
+  displayName?: string;
+
+  /**
+   * New resources can be created of this type
+   */
+  isCreatable?: boolean;
+
+  /**
+   * Resources of this type can be deleted/removed
+   */
+  isRemovable?: boolean;
+
+  /**
+   * This type should be grouped by namespaces when displayed in a table
+   */
+  namespaced?: boolean;
+
+  /**
+   * Show the age column in when displaying this type in a table
+   */
+  showAge?: boolean;
+
+   /**
+   * Show the masthead at the top of the list view of this type
+   */
+  showListMasthead?: boolean;
+
+   /**
+   * Show the state column in when displaying this type in a table
+   */
+  showState?: boolean;
+
+  /**
+   * Leaving these here for completeness but I don't think these should be advertised as useable to plugin creators.
+   */
+  // alias
+  // customRoute
+  // customRoute
+  // depaginate
+  // graphConfig
+  // hasGraph
+  // isEditable
+  // limit
+  // listGroups
+  // localOnly
+  // location
+  // match
+  // realResource
+  // resource
+  // resourceDetail
+  // resourceEdit
+  // showConfigView
+}
+
+export interface DSLReturnType {
+  /**
+   * Register multiple types by name and place them all in a group if desired. Primarily used for grouping things in the cluster explorer navigation.
+   * @param types A list of types that are going to be registered
+   * @param group Conditionally a group you want to places all the types in
+   * @returns {@link void}
+   */
+  basicType: (types: string[], group?: string) => void;
+
+  /**
+   * Configure a myriad of options for the specified type
+   * @param type The type to be configured
+   * @param options {@link ConfigureTypeOptions}
+   * @returns {@link void}
+   */
+  configureType: (type: string, options: ConfigureTypeOptions) => void;
+
+  /**
+   * Register the headers/columns that should be used when rendering a table for the specified type.
+   * @param type The type you'd like to register headers/columns for.
+   * @param headers {@link HeaderOptions[]}
+   * @returns {@link void}
+   */
+  headers: (type: string, headers: HeaderOptions[]) => void;
+
+  /**
+   * Create and register a new product
+   * @param options {@link ProductOptions}
+   * @returns {@link void}
+   */
+  product: (options: ProductOptions) => void;
+
+  /**
+   * Leaving these here for completeness but I don't think these should be advertised as useable to plugin creators.
+   */
+  // componentForType: (type: string, replacementType: string)
+  // groupBy: (type: string, field: string)
+  // hideBulkActions: (type: string, field)
+  // ignoreGroup: (regexOrString)
+  // ignoreType: (regexOrString)
+  // mapGroup: (match, replace)
+  // mapType: (match, replace)
+  // moveType: (match, group)
+  // setGroupDefaultType: (input, defaultType)
+  // spoofedType: (obj)
+  // virtualType: (obj)
+  // weightGroup: (input, weight, forBasic)
+  // weightType: (input, weight, forBasic)
+}
+
 /**
  * Interface for a Dashboard plugin
  */
@@ -144,7 +394,7 @@ export interface IPlugin {
    * Add a product
    * @param importFn Function that will import the module containing a product definition
    */
-  addProduct(importFn: Function): void;
+  addProduct(importFn: ProductFunction): void;
 
   /**
    * Add a locale to the i18n store
@@ -249,4 +499,11 @@ export interface IPlugin {
    * @param {Function} fn function that dynamically loads the module for the thing being registered
    */
   register(type: string, name: string, fn: Function): void;
+
+  /**
+   * Will return all of the configuration functions used for creating a new product.
+   * @param store The store that was passed to the function that's passed to `plugin.addProduct(function)`
+   * @param productName The name of the new product. This name is displayed in the navigation.
+   */
+  DSL(store: any, productName: string): DSLReturnType;
 }

package/creators/app/files/tsconfig.json

@@ -31,7 +31,6 @@
     ],    
     "types": [
       "@types/node",
-      "@nuxt/types",
       "cypress",
       "rancher",
       "shell"

package/creators/app/files/vue.config.js

@@ -3,5 +3,4 @@ const config = require('@rancher/shell/vue.config');
 module.exports = config(__dirname, {
   excludes: [],
   // excludes: ['fleet', 'example']
-  // autoLoad: ['fleet', 'example']
 });

package/creators/pkg/files/.github/workflows/build-extension.yml

@@ -64,7 +64,7 @@ jobs:
         shell: bash
         id: build_script
         run: |
-          yarn publish-pkgs -s "${{ github.repository }}" -b main
+          yarn publish-pkgs -s "${{ github.repository }}" -b gh-pages
 
       - name: Upload charts artifact
         if: github.ref == 'refs/heads/main' && github.event_name != 'pull_request'
@@ -83,8 +83,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
         with:
-          fetch-depth: 0
-          ref: main
+          ref: gh-pages
 
       - name: Configure Git
         run: |
@@ -105,7 +104,7 @@ jobs:
       - name: Run chart-releaser
         uses: helm/chart-releaser-action@v1.4.1
         with:
-          charts_dir: ./charts
+          charts_dir: ./charts/*
         env:
           CR_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
           CR_SKIP_EXISTING: true

package/creators/pkg/files/tsconfig.json

@@ -23,7 +23,6 @@
       "@types/node",
       "@types/jest",
       "@types/lodash",
-      "@nuxt/types",
       "rancher",
       "shell"
     ],

package/creators/pkg/pkg.package.json

@@ -9,9 +9,9 @@
     "node": ">=12"
   },
   "devDependencies": {
-    "@vue/cli-plugin-babel": "~4.5.0",
-    "@vue/cli-service": "~4.5.0",
-    "@vue/cli-plugin-typescript": "^4.5.15"
+    "@vue/cli-plugin-babel": "4.5.18",
+    "@vue/cli-service": "4.5.18",
+    "@vue/cli-plugin-typescript": "4.5.18"
   },
   "browserslist": [
     "> 1%",

package/detail/constraints.gatekeeper.sh.constraint.vue

@@ -2,18 +2,26 @@
 import CreateEditView from '@shell/mixins/create-edit-view';
 import SortableTable from '@shell/components/SortableTable';
 import Banner from '@components/Banner/Banner.vue';
-import { CONSTRAINT_VIOLATION_RESOURCE_LINK, CONSTRAINT_VIOLATION_MESSAGE, CONSTRAINT_VIOLATION_TYPE } from '@shell/config/table-headers';
+import {
+  CONSTRAINT_VIOLATION_RESOURCE_LINK,
+  CONSTRAINT_VIOLATION_MESSAGE,
+  CONSTRAINT_VIOLATION_TYPE,
+  CONSTRAINT_VIOLATION_NAMESPACE,
+} from '@shell/config/table-headers';
 
 export default {
   components: { Banner, SortableTable },
   mixins:     [CreateEditView],
   data() {
+    const headers = [
+      CONSTRAINT_VIOLATION_TYPE,
+      CONSTRAINT_VIOLATION_NAMESPACE,
+      CONSTRAINT_VIOLATION_RESOURCE_LINK,
+      CONSTRAINT_VIOLATION_MESSAGE
+    ];
+
     return {
-      headers: [
-        CONSTRAINT_VIOLATION_TYPE,
-        CONSTRAINT_VIOLATION_RESOURCE_LINK,
-        CONSTRAINT_VIOLATION_MESSAGE
-      ],
+      headers,
       violations: this.value.violations.map((violation, i) => ({ ...violation, id: i }))
     };
   }
@@ -46,7 +54,6 @@ export default {
         <SortableTable
           :headers="headers"
           :rows="violations"
-          :search="false"
           :table-actions="false"
           :row-actions="false"
           :paging="true"

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

@@ -5,6 +5,7 @@ import FleetClusters from '@shell/components/fleet/FleetClusters';
 import ResourceTabs from '@shell/components/form/ResourceTabs';
 import Tab from '@shell/components/Tabbed/Tab';
 import { FLEET } from '@shell/config/types';
+import { allHash } from '@shell/utils/promise';
 
 export default {
   name: 'DetailClusterGroup',
@@ -25,7 +26,12 @@ export default {
   },
 
   async fetch() {
-    await this.$store.dispatch('management/findAll', { type: FLEET.CLUSTER });
+    const hash = {
+      workspaces:    this.$store.dispatch('cluster/findAll', { type: FLEET.WORKSPACE }),
+      FleetClusters: this.$store.dispatch('management/findAll', { type: FLEET.CLUSTER }),
+    };
+
+    await allHash(hash);
   },
 
   computed: {

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

@@ -24,6 +24,7 @@ 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';
@@ -33,6 +34,7 @@ export default {
   name: 'CruGitRepo',
 
   components: {
+    Checkbox,
     ArrayList,
     Banner,
     CruResource,
@@ -601,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/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/namespace.vue

@@ -10,7 +10,7 @@ import PodSecurityAdmission from '@shell/components/PodSecurityAdmission';
 import Tabbed from '@shell/components/Tabbed';
 import Tab from '@shell/components/Tabbed/Tab';
 import CruResource from '@shell/components/CruResource';
-import { PROJECT_ID, _VIEW } from '@shell/config/query-params';
+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';
@@ -67,6 +67,10 @@ export default {
   computed: {
     ...mapGetters(['isSingleProduct']),
 
+    isCreate() {
+      return this.mode === _CREATE;
+    },
+
     isSingleHarvester() {
       return this.$store.getters['currentProduct'].inStore === HARVESTER && this.isSingleProduct;
     },
@@ -77,7 +81,6 @@ export default {
 
       // Filter out projects not for the current cluster
       projects = projects.filter(c => c.spec?.clusterName === clusterId);
-
       const out = projects.map((project) => {
         return {
           label: project.nameDisplay,
@@ -86,7 +89,7 @@ export default {
       });
 
       out.unshift({
-        label: '(None)',
+        label: this.t('namespace.project.none'),
         value: null,
       });
 
@@ -105,6 +108,9 @@ export default {
       return !this.isSingleHarvester;
     },
 
+    flatView() {
+      return (this.$route.query[FLAT_VIEW] || false);
+    }
   },
 
   watch: {
@@ -139,13 +145,11 @@ export default {
       }
 
       const projects = this.$store.getters['management/all'](MANAGEMENT.PROJECT);
-
       const project = projects.find(p => p.id.includes(projectName));
 
       return project?.spec?.containerDefaultResourceLimit || {};
     }
-  }
-
+  },
 };
 </script>
 
@@ -169,9 +173,10 @@ export default {
       :value="value"
       :namespaced="false"
       :mode="mode"
+      :extra-columns="['project-col']"
     >
       <template
-        v-if="project"
+        v-if="flatView && isCreate"
         #project-col
       >
         <LabeledSelect
@@ -181,7 +186,6 @@ export default {
         />
       </template>
     </NameNsDescription>
-
     <Tabbed :side-tabs="true">
       <Tab
         v-if="showResourceQuota"

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

@@ -173,6 +173,14 @@ export default {
 
 <template>
   <div>
+    <Banner
+      v-if="value.pool.hostnameLengthLimit"
+      color="info"
+    >
+      <div class="text">
+        {{ t('cluster.machinePool.truncationPool', { limit: value.pool.hostnameLengthLimit }) }}
+      </div>
+    </Banner>
     <div class="row">
       <div class="col span-4">
         <LabeledInput
@@ -200,19 +208,19 @@ export default {
         <Checkbox
           v-model="value.pool.etcdRole"
           :mode="mode"
-          label="etcd"
+          :label="t('cluster.machinePool.role.etcd')"
           :disabled="isWindows"
         />
         <Checkbox
           v-model="value.pool.controlPlaneRole"
           :mode="mode"
-          label="Control Plane"
+          :label="t('cluster.machinePool.role.controlPlane')"
           :disabled="isWindows"
         />
         <Checkbox
           v-model="value.pool.workerRole"
           :mode="mode"
-          label="Worker"
+          :label="t('cluster.machinePool.role.worker')"
         />
       </div>
     </div>
@@ -294,7 +302,6 @@ export default {
         :read-allowed="false"
         :value-can-be-empty="true"
       />
-
       <div class="spacer" />
 
       <Taints

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

@@ -135,31 +135,29 @@ export default {
     @finish="saveOverride"
     @error="e=>errors = e"
   >
-    <div class="mt-20">
-      <Banner
-        v-if="harvesterLocation"
-        color="info"
-        :closable="true"
-        class="mb-20"
-        @close="hideHarvesterNotice"
-      >
-        {{ t('cluster.harvester.importNotice') }}
-        <nuxt-link :to="harvesterLocation">
-          {{ t('product.harvesterManager') }}
-        </nuxt-link>
-      </Banner>
-
-      <NameNsDescription
-        v-if="!isView"
-        v-model="value"
-        :mode="mode"
-        :namespaced="false"
-        name-label="cluster.name.label"
-        name-placeholder="cluster.name.placeholder"
-        description-label="cluster.description.label"
-        description-placeholder="cluster.description.placeholder"
-      />
-    </div>
+    <Banner
+      v-if="harvesterLocation"
+      color="info"
+      :closable="true"
+      class="mb-20"
+      @close="hideHarvesterNotice"
+    >
+      {{ t('cluster.harvester.importNotice') }}
+      <nuxt-link :to="harvesterLocation">
+        {{ t('product.harvesterManager') }}
+      </nuxt-link>
+    </Banner>
+
+    <NameNsDescription
+      v-if="!isView"
+      v-model="value"
+      :mode="mode"
+      :namespaced="false"
+      name-label="cluster.name.label"
+      name-placeholder="cluster.name.placeholder"
+      description-label="cluster.description.label"
+      description-placeholder="cluster.description.placeholder"
+    />
 
     <Tabbed :side-tabs="true">
       <Tab