@rancher/shell 0.3.14 → 0.3.16

package/components/auth/SelectPrincipal.vue

@@ -76,7 +76,7 @@ export default {
         return true;
       })
         .sort((a, b) => a.name.localeCompare(b.name))
-        .map(x => x.id);
+        .map((x) => x.id);
 
       return out;
     },
@@ -100,7 +100,7 @@ export default {
         return;
       }
       if (this.principals) {
-        const selected = this.principals.find(p => p.id === this.newValue);
+        const selected = this.principals.find((p) => p.id === this.newValue);
 
         this.tooltipContent = selected?.name;
       } else {
@@ -159,7 +159,7 @@ export default {
 
         if ( this.searchStr === str ) {
           // If not, they've already typed something else
-          this.options = res.map(x => x.id);
+          this.options = res.map((x) => x.id);
         }
       } catch (e) {
         this.options = [];

package/components/fleet/FleetResources.vue

@@ -32,7 +32,7 @@ export default {
 
         for ( const c of clusters ) {
           let state = r.state;
-          const perEntry = r.perClusterState?.find(x => x.clusterId === c.id );
+          const perEntry = r.perClusterState?.find((x) => x.clusterId === c.id );
           const tooMany = r.perClusterState?.length >= 10 || false;
 
           if ( perEntry ) {

package/components/fleet/FleetStatus.vue

@@ -50,8 +50,8 @@ export default {
   computed: {
     meta() {
       return {
-        total:      this.values.map(x => x.value).reduce((a, b) => a + b),
-        readyCount: this.values.filter(x => x.label === 'Success' || x.label === 'Ready').map(x => x.value).reduce((a, b) => a + b)
+        total:      this.values.map((x) => x.value).reduce((a, b) => a + b),
+        readyCount: this.values.filter((x) => x.label === 'Success' || x.label === 'Ready').map((x) => x.value).reduce((a, b) => a + b)
       };
     },
 
@@ -83,7 +83,7 @@ export default {
       if ( !this.max ) {
         max = 100;
         if ( out.length ) {
-          max = out.map(x => x.value).reduce((a, b) => a + b);
+          max = out.map((x) => x.value).reduce((a, b) => a + b);
         }
       }
 
@@ -112,7 +112,7 @@ export default {
         return obj;
       });
 
-      return [...out].filter(obj => obj.percent);
+      return [...out].filter((obj) => obj.percent);
     },
   },
 

package/components/fleet/FleetSummary.vue

@@ -80,7 +80,7 @@ export default {
     },
 
     bundleCounts() {
-      const resources = this.bundles.filter(item => item.metadata.name.startsWith(`${ this.repoName }-`));
+      const resources = this.bundles.filter((item) => item.metadata.name.startsWith(`${ this.repoName }-`));
 
       if (!resources.length) {
         return [];

package/components/fleet/ForceDirectedTreeChart/chartIcons.js

@@ -1,6 +1,6 @@
 // This is to mitigate an issue where the SVG icons being imported from the project weren't being rendered on Firefox
 // To know more about this technique, check this doc: https://developer.mozilla.org/en-US/docs/Web/SVG/Element/defs
-export const getChartIcon = type => `<defs>
+export const getChartIcon = (type) => `<defs>
 <!-- GIT REPO ICON -->
 <svg id="git" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 96 96" style="enable-background:new 0 0 96 96" xml:space="preserve"><path class="st0" d="M92.138 43.888 52.018 3.77a5.918 5.918 0 0 0-8.369 0l-8.33 8.332L45.887 22.67a7.025 7.025 0 0 1 7.23 1.684 7.031 7.031 0 0 1 1.67 7.275l10.185 10.185a7.03 7.03 0 0 1 7.275 1.67 7.04 7.04 0 0 1 0 9.958 7.042 7.042 0 0 1-11.492-7.658l-9.5-9.499v24.997a7.09 7.09 0 0 1 1.861 1.331 7.042 7.042 0 1 1-7.65-1.537V35.849a7.04 7.04 0 0 1-3.822-9.234l-10.418-10.42-27.51 27.508a5.921 5.921 0 0 0 0 8.371l40.121 40.118a5.919 5.919 0 0 0 8.37 0l39.93-39.932a5.92 5.92 0 0 0 0-8.37z"/></svg>
 <!-- GENERIC BUNDLE ICON -->

package/components/fleet/ForceDirectedTreeChart/index.vue

@@ -57,7 +57,7 @@ export default {
           let hasStatusChange = false;
 
           flattenedData.forEach((item) => {
-            const index = this.allNodesData.findIndex(nodeData => item.matchingId === nodeData.data.matchingId);
+            const index = this.allNodesData.findIndex((nodeData) => item.matchingId === nodeData.data.matchingId);
 
             // apply status change to each node
             if (index > -1 && this.allNodesData[index].data.state !== item.state) {

package/components/form/ArrayList.vue

@@ -82,7 +82,7 @@ export default {
       default:   () => [],
       type:      Array,
       // we only want functions in the rules array
-      validator: rules => rules.every(rule => ['function'].includes(typeof rule))
+      validator: (rules) => rules.every((rule) => ['function'].includes(typeof rule))
     }
   },
   data() {
@@ -124,7 +124,7 @@ export default {
   watch: {
     value() {
       this.lastUpdateWasFromValue = true;
-      this.rows = (this.value || []).map(v => ({ value: v }));
+      this.rows = (this.value || []).map((v) => ({ value: v }));
     },
     rows: {
       deep: true,
@@ -186,9 +186,17 @@ export default {
       }
       event.preventDefault();
       const text = event.clipboardData.getData('text/plain');
-      const split = text.split('\n').map(value => ({ value }));
+      const split = text.split('\n').map((value) => ({ value }));
+
+      if (split.length === 1) {
+        // It's not multi-line, so don't treat it as such
+        return;
+      }
+
+      event.preventDefault();
 
       this.rows.splice(index, 1, ...split);
+
       this.update();
     }
   },

package/components/form/ArrayListSelect.vue

@@ -29,7 +29,7 @@ export default {
   computed: {
     filteredOptions() {
       return this.options
-        .filter(option => !this.value.includes(option.value));
+        .filter((option) => !this.value.includes(option.value));
     },
 
     addAllowed() {
@@ -43,7 +43,7 @@ export default {
       this.$emit(value);
     },
     calculateOptions(value) {
-      const valueOption = this.options.find(o => o.value === value);
+      const valueOption = this.options.find((o) => o.value === value);
 
       if (valueOption) {
         return [valueOption, ...this.filteredOptions];

package/components/form/FileSelector.vue

@@ -58,6 +58,11 @@ export default {
     rawData: {
       type:    Boolean,
       default: false
+    },
+
+    accept: {
+      type:    String,
+      default: '*'
     }
   },
 
@@ -151,6 +156,7 @@ export default {
       class="hide"
       :multiple="multiple"
       :webkitdirectory="directory"
+      :accept="accept"
       @change="fileChange"
     >
   </button>

package/components/form/GitPicker.vue

@@ -0,0 +1,528 @@
+<script lang="ts">
+import Vue from 'vue';
+import SortableTable from '@shell/components/SortableTable/index.vue';
+import RadioButton from '@components/Form/Radio/RadioButton.vue';
+import debounce from 'lodash/debounce';
+import { isArray } from '@shell/utils/array';
+import LabeledSelect from '@shell/components/form/LabeledSelect.vue';
+import LabeledInput from '@components/Form/LabeledInput/LabeledInput.vue';
+import { GitUtils } from '../../utils/git';
+
+interface commit {
+  [key: string]: any,
+  sha: string,
+}
+interface Data {
+  hasError: {
+    repo: boolean,
+    branch: boolean,
+    commits: boolean,
+  },
+
+  repos: object[],
+  branches: object[],
+  commits: commit[],
+
+  selectedAccOrOrg: string| null,
+  selectedRepo: object| null,
+  selectedBranch: object| null,
+  selectedCommit: object | null,
+}
+
+const debounceTime = 1000;
+
+export default Vue.extend<Data, any, any, any>({
+
+  components: {
+    LabeledSelect,
+    SortableTable,
+    RadioButton,
+    LabeledInput,
+  },
+
+  props: {
+    value: {
+      type:    Object,
+      default: null
+    },
+
+    type: {
+      type:    String,
+      default: null
+    }
+  },
+
+  data() {
+    return {
+      debounceTime,
+
+      hasError: {
+        repo:    false,
+        branch:  false,
+        commits: false,
+      },
+
+      repos:    [],
+      branches: [],
+      commits:  [] as commit[],
+
+      selectedAccOrOrg: null,
+      selectedRepo:     null,
+      selectedBranch:   null,
+      selectedCommit:   {},
+    };
+  },
+
+  created() {
+    this.onSearchRepo = this.searchForResult(this.searchRepo);
+    this.onSearchBranch = this.searchForResult(this.searchBranch);
+  },
+
+  watch: {
+    value: {
+      async handler(neu, old) {
+        if (JSON.stringify(neu) === JSON.stringify(old)) {
+          return;
+        }
+        if (neu?.type !== old?.type) {
+          this.reset();
+          await this.loadSourceCache(neu.selectedAccOrOrg, neu.selectedRepo, neu.selectedBranch, neu.selectedCommit);
+        }
+      },
+      immediate: true,
+      deep:      true,
+    }
+  },
+
+  computed: {
+    commitHeaders() {
+      return [
+        {
+          name:  'index',
+          label: this.t(`gitPicker.${ this.type }.tableHeaders.choose.label`),
+          width: 60,
+        }, {
+          name:          'sha',
+          label:         this.t(`gitPicker.${ this.type }.tableHeaders.sha.label`),
+          width:         90,
+          formatter:     'Link',
+          formatterOpts: { urlKey: 'htmlUrl' },
+          value:         'sha'
+        },
+        {
+          name:  'author',
+          label: this.t(`gitPicker.${ this.type }.tableHeaders.author.label`),
+          width: 190,
+          value: 'author.login',
+          sort:  'author.login',
+        },
+        {
+          name:  'message',
+          label: this.t(`gitPicker.${ this.type }.tableHeaders.message.label`),
+          value: 'message',
+          sort:  'message',
+        },
+        {
+          name:        'date',
+          width:       220,
+          label:       this.t(`gitPicker.${ this.type }.tableHeaders.date.label`),
+          value:       'date',
+          sort:        ['date:desc'],
+          formatter:   'Date',
+          defaultSort: true,
+        },
+      ];
+    },
+
+    preparedRepos() {
+      return this.normalizeArray(this.repos, (item: any) => ({ id: item.id, name: item.name }));
+    },
+
+    preparedBranches() {
+      return this.normalizeArray(this.branches, (item: any) => ({ id: item.id, name: item.name }));
+    },
+
+    preparedCommits() {
+      return this.normalizeArray(this.commits, (c: any) => GitUtils[this.type].normalize.commit(c));
+    },
+  },
+
+  methods: {
+    debounceRequest(callback: (param: any) => Promise<any>, timeout = debounceTime) {
+      return debounce(async(param) => await callback(param), timeout);
+    },
+
+    searchForResult(callback: (query: string) => Promise<any>) {
+      return this.debounceRequest(async(query: string) => {
+        if (!query.length) {
+          return;
+        }
+
+        return await callback(query);
+      });
+    },
+
+    reset() {
+      this.repos = [];
+      this.selectedAccOrOrg = null;
+      this.selectedRepo = null;
+      this.selectedBranch = null;
+      this.selectedCommit = {};
+
+      this.communicateReset();
+    },
+
+    communicateReset() {
+      this.$emit('change', {
+        selectedAccOrOrg: this.selectedAccOrOrg,
+        repo:             this.selectedRepo,
+        commit:           this.selectedCommit,
+      });
+    },
+
+    async loadSourceCache(accOrOrg: string, repo: { name: string}, branch: { name: string}, commit: { sha: string}) {
+      this.selectedAccOrOrg = accOrOrg;
+      if (this.selectedAccOrOrg) {
+        await this.fetchRepos()
+          .then(() => {
+            if (this.repos.length && !this.hasError.repo) {
+              this.selectedRepo = repo;
+
+              return this.fetchBranches();
+            }
+          })
+          .then(() => {
+            if (this.branches.length && !this.hasError.branch) {
+              if (branch?.name) {
+                this.selectedBranch = branch;
+
+                return this.fetchCommits();
+              }
+            }
+          });
+
+        const selectedCommit = this.commits?.find((c: commit) => {
+          // Github has sha's
+          // Gitlab has id's as sha's
+          const sha = c.sha || c.id;
+
+          return sha === commit.sha;
+        });
+
+        if (selectedCommit) {
+          this.final(selectedCommit.sha || selectedCommit.id);
+        }
+      }
+    },
+
+    async fetchRepos() {
+      this.repos = [];
+      this.selectedRepo = null;
+      this.selectedBranch = null;
+      this.selectedCommit = {};
+
+      this.communicateReset();
+
+      if (this.selectedAccOrOrg.length) {
+        try {
+          const res = await this.$store.dispatch(`${ this.type }/fetchRecentRepos`, { username: this.selectedAccOrOrg });
+
+          this.repos = res;
+
+          this.hasError.repo = false;
+        } catch (error) {
+          this.hasError.repo = true;
+        }
+      }
+    },
+
+    async fetchBranches() {
+      this.selectedBranch = null;
+      this.selectedCommit = {};
+
+      this.communicateReset();
+
+      try {
+        const res = await this.$store.dispatch(`${ this.type }/fetchBranches`, { repo: this.selectedRepo, username: this.selectedAccOrOrg });
+
+        this.branches = res;
+        this.hasError.branch = false;
+      } catch (error) {
+        this.hasError.branch = true;
+      }
+    },
+
+    async fetchCommits() {
+      this.selectedCommit = {};
+
+      this.communicateReset();
+
+      try {
+        const res = await this.$store.dispatch(`${ this.type }/fetchCommits`, {
+          repo:     this.selectedRepo,
+          username: this.selectedAccOrOrg,
+          branch:   this.selectedBranch,
+        });
+
+        this.commits = res as commit[];
+
+        this.hasError.branch = false;
+      } catch (error) {
+        this.hasError.commits = true;
+      }
+    },
+
+    normalizeArray(elem: any, normalize: (v: any) => object) {
+      const arr = isArray(elem) ? elem : [elem];
+
+      return arr.map((item: any) => normalize(item));
+    },
+
+    final(commitId: string) {
+      this.selectedCommit = this.preparedCommits.find((c: { commitId?: string }) => c.commitId === commitId);
+
+      if (this.selectedAccOrOrg && this.selectedRepo && this.selectedCommit?.commitId) {
+        this.$emit('change', {
+          selectedAccOrOrg: this.selectedAccOrOrg,
+          repo:             this.selectedRepo,
+          branch:           this.selectedBranch,
+          commit:           this.selectedCommit.commitId,
+          sourceData:       {
+            repos:    this.repos,
+            branches: this.branches,
+            commits:  this.commits
+          }
+
+        });
+      }
+    },
+
+    async searchRepo(query: string) {
+      if (query.length) {
+        // Check if the result is already in the fetched list.
+        const resultInCurrentState = this.repos.filter((r: any) => r.name.startsWith(query));
+
+        if (!resultInCurrentState.length) {
+          // Search for specific repo under the username
+          const res = await this.$store.dispatch(`${ this.type }/search`, {
+            repo:     { id: query, name: query },
+            username: this.selectedAccOrOrg
+          });
+
+          this.hasError.branches = !!res.hasError;
+
+          if (!res.hasError) {
+            if (res.length >= 1) {
+              this.repos = res;
+            }
+          }
+        } else {
+          return resultInCurrentState;
+        }
+      }
+    },
+
+    async searchBranch(query: string) {
+      const res = await this.$store.dispatch(`${ this.type }/search`, {
+        repo:     this.selectedRepo,
+        branch:   { name: query },
+        username: this.selectedAccOrOrg,
+      });
+
+      this.hasError.branch = !!res.hasError;
+
+      if (!this.hasError) {
+        this.branches = res;
+      }
+    },
+
+    status(value: boolean) {
+      return value ? 'error' : null;
+    },
+
+    reposRules() {
+      return this.hasError.repo ? this.t(`gitPicker.${ this.type }.errors.noAccount`) : null;
+    },
+
+    branchesRules() {
+      return this.hasError.branch ? this.t(`gitPicker.${ this.type }.errors.noBranch`) : null;
+    },
+  },
+});
+</script>
+
+<template>
+  <div class="picker">
+    <div class="row">
+      <div class="spacer">
+        <LabeledInput
+          v-model="selectedAccOrOrg"
+          data-testid="git_picker-username-or-org"
+          :tooltip="t(`gitPicker.${ type }.username.tooltip`)"
+          :label="t(`gitPicker.${ type }.username.inputLabel`)"
+          :required="true"
+          :rules="[reposRules]"
+          :delay="debounceTime"
+          :status="status(hasError.repo)"
+          @input="fetchRepos"
+        />
+      </div>
+
+      <div
+        v-if="repos.length && !hasError.repo"
+        class="spacer"
+      >
+        <LabeledSelect
+          v-model="selectedRepo"
+          :required="true"
+          :label="t(`gitPicker.${ type }.repo.inputLabel`)"
+          :options="preparedRepos"
+          :clearable="true"
+          :searchable="true"
+          :reduce="(e) => e"
+          :rules="[reposRules]"
+          :status="status(hasError.repo)"
+          :option-label="'name'"
+          @search="onSearchRepo"
+          @input="fetchBranches"
+        />
+      </div>
+      <!-- Deals with Branches  -->
+      <div
+        v-if="selectedRepo"
+        class="spacer"
+      >
+        <LabeledSelect
+          v-model="selectedBranch"
+          :required="true"
+          :label="t(`gitPicker.${ type }.branch.inputLabel`)"
+          :options="preparedBranches"
+          :clearable="false"
+          :reduce="(e) => e"
+          :searchable="true"
+          :rules="[branchesRules]"
+          :status="status(hasError.branch)"
+          :option-label="'name'"
+          @search="onSearchBranch"
+          @input="fetchCommits"
+        />
+      </div>
+      <!-- Deals with Commits, display & allow to pick from it  -->
+      <div
+        v-if="selectedBranch && preparedCommits.length"
+        class="commits-table mt-20"
+      >
+        <SortableTable
+          :rows="preparedCommits"
+          :headers="commitHeaders"
+          mode="view"
+          key-field="sha"
+          :search="true"
+          :paging="true"
+          :table-actions="false"
+          :row-actions="false"
+          :rows-per-page="10"
+        >
+          <template #cell:index="{row}">
+            <RadioButton
+              :value="selectedCommit.commitId"
+              :val="row.commitId"
+              @input="final($event)"
+            />
+          </template>
+
+          <template #cell:author="{row}">
+            <div class="sortable-table-avatar">
+              <template v-if="row.author">
+                <img
+                  :src="row.author.avatarUrl"
+                  alt=""
+                >
+                <a
+                  :href="row.author.htmlUrl"
+                  target="_blank"
+                  rel="nofollow noopener noreferrer"
+                >
+                  {{ row.author.name }}
+                </a>
+              </template>
+              <template v-else>
+                {{ t(`gitPicker.${ type }.tableHeaders.author.unknown`) }}
+              </template>
+            </div>
+          </template>
+        </SortableTable>
+      </div>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.picker {
+  .row {
+    display: flex;
+    flex-direction: column;
+    margin: 6px 0;
+  }
+
+  img {
+    height: 30px;
+    margin-right: 1rem;
+
+    .labeled-input {
+      width: 100%;
+    }
+  }
+
+  .sortable-table-avatar {
+    display: flex;
+    align-items: center;
+    justify-content: flex-start;
+
+    img {
+      width: 30px;
+      height: 30px;
+      border-radius: var(--border-radius);
+    }
+  }
+
+  .spacer {
+    max-width: 700px;
+  }
+
+  .commits-table {
+    margin: 0 1px;
+    max-width: 1400px;
+  }
+
+  .d-center {
+    display: flex;
+    align-items: center;
+  }
+
+  .selected img {
+    width: auto;
+    max-height: 23px;
+    margin-right: 0.5rem;
+  }
+
+  .v-select .dropdown li {
+    border-bottom: 1px solid rgba(112, 128, 144, 0.1);
+  }
+
+  .v-select .dropdown li:last-child {
+    border-bottom: none;
+  }
+
+  .v-select .dropdown li a {
+    padding: 10px 20px;
+    width: 100%;
+    font-size: 1.25em;
+    color: #3c3c3c;
+  }
+
+  .v-select .dropdown-menu .active > a {
+    color: #fff;
+  }
+}
+</style>