@rancher/shell 0.1.4 → 0.2.1

package/assets/images/generic-plugin.svg

@@ -1,7 +1 @@
-<svg width="36px" height="36px" viewBox="0 0 36 36" version="1.1"  preserveAspectRatio="xMidYMid meet" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-  <style type="text/css">
-    .st0{fill:#777;}
-  </style>    
-  <path d="M29.81,16H29V8.83a2,2,0,0,0-2-2H21A5.14,5.14,0,0,0,16.51,2,5,5,0,0,0,11,6.83H4a2,2,0,0,0-2,2V17H4.81A3.13,3.13,0,0,1,8,19.69,3,3,0,0,1,7.22,22,3,3,0,0,1,5,23H2v8.83a2,2,0,0,0,2,2H27a2,2,0,0,0,2-2V26h1a5,5,0,0,0,5-5.51A5.15,5.15,0,0,0,29.81,16Zm2.41,7A3,3,0,0,1,30,24H27v7.83H4V25H5a5,5,0,0,0,5-5.51A5.15,5.15,0,0,0,4.81,15H4V8.83h9V7a3,3,0,0,1,1-2.22A3,3,0,0,1,16.31,4,3.13,3.13,0,0,1,19,7.19V8.83h8V18h2.81A3.13,3.13,0,0,1,33,20.69,3,3,0,0,1,32.22,23Z" class="clr-i-outline clr-i-outline-path-1 st0"></path>
-  <rect class="st0" x="0" y="0" width="36" height="36" fill-opacity="0"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><g fill="#777" transform="translate(0, 0) scale(1, 1) "><path d="M20.5 11H19V7c0-1.1-.9-2-2-2h-4V3.5C13 2.12 11.88 1 10.5 1S8 2.12 8 3.5V5H4c-1.1 0-1.99.9-1.99 2v3.8H3.5c1.49 0 2.7 1.21 2.7 2.7s-1.21 2.7-2.7 2.7H2V20c0 1.1.9 2 2 2h3.8v-1.5c0-1.49 1.21-2.7 2.7-2.7 1.49 0 2.7 1.21 2.7 2.7V22H17c1.1 0 2-.9 2-2v-4h1.5c1.38 0 2.5-1.12 2.5-2.5S21.88 11 20.5 11z"/></g></svg>

package/assets/styles/global/_button.scss

@@ -139,6 +139,7 @@ fieldset[disabled] .btn {
   color: var(--disabled-text) !important;
   &:not(.role-link){
     background-color: var(--disabled-bg) !important;
+    border-color: var(--disabled-bg) !important;
   }
 }
 

package/assets/translations/en-us.yaml

@@ -48,6 +48,7 @@ generic:
   plusMore: "+ {n} more"
   readFromFile: Read from File
   readFromFolder: Read from Folder
+  reload: Reload
   register: Register
   remove: Remove
   resource: |-
@@ -189,7 +190,7 @@ product:
   neuvector: NeuVector
   harvesterManager: Virtualization Management
   rancher: Rancher
-  uiplugins: UI Plugins
+  uiplugins: Extensions
 
 suffix:
   percent: "%"
@@ -751,8 +752,6 @@ backupRestoreOperator:
     useDefault: Use the default storage location configured during installation
   targetBackup: Target Backup
 
-
-
 catalog:
   app:
     managed: Managed
@@ -766,6 +765,13 @@ catalog:
         busy: The related resources will appear when {app} is fully installed.
       values: Values YAML
   chart:
+    registry:
+      label: Container Registry
+      tooltip: Container images are pulled from the Cluster Container or, failing that, the System Container Registry Setting. To change this default behavior enter or update the registry here
+      custom:
+        checkBoxLabel: Container Registry for Rancher System Container Images
+        inputLabel: Container Registry
+        placeholder: Registry domain and ports, ex. registry.io:5000
     header:
       charts: Charts
     info:
@@ -1565,6 +1571,9 @@ cluster:
       label: Roles
     labels:
       label: Kubernetes Node Labels
+    noAccessBanner: "You do not have access to see this machine pool's configuration."
+    configNotFound: "We could not find this machine pool's configuration. We recommend that you create a new cluster with the desired configuration."
+    noPoolsDisclaimer: You do not have any machine pools defined, click the plus to add one.
     autoReplace:
       label: Auto Replace
       toolTip: If greater than 0, nodes that are unreachable for this duration will be automatically deleted and replaced.
@@ -1580,10 +1589,10 @@ cluster:
       noResults: No results found
   privateRegistry:
     systemDefaultRegistry:
-      label: Registry hostname for {vendor} System Container Images
+      label: Registry hostname for Rancher System Container Images
     mode:
-      public: Use default global registry for {vendor} System Container Images
-      private: Use specified private registry for {vendor} System Container Images
+      public: Use default global registry for Rancher System Container Images
+      private: Use specified private registry for Rancher System Container Images
       advanced: Configure advanced containerd mirroring and registry authentication options
   provider:
     aliyunecs: Aliyun ECS
@@ -1641,6 +1650,7 @@ cluster:
     upcloud: UpCloud
     vmwarevsphere: VMware vSphere
     zstack: ZStack
+    machineinventoryselectortemplate: Elemental Cluster
   providerTag:
     rke2:
       harvester: '{tag}'
@@ -3665,7 +3675,7 @@ persistentVolumeClaim:
   status:
     label: Status
 
-# UI Plugins
+# Rancher Extensions
 plugins:
   labels:
     builtin: Built-in
@@ -3674,78 +3684,87 @@ plugins:
     installing: Installing ...
     uninstalling: Uninstalling ...
   descriptions:
-    experimental: This UI Plugin is marked as experimental
-    third-party: This UI plugin is provided by a Third-Party
+    experimental: This Extension is marked as experimental
+    third-party: This Extension is provided by a Third-Party
+    built-in: This Extension is built-in
   error:
-    title: Error loading plugin
-    message: Could not load plugin code
+    title: Error loading extension
+    message: Could not load extension code
+    generic: Extension error
+    api: This Extension is not compatible with the Extensions API
+    host: This Extension is not compatible with this application
+    version: This Extension is not compatible with this version of Rancher
+    load: An error occurred loading the code for this Extension
   success:
-    title: Loaded plugin {name}
-    message: Plugin was loaded successfully
+    title: Loaded extension {name}
+    message: Extension was loaded successfully
   developer:
     label: Developer Load
-    title: Developer Load Plugin
-    prompt: Load a plugin from a URL
+    title: Developer Load Extension
+    prompt: Load an extension from a URL
     fields:
-      url: Plugin URL
-      name: Plugin module name
-      persist: Persist plugin by creating custom resource
+      url: Extension URL
+      name: Extension module name
+      persist: Persist extension by creating custom resource
   info:
     detail: Detail
     versions: Versions
     versionError: Could not load version information
   empty:
-    all: No UI Plugins either installed nor available
-    available: No UI Plugins available
-    installed: No UI Plugins installed
-    updates: No UI Plugin updates available
-  loadError: An error occurred loading the code for this plugin
-  helmError: "An error occurred installing the plugin via Helm"
+    all: Extensions are neither installed or available
+    available: No Extensions available
+    installed: No Extensions installed
+    updates: No updates available for installed Extensions
+  loadError: An error occurred loading the code for this extension
+  helmError: "An error occurred installing the extension via Helm"
+  manageRepos: Manage Repositories
   tabs:
     all: All
     available: Available
     installed: Installed
     updates: Updates
-  title: UI Plugins
+  title: Extensions
+  version: "Version: {version}"
   install:
     label: Install
-    title: Install UI Plugin {name}
-    prompt: "Are you sure that you want to install this UI Plugin?"
+    title: Install Extension {name}
+    prompt: "Are you sure that you want to install this Extension?"
     version: Version
-    warnNotCertified: Please ensure that you are aware of the risks of installing UI Plugins from untrusted authors
+    warnNotCertified: Please ensure that you are aware of the risks of installing Extensions from untrusted authors
   update:
     label: Update
-    title: Update UI Plugin {name}
-    prompt: "Are you sure that you want to update this UI Plugin?"
+    title: Update Extension {name}
+    prompt: "Are you sure that you want to update this Extension?"
   rollback:
     label: Rollback
-    title: Rollback UI Plugin {name}
-    prompt: "Are you sure that you want to rollback this UI Plugin?"
+    title: Rollback Extension {name}
+    prompt: "Are you sure that you want to rollback this Extension?"
   uninstall:
     label: Uninstall
-    title: "Uninstall UI Plugin: {name}"
-    prompt: "Are you sure that you want to uninstall this UI Plugin?"
-  upgradeAvailable: A newer version of this UI Plugin is available
+    title: "Uninstall Extension: {name}"
+    prompt: "Are you sure that you want to uninstall this Extension?"
+  upgradeAvailable: A newer version of this Extension is available
+  reload: Extensions changed - reload required
   safeMode:
-    title: UI Plugins Safe Mode
-    message: UI Plugins were not loaded
+    title: Extensions Safe Mode
+    message: Extensions were not loaded
   setup:
-    title: UI Plugin Support is not enabled
+    title: Extension support is not enabled
     prompt:
       cant: Automatic installation is not available - required Helm Charts could not be found
-      can: You need to install the Plugin Operator
+      can: You need to install the Extension Operator
     install:
-      title: Enable UI Plugin Support?
-      prompt: This will install the Helm charts to enable Rancher UI Plugin support
-      airgap: Un-check if your Rancher installation is air-gapped
-      addRancherRepo: Add the Rancher UI Plugins Repository
+      title: Enable Extension Support?
+      prompt: This will install the Helm charts to enable Extension support
+      airgap: The Rancher Extensions Repository provides extensions published by Rancher. Un-check if your Rancher installation is air-gapped
+      addRancherRepo: Add the Rancher Extension Repository
     remove:
-      label: Disable UI Plugin Support
-      title: Disable UI Plugin Support?
-      prompt: This will un-install the Helm charts that enable Rancher UI Plugin support
+      label: Disable Extension Support
+      title: Disable Extension Support?
+      prompt: This will un-install the Helm charts that enable Extension support
       registry:
-        title: Remove the Rancher UI Plugins Repository
-        prompt: Remove the default UI Plugins Repository
+        title: Remove the Rancher Extensions Repository
+        prompt: The Rancher Extensions Repository provides extensions published by Rancher
 
 prefs:
   title: Preferences
@@ -3785,7 +3804,7 @@ prefs:
     viewInApi: Enable "View in API"
     allNamespaces: Show system Namespaces managed by Rancher (not intended for editing or deletion)
     themeShortcut: Enable Dark/Light Theme keyboard shortcut toggle (shift+T)
-    pluginDeveloper: Enable UI Plugin Developer features
+    pluginDeveloper: Enable Extension developer features
   hideDesc:
     label: Hide All Type Descriptions
   helm:
@@ -4238,8 +4257,10 @@ resourceTable:
     namespace: Group by Namespace
     project: Group by Project
     node: Group by Node
+    cluster: Group by Cluster
   groupLabel:
     cluster: "<span>Cluster:</span> {name}"
+    notInACluster: Not in a Cluster
     namespace: "<span>Namespace:</span> {name}"
     notInAMachinePool: "Not In A Deployment"
     machinePool: "<span>Pool:</span> {name}"
@@ -4429,6 +4450,24 @@ servicesPage:
     placeholder: e.g. my.database.example.com
     input:
       label: DNS Name
+  harvester:
+    title: Add-on Config
+    ipam:
+      label: IPAM
+    healthCheckPort:
+      label: Health Check Port
+    healthCheckSuccessThreshold:
+      label: Health Check Success Threshold
+      description: If the number of times the prober continuously detects an address successfully reaches the success threshold, then the backend server can start to forward traffic.
+    healthCheckFailureThreshold:
+      label: Health Check Failure Threshold
+      description: The backend server will stop forwarding traffic if the number of health check failures reaches the failure threshold.
+    healthCheckPeriod:
+      label: Health Check Period
+    healthCheckTimeout:
+      label: Health Check Timeout
+    healthCheckEnabled:
+      label: Health Check
   ips:
     define: Service Ports
     clusterIpHelpText: The Cluster IP address must be within the CIDR range configured for the API server.
@@ -4529,6 +4568,16 @@ sortableTable:
       =1 {{count} {count, plural, =1 {{singularLabel}} other {{pluralLabel}}}}
       other {{from} - {to} of {count} {pluralLabel}}}
   search: Filter
