@rancher/shell 0.2.4 → 0.3.0

package/creators/app/init

@@ -1,13 +1,12 @@
 #!/usr/bin/env node
 
-const fs = require('fs-extra');
 const path = require('path');
-const exec = require('child_process').exec;
+const fs = require('fs-extra');
 
 const targets = {
-  'dev': './node_modules/.bin/nuxt dev',
-  'nuxt': './node_modules/.bin/nuxt',
-  'build': './node_modules/.bin/nuxt build'
+  dev:   './node_modules/.bin/nuxt dev',
+  nuxt:  './node_modules/.bin/nuxt',
+  build: './node_modules/.bin/nuxt build'
 };
 
 const files = [
@@ -30,8 +29,8 @@ if (args.length == 3) {
   const folder = path.resolve('.');
 
   appFolder = path.join(folder, name);
-  console.log(`  Creating application folder: ${ appFolder}`);
-  fs.ensureDirSync(appFolder);  
+  console.log(`  Creating application folder: ${ appFolder }`);
+  fs.ensureDirSync(appFolder);
 }
 
 // Check that there is a package file
@@ -71,18 +70,23 @@ const creatorPkgData = fs.readFileSync(path.join(__dirname, 'package.json'));
 const creatorPkg = JSON.parse(creatorPkgData);
 
 pkg.dependencies['@rancher/shell'] = `^${ creatorPkg.version }`;
-pkg.dependencies['core-js'] = '^3.20.3';
-pkg.dependencies['css-loader'] = '4.3.0';
+
+// Rest of dependencies are in the _pkgs property of package.json - copy then across
+if (creatorPkg._pkgs) {
+  Object.keys(creatorPkg._pkgs).forEach((pkgName) => {
+    pkg.dependencies[pkgName] = creatorPkg._pkgs[pkgName];
+  });
+}
 
 fs.writeFileSync(path.join(appFolder, 'package.json'), JSON.stringify(pkg, null, 2));
 
 // Copy base files
 files.forEach((file) => {
-  const src = path.join(__dirname, file);
+  const src = path.join(__dirname, 'files', file);
   const dest = path.join(appFolder, file);
 
   if (!fs.existsSync(dest)) {
-    console.log('  Adding file: ' + file);
+    console.log(`  Adding file: ${ file }`);
 
     const folder = path.dirname(file);
 
@@ -93,9 +97,4 @@ files.forEach((file) => {
   }
 });
 
-// require("child_process").spawn('yarn', ['install'], {
-//   cwd: process.cwd(),
-//   stdio: "inherit"
-// });
-
-console.log('');
+console.log('');

package/creators/app/package.json

@@ -7,12 +7,18 @@
   "private": false,
   "bin": "./init",
   "files": [
-    "*.*",
+    "**/*.*",
     "init"
   ],
   "engines": {
     "node": ">=12"
   },
+  "_requires": [
+    "core-js",
+    "css-loader",
+    "@types/lodash",
+    "@rancher/components"
+  ],
   "dependencies": {
     "fs-extra": "^10.0.0"
   }

package/creators/pkg/{tsconfig.json → files/tsconfig.json}

@@ -16,12 +16,16 @@
     "typeRoots": [
       "../../node_modules",
       "../../node_modules/@rancher/shell/types"
-    ],
+    ],    
     "types": [
       "node",
       "webpack-env",
+      "@types/node",
+      "@types/jest",
+      "@types/lodash",
       "@nuxt/types",
-      "rancher"
+      "rancher",
+      "shell"
     ],
     "lib": [
       "esnext",
@@ -30,24 +34,21 @@
       "scripthost"
     ],
     "paths": {
-      "@shell/core/*": [
-        "../../node_modules/@rancher/shell/core/*"
-      ],
-      "@shell/config/*": [
-        "../../node_modules/@rancher/shell/config/*"
+      "@shell/*": [
+        "../../node_modules/@rancher/shell/*"
       ],
-      "@shell/store/*": [
-        "../../node_modules/@rancher/shell/store/*"
+      "@components/*": [
+        "@rancher/components/*"
       ]
     }
   },
   "include": [
     "**/*.ts",
+    "**/*.d.ts",
     "**/*.tsx",
-    "**/*.vue",
-    "../../node_modules/@rancher/shell/core/types.ts"
+    "**/*.vue"
   ],
   "exclude": [
-    "node_modules"
+    "../../node_modules"
   ]
 }

package/creators/pkg/init

@@ -95,7 +95,7 @@ if (addTypeFolders) {
 
 // Copy base files
 files.forEach((file) => {
-  const src = path.join(__dirname, file);
+  const src = path.join(__dirname, 'files', file);
   const dest = path.join(path.join(pkgFolder, file));
 
   if (!fs.existsSync(dest)) {

package/creators/pkg/package.json

@@ -7,7 +7,7 @@
   "private": false,
   "bin": "./init",
   "files": [
-    "*.*",
+    "**/*.*",
     "init"
   ],
   "engines": {

package/creators/update/init

@@ -0,0 +1,56 @@
+#!/usr/bin/env node
+
+const path = require('path');
+const fs = require('fs-extra');
+const { spawnSync } = require('child_process');
+
+const scriptFolder = __dirname;
+const dest = path.resolve('.');
+
+// Remove first two args
+let args = process.argv;
+args.splice(0, 2);
+
+const res = spawnSync(`${__dirname}/upgrade`, args, {
+  cwd: dest,
+  shell: false,
+  stdio: [ 'ignore', process.stdout, process.stderr ],
+});
+
+if (res.status !== 0) {
+  process.exit(res.status);
+}
+
+// Read the existing package.json
+let rawdata = fs.readFileSync(path.join(dest, 'package.json'));
+const appPackage = JSON.parse(rawdata);
+
+// Read the package.json from the app creator
+rawdata = fs.readFileSync(path.join(scriptFolder, 'app', 'package.json'));
+const latestPackage = JSON.parse(rawdata);
+
+// Read the package.json from the upgrade creator
+rawdata = fs.readFileSync(path.join(scriptFolder, 'package.json'));
+const upgradePackage = JSON.parse(rawdata);
+
+// Update dependency versions to match the latest from the creator
+Object.keys(latestPackage._pkgs).forEach((key) => {
+  appPackage.dependencies[key] = latestPackage._pkgs[key];
+});
+
+// Add in the weback resolution
+appPackage.resolutions = appPackage.resolutions || {};
+appPackage.resolutions['**/webpack'] = '4';
+
+// Update the version of @rancher/shell
+const shellVersion = upgradePackage.version;
+
+appPackage.dependencies['@rancher/shell'] = shellVersion;
+
+fs.writeFileSync(path.join(dest, 'package.json'), JSON.stringify(appPackage, null, 2) + '\n');
+
+spawnSync(`yarn`, ['install'], {
+  cwd: dest,
+  shell: false,
+  stdio: [ 'ignore', process.stdout, process.stderr ],
+});

package/creators/update/package.json

@@ -0,0 +1,20 @@
+{
+  "name": "@rancher/create-update",
+  "description": "Rancher UI Update helper",
+  "version": "0.0.0",
+  "license": "Apache-2.0",
+  "author": "SUSE",
+  "private": false,
+  "bin": "./init",
+  "files": [
+    "**/*.*",
+    "init",
+    "upgrade"
+  ],
+  "engines": {
+    "node": ">=12"
+  },
+  "dependencies": {
+    "fs-extra": "^10.0.0"
+  }
+}

package/creators/update/upgrade

@@ -0,0 +1,56 @@
+#!/usr/bin/env sh
+
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+
+echo "Upgrading Rancher Shell"
+
+# Get the version number from the package.json file
+VERSION=$(node -p -e "require('${SCRIPT_DIR}/package.json').version")
+
+echo "Updating to version: ${VERSION}"
+echo ""
+
+FORCE="false"
+
+if [ "$1" == "-f" ]; then
+  FORCE="true"
+fi
+
+# Check for a clean git repository
+if [ ! -d ".git" ] && [ "${FORCE}" == "false" ]; then
+  echo "Not runnning in a git repository. Re-run with -f to ignore this check"
+  echo "Note: This action will update yuor files - running in a git repsository will ensure you have visibility over changes made"
+  exit 1 
+fi
+
+if [[ $(git diff --stat) != '' ]] && [ "${FORCE}" == "false" ]; then
+  echo "Git repository is not clean. Re-run with -f to ignore this check"
+  echo "Note: This action will update yuor files - running in a clean git repsository will ensure you have visibility over changes made"
+  exit 1 
+fi
+
+# Check this is a Rancher Extension
+if [ ! -f "./package.json" ]; then
+  echo "Can't find package.json - check you're running from the correct folder"
+  exit 1 
+fi
+
+HAS_SHELL=$(grep "\"@rancher/shell\"" package.json -c )
+if [ "${HAS_SHELL}" != "1" ]; then
+  echo "package.json does not reference @rancher/shell - check you're running from the correct folder"
+  exit 1 
+fi
+
+# Copy files for the top-level folder (from the app creator)
+rsync --exclude nuxt.config.js ${SCRIPT_DIR}/app/files/* .
+
+# Go through each folder in the pkg folder and update their files
+for pkg in ./pkg/*
+do
+  if [ -d "${pkg}" ]; then
+    pkgName=$(basename $pkg)
+    echo "Updating package ${pkgName}"
+
+    cp ${SCRIPT_DIR}/pkg/files/* ${pkg}
+  fi
+done

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

@@ -165,14 +165,14 @@ export default {
           sort:          'testStateSort'
         },
         {
-          name:      'node',
-          label:     this.t('tableHeaders.name'),
-          value:     'name',
+          name:  'node',
+          label: this.t('tableHeaders.name'),
+          value: 'name',
         },
         {
-          name:      'type',
-          label:     this.t('tableHeaders.type'),
-          value:     'type',
+          name:  'type',
+          label: this.t('tableHeaders.type'),
+          value: 'type',
         },
       ];
     },

package/detail/configmap.vue

@@ -20,7 +20,7 @@ export default {
     }
   },
 
-  computed:   {
+  computed: {
     parsedRows() {
       const rows = [];
       const { data = {}, binaryData = {} } = this.value;

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

@@ -13,7 +13,7 @@ export default {
         CONSTRAINT_VIOLATION_RESOURCE_LINK,
         CONSTRAINT_VIOLATION_MESSAGE
       ],
-      violations:  this.value.violations
+      violations: this.value.violations
         .map((violation, i) => ({ ...violation, id: i }))
     };
   }

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

@@ -10,7 +10,7 @@ export default {
     FleetBundleResources,
     SortableTable,
   },
-  props:      {
+  props: {
     value: {
       type:     Object,
       required: true,
@@ -55,10 +55,10 @@ export default {
     resourceHeaders() {
       return [
         {
-          name:      'name',
-          value:     'name',
-          sort:      ['name'],
-          labelKey:  'tableHeaders.name',
+          name:     'name',
+          value:    'name',
+          sort:     ['name'],
+          labelKey: 'tableHeaders.name',
         },
       ];
     },

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

@@ -31,8 +31,8 @@ export default {
 
   data() {
     return {
-      allFleet:      [],
-      allBundles:    []
+      allFleet:   [],
+      allBundles: []
     };
   },
 
@@ -77,9 +77,9 @@ export default {
     const { $store } = this;
 
     const allDispatches = await allHash({
-      allBundles:     $store.dispatch('management/findAll', { type: FLEET.BUNDLE }),
-      allFleet:       $store.dispatch('management/findAll', { type: FLEET.CLUSTER }),
-      clusterGroups:  $store.dispatch('management/findAll', { type: FLEET.CLUSTER_GROUP }),
+      allBundles:    $store.dispatch('management/findAll', { type: FLEET.BUNDLE }),
+      allFleet:      $store.dispatch('management/findAll', { type: FLEET.CLUSTER }),
+      clusterGroups: $store.dispatch('management/findAll', { type: FLEET.CLUSTER_GROUP }),
     });
 
     this.allBundles = allDispatches.allBundles;

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

@@ -39,7 +39,7 @@ export default {
       return {
         alertmanagerURL: this.makeRelativeURL(alertmanagerURL),
         grafanaURL:      this.makeRelativeURL(grafanaURL),
-        prometheusURL:      this.makeRelativeURL(prometheusURL)
+        prometheusURL:   this.makeRelativeURL(prometheusURL)
       };
     },
     monitoringNamespace() {

package/detail/management.cattle.io.user.vue

@@ -14,7 +14,7 @@ export default {
     SortableTable,
     Loading
   },
-  mixins:     [
+  mixins: [
     CreateEditView
   ],
   async fetch() {
@@ -69,8 +69,8 @@ export default {
           NAME,
           {
             ...since,
-            value:     'bound',
-            sort:      'bound',
+            value: 'bound',
+            sort:  'bound',
           }
         ],
         cr: [

package/detail/namespace.vue

@@ -67,9 +67,9 @@ export default {
         formatter: 'Number'
       },
       {
-        name:      'active',
-        label:     this.t('namespace.resourceStates.success'),
-        sort:      'byState.success:desc',
+        name:  'active',
+        label: this.t('namespace.resourceStates.success'),
+        sort:  'byState.success:desc',
         value: 'byState.success',
       },
       {
@@ -80,22 +80,22 @@ export default {
         formatter: 'Number'
       },
       {
-        name:      'total',
-        label:     this.t('namespace.total'),
-        sort:      'totalCount:desc',
-        value:     'totalCount',
+        name:  'total',
+        label: this.t('namespace.total'),
+        sort:  'totalCount:desc',
+        value: 'totalCount',
       },
     ];
 
     return {
       allWorkloads: {
         default: () => ([]),
-        type:     Array,
+        type:    Array,
       },
-      resourceTypes:    [],
-      summaryStates:    ['success', 'info', 'warning', 'error', 'unknown'],
+      resourceTypes:  [],
+      summaryStates:  ['success', 'info', 'warning', 'error', 'unknown'],
       headers,
-      workloadSchema:        WORKLOAD_SCHEMA
+      workloadSchema: WORKLOAD_SCHEMA
     };
   },
 
@@ -121,8 +121,8 @@ export default {
 
         namespaced.push({
           type,
-          byState:     this.reduceStates(inNamespace.states || {}, inNamespace.count),
-          totalCount:    inNamespace.count,
+          byState:    this.reduceStates(inNamespace.states || {}, inNamespace.count),
+          totalCount: inNamespace.count,
           schema:     this.schemaFor(type)
         });
 

package/detail/node.vue

@@ -167,8 +167,8 @@ export default {
   methods: {
     memoryFormatter(value) {
       const formatOptions = {
-        addSuffix:  false,
-        increment:  1024,
+        addSuffix: false,
+        increment: 1024,
       };
 
       return formatSi(value, formatOptions);

package/detail/pod.vue

@@ -54,7 +54,7 @@ export default {
     };
   },
 
-  computed:   {
+  computed: {
     ...mapGetters(['currentCluster']),
     containers() {
       const containers = this.allContainers;

package/detail/provisioning.cattle.io.cluster.vue

@@ -97,10 +97,14 @@ export default {
       fetchOne.clusterToken = this.value.getOrCreateToken();
     }
 
+    // Need to get Norman clusters so that we can check if user has permissions to access the local cluster
+    if ( this.$store.getters['rancher/canList'](NORMAN.CLUSTER) ) {
+      fetchOne.normanClusters = this.$store.dispatch('rancher/findAll', { type: NORMAN.CLUSTER });
+    }
+
     if ( this.value.isRke1 && this.$store.getters['isRancher'] ) {
       fetchOne.etcdBackups = this.$store.dispatch('rancher/findAll', { type: NORMAN.ETCD_BACKUP });
 
-      fetchOne.normanClusters = this.$store.dispatch('rancher/findAll', { type: NORMAN.CLUSTER });
       fetchOne.normanNodePools = this.$store.dispatch('rancher/findAll', { type: NORMAN.NODE_POOL });
     }
 
@@ -113,6 +117,11 @@ export default {
     this.clusterToken = fetchOneRes.clusterToken;
     this.etcdBackups = fetchOneRes.etcdBackups;
 
+    if (fetchOneRes.normanClusters) {
+      // Does the user have access to the local cluster? Need to in order to be able to show the 'Related Resources' tab
+      this.hasLocalAccess = !!fetchOneRes.normanClusters.find(c => c.internal);
+    }
+
     const fetchTwo = {};
 
     const thisClusterMachines = this.allMachineDeployments.filter((deployment) => {
@@ -183,6 +192,7 @@ export default {
       haveDeployments: false,
       haveNodes:       false,
       haveNodePools:   false,
+      hasLocalAccess:  false,
 
       mgmtNodeSchema: this.$store.getters[`management/schemaFor`](MANAGEMENT.NODE),
       machineSchema:  this.$store.getters[`management/schemaFor`](CAPI.MACHINE),
@@ -615,6 +625,7 @@ export default {
     <ResourceTabs
       v-model="value"
       :default-tab="defaultTab"
+      :need-related="hasLocalAccess"
     >
       <Tab
         v-if="showMachines"

package/detail/secret.vue

@@ -26,7 +26,7 @@ export default {
 
   mixins: [CreateEditView],
 
-  props:      {
+  props: {
     value: {
       type:    Object,
       default: () => {
@@ -103,7 +103,7 @@ export default {
     };
   },
 
-  computed:   {
+  computed: {
     isCertificate() {
       return this.value._type === TYPES.TLS;
     },

package/detail/workload/index.vue

@@ -105,7 +105,7 @@ export default {
     };
   },
 
-  computed:   {
+  computed: {
     ...mapGetters(['currentCluster']),
 
     isActive() {

package/dialog/AddClusterMemberDialog.vue

@@ -8,7 +8,7 @@ export default {
     ClusterPermissionsEditor
   },
 
-  props:      {
+  props: {
     resources: {
       type:     Array,
       required: true

package/dialog/AddCustomBadgeDialog.vue

@@ -66,10 +66,10 @@ export default {
         isLocal:         this.currentCluster.isLocal,
         providerNavLogo: this.currentCluster.providerNavLogo,
         badge:           {
-          text:        this.badgeDescription,
-          color:       this.badgeBgColor,
-          textColor:   textColor(parseColor(this.badgeBgColor)),
-          iconText:    this.badgeAsIcon ? this.letter.toUpperCase() : '',
+          text:      this.badgeDescription,
+          color:     this.badgeBgColor,
+          textColor: textColor(parseColor(this.badgeBgColor)),
+          iconText:  this.badgeAsIcon ? this.letter.toUpperCase() : '',
         }
       };
     },