@rancher/shell 0.3.10 → 0.3.12

package/pages/fail-whale.vue

@@ -35,7 +35,7 @@ export default {
     },
 
     displayError() {
-      return stringify(this.error);
+      return this.error?.data ? this.error.data : stringify(this.error);
     },
   },
 

package/pages/home.vue

@@ -53,6 +53,15 @@ export default {
     if ( this.$store.getters['management/canList'](MANAGEMENT.NODE) ) {
       this.$store.dispatch('management/findAll', { type: MANAGEMENT.NODE });
     }
+
+    // We need to fetch node pools and node templates in order to correctly show the provider for RKE1 clusters
+    if ( this.$store.getters['management/canList'](MANAGEMENT.NODE_POOL) ) {
+      this.$store.dispatch('management/findAll', { type: MANAGEMENT.NODE_POOL });
+    }
+
+    if ( this.$store.getters['management/canList'](MANAGEMENT.NODE_TEMPLATE) ) {
+      this.$store.dispatch('management/findAll', { type: MANAGEMENT.NODE_TEMPLATE });
+    }
   },
 
   data() {
@@ -211,6 +220,8 @@ export default {
   beforeDestroy() {
     this.$store.dispatch('management/forgetType', CAPI.MACHINE);
     this.$store.dispatch('management/forgetType', MANAGEMENT.NODE);
+    this.$store.dispatch('management/forgetType', MANAGEMENT.NODE_POOL);
+    this.$store.dispatch('management/forgetType', MANAGEMENT.NODE_TEMPLATE);
   },
 
   methods: {

package/pages/prefs.vue

@@ -70,7 +70,25 @@ export default {
     dateOptions() {
       const now = day();
 
-      return this.$store.getters['prefs/options'](DATE_FORMAT).map((value) => {
+      const currentDate = this.$store.getters['prefs/options'](DATE_FORMAT).map((value) => {
+        return now.format(value);
+      });
+
+      // Check for duplication of date (date with same digit in month and day) in options list eg. (3/3/2023)
+      const isDuplicate = currentDate.some((item, idx) => {
+        return currentDate.indexOf(item) !== idx;
+      });
+
+      return this.$store.getters['prefs/options'](DATE_FORMAT).map((value, index) => {
+        const updateValue = `${ now.format(value) } (${ value })`;
+
+        if (index > 1 && isDuplicate) {
+          return {
+            label: updateValue,
+            value
+          };
+        }
+
         return {
           label: now.format(value),
           value
@@ -210,6 +228,7 @@ export default {
             v-model="dateFormat"
             data-testid="prefs__displaySetting__dateFormat"
             :label="t('prefs.dateFormat.label')"
+            option-key="value"
             :options="dateOptions"
           />
         </div>

package/plugins/plugin.js

@@ -30,7 +30,7 @@ export default async function(context) {
         const entries = res.entries || res.Entries || {};
 
         Object.values(entries).forEach((plugin) => {
-          const shouldNotLoad = shouldNotLoadPlugin(plugin, rancherVersion); // Error key string or false
+          const shouldNotLoad = shouldNotLoadPlugin(plugin, rancherVersion); // Error key string or boolean
 
           if (!shouldNotLoad) {
             hash[plugin.name] = context.$plugin.loadPluginAsync(plugin);

package/plugins/steve/subscribe.js

@@ -43,12 +43,16 @@ const workerQueues = {};
 
 const supportedStores = [STORE.CLUSTER, STORE.RANCHER, STORE.MANAGEMENT];
 
-const waitForSettingsSchema = (store) => {
-  return waitFor(() => !!store.getters['management/byId'](SCHEMA, MANAGEMENT.SETTING));
+const isWaitingForDestroy = (storeName, store) => {
+  return store.$workers[storeName]?.waitingForDestroy && store.$workers[storeName].waitingForDestroy();
 };
 
-const waitForSettings = (store) => {
-  return waitFor(() => !!store.getters['management/byId'](MANAGEMENT.SETTING, SETTING.UI_PERFORMANCE));
+const waitForSettingsSchema = (storeName, store) => {
+  return waitFor(() => isWaitingForDestroy(storeName, store) || !!store.getters['management/byId'](SCHEMA, MANAGEMENT.SETTING));
+};
+
+const waitForSettings = (storeName, store) => {
+  return waitFor(() => isWaitingForDestroy(storeName, store) || !!store.getters['management/byId'](MANAGEMENT.SETTING, SETTING.UI_PERFORMANCE));
 };
 
 const isAdvancedWorker = (ctx) => {
@@ -80,18 +84,41 @@ export async function createWorker(store, ctx) {
     // it will simply queue up any messages for the real worker to process when it loads up
     store.$workers[storeName] = {
       postMessage: (msg) => {
+        if (Object.keys(msg)?.[0] === 'destroyWorker') {
+          // The worker has been destroyed before it's been set up. Flag this so we stop waiting for mgmt settings and then can destroy worker.
+          // This can occurr when the user is redirected to the log in page
+          // - workers created (but waiting)
+          // - logout is called
+          // - <store>/unsubscribe is dispatched
+          // - wait for worker object to be destroyed <-- requires initial wait to be unblocked
+          store.$workers[storeName].mode = WORKER_MODES.DESTROY_MOCK;
+
+          return;
+        }
         if (workerQueues[storeName]) {
           workerQueues[storeName].push(msg);
         } else {
           workerQueues[storeName] = [msg];
         }
       },
-      mode: WORKER_MODES.WAITING
+      mode:              WORKER_MODES.WAITING,
+      waitingForDestroy: () => {
+        return store.$workers[storeName]?.mode === WORKER_MODES.DESTROY_MOCK;
+      },
+      destroy: () => {
+        // Similar to workerActions.destroyWorker
+        delete store.$workers[storeName];
+      }
     };
   }
 
-  await waitForSettingsSchema(store);
-  await waitForSettings(store);
+  await waitForSettingsSchema(storeName, store);
+  await waitForSettings(storeName, store);
+  if (store.$workers[storeName].waitingForDestroy()) {
+    store.$workers[storeName].destroy();
+
+    return;
+  }
   const advancedWorker = isAdvancedWorker(ctx);
 
   const workerActions = {

package/plugins/steve/worker/index.js

@@ -4,9 +4,10 @@ import basicWorkerConstructor from '@shell/plugins/steve/worker/web-worker.basic
 import advancedWorkerConstructor from '@shell/plugins/steve/worker/web-worker.advanced.js';
 
 export const WORKER_MODES = {
-  WAITING:  'waiting',
-  BASIC:    'basic',
-  ADVANCED: 'advanced'
+  WAITING:      'waiting',
+  DESTROY_MOCK: 'destroy',
+  BASIC:        'basic',
+  ADVANCED:     'advanced'
 };
 
 export default function storeWorker(mode, options = {}, closures = {}) {

package/public/index.html

@@ -13,7 +13,12 @@
     <div id="app">
         <script>
             (() => {
-                const isDark = document.cookie.includes('R_PCS=dark');
+                const isDark = document.cookie.includes('R_THEME=auto') ?
+                    // User selected automatic theme, so use pcs (set when ui previously loaded and is either os theme or time of day based
+                    document.cookie.includes('R_PCS=dark') :
+                    // Otherwise user selected light/dark theme directly
+                    document.cookie.includes('R_THEME=dark');
+
                 const color = isDark ? '#1b1c21' : '#FFF';
                 const style = document.createElement('style');
                 style.innerHTML = ':root { --loading-bg-color: ' + color + ';}';

package/rancher-components/components/Card/Card.vue

@@ -58,6 +58,7 @@ export default Vue.extend({
   <div
     class="card-container"
     :class="{'highlight-border': showHighlightBorder, 'card-sticky': sticky}"
+    data-testid="card"
   >
     <div class="card-wrap">
       <div

package/rancher-components/components/Form/Radio/RadioGroup.vue

@@ -209,6 +209,7 @@ export default Vue.extend({
         <slot
           :listeners="$listeners"
           :option="option"
+          :isDisabled="isDisabled"
           :name="i"
         >
           <RadioButton

package/scripts/extension/bundle

@@ -8,7 +8,7 @@ RESET="\033[0m"
 BOLD="\033[1m"
 
 TMP=${BASE_DIR}/tmp
-CHART_TEMPLATE=${TMP}/ui-plugin-server
+CHART_TEMPLATE=${TMP}/helm
 
 PKG="${1}"
 PKG_VERSION="${2}"
@@ -26,12 +26,28 @@ mkdir -p ${TMP}/container
 cp -R ${CHART_TEMPLATE}/* ${TMP}/container/    
 
 # Copy the plugin assets
-rm -rf ${TMP}/container/plugin
-mkdir ${TMP}/container/plugin
+mkdir -p ${TMP}/container/plugin
 
-cp -R ${BASE_DIR}/dist-pkg/${PKG_NAME}/* ${TMP}/container/plugin
+cp -R ${BASE_DIR}/assets/* ${TMP}/container/plugin
+cp ${BASE_DIR}/package.json ${TMP}/container/plugin
+cp ${BASE_DIR}/index.yaml ${TMP}/container/
+cp ${BASE_DIR}/index.yaml ${TMP}/container/plugin
 rm -f ${TMP}/container/plugin/report.html
 
+# Generate files.txt for each pkg and move pkg files into relative plugin directories
+for d in ${BASE_DIR}/dist-pkg/*; do
+  pkg=$(basename $d)
+
+  pushd ${BASE_DIR}/dist-pkg > /dev/null
+  mkdir plugin && mv ./${pkg}/* ./plugin
+  rm -rf ./${pkg}/* && mv ./plugin ./${pkg}
+
+  find ${pkg} -type f -printf '%P\n' | sort > ./${pkg}/files.txt
+  popd > /dev/null
+
+  cp -R ${BASE_DIR}/dist-pkg/${pkg} ${TMP}/container/plugin
+done
+
 # Build the docker image
 pushd ${TMP}/container > /dev/null
 echo -e "${CYAN}Building container image ...${RESET}"

package/scripts/extension/helm/charts/ui-plugin-server/.helmignore

@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/

package/scripts/extension/helm/charts/ui-plugin-server/Chart.yaml

@@ -0,0 +1,20 @@
+annotations:
+  catalog.cattle.io/certified: rancher # Any application we are adding as a helm chart
+  catalog.cattle.io/kube-version: '>= 1.16.0-0 < 1.26.0-0'
+  catalog.cattle.io/namespace: cattle-ui-plugin-system # Must prefix with cattle- and suffix with -system=
+  catalog.cattle.io/os: linux
+  catalog.cattle.io/permits-os: linux, windows
+  catalog.cattle.io/rancher-version: '>= 2.7.0-0 < 2.8.0-0'
+  catalog.cattle.io/scope: management
+  catalog.cattle.io/ui-component: plugins
+apiVersion: v2
+appVersion: "0.1.0"
+description: Extension server
+name: extension-server
+type: application
+keywords:
+  - applications
+  - infrastructure
+version: 0.1.0
+icon: https://docs.ranchermanager.rancher.io/img/rancher-logo-horiz-color.svg
+home: https://rancher.com

package/scripts/extension/helm/charts/ui-plugin-server/templates/_helpers.tpl

@@ -0,0 +1,52 @@
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "extension-server.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "extension-server.fullname" -}}
+{{- if .Values.fullnameOverride }}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- $name := default .Chart.Name .Values.nameOverride }}
+{{- if contains $name .Release.Name }}
+{{- .Release.Name | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
+{{- end }}
+{{- end }}
+{{- end }}
+
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "extension-server.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Common labels
+*/}}
+{{- define "extension-server.labels" -}}
+helm.sh/chart: {{ include "extension-server.chart" . }}
+{{ include "extension-server.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "extension-server.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "extension-server.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}

package/scripts/extension/helm/charts/ui-plugin-server/templates/cr.yaml

@@ -0,0 +1,12 @@
+apiVersion: catalog.cattle.io/v1
+kind: UIPlugin
+metadata:
+  name: {{ include "extension-server.fullname" . }}
+  namespace: {{ .Release.Namespace }}
+  labels: {{ include "extension-server.labels" . | nindent 4 }}
+spec:
+  plugin:
+    name: {{ include "extension-server.fullname" . }}
+    version: {{ (semver (default .Chart.AppVersion .Values.plugin.versionOverride)).Original }}
+    endpoint: http://{{ include "extension-server.fullname" . }}.{{ .Release.Namespace }}.svc
+    noCache: {{ .Values.plugin.noCache }}

package/scripts/extension/helm/charts/ui-plugin-server/values.yaml

@@ -0,0 +1,6 @@
+nameOverride: ""
+fullnameOverride: ""
+plugin:
+  enabled: true
+  versionOverride: ""
+  noCache: false

package/scripts/extension/helm/package/Dockerfile

@@ -0,0 +1,27 @@
+FROM registry.suse.com/bci/bci-base:15.4
+
+RUN zypper -n install nginx jq
+
+COPY package/nginx.conf /etc/nginx/nginx.conf
+
+# Copy in plugin files and generate files.txt statically
+COPY plugin /home/plugin-server/plugin-contents/plugin
+COPY plugin/index.yaml /home/plugin-server/plugin-contents
+
+RUN echo 'pluginserver:x:1000:1000::/home/pluginserver:/bin/bash' >> /etc/passwd && \
+    echo 'pluginserver:x:1000:' >> /etc/group && \
+    mkdir -p /home/plugin-server && \
+    mkdir -p /home/plugin-server/plugin-contents && \
+    chown -R pluginserver:pluginserver /etc/nginx/nginx.conf && \
+    chown -R pluginserver:pluginserver /home/plugin-server && \
+    chown -R pluginserver:pluginserver /var/lib/nginx && \
+    chown -R pluginserver:pluginserver /var/log/nginx && \
+    touch /run/nginx.pid && \
+    chown pluginserver:pluginserver /run/nginx.pid
+USER pluginserver
+
+WORKDIR /home/plugin-server/plugin-contents
+
+RUN find plugin -type f | sort > files.txt
+
+ENTRYPOINT ["nginx", "-g", "daemon off;"]

package/scripts/extension/helm/package/nginx.conf

@@ -0,0 +1,17 @@
+events {}
+http {
+    sendfile on;
+    server {
+        listen 8080;
+        listen [::]:8080;
+
+        resolver 0.0.0.0;
+        autoindex on;
+
+        server_name _;
+        server_tokens off;
+
+        root /home/plugin-server/plugin-contents;
+        gzip_static on;
+    }
+}

package/scripts/extension/helm/scripts/package

@@ -0,0 +1,23 @@
+#!/bin/bash
+set -e
+
+source $(dirname $0)/version
+
+cd $(dirname $0)/..
+
+if [[ -z ${ORG} ]] || [[ -z ${REPO} ]] || [[ -z ${TAG} ]]; then
+    echo "Usage: [REGISTRY=] ORG= REPO= TAG= ./scripts/package"
+    exit 1
+fi
+
+IMAGE=${ORG}/${REPO}:${TAG}
+if [[ -n ${REGISTRY} ]]; then
+    IMAGE=${REGISTRY%/}/${IMAGE}
+fi
+DOCKERFILE=package/Dockerfile
+if [ -e ${DOCKERFILE}.${ARCH} ]; then
+    DOCKERFILE=${DOCKERFILE}.${ARCH}
+fi
+
+docker build -f ${DOCKERFILE} -t ${IMAGE} .
+echo Built ${IMAGE}

package/scripts/extension/helm/scripts/patch

@@ -0,0 +1,101 @@
+#!/bin/bash
+set -e
+
+cd $(dirname $0)/..
+
+if [[ -z ${CHART} ]]; then
+    # Assume that the chart is the main one found in this repository
+    CHART="./charts/ui-plugin-server"
+fi
+
+if ! [[ -d ${CHART} ]]; then
+    echo "${CHART} is not a directory"
+    exit 1
+fi
+
+if ! [[ -f ${CHART}/Chart.yaml ]]; then
+    echo "${CHART} is not a valid Helm chart: could not find Chart.yaml"
+    exit 1
+fi
+
+if ! [[ -f ${CHART}/values.yaml ]]; then
+    echo "${CHART} does not have default values: could not find values.yaml"
+    exit 1
+fi
+
+if [[ -z ${REGISTRY} ]]; then
+    # By default, we assume you are using DockerHub  
+    REGISTRY=""
+fi
+
+# Remove trailing slash if it exists
+REGISTRY=${REGISTRY%/}
+
+if [[ -z ${ORG} ]]; then
+    # By default, we assume this is a plugin hosted by Rancher
+    ORG=rancher
+fi
+
+if [[ -z ${PACKAGE_JSON} ]]; then
+    PACKAGE_JSON=plugin/package.json
+fi
+
+if ! [[ -f ${PACKAGE_JSON} ]]; then
+    echo "Could not find package.json at path ${PACKAGE_JSON}"
+    exit 1
+fi
+
+if [[ -z ${REPO} ]]; then
+    REPO=$(cat ${PACKAGE_JSON} | jq ".name" | tr -d '"')
+fi
+
+if [[ -z ${TAG} ]]; then
+    TAG=$(cat ${PACKAGE_JSON} | jq ".version" | tr -d '"')
+fi
+
+DESCRIPTION=$(cat ${PACKAGE_JSON} | jq ".description" | tr -d '"')
+ICON=$(cat ${PACKAGE_JSON} | jq ".icon" | tr -d '"')
+KEYWORDS=$(cat ${PACKAGE_JSON} | jq ".keywords")
+HOME=$(cat ${PACKAGE_JSON} | jq ".homepage" | tr -d '"')
+
+if [[ -z ${ORG} ]] || [[ -z ${REPO} ]] || [[ -z ${TAG} ]]; then
+    echo "Usage: [CHART=charts/ui-plugin-server] [REGISTRY=""] [ORG=rancher] [REPO=<override-repo>] [TAG=<override-tag>] [PACKAGE_JSON=plugin/package.json] ./scripts/patch <chart>"
+    exit 1
+fi
+
+# Edit Chart information to match plugin using yq
+yq -i eval ".name = \"${REPO}\"" $CHART/Chart.yaml
+yq -i eval ".appVersion = \"${TAG}\"" $CHART/Chart.yaml
+yq -i eval ".version = \"${TAG}\"" $CHART/Chart.yaml
+
+if [[ -n "${DESCRIPTION}" ]]; then
+    if [[ "${DESCRIPTION}" == "null" ]]; then
+        yq -i eval "del(.description)" $CHART/Chart.yaml
+    else
+        yq -i eval ".description = \"${DESCRIPTION}\"" $CHART/Chart.yaml
+    fi
+fi
+
+if [[ -n "${ICON}" ]]; then
+    if [[ "${ICON}" == "null" ]]; then
+        yq -i eval "del(.icon)" $CHART/Chart.yaml
+    else
+        yq -i eval ".icon = \"${ICON}\"" $CHART/Chart.yaml
+    fi
+fi
+
+if [[ -n "${KEYWORDS}" ]]; then
+    if [[ "${KEYWORDS}" == "null" ]]; then
+        yq -i eval "del(.keywords)" $CHART/Chart.yaml
+    else
+        yq -i -I2 eval ".keywords = ${KEYWORDS}" $CHART/Chart.yaml
+    fi
+fi
+
+if [[ -n "${HOME}" ]]; then
+    if [[ "${HOME}" == "null" ]]; then
+        yq -i eval "del(.home)" $CHART/Chart.yaml
+    else
+        yq -i eval ".home = \"${HOME}\"" $CHART/Chart.yaml
+    fi
+fi

package/scripts/extension/helm/scripts/version

@@ -0,0 +1,31 @@
+#!/bin/bash
+
+if [ -z "$ARCH" ]; then
+    ARCH=$(go env GOHOSTARCH)
+fi
+
+SUFFIX="-${ARCH}"
+
+if git rev-parse --is-inside-work-tree >/dev/null 2>&1; then
+    if [ -n "$(git status --porcelain --untracked-files=no)" ]; then
+        DIRTY="-dirty"
+    fi
+
+    COMMIT=$(git rev-parse --short HEAD)
+    GIT_TAG=${DRONE_TAG:-$(git tag -l --contains HEAD | head -n 1)}
+
+    if [[ -z "$DIRTY" && -n "$GIT_TAG" ]]; then
+        VERSION=$GIT_TAG
+    else
+        VERSION="${COMMIT}${DIRTY}"
+    fi
+
+    TAG=${TAG:-${VERSION}${SUFFIX}}
+fi
+
+REPO=${REPO:-ui-plugin-server}
+ORG=${ORG:-rancher}
+
+if echo $TAG | grep -q dirty; then
+    TAG=dev
+fi

package/scripts/extension/helmpatch

@@ -12,14 +12,13 @@ const yaml = require('js-yaml');
 
 console.log('Helm file update');
 
-if (process.argv.length !== 5) {
+if (process.argv.length !== 4) {
   console.log('Incorrect number of arguments');
   process.exit(1);
 }
 
 const destFolder = process.argv[2];
 const pkgFilePath = process.argv[3];
-const image = process.argv[4];
 
 const pkgFile = JSON.parse(fs.readFileSync(pkgFilePath, 'utf8'));
 
@@ -50,40 +49,19 @@ if (pkgFile.rancher && typeof pkgFile.rancher === 'object') {
   }
 }
 
-if (updated ){
+if (updated) {
   // Write out updated file
   const str = yaml.dump(chart);
 
   fs.writeFileSync(chartFile, str, 'utf8');
 }
 
-// chart.name = pkgFile.name;
-// chart.appVersion = pkgFile.version;
-// chart.version = pkgFile.version;
-// chart.description = pkgFile.description || `${pkgFile.name} ui plugin `;
-// chart.annotations[UI_PLUGIN_ANNOTATION_NAME] = UI_PLUGIN_ANNOTATION_VALUE;
-
-// if (pkgFile.icon) {
-//   chart.icon = pkgFile.icon;
-// }
-
-// if (pkgFile.keywords) {
-//   chart.keywords = pkgFile.keywords;
-// } else {
-//   chart.keywords = [];
-// }
-
-// if (pkgFile.homepage) {
-//   chart.home = pkgFile.homepage;
-// }
-
 // --------------------------------------------------------------------------------
 // values.yaml
 // --------------------------------------------------------------------------------
 
 const values = yaml.load(fs.readFileSync(valuesFile, 'utf8'));
 
-values.pluginServer.image.repository = `${image}`;
+const valuesYaml = yaml.dump(values, { quotingType: '"' });
 
-const valuesYaml = yaml.dump(values, {quotingType: '"' });
 fs.writeFileSync(valuesFile, valuesYaml, 'utf8');