+  in: in
+  addFilter: Add Filter
+  filterFor: Filter for...
+  selectCol: Select a column
+  resetFilters: Reset
+  add: Add
+  tableHeader:
+    noFilter: This column cannot be filtered by
+    groupBy: Group by
+    show: Show
 
 storageClass:
   actions:
@@ -4835,6 +4884,7 @@ tableHeaders:
   clusterCreatorDefault: Cluster Creator Default
   clusterFlow: Cluster Flow
   clusterOutput: Cluster Output
+  cluster: Cluster
   clusters: Clusters
   clustersReady: Clusters Ready
   clusterGroups: Cluster Groups
@@ -6174,7 +6224,7 @@ performance:
     label: Incremental Loading
     setting: You can configure the threshold above which incremental loading will be used.
     description: |-
-      When enabled, resources will appear more quickly, but it may take slightly longer to load the entire set of resources. This setting only applies to the following resources: Pods, Deployments, Cron Jobs, Daemon Sets, Jobs, Stateful Sets, Replica Sets, Replication Controllers, Workloads and Secrets.
+      When enabled, resources will appear more quickly, but it may take slightly longer to load the entire set of resources. This setting only applies to resources that come from the Kubernetes API
     checkboxLabel: Enable incremental loading
     inputLabel: Resource Threshold
   manualRefresh:
