@appscode/design-system 1.0.43-alpha.22 → 1.0.43-alpha.221

package/vue-components/v2/sidebar/ClusterSwitcher.vue

@@ -0,0 +1,126 @@
+<template>
+  <div class="is-cluster-logo" v-if="sidebarCollapsed">
+    <img
+      width="40"
+      :src="getProviderIcon(selectedCluster && selectedCluster.provider)"
+      onerror="this.onerror=null;this.src='https://cdn.appscode.com/images/cloud-provider-icons/Generic.png';"
+      alt="provider-icon"
+    />
+  </div>
+  <multiselect
+    v-else
+    v-model="selectedCluster"
+    placeholder="Selected Cluster"
+    label="name"
+    track-by="name"
+    :options="clusterOptions"
+    :allow-empty="false"
+    deselectLabel=""
+    selectLabel=""
+    selectedLabel=""
+  >
+    <template slot="singleLabel" slot-scope="props">
+      <div class="is-flex is-align-items-center">
+        <img
+          :src="getProviderIcon(props.option.provider)"
+          onerror="this.onerror=null;this.src='https://cdn.appscode.com/images/cloud-provider-icons/Generic.png';"
+          alt="No cluster selected"
+        /><span
+          ><span>{{ props.option.displayName }}</span></span
+        >
+      </div>
+    </template>
+    <template slot="option" slot-scope="props">
+      <div class="is-flex is-align-items-center">
+        <img
+          class="mr-15"
+          :src="getProviderIcon(props.option.provider)"
+          onerror="this.onerror=null;this.src='https://cdn.appscode.com/images/cloud-provider-icons/Generic.png';"
+          alt="No cluster selected"
+        />
+        <div>
+          <p>{{ props.option.displayName }}</p>
+          <p class="location">{{ props.option.location }}</p>
+        </div>
+      </div>
+    </template>
+  </multiselect>
+</template>
+
+<script>
+export default {
+  props: {
+    sidebarCollapsed: {
+      type: Boolean,
+      default: false,
+    },
+    mouseHover: {
+      type: Boolean,
+      default: false,
+    },
+    clusterOptions: {
+      type: Array,
+      default: [],
+    },
+    value: {
+      type: String,
+      default: "",
+    }
+  },
+
+  components: {
+    Multiselect: () => import("vue-multiselect"),
+  },
+
+  data() {
+    return {
+      selectedCluster: null,
+      selectedClusterName: "",
+    };
+  },
+
+  methods: {
+    getProviderIcon(provider) {
+      return `https://cdn.appscode.com/images/cloud-provider-icons/${provider}.png`;
+    },
+  },
+
+  watch: {
+    value: {
+      immediate: true,
+      handler(n) {
+        this.selectedClusterName = n;
+      },
+    },
+    selectedCluster: {
+      deep: true,
+      handler(n) {
+        this.selectedClusterName = n.name;
+      },
+    },
+    selectedClusterName(n) {
+      if (this.selectedCluster && n !== this.selectedCluster.name) {
+        this.clusterOptions.forEach((item) => {
+          if (this.selectedClusterName === item.name) {
+            this.selectedCluster = item;
+          }
+        });
+      }
+      this.$emit("input", n);
+    },
+    clusterOptions: {
+      deep: true,
+      immediate: true,
+      async handler(list) {
+        if (list) {
+          list.forEach(async (item) => {
+            if(item.name === this.selectedClusterName) {
+              this.selectedCluster = item;
+            }
+          });
+        }
+      },
+    },
+  },
+};
+</script>

package/vue-components/v2/sidebar/SidebarItem.vue

@@ -1,5 +1,5 @@
 <template>
-  <li>
+  <li ref="sidebarItem">
     <router-link
       :id="id"
       :title="title"
@@ -38,5 +38,27 @@ export default {
       default: "@/assets/images/icons/basic.svg",
     },
   },
