@rancher/shell 0.3.28 → 0.3.29

package/rancher-components/StringList/StringList.vue

@@ -30,9 +30,9 @@ const CLASS = {
  * Manage a list of strings
  */
 export default Vue.extend({
-  components: { LabeledInput },
 
-  name: 'StringList',
+  name:       'StringList',
+  components: { LabeledInput },
 
   props: {
     /**
@@ -85,11 +85,11 @@ export default Vue.extend({
   },
   data() {
     return {
-      value:             null as string | null,
-      selected:          null as string | null,
-      isEditItem:        null as string | null,
-      isCreateItem:      false,
-      errors:            { duplicate: false } as Record<Error, boolean>
+      value:        null as string | null,
+      selected:     null as string | null,
+      editedItem:   null as string | null,
+      isCreateItem: false,
+      errors:       { duplicate: false } as Record<Error, boolean>
     };
   },
 
@@ -100,8 +100,8 @@ export default Vue.extend({
      */
     errorMessagesArray(): string[] {
       return (Object.keys(this.errors) as Error[])
-        .filter(f => !!(this.errors)[f])
-        .map(k => this.errorMessages[k]);
+        .filter((f) => this.errors[f] && this.errorMessages[f])
+        .map((k) => this.errorMessages[k]);
     },
   },
 
@@ -113,23 +113,35 @@ export default Vue.extend({
       this.toggleEditMode(false);
       this.toggleCreateMode(false);
     },
+    value(val) {
+      this.$emit('type:item', val);
+    },
+    errors: {
+      handler(val) {
+        this.$emit('errors', val);
+      },
+      deep: true
+    }
   },
 
   methods: {
     onChange(value: string) {
       this.value = value;
-      /**
-       * Remove duplicate error when a new value is typed
-       */
+
+      const items = [
+        ...this.items,
+        this.value
+      ];
+
       this.toggleError(
         'duplicate',
-        false,
-        this.isCreateItem ? INPUT.create : INPUT.edit,
+        hasDuplicatedStrings(items, this.caseSensitive),
+        this.isCreateItem ? INPUT.create : INPUT.edit
       );
     },
 
     onSelect(item: string) {
-      if (this.isCreateItem || this.isEditItem === item) {
+      if (this.readonly || this.isCreateItem || this.editedItem === item) {
         return;
       }
       this.selected = item;
@@ -160,7 +172,7 @@ export default Vue.extend({
     },
 
     onClickEmptyBody() {
-      if (!this.isCreateItem && !this.isEditItem) {
+      if (!this.isCreateItem && !this.editedItem) {
         this.toggleCreateMode(true);
       }
     },
@@ -176,38 +188,43 @@ export default Vue.extend({
 
         return;
       }
-      if (this.isEditItem) {
+      if (this.editedItem) {
+        this.deleteAndSelectNext(this.editedItem);
         this.toggleEditMode(false);
 
         return;
       }
       if (this.selected) {
-        const index = findStringIndex(this.items, this.selected, false);
+        this.deleteAndSelectNext(this.selected);
+      }
+    },
 
-        if (index !== -1) {
-          /**
-           * Select the next item in the list when an item is to be deleted.
-           */
-          const item = (this.items[index + 1] || this.items[index - 1]);
+    deleteAndSelectNext(currItem: string) {
+      const index = findStringIndex(this.items, currItem, false);
+
+      if (index !== -1) {
+        /**
+         * Select the next item in the list.
+         */
+        const item = (this.items[index + 1] || this.items[index - 1]);
 
-          this.onSelect(item);
-          this.setFocus(item);
+        this.onSelect(item);
+        this.setFocus(item);
 
-          this.deleteItem(this.items[index]);
-        }
+        this.deleteItem(this.items[index]);
       }
     },
 
     setFocus(refId: string) {
-      this.$nextTick(() => this.getElemByRef(refId)?.focus());
+      this.$nextTick(() => (this.getElemByRef(refId) as Vue & HTMLElement)?.focus());
     },
 
     /**
      * Move scrollbar when the selected item is over the top or bottom side of the box
      */
     moveScrollbar(arrow: Arrow, value?: number) {
-      const box = this.getElemByRef(BOX);
-      const item = this.getElemByRef(this.selected || '');
+      const box = this.getElemByRef(BOX) as HTMLElement;
+      const item = this.getElemByRef(this.selected || '') as HTMLElement;
 
       if (box && item && item.className.includes(CLASS.item)) {
         const boxRect = box.getClientRects()[0];
@@ -229,13 +246,14 @@ export default Vue.extend({
      */
     toggleError(type: Error, val: boolean, refId?: string) {
       this.errors[type] = val;
+
       if (refId) {
         this.toggleErrorClass(refId, val);
       }
     },
 
     toggleErrorClass(refId: string, val: boolean) {
-      const input = this.getElemByRef(refId)?.$el;
+      const input = (this.getElemByRef(refId) as Vue)?.$el;
 
       if (input) {
         if (val) {
@@ -250,7 +268,11 @@ export default Vue.extend({
      * Show/Hide the input line to create new item
      */
     toggleCreateMode(show: boolean) {
+      if (this.readonly) {
+        return;
+      }
       if (show) {
+        this.toggleEditMode(false);
         this.value = '';
 
         this.isCreateItem = true;
@@ -268,31 +290,34 @@ export default Vue.extend({
      * Show/Hide the in-line editing to edit an existing item
      */
     toggleEditMode(show: boolean, item?: string) {
+      if (this.readonly) {
+        return;
+      }
       if (show) {
         this.toggleCreateMode(false);
-        this.value = this.isEditItem;
+        this.value = this.editedItem;
 
-        this.isEditItem = item || '';
+        this.editedItem = item || '';
         this.setFocus(INPUT.edit);
       } else {
         this.value = null;
         this.toggleError('duplicate', false);
         this.onSelectLeave();
 
-        this.isEditItem = null;
+        this.editedItem = null;
       }
     },
 
     getElemByRef(id: string) {
       const ref = this.$refs[id];
 
-      return (Array.isArray(ref) ? ref[0] : ref) as any;
+      return Array.isArray(ref) ? ref[0] : ref;
     },
 
     /**
      * Create a new item and insert in the items list
      */
-    saveItem() {
+    saveItem(closeInput = true) {
       const value = this.value?.trim();
 
       if (value) {
@@ -301,21 +326,20 @@ export default Vue.extend({
           value,
         ];
 
-        if (hasDuplicatedStrings(items, this.caseSensitive)) {
-          this.toggleError('duplicate', true, INPUT.create);
-
-          return;
+        if (!hasDuplicatedStrings(items, this.caseSensitive)) {
+          this.updateItems(items);
         }
+      }
 
-        this.updateItems(items);
+      if (closeInput) {
+        this.toggleCreateMode(false);
       }
-      this.toggleCreateMode(false);
     },
 
     /**
      * Update an existing item in the items list
      */
-    updateItem(item: string) {
+    updateItem(item: string, closeInput = true) {
       const value = this.value?.trim();
 
       if (value) {
@@ -326,22 +350,21 @@ export default Vue.extend({
           items[index] = value;
         }
 
-        if (hasDuplicatedStrings(items, this.caseSensitive)) {
-          this.toggleError('duplicate', true, INPUT.edit);
-
-          return;
+        if (!hasDuplicatedStrings(items, this.caseSensitive)) {
+          this.updateItems(items);
         }
+      }
 
-        this.updateItems(items);
+      if (closeInput) {
+        this.toggleEditMode(false);
       }
-      this.toggleEditMode(false);
     },
 
     /**
      * Remove an item from items list
      */
     deleteItem(item?: string) {
-      const items = this.items.filter(f => f !== item);
+      const items = this.items.filter((f) => f !== item);
 
       this.updateItems(items);
     },
@@ -387,19 +410,20 @@ export default Vue.extend({
         @blur="onSelectLeave(item)"
       >
         <span
-          v-if="!isEditItem || isEditItem !== item"
+          v-if="!editedItem || editedItem !== item"
           class="label static"
         >
           {{ item }}
         </span>
         <LabeledInput
-          v-if="isEditItem && isEditItem === item"
+          v-if="editedItem && editedItem === item"
           ref="item-edit"
+          :data-testid="`item-edit-${item}`"
           class="edit-input static"
           :value="value != null ? value : item"
           @input="onChange($event)"
-          @blur.prevent="toggleEditMode(false)"
-          @keydown.native.enter="updateItem(item)"
+          @blur.prevent="updateItem(item)"
+          @keydown.native.enter="updateItem(item, !errors.duplicate)"
         />
       </div>
       <div
@@ -408,12 +432,14 @@ export default Vue.extend({
       >
         <LabeledInput
           ref="item-create"
+          data-testid="item-create"
           class="create-input static"
           type="text"
           :value="value"
           :placeholder="placeholder"
           @input="onChange($event)"
-          @keydown.native.enter="saveItem"
+          @blur.prevent="saveItem"
+          @keydown.native.enter="saveItem(!errors.duplicate)"
         />
       </div>
     </div>
@@ -427,25 +453,32 @@ export default Vue.extend({
         class="action-buttons"
       >
         <button
+          data-testid="button-remove"
           class="btn btn-sm role-tertiary remove-button"
-          :disabled="!selected && !isCreateItem && !isEditItem"
+          :disabled="!selected && !isCreateItem && !editedItem"
           @mousedown.prevent="onClickMinusButton"
         >
           <span class="icon icon-minus icon-sm" />
         </button>
         <button
+          data-testid="button-add"
           class="btn btn-sm role-tertiary add-button"
-          :disabled="isCreateItem"
+          :disabled="isCreateItem || editedItem"
           @click.prevent="onClickPlusButton"
         >
           <span class="icon icon-plus icon-sm" />
         </button>
       </div>
       <div class="messages">
-        <i v-if="errorMessagesArray.length > 0" class="icon icon-warning icon-lg" />
+        <i
+          v-if="errorMessagesArray.length > 0"
+          data-testid="i-warning-icon"
+          class="icon icon-warning icon-lg"
+        />
         <span
           v-for="(msg, idx) in errorMessagesArray"
           :key="idx"
+          :data-testid="`span-error-message-${msg}`"
           class="error"
         >
           {{ idx > 0 ? '; ' : '' }}
@@ -499,6 +532,7 @@ export default Vue.extend({
         width: auto;
         user-select: none;
         overflow: hidden;
+        white-space: no-wrap;
         text-overflow: ellipsis;
         padding-top: 1px;
       }

package/types/shell/index.d.ts

@@ -3621,35 +3621,35 @@ export namespace KEY {
 }
 }
 
-// @shell/utils/poller
+// @shell/utils/poller-sequential
 
-declare module '@shell/utils/poller' {
-export default class Poller {
+declare module '@shell/utils/poller-sequential' {
+export default class PollerSequential {
     constructor(fn: any, pollRateMs: any, maxRetries?: number);
     fn: any;
     pollRateMs: any;
     maxRetries: number;
-    intervalId: any;
+    timeoutId: any;
     tryCount: number;
     start(): void;
     stop(): void;
+    _poll(): void;
     _intervalMethod(): Promise<void>;
 }
 }
 
-// @shell/utils/poller-sequential
+// @shell/utils/poller
 
-declare module '@shell/utils/poller-sequential' {
-export default class PollerSequential {
+declare module '@shell/utils/poller' {
+export default class Poller {
     constructor(fn: any, pollRateMs: any, maxRetries?: number);
     fn: any;
     pollRateMs: any;
     maxRetries: number;
-    timeoutId: any;
+    intervalId: any;
     tryCount: number;
     start(): void;
     stop(): void;
-    _poll(): void;
     _intervalMethod(): Promise<void>;
 }
 }

package/yarn-error.log

@@ -0,0 +1,200 @@
+Arguments: 
+  /Users/aalves/.nvm/versions/node/v16.19.1/bin/node /Users/aalves/.nvm/versions/node/v16.19.1/bin/yarn publish . --new-version 0.3.22 --no-git-tag-version --access public
+
+PATH: 
+  /Users/aalves/.rd/bin:/Users/aalves/.nvm/versions/node/v16.19.1/bin:/opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Users/aalves/.rd/bin:/Users/aalves/.nvm/versions/node/v16.19.1/bin:/opt/homebrew/bin:/opt/homebrew/sbin
+
+Yarn version: 
+  1.22.19
+
+Node version: 
+  16.19.1
+
+Platform: 
+  darwin arm64
+
+Trace: 
+  Error: https://registry.yarnpkg.com/-/user/org.couchdb.user:aalves08: failed to authenticate: Could not authenticate aalves08: bad password
+      at Request.params.callback [as _callback] (/Users/aalves/.nvm/versions/node/v16.19.1/lib/node_modules/yarn/lib/cli.js:66145:18)
+      at Request.self.callback (/Users/aalves/.nvm/versions/node/v16.19.1/lib/node_modules/yarn/lib/cli.js:140890:22)
+      at Request.emit (node:events:513:28)
+      at Request.<anonymous> (/Users/aalves/.nvm/versions/node/v16.19.1/lib/node_modules/yarn/lib/cli.js:141862:10)
+      at Request.emit (node:events:513:28)
+      at IncomingMessage.<anonymous> (/Users/aalves/.nvm/versions/node/v16.19.1/lib/node_modules/yarn/lib/cli.js:141784:12)
+      at Object.onceWrapper (node:events:627:28)
+      at IncomingMessage.emit (node:events:525:35)
+      at endReadableNT (node:internal/streams/readable:1358:12)
+      at processTicksAndRejections (node:internal/process/task_queues:83:21)
+
+npm manifest: 
+  {
+    "name": "@rancher/shell",
+    "version": "0.3.22",
+    "description": "Rancher Dashboard Shell",
+    "repository": "https://github.com/rancherlabs/dashboard",
+    "license": "Apache-2.0",
+    "author": "SUSE",
+    "private": false,
+    "engines": {
+      "node": ">=12"
+    },
+    "files": [
+      "**/*"
+    ],
+    "scripts": {
+      "clean": "./scripts/clean",
+      "lint": "./node_modules/.bin/eslint --max-warnings 0 --ext .ts,.js,.vue .",
+      "test": "./node_modules/.bin/nyc ava --serial --verbose",
+      "dev": "./node_modules/.bin/vue-cli-service dev",
+      "docker-dev": "docker run --rm --name dashboard-dev -p 8005:8005 -e API=$API -v $(pwd):/src -v dashboard_node:/src/node_modules rancher/dashboard:dev",
+      "build": "./node_modules/.bin/vue-cli-service build",
+      "analyze": "./node_modules/.bin/vue-cli-service build --report",
+      "start": "./node_modules/.bin/vue-cli-service start",
+      "cy:run": "cypress run",
+      "cy:open": "cypress open",
+      "e2e:pre": "NODE_ENV=dev yarn build",
+      "e2e:run": "NODE_ENV=dev START_SERVER_AND_TEST_INSECURE=1 start-server-and-test start  https://localhost:8005/ cy:run",
+      "e2e:dev": "start-server-and-test dev https://localhost:8005 cy:open"
+    },
+    "dependencies": {
+      "@aws-sdk/client-ec2": "3.1.0",
+      "@aws-sdk/client-eks": "3.1.0",
+      "@aws-sdk/client-kms": "3.8.1",
+      "@babel/plugin-proposal-optional-chaining": "7.14.5",
+      "@babel/plugin-proposal-private-property-in-object": "7.14.5",
+      "@babel/preset-typescript": "7.16.7",
+      "@innologica/vue-dropdown-menu": "0.1.3",
+      "@novnc/novnc": "1.2.0",
+      "@nuxt/types": "2.14.6",
+      "@nuxt/typescript-build": "2.1.0",
+      "@nuxtjs/axios": "5.12.0",
+      "@nuxtjs/eslint-config-typescript": "6.0.1",
+      "@nuxtjs/webpack-profile": "0.1.0",
+      "@popperjs/core": "2.4.4",
+      "@types/node": "16.4.3",
+      "@typescript-eslint/eslint-plugin": "4.33.0",
+      "@typescript-eslint/parser": "4.33.0",
+      "@vue/cli-plugin-babel": "4.5.18",
+      "@vue/cli-plugin-typescript": "4.5.18",
+      "@vue/cli-service": "4.5.18",
+      "@vue/test-utils": "1.2.1",
+      "@vue/vue2-jest": "27.0.0",
+      "add": "2.0.6",
+      "ansi_up": "5.0.0",
+      "babel-eslint": "10.1.0",
+      "babel-plugin-module-resolver": "4.0.0",
+      "babel-preset-vue": "2.0.2",
+      "browser-env": "3.3.0",
+      "cookie": "0.5.0",
+      "cookie-universal-nuxt": "2.1.4",
+      "core-js": "3.21.1",
+      "cron-validator": "1.2.0",
+      "cronstrue": "1.95.0",
+      "cross-env": "6.0.3",
+      "css-loader": "6.7.3",
+      "csv-loader": "3.0.3",
+      "cypress": "10.3.1",
+      "d3": "7.3.0",
+      "d3-selection": "1.4.1",
+      "dagre-d3": "0.6.4",
+      "dayjs": "1.8.29",
+      "diff2html": "3.4.24",
+      "dompurify": "2.4.5",
+      "eslint": "7.32.0",
+      "eslint-config-standard": "16.0.3",
+      "eslint-import-resolver-node": "0.3.4",
+      "eslint-module-utils": "2.6.1",
+      "eslint-plugin-cypress": "2.12.1",
+      "eslint-plugin-import": "2.23.4",
+      "eslint-plugin-jest": "24.4.0",
+      "eslint-plugin-n": "15.2.0",
+      "eslint-plugin-vue": "9.10.0",
+      "event-target-shim": "5.0.1",
+      "express": "4.17.1",
+      "file-saver": "2.0.2",
+      "frontmatter-markdown-loader": "3.7.0",
+      "identicon.js": "2.3.3",
+      "intl-messageformat": "7.8.4",
+      "is-url": "1.2.4",
+      "jest": "27.5.1",
+      "jest-serializer-vue": "2.0.2",
+      "jexl": "2.2.2",
+      "jquery": "3.5.1",
+      "js-cookie": "2.2.1",
+      "js-yaml": "4.1.0",
+      "js-yaml-loader": "1.2.2",
+      "jsdiff": "1.1.1",
+      "jsdom-global": "3.0.2",
+      "jsonpath-plus": "6.0.1",
+      "jsrsasign": "10.5.25",
+      "jszip": "3.8.0",
+      "lodash": "4.17.21",
+      "marked": "4.0.17",
+      "nodemon": "2.0.22",
+      "nuxt": "2.15.8",
+      "nyc": "15.1.0",
+      "papaparse": "5.3.0",
+      "portal-vue": "2.1.7",
+      "rancher-icons": "rancher/icons#v2.0.16",
+      "require-extension-hooks": "0.3.3",
+      "require-extension-hooks-babel": "1.0.0",
+      "require-extension-hooks-vue": "3.0.0",
+      "sass": "1.51.0",
+      "sass-loader": "10.2.1",
+      "serve-static": "1.14.1",
+      "set-cookie-parser": "2.4.6",
+      "shell-quote": "1.7.3",
+      "sinon": "8.1.1",
+      "start-server-and-test": "1.13.1",
+      "style-loader": "1.2.1",
+      "ts-node": "8.10.2",
+      "typescript": "4.1.6",
+      "url-parse": "1.5.10",
+      "v-tooltip": "2.0.3",
+      "vue": "2.7.14",
+      "vue-clipboard2": "0.3.1",
+      "vue-codemirror": "4.0.6",
+      "vue-js-modal": "1.3.35",
+      "vue-resize": "0.4.5",
+      "vue-select": "3.18.3",
+      "vue-server-renderer": "2.7.14",
+      "vue-shortkey": "3.1.7",
+      "vue-template-compiler": "2.7.14",
+      "vue-virtual-scroll-list": "^2.3.4",
+      "vue2-transitions": "0.3.0",
+      "vuedraggable": "2.24.3",
+      "vuex": "3.6.2",
+      "webpack-bundle-analyzer": "4.5.0",
+      "webpack-virtual-modules": "0.4.3",
+      "xterm": "5.0.0",
+      "xterm-addon-fit": "0.6.0",
+      "xterm-addon-search": "0.10.0",
+      "xterm-addon-web-links": "0.7.0",
+      "xterm-addon-webgl": "0.13.0",
+      "worker-loader": "3.0.8",
+      "yarn": "1.22.18"
+    },
+    "resolutions": {
+      "ejs": "^3.1.7",
+      "json5": ">=2.2.2",
+      "d3-color": ">=3.1.0",
+      "glob-parent": ">=5.1.2",
+      "node-forge": ">=1.3.0",
+      "qs": ">=6.7.3",
+      "nth-check": ">=2.0.1",
+      "follow-redirects": ">=1.14.7",
+      "merge": ">=2.1.1"
+    },
+    "nyc": {
+      "extension": [
+        ".js",
+        ".vue"
+      ]
+    }
+  }
+
+yarn manifest: 
+  No manifest
+
+Lockfile: 
+  No lockfile