@@ -6183,7 +6233,7 @@ performance:
     setting: You can configure a threshold above which manual refresh will be enabled.
     buttonTooltip: Refresh list
     description: |-
-      When enabled, list data will not auto-update but instead the user must manually trigger a list-view refresh. This setting only applies to the following resources: Pods, Deployments, Cron Jobs, Daemon Sets, Jobs, Stateful Sets, Replica Sets, Replication Controllers, Workloads and Secrets.
+      When enabled, list data will not auto-update but instead the user must manually trigger a list-view refresh. This setting only applies to resources that come from the Kubernetes API
     checkboxLabel: Enable manual refresh of data for lists
     inputLabel: Resource Threshold
   websocketNotification:
@@ -6191,6 +6241,29 @@ performance:
     description: |-
       When checked, websocket notifications will not appear when the UI detects a disconnection.
     checkboxLabel: Disable websocket notifications
+  gc:
+    label: Resource Garbage Collection
+    description: The UI will cache kuberentes resources locally to avoid having to re-fetch them. In some cases this can lead to a large amount of data stored in the browser. Enable this setting to periodically remove them.
+    banner: This setting is experimental and may be removed or updated in future versions.
+    checkboxLabel: Enable Garbage Collection
+    whenRun:
+      description: Update when garbage collection runs
+      intervalCheckBox:
+        label: Run garbage collection periodically
+      interval:
+        inputLabel: Run every
+      route:
+        description: Run garbage collection on page change
+        inputLabel: Page Change
+    howRun:
+      description: Update how garbage collection runs
+      age:
+        description: "Resource types musn't have been accessed within this period to be considered for garbage collection."
+        inputLabel: Resource Age
+      count:
+        description: Resource types must exceed this amount to be considered for garbage collection.
+        inputLabel: Resource Count
+
 
 banner:
   label: Fixed Banners