+  watch: {
+    isActive: {
+      immediate: true,
+      handler(n) {
+        if (n) {
+          this.$nextTick(() => {
+            setTimeout(() => {
+              const top = (this.$refs.sidebarItem && this.$refs.sidebarItem.getBoundingClientRect().top) || 0;
+              // preventing scroll to options that are already visible
+              if (top > window.innerHeight - 200) {
+                // scroll to selected option item
+                this.$refs.sidebarItem.scrollIntoView({
+                  behavior: 'smooth',
+                  block: "center"
+                });
+              }
+            }, 500);  
+          });
+        }
+      }
+    }
+  }
 };
 </script>

package/vue-components/v2/sidebar/SidebarItemWithDropDown.vue

@@ -10,7 +10,7 @@
       </span>
     </a>
 
-    <ul :ref="title" :style="{ maxHeight: dropDownSectionHeight }">
+    <ul ref="sectionItems" :style="{ maxHeight: dropDownSectionHeight }">
       <slot />
     </ul>
   </li>
@@ -23,10 +23,6 @@ export default {
       type: Boolean,
       default: false,
     },
-    isLoaderActive: {
-      type: Boolean,
-      default: false,
-    },
     title: {
       type: String,
       default: "Sidebar Item",
@@ -41,27 +37,32 @@ export default {
     return {
       dropDownStatus: "close",
       dropDownSectionHeight: null,
+      isCompMounted: false,
     };
   },
 
-  watch: {
-    isLoaderActive(n) {
-      if (!n) {
-        this.$nextTick(() => {
-          // for expanding dropdown
-          this.setDropdownMaxHeight("open");
-        });
+  mounted() {
+    this.isCompMounted = true;
+    setTimeout(() => {
+      // for expanding dropdown
+      if (this.isDropDownOpen) {
+        this.setDropdownMaxHeight("open");
+      } else {
+        this.setDropdownMaxHeight("close");
       }
-    },
+    }, 700);
+  },
+
+  watch: {
     title(n, o) {
-      if (n && !this.isLoaderActive) {
+      if (n && this.isCompMounted) {
         this.$nextTick(() => {
           // for expanding dropdown
           this.setDropdownMaxHeight("open");
         });
       }
 
-      if (o && !this.isLoaderActive) {
+      if (o && this.isCompMounted) {
         this.$nextTick(() => {
           // for expanding dropdown
           this.setDropdownMaxHeight("close");
@@ -84,7 +85,7 @@ export default {
           this.$emit("dropDownItemChange");
 
           this.$nextTick(() => {
-            const dropDownUl = this.$refs[this.title];
+            const dropDownUl = this.$refs["sectionItems"];
             if (dropDownUl)
               this.dropDownSectionHeight = `${dropDownUl.scrollHeight}px`;
           });
@@ -99,11 +100,9 @@ export default {
   methods: {
     setDropdownMaxHeight(mode) {
       if (mode === "open") {
-        this.$refs[this.title][0].style.maxHeight = `${
-          this.$refs[this.title][0].scrollHeight
-        }px`;
+        this.dropDownSectionHeight = `${this.$refs["sectionItems"]?.scrollHeight}px`;
       } else {
-        this.$refs[this.title][0].style.maxHeight = null;
+        this.dropDownSectionHeight = null;
       }
     },
     toggleDropDownStatus() {

package/vue-components/v2/tab/TabItem.vue

@@ -1,5 +1,5 @@
 <template>
-  <li :class="{ 'is-active': isActive }">
+  <li :class="{ 'is-active': isActive }" data-testid="tab-item">
     <slot />
   </li>
 </template>

package/vue-components/v2/table/Table.vue

@@ -23,12 +23,41 @@
             :key="idx"
             :class="{
               sorting: headerSortables[idx] && headerSortables[idx].enabled,
-              'sorting-desc': headerSortables[idx] && headerSortables[idx].mode === 'desc',
-              'sorting-asc': headerSortables[idx] && headerSortables[idx].mode === 'asc',
+              'sorting-desc':
+                headerSortables[idx] && headerSortables[idx].mode === 'desc',
+              'sorting-asc':
+                headerSortables[idx] && headerSortables[idx].mode === 'asc',
+              'has-text-centered':
+                typeof tableHeader === 'string'
+                  ? false
+                  : tableHeader.textAlign === 'center',
+              'has-text-left':
+                typeof tableHeader === 'string'
+                  ? false
+                  : tableHeader.textAlign === 'left',
+              'has-text-right':
+                typeof tableHeader === 'string'
+                  ? false
+                  : tableHeader.textAlign === 'right',
             }"
-            @click.prevent="headerSortables[idx] && headerSortables[idx].enabled && emitSortEvent(idx)"
+            @click.prevent="
+              headerSortables[idx] &&
+                headerSortables[idx].enabled &&
+                emitSortEvent(idx)
+            "
           >
             {{ headerLabels[idx] }}
+            <span
+              v-if="
+                tableHeader.dashboard &&
+                tableHeader.dashboard.status &&
+                tableHeader.dashboard.status !== 'Success'
+              "
+              class="icon has-text-danger"
+              :title="tableHeader.dashboard && tableHeader.dashboard.message"
+            >
+              <i class="fa fa-exclamation-triangle" />
+            </span>
           </th>
           <th
             ref="action-section"
@@ -146,7 +175,7 @@ export default {
     },
     headerLabels() {
       return this.tableHeaders.map((th) =>
-        typeof th === "string" ? th : th.label || "Label"
+        typeof th === "string" ? th : th.name || "Label"
       );
     },
   },
@@ -157,8 +186,15 @@ export default {
       handler(n) {
         if (this.headerSortables.length === n.length) {
           n.forEach((th, idx) => {
-            if (this.headerSortables[idx].enabled !== !!th.sortable) {
-              this.headerSortables[idx].enabled = !!th.sortable;
+            if (
+              this.headerSortables[idx].enabled !==
+              !!(th && th.sort && th.sort.enable)
+            ) {
+              this.headerSortables[idx].enabled = !!(
+                th &&
+                th.sort &&
+                th.sort.enable
+              );
               this.headerSortables[idx].mode = "";
             }
           });
@@ -171,7 +207,7 @@ export default {
               };
             } else {
               return {
-                enabled: !!th.sortable,
+                enabled: !!(th && th.sort && th.sort.enable),
                 mode: "",
               };
             }
@@ -198,7 +234,7 @@ export default {
     emitSortEvent(index) {
       const emitValue = {
         index,
-        label: this.tableHeaders[index].label,
+        label: this.tableHeaders[index].name,
         mode: "",
       };
 

package/vue-components/v2/table/TableRow.vue

@@ -6,7 +6,7 @@
     custom
     v-slot="{ navigate }"
   >
-    <tr @click="navigate">
+    <tr class="is-link" @click="navigate" data-testid="ac-table-row">
       <slot />
       <fake-table-cell
         v-if="fakeCellWidth > 0"
@@ -14,9 +14,15 @@
       />
     </tr>
   </router-link>
+
   <tr
     v-else
-    :class="{ 'is-selected': isSelected, 'is-hoverless': !isSelected }"
+    :class="{
+      'is-selected': isSelected,
+      'is-hoverless': !isSelected,
+      'is-disabled': isDisabled,
+    }"
+    data-testid="ac-table-row"
     @click.prevent="$emit('rowselect', true)"
   >
     <slot />
@@ -38,6 +44,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    isDisabled: {
+      type: Boolean,
+      default: false,
+    },
     fakeCellWidth: {
       type: Number,
       default: 0,

package/vue-components/v2/table/table-cell/CellValue.vue

@@ -1,22 +1,29 @@
 <template>
   <div v-if="isLoaderActive" ref="cellLoaderDiv" :style="{ maxWidth: '300px' }">
-    <content-loader :height="10" :width="computedCellWidth || 300" />
+    <content-loader
+      :height="10"
+      :width="computedCellWidth || 300"
+      :primaryColor="primaryColor"
+      :secondaryColor="secondaryColor"
+    />
   </div>
-  <div v-else class="haha" ref="cellDiv">
+  <div v-else ref="cellDiv">
     <object-cell
       v-if="valueType === 'object'"
       :obj="value"
       :cell-title="cellTitle"
       :max-character-length="maxCharacterLength"
+      data-testid="object-cell-value"
     />
     <array-cell
       v-else-if="valueType === 'array'"
       :items="value"
       :cell-title="cellTitle"
       :max-character-length="maxCharacterLength"
+      data-testid="array-cell-value"
     />
     <template v-else>
-      <span class="is-ellipsis-1" :title="value">{{
+      <span class="is-ellipsis-1" :title="tooltip" data-testid="cell-value">{{
         value || (value === 0 ? 0 : "-")
       }}</span>
     </template>
@@ -24,6 +31,13 @@
 </template>
 
 <script>
+import {
+  loaderLightThemePrimaryColor,
+  loaderDarkThemePrimaryColor,
+  loaderLightThemeSecondaryColor,
+  loaderDarkThemeSecondaryColor,
+} from "@appscode/design-system/plugins/theme";
+
 export default {
   props: {
     isLoaderActive: {
@@ -38,6 +52,10 @@ export default {
       type: null,
       default: "",
     },
+    tooltip: {
+      type: String,
+      defualt: "",
+    },
   },
   components: {
     ContentLoader: () =>
@@ -49,13 +67,24 @@ export default {
   computed: {
     valueType() {
       if (typeof this.value === "object") {
-        if (Array.isArray(this.value)) return "array";
+        if (this.value === null) return "null";
+        else if (Array.isArray(this.value)) return "array";
         else return "object";
       } else return typeof this.value;
     },
     maxCharacterLength() {
       return Math.ceil(this.computedCellWidth / 8);
     },
+    primaryColor() {
+      return document.documentElement.classList.contains("is-dark-theme")
+        ? loaderDarkThemePrimaryColor
+        : loaderLightThemePrimaryColor;
+    },
+    secondaryColor() {
+      return document.documentElement.classList.contains("is-dark-theme")
+        ? loaderDarkThemeSecondaryColor
+        : loaderLightThemeSecondaryColor;
+    },
   },
 
   data() {

package/vue-components/v2/table/table-cell/GenericCell.vue

@@ -0,0 +1,56 @@
+<template>
+  <span
+    :class="{
+      'is-flex': cellDescriptor.type !== 'object',
+      'is-align-items-center': cellValue.icon,
+      'is-justify-content-center': cellDescriptor.textAlign === 'center',
+      'is-justify-content-left': cellDescriptor.textAlign === 'left',
+      'is-justify-content-right': cellDescriptor.textAlign === 'right'
+    }"
+  >
+    <span v-if="cellValue.icon" class="icon p-0 mr-10">
+      <img width="15" :src="cellValue.icon" />
+    </span>
+    <router-link v-if="cellValue.link" :to="getCellLink(cellValue)">
+      {{ cellValue.data }}
+    </router-link>
+    <tag v-else-if="cellValue.color" :class="`is-${cellValue.color}`">
+      {{ cellValue.data }}
+    </tag>
+    <cell-value
+      v-else
+      :cell-title="cellDescriptor.name"
+      :value="cellValue.data || '-'"
+      :tooltip="cellValue.tooltip || JSON.stringify(cellValue.data)"
+    />
+  </span>
+</template>
+<script>
+export default {
+  components: {
+    Tag: () => import("../../tag/Tag.vue"),
+    CellValue: () => import("../table-cell/CellValue.vue")
+  },
+  props: {
+    cellDescriptor: {
+      type: Object,
+      default: () => ({})
+    },
+    cellValue: {
+      type: Object,
+      default: () => ({})
+    }
+  },
+  methods: {
+    getCellLink(cell) {
+      const inject = (str, obj) => str.replace(/\${(.*?)}/g, (x, g) => obj[g]);
+      const { user, cluster } = this.$route.params;
+      const link = inject(cell.link || "", {
+        username: user,
+        clustername: cluster
+      });
+      return link;
+    }
+  }
+};
+</script>

package/vue-components/v2/table/table-cell/ObjectCell.vue

@@ -68,7 +68,10 @@ export default {
     },
     printableStringObjs() {
       return this.objKeys.map((key) => {
-        const value = this.obj[key];
+        let value = this.obj[key];
+        if (typeof value === "object" && value !== null) {
+          value = JSON.stringify(value);
+        }
         const keyValue = `${key}: ${value}`;
         const exceededLength = keyValue.length > 30;
         const print = exceededLength ? key : keyValue;

package/vue-components/v2/tabs/EditorTabs.vue

@@ -1,5 +1,5 @@
 <template>
-  <tabs-body class="mt-20">
+  <tabs-body>
     <tabs class="is-line">
       <tab-item :is-active="activeTab === 'edit'">
         <a @click.prevent="$emit('tabchange', 'edit')">Edit</a>

package/vue-components/v3/button/Button.vue

@@ -4,12 +4,13 @@
     :class="`${modifierClasses}${isLoaderActive ? ' is-loading' : ''}`"
     :disabled="disabled ? true : null"
     @click="handleClick"
+    :title="tooltip"
   >
     <span v-if="iconClass || iconImage" class="icon is-small">
       <img
         v-if="iconImage"
         :src="iconImage"
-        alt="close-icon"
+        alt="icon"
         :width="iconImageWidth"
       />
       <i v-else :class="`fa fa-${iconClass}`" aria-hidden="true" />
@@ -28,6 +29,10 @@ export default defineComponent({
       type: String,
       default: "",
     },
+    tooltip: {
+      type: String,
+      defualt: undefined
+    },
     // for loader
     isLoaderActive: {
       type: Boolean,

package/vue-components/v3/content/ContentHeader.vue

@@ -4,9 +4,10 @@
     <div class="ac-cheader-left">
       <!-- title  -->
       <div class="ac-content-title">
-        <h6>
+        <h6 class="is-flex">
           <slot name="header-icon" />
           {{ headerTitle }}
+          <slot name="title-right-actions" />
         </h6>
         <p v-if="headerSubTitle">{{ headerSubTitle }}</p>
       </div>

package/vue-components/v3/content/ContentTable.vue

@@ -2,18 +2,26 @@
   <content-layout>
     <template #content-header>
       <content-header
+        v-if="!hideHeader"
         :header-title="tableTitle"
         :header-sub-title="tableSubTitle"
         :class="{ 'pl-0 pr-0': removeTableHeaderPadding }"
       >
+        <template #title-right-actions>
+          <slot name="title-right-actions" />
+        </template>
         <slot name="content-left-controls" />
         <header-item>
-          <search-bar v-if="searchable" @search="searchText = $event" />
+          <search-bar v-if="searchable" @search="updateSearchText" />
         </header-item>
         <slot name="content-right-controls" />
       </content-header>
     </template>
-    <slot name="content" :search-text="searchText" />
+    <slot
+      name="content"
+      :search-text="searchText"
+      :update-search-text="updateSearchText"
+    />
   </content-layout>
 </template>
 
@@ -38,6 +46,10 @@ export default defineComponent({
       type: Boolean,
       default: true,
     },
+    hideHeader: {
+      type: Boolean,
+      default: false,
+    },
   },
   components: {
     ContentLayout: defineAsyncComponent(() =>
@@ -61,5 +73,11 @@ export default defineComponent({
       searchText: "",
     };
   },
+
+  methods: {
+    updateSearchText(text) {
+      this.searchText = text;
+    },
+  },
 });
 </script>