@rancher/shell 1.2.5 → 1.2.6

package/core/types.ts

@@ -237,6 +237,16 @@ export interface ProductOptions {
    */
   to?: Location;
 
+  /**
+   * Alternative to the icon property. Uses require
+   */
+  svg?: Function;
+
+  /**
+   * Product name
+   */
+  name?: string;
+
   /**
    * Leaving these here for completeness but I don't think these should be advertised as useable to plugin creators.
    */
@@ -373,10 +383,25 @@ export interface ConfigureTypeOptions {
 }
 
 export interface ConfigureVirtualTypeOptions extends ConfigureTypeOptions {
+  /**
+   * Only load the product if the type is present
+   */
+  ifHave?: string;
+
+  /**
+   * Only load the product if the type is present
+   */
+  ifHaveType?: string | RegExp | Object;
+
+  /**
+   * The label that this type should display
+   */
+  label?: string;
+
   /**
    * The translation key displayed anywhere this type is referenced
    */
-  labelKey: string;
+  labelKey?: string;
 
   /**
    * An identifier that should be unique across all types

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rancher/shell",
-  "version": "1.2.5",
+  "version": "1.2.6",
   "description": "Rancher Dashboard Shell",
   "repository": "https://github.com/rancherlabs/dashboard",
   "license": "Apache-2.0",

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

@@ -1,10 +1,8 @@
 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.29.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.9.0-0'
   catalog.cattle.io/scope: management
   catalog.cattle.io/ui-component: plugins
 apiVersion: v2

package/scripts/extension/parse-tag-name

@@ -4,27 +4,36 @@ GITHUB_RELEASE_TAG=$1
 GITHUB_RUN_ID=$2
 GITHUB_WORKFLOW_TYPE=$3
 
-# Check packages for released tag name
-if [[ "${GITHUB_WORKFLOW_TYPE}" == "container" ]]; then
+echo "Parse tag name - evaluating release tag $GITHUB_RELEASE_TAG"
+
+# Ensure "catalog" workflow release tag name matches the root <pkg-name>
+if [[ "${GITHUB_WORKFLOW_TYPE}" == "catalog" ]]; then
+  BASE_EXT=$(jq -r .name package.json)
+  EXT_VERSION=$(jq -r .version package.json)
+
+  if [[ "${GITHUB_RELEASE_TAG}" != "${BASE_EXT}-${EXT_VERSION}" ]]; then
+    echo -e "release tag doesn't match catalog tag: release tag -> ${GITHUB_RELEASE_TAG} ::: curr catalog tag -> ${BASE_EXT}-${EXT_VERSION}"
+    gh run cancel ${GITHUB_RUN_ID}
+    exit 1
+  fi
+# Ensure "chart" workflow release tag name matches some pkg/<pkg-name>
+else
+  NO_MATCHES="true"
+
   for d in pkg/*/ ; do
     pkg=$(basename $d)
 
     PKG_VERSION=$(jq -r .version pkg/${pkg}/package.json)
-    PKG_NAME="${pkg}-${PKG_VERSION}"
+    CURR_PKG_TAG="${pkg}-${PKG_VERSION}"
 
-    if [[ "${GITHUB_RELEASE_TAG}" == "${PKG_NAME}" ]]; then
-      gh run cancel ${GITHUB_RUN_ID}
-    else
-      continue
+    if [[ "${GITHUB_RELEASE_TAG}" == "${CURR_PKG_TAG}" ]]; then
+      NO_MATCHES="false"
     fi
   done
-else
-  # Check base extension name for tag name
-  BASE_EXT=$(jq -r .name package.json)
-  EXT_VERSION=$(jq -r .version package.json)
 
-  if [[ "${GITHUB_RELEASE_TAG}" == "${BASE_EXT}-${EXT_VERSION}" ]]; then
-    echo -e "tag: ${GITHUB_RELEASE_TAG}"
+  if [[ "${NO_MATCHES}" == "true" ]]; then
+    echo -e "release tag doesn't match any chart tag: ${GITHUB_RELEASE_TAG}. Check your pkg/<!-YOUR-EXT-> folders and corresponding versions to complete the match"
     gh run cancel ${GITHUB_RUN_ID}
+    exit 1
   fi
-fi
+fi

package/scripts/publish-shell.sh

@@ -64,6 +64,13 @@ function publish() {
     PUBLISH_ARGS="$PUBLISH_ARGS --tag legacy-v1"
   fi
 
+  # when testing the workflow, we don't want to actually do an npm publish but only a dry run
+  if [ ${DRY_RUN} == "true" ]; then
+    PUBLISH_ARGS="$PUBLISH_ARGS --dry-run"
+  fi
+
+  echo "Publish to NPM - arguments ::: ${PUBLISH_ARGS}"
+
   # Make a note of dependency versions, if required
   node ${SCRIPT_DIR}/record-deps.js
 

package/scripts/typegen.sh

@@ -31,9 +31,11 @@ ${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/plugins/dashboard-store/normalize
 ${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/plugins/dashboard-store/resource-class.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/plugins/dashboard-store/ > /dev/null
 ${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/plugins/dashboard-store/classify.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/plugins/dashboard-store/ > /dev/null
 ${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/plugins/dashboard-store/actions.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/plugins/dashboard-store/ > /dev/null
+${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/plugins/steve/steve-class.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/plugins/steve/ > /dev/null
 
 # # mixins
 ${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/mixins/create-edit-view/index.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/mixins/create-edit-view > /dev/null
+${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/mixins/resource-fetch.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/mixins > /dev/null
 
 # # models
 ${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/models/namespace.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/models/ > /dev/null
@@ -93,4 +95,4 @@ function processDir() {
 
 processDir ${SHELL_DIR}/tmp @shell
 
-rm -rf ${SHELL_DIR}/tmp
+rm -rf ${SHELL_DIR}/tmp

package/types/shell/index.d.ts

@@ -2147,6 +2147,64 @@ export default _default;
 import Vue from "vue";
 }
 
+// @shell/mixins/resource-fetch
+
+declare module '@shell/mixins/resource-fetch' {
+declare namespace _default {
+    const mixins: any[];
+    function data(): {
+        perfConfig: {};
+        init: boolean;
+        multipleResources: any[];
+        loadResources: any[];
+        hasManualRefresh: boolean;
+        watch: boolean;
+        isTooManyItemsToAutoUpdate: boolean;
+        force: boolean;
+        incremental: boolean;
+        fetchedResourceType: any[];
+    };
+    function data(): {
+        perfConfig: {};
+        init: boolean;
+        multipleResources: any[];
+        loadResources: any[];
+        hasManualRefresh: boolean;
+        watch: boolean;
+        isTooManyItemsToAutoUpdate: boolean;
+        force: boolean;
+        incremental: boolean;
+        fetchedResourceType: any[];
+    };
+    function beforeDestroy(): void;
+    function beforeDestroy(): void;
+    namespace computed {
+        function rows(): any;
+        function rows(): any;
+        function loading(): any;
+        function loading(): any;
+        const refreshFlag: import("vuex").Computed;
+    }
+    namespace watch {
+        function refreshFlag(neu: any): void;
+        function refreshFlag(neu: any): void;
+    }
+    namespace methods {
+        function $initializeFetchData(type: any, multipleResources: any[], storeType: any): void;
+        function $initializeFetchData(type: any, multipleResources: any[], storeType: any): void;
+        function $fetchType(type: any, multipleResources: any[], storeType: any): any;
+        function $fetchType(type: any, multipleResources: any[], storeType: any): any;
+        function __getCountForResources(resourceNames: any, namespace: any, storeType: any): any;
+        function __getCountForResources(resourceNames: any, namespace: any, storeType: any): any;
+        function __getCountForResource(resourceName: any, namespace: any, storeType: any): any;
+        function __getCountForResource(resourceName: any, namespace: any, storeType: any): any;
+        function __gatherResourceFetchData(resourceName: any, multipleResources: any, currStore: any): void;
+        function __gatherResourceFetchData(resourceName: any, multipleResources: any, currStore: any): void;
+    }
+}
+export default _default;
+}
+
 // @shell/models/namespace
 
 declare module '@shell/models/namespace' {
@@ -2857,6 +2915,40 @@ export default class Resource {
 }
 }
 
+// @shell/plugins/steve/hybrid-class
+
+declare module '@shell/plugins/steve/hybrid-class' {
+export function cleanHybridResources(data: any): any;
+export default class HybridModel {
+    constructor(data: any, ctx: any, rehydrateNamespace?: any, setClone?: boolean);
+    get labels(): any;
+    setLabels(val: any): void;
+    metadata: {};
+    setLabel(key: any, val: any): void;
+    get annotations(): any;
+    setAnnotations(val: any): void;
+    setAnnotation(key: any, val: any): void;
+    get state(): any;
+}
+}
+
+// @shell/plugins/steve/steve-class
+
+declare module '@shell/plugins/steve/steve-class' {
+export default class SteveModel extends HybridModel {
+    constructor(data: any, ctx: any, rehydrateNamespace?: any, setClone?: boolean);
+    get name(): any;
+    get namespace(): any;
+    /**
+     * Set description based on the type of model available with private fallback
+     */
+    set description(arg: any);
+    get description(): any;
+    _description: any;
+}
+import HybridModel from "./hybrid-class";
+}
+
 // @shell/store/features
 
 declare module '@shell/store/features' {