@@ -6310,13 +6383,16 @@ resourceQuota:
 customLinks: 
   displayTitle: Links
   label: Home Links
-  description: 'Links to display on the home page.'
+  description: 'Configure the links to display on the home page. You can define your own custom links as well as show or hide default links.'
   restoreDefaults: 'Restore Defaults'
   addLink: Add Link
   restoreSuccess: Default URLs have been restored.
   settings:
+    default: Default Links
+    custom: Custom Links
     keyLabel: Display Text
     valueLabel: URL
+    showLabel: Show
   defaults: 
     docs:       Docs
     forums:     Forums
@@ -6425,4 +6501,4 @@ auth:
     label: Auth Provider
 vncConsole:
   error:
-    message: Web VNC console connection is disconnected
+    message: Web VNC console connection is disconnected

package/assets/translations/zh-hans.yaml

@@ -4312,6 +4312,24 @@ servicesPage:
     placeholder: 例如：my.database.example.com
     input:
       label: DNS 名称
+  harvester:
+    title: 附加配置
+    ipam:
+      label: IPAM
+    healthCheckPort:
+      label: 健康检查端口
+    healthCheckSuccessThreshold:
+      label: 健康检查成功阙值
+      description: 如果探针连续检测到某个地址的成功次数达到成功阈值，后端服务器就可以开始转发流量。
+    healthCheckFailureThreshold:
+      label: 健康检查失败阈值
+      description: 如果健康检查失败的数量达到失败阈值，后端服务器将停止转发流量。
+    healthCheckPeriod:
+      label: 健康检查周期
+    healthCheckTimeout:
+      label: 健康检查超时
+    healthCheckEnabled:
+      label: 健康检查
   ips:
     define: 服务端口
     clusterIpHelpText: 集群 IP 地址必须在为 API server 配置的 CIDR 范围内。

package/components/CommunityLinks.vue

@@ -1,10 +1,11 @@
 <script>
-import { options } from '@shell/config/footer';
 import SimpleBox from '@shell/components/SimpleBox';
 import Closeable from '@shell/mixins/closeable';
 import { MANAGEMENT } from '@shell/config/types';
 import { SETTING } from '@shell/config/settings';
 import { mapGetters } from 'vuex';
+import { isRancherPrime } from '@shell/config/version';
+import { fetchLinks } from '@shell/config/home-links';
 
 export default {
   name: 'CommunityLinks',
@@ -18,36 +19,23 @@ export default {
         return {};
       },
     },
+    isSupportPage: {
+      type:    Boolean,
+      default: false,
+    },
   },
 
   mixins: [Closeable],
 
   async fetch() {
-    // If user already have custom links and uiIssueSetting Doc URL set
-    // This should already be in the uiCustomLinks
-    try {
-      this.uiCustomLinks = await this.$store.dispatch('management/find', { type: MANAGEMENT.SETTING, id: SETTING.UI_CUSTOM_LINKS });
-    } catch (err) {
-
-    }
-
-    // Fallback:
-    // NB: this.uiIssueSetting is deprecated now.
-    if (!this.uiCustomLinks) {
-      try {
-        this.uiIssuesSetting = await this.$store.dispatch('management/find', { type: MANAGEMENT.SETTING, id: SETTING.ISSUES });
-      } catch (err) {
-
-      }
-    }
+    this.links = await fetchLinks(this.$store, this.hasSupport, this.isSupportPage, str => this.t(str));
   },
 
   data() {
-    return { uiCustomLinks: null, uiIssuesSetting: null };
+    return { links: {} };
   },
 
   computed: {
-
     ...mapGetters('i18n', [
       'selectedLocaleLabel'
     ]),
@@ -56,38 +44,41 @@ export default {
       return !!Object.keys(this.options).length || !!Object.keys(this.$slots).length;
     },
 
+    hasSupport() {
+      return isRancherPrime() || this.$store.getters['management/byId'](MANAGEMENT.SETTING, SETTING.SUPPORTED )?.value === 'true';
+    },
+
     options() {
-      // Link options are provided
-      if (Object.keys(this.linkOptions).length > 0) {
-        return this.linkOptions;
+      // Use linkOptions if provided - used by Harvester
+      if (this.linkOptions && Object.keys(this.linkOptions).length) {
+        const options = [];
+
+        Object.keys(this.linkOptions).forEach((key) => {
+          options.push({
+            key,
+            label: this.t(key),
+            value: this.linkOptions[key]
+          });
+        });
+
+        return options;
       }
 
-      // Custom links set from settings
-      if (!!this.uiCustomLinks?.value) {
-        try {
-          const customLinks = JSON.parse(this.uiCustomLinks.value);
-
-          if (Array.isArray(customLinks)) {
-            return customLinks.reduce((prev, curr) => {
-              prev[curr.key] = curr.value;
-
-              return prev;
-            }, {});
-          }
-        } catch (e) {
-          console.error('Could not parse custom links setting', e); // eslint-disable-line no-console
-        }
+      // Combine the links
+      const all = [];
+
+      if (this.links.custom) {
+        all.push(...this.links.custom);
       }
 
-      // Fallback
-      return options(false, this.uiIssuesSetting?.value);
-    },
+      if (this.links.defaults) {
+        all.push(...this.links.defaults.filter(link => link.enabled));
+      }
+
+      return all;
+    }
   },
   methods: {
-    getLabel(label) {
-      return this.$store.getters['i18n/withFallback'](`customLinks.defaults.${ label }`, null, label);
-    },
-
     show() {
       this.$modal.show('wechat-modal');
     },
@@ -106,11 +97,11 @@ export default {
           {{ t('customLinks.displayTitle') }}
         </h2>
       </template>
-      <div v-for="(value, name) in options" :key="name" class="support-link">
-        <n-link v-if="value.startsWith('/') " :to="value">
-          {{ getLabel(name) }}
+      <div v-for="link in options" :key="link.label" class="support-link">
+        <n-link v-if="link.value.startsWith('/') " :to="link.value">
+          {{ link.label }}
         </n-link>
-        <a v-else :href="value" rel="noopener noreferrer nofollow" target="_blank"> {{ getLabel(name) }} </a>
+        <a v-else :href="link.value" rel="noopener noreferrer nofollow" target="_blank"> {{ link.label }} </a>
       </div>
       <slot />
       <div v-if="selectedLocaleLabel === t('locale.zh-hans')" class="support-link">

package/components/ExplorerProjectsNamespaces.vue

@@ -10,12 +10,14 @@ import { mapPref, GROUP_RESOURCES, ALL_NAMESPACES } from '@shell/store/prefs';
 import MoveModal from '@shell/components/MoveModal';
 import { defaultTableSortGenerationFn } from '@shell/components/ResourceTable.vue';
 import { NAMESPACE_FILTER_ALL_ORPHANS } from '@shell/utils/namespace-filter';
+import ResourceFetch from '@shell/mixins/resource-fetch';
 
 export default {
   name:       'ListProjectNamespace',
   components: {
     Masthead, MoveModal, ResourceTable
   },
+  mixins: [ResourceFetch],
 
   props: {
     createProjectLocationOverride: {
@@ -42,14 +44,15 @@ export default {
       return;
     }
 
-    this.namespaces = await this.$store.dispatch(`${ inStore }/findAll`, { type: NAMESPACE });
+    await this.$fetchType(NAMESPACE);
     this.projects = await this.$store.dispatch('management/findAll', { type: MANAGEMENT.PROJECT, opt: { force: true } });
   },
 
   data() {
     return {
+      loadResources:                [NAMESPACE],
+      loadIndeterminate:            true,
       schema:                       null,
-      namespaces:                   [],
       projects:                     [],
       projectSchema:                null,
       MANAGEMENT,
@@ -66,6 +69,17 @@ export default {
 
   computed: {
     ...mapGetters(['currentCluster', 'currentProduct']),
+    namespaces() {
+      const inStore = this.$store.getters['currentStore'](NAMESPACE);
+
+      return this.$store.getters[`${ inStore }/all`](NAMESPACE);
+    },
+    loading() {
+      return !this.currentCluster || this.namespaces.length ? false : this.$fetchState.pending;
+    },
+    showIncrementalLoadingIndicator() {
+      return this.perfConfig?.incrementalLoading?.enabled;
+    },
     isNamespaceCreatable() {
       return (this.schema?.collectionMethods || []).includes('POST');
     },
@@ -309,6 +323,9 @@ export default {
       :favorite-resource="VIRTUAL_TYPES.PROJECT_NAMESPACES"
       :create-location="createProjectLocation"
       :create-button-label="t('projectNamespaces.createProject')"
+      :show-incremental-loading-indicator="showIncrementalLoadingIndicator"
+      :load-resources="loadResources"
+      :load-indeterminate="loadIndeterminate"
     />
     <ResourceTable
       ref="table"
@@ -319,7 +336,7 @@ export default {
       :rows="filteredRows"
       :groupable="true"
       :sort-generation-fn="sortGenerationFn"
-      :loading="$fetchState.pending || !currentCluster"
+      :loading="loading"
       group-tooltip="resourceTable.groupBy.project"
       key-field="_key"
       v-on="$listeners"