@appscode/design-system 1.0.43-alpha.13 → 1.0.43-alpha.132

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

@@ -23,12 +23,40 @@
             :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)
+            "
+            :title="tableHeader.dashboard && tableHeader.dashboard.message"
           >
             {{ headerLabels[idx] }}
+            <span
+              v-if="
+                tableHeader.dashboard &&
+                tableHeader.dashboard.status !== 'Success'
+              "
+              class="icon has-text-danger"
+            >
+              <i class="fa fa-exclamation-triangle" />
+            </span>
           </th>
           <th
             ref="action-section"
@@ -146,7 +174,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 +185,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 +206,7 @@ export default {
               };
             } else {
               return {
-                enabled: !!th.sortable,
+                enabled: !!(th && th.sort && th.sort.enable),
                 mode: "",
               };
             }
@@ -198,7 +233,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">
       <slot />
       <fake-table-cell
         v-if="fakeCellWidth > 0"
@@ -14,9 +14,14 @@
       />
     </tr>
   </router-link>
+
   <tr
     v-else
-    :class="{ 'is-selected': isSelected, 'is-hoverless': !isSelected }"
+    :class="{
+      'is-selected': isSelected,
+      'is-hoverless': !isSelected,
+      'is-disabled': isDisabled
+    }"
     @click.prevent="$emit('rowselect', true)"
   >
     <slot />
@@ -32,21 +37,25 @@ export default {
   props: {
     link: {
       type: String,
-      default: "",
+      default: ""
     },
     isSelected: {
       type: Boolean,
-      default: false,
+      default: false
+    },
+    isDisabled: {
+      type: Boolean,
+      default: false
     },
     fakeCellWidth: {
       type: Number,
-      default: 0,
-    },
+      default: 0
+    }
   },
 
   components: {
     TableCell: () => import("./TableCell.vue"),
-    FakeTableCell: () => import("./FakeTableCell.vue"),
-  },
+    FakeTableCell: () => import("./FakeTableCell.vue")
+  }
 };
 </script>

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

@@ -1,8 +1,13 @@
 <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"
@@ -16,7 +21,7 @@
       :max-character-length="maxCharacterLength"
     />
     <template v-else>
-      <span class="is-ellipsis-1" :title="value">{{
+      <span class="is-ellipsis-1" :title="tooltip">{{
         value || (value === 0 ? 0 : "-")
       }}</span>
     </template>
@@ -24,6 +29,13 @@
 </template>
 
 <script>
+import {
+  loaderLightThemePrimaryColor,
+  loaderDarkThemePrimaryColor,
+  loaderLightThemeSecondaryColor,
+  loaderDarkThemeSecondaryColor,
+} from "@appscode/design-system/plugins/theme";
+
 export default {
   props: {
     isLoaderActive: {
@@ -38,6 +50,10 @@ export default {
       type: null,
       default: "",
     },
+    tooltip: {
+      type: String,
+      defualt: "",
+    },
   },
   components: {
     ContentLoader: () =>
@@ -49,13 +65,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,6 +4,7 @@
     :class="`${modifierClasses}${isLoaderActive ? ' is-loading' : ''}`"
     :disabled="disabled ? true : null"
     @click="handleClick"
+    :title="tooltip"
   >
     <span v-if="iconClass || iconImage" class="icon is-small">
       <img
@@ -28,6 +29,10 @@ export default defineComponent({
       type: String,
       default: "",
     },
+    tooltip: {
+      type: String,
+      defualt: undefined
+    },
     // for loader
     isLoaderActive: {
       type: Boolean,

package/vue-components/v3/dropdown/DropdownMenu.vue

@@ -57,9 +57,9 @@ export default defineComponent({
 
     // attach click event listener on window, and close the dropdown
     function deactivateDropdown(e: Event) {
-      e.preventDefault();
       const { target } = e;
       if (
+        isDropdownActive.value &&
         dropdown.value &&
         dropdown.value !== target &&
         !dropdown.value.contains(target as Node)

package/vue-components/v3/editor/Editor.vue

@@ -7,7 +7,6 @@
     />
     <monaco-editor
       v-if="activeTab === 'edit'"
-      ref="monacoEditor"
       @editorDidMount="onEditorMount"
       key="edit"
       :class="`vh-${editorHeight} is-clipped`"
@@ -18,7 +17,9 @@
         minimap: {
           enabled: calcShowMinimap,
         },
+        theme: theme,
         readOnly: readOnly,
+        wordWrap: wordWrap,
         scrollBeyondLastLine: false,
       }"
     />
@@ -32,7 +33,9 @@
         minimap: {
           enabled: calcShowMinimap,
         },
+        theme: theme,
         readOnly: true,
+        wordWrap: wordWrap,
         scrollBeyondLastLine: false,
       }"
       :original="originalEditorContent"
@@ -43,6 +46,8 @@
 
 <script>
 import { defineComponent, defineAsyncComponent, h } from "vue";
+import Preloader from "../../v2/preloader/Preloader.vue";
+import Banner from "../../v2/banner/Banner.vue";
 export default defineComponent({
   props: {
     value: {
@@ -69,6 +74,14 @@ export default defineComponent({
       type: Number,
       default: 40,
     },
+    editorTheme: {
+      type: String,
+      default: "",
+    },
+    wordWrap: {
+      type: String,
+      default: "off",
+    },
   },
 
   emits: ["update:modelValue"],
@@ -77,14 +90,15 @@ export default defineComponent({
     EditorTabs: defineAsyncComponent(() =>
       import("../tabs/EditorTabs.vue").then((module) => module.default)
     ),
-    MonacoEditor: defineAsyncComponent(() =>
-      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-      // @ts-ignore
-      import("vue-monaco").then((module) => {
-        module.default.render = () => h("div");
-        return module.default;
-      })
-    ),
+    MonacoEditor: defineAsyncComponent({
+      loader: () =>
+        import("monaco-editor-vue3").then((module) => module.default),
+
+      loadingComponent: Preloader,
+      delay: 200,
+      errorComponent: Banner,
+      timeout: 20000,
+    }),
   },
 
   data() {
@@ -100,6 +114,14 @@ export default defineComponent({
       const noOfLines = this.editorContent.split("\n").length;
       return this.showMinimap && noOfLines * 2 > this.editorHeight;
     },
+    theme() {
+      return (
+        this.editorTheme ||
+        (document.documentElement.classList.contains("is-dark-theme")
+          ? "vs-dark"
+          : "vs")
+      );
+    },
   },
 
   watch: {
@@ -125,8 +147,7 @@ export default defineComponent({
     onChange(e) {
       if (typeof e === "string") this.editorContent = e;
     },
-    onEditorMount() {
-      const editor = this.$refs.monacoEditor.getEditor();
+    onEditorMount(editor) {
       // add event listeners
       editor.onDidBlurEditorText(() => {
         this.$emit("update:modelValue", this.editorContent);

package/vue-components/v3/modal/Modal.vue

@@ -17,6 +17,7 @@
             <header-item>
               <ac-button
                 modifier-classes="is-square is-transparent"
+                :disabled="isCloseOptionDisabled"
                 :icon-image="crossIcon"
                 @click.stop="destroyModal"
               />
@@ -36,7 +37,10 @@
         <!-- modal body end  -->
 
         <!-- modal footer start -->
-        <div class="ac-modal-footer action-footer">
+        <div class="ac-modal-footer action-footer is-flex is-align-items-center is-justify-content-space-between">
+          <div>
+            <slot name="modal-footer-left" />
+          </div>
           <buttons class="has-text-right is-block">
             <slot name="modal-footer-controls" />
           </buttons>
@@ -64,6 +68,10 @@ export default defineComponent({
       type: String,
       default: "",
     },
+    isCloseOptionDisabled: {
+      type: Boolean,
+      default: false,
+    }
   },
   emits: ["closemodal"],
 
@@ -116,6 +124,7 @@ export default defineComponent({
       document.addEventListener("keydown", this.onKeyDown);
     },
     destroyModal() {
+      if (this.isCloseOptionDisabled) return;
       this.showModal = false;
       document.removeEventListener("keydown", this.onKeyDown);
 

package/vue-components/v3/modals/JsonShowModal.vue

@@ -10,7 +10,9 @@
         <ac-button
           modifier-classes="is-square is-primary"
           icon-class="copy"
-          v-clipboard:copy="`${editorTitle}: &quot;${editorContent}&quot;`"
+          v-clipboard:copy="
+            `${editorTitle}: ${JSON.stringify(parsedContent, null, 4)}`
+          "
           v-clipboard:success="onCopy"
           v-clipboard:error="onError"
         />
@@ -28,6 +30,8 @@
 <script>
 import { defineComponent, defineAsyncComponent } from "vue";
 import { useToast } from "vue-toastification";
+import Preloader from "../../v2/preloader/Preloader.vue";
+import Banner from "../../v2/banner/Banner.vue";
 
 export default defineComponent({
   props: {
@@ -49,9 +53,14 @@ export default defineComponent({
     Modal: defineAsyncComponent(() =>
       import("../modal/Modal.vue").then((module) => module.default)
     ),
-    Editor: defineAsyncComponent(() =>
-      import("../editor/Editor.vue").then((module) => module.default)
-    ),
+    Editor: defineAsyncComponent({
+      loader: () =>
+        import("../editor/Editor.vue").then((module) => module.default),
+      loadingComponent: Preloader,
+      delay: 200,
+      errorComponent: Banner,
+      timeout: 20000,
+    }),
     AcButton: defineAsyncComponent(() =>
       import("../button/Button.vue").then((module) => module.default)
     ),

package/vue-components/v3/navbar/Appdrawer.vue

@@ -1,10 +1,13 @@
 <template>
-  <div class="app-drawer-wrapper">
-    <div class="drawer-icon">
+  <div class="app-drawer-wrapper is-flex">
+    <div
+      class="drawer-icon  is-flex is-justify-content-center is-align-items-center"
+    >
       <svg
         class="gb_We"
         focusable="false"
         viewBox="0 0 24 24"
+        style="width: 22px;margin-top: 2px;"
         :style="{ fill: 'white' }"
       >
         <path
@@ -46,13 +49,15 @@ export default defineComponent({
   props: {
     apps: {
       type: Array,
-      default: () => [],
-    },
+      default: () => []
+    }
   },
   components: {
     NavbarItemContent: defineAsyncComponent(() =>
-      import("../../v2/navbar/NavbarItemContent.vue").then((module) => module.default)
-    ),
-  },
+      import("../../v2/navbar/NavbarItemContent.vue").then(
+        module => module.default
+      )
+    )
+  }
 });
 </script>

package/vue-components/v3/navbar/ThemeMode.vue

@@ -0,0 +1,128 @@
+<template>
+  <div>
+    <button 
+      v-if="themeMode" 
+      class="button ac-nav-button"
+      @click="toggleTheme"
+      :title="themeModes[themeMode].displayName"
+    >
+      <i :class="`fa ${themeModes[themeMode].iconClass} width-15`" />
+    </button>
+    <div class="ac-menu-content theme-choice">
+      <ul class="is-flex is-flex-direction-row is-justify-content-space-around">
+        <li 
+          v-for="theme of Object.keys(themeModes)"
+          :title="themeModes[theme].displayName"
+          @click="themeMode = theme"
+          :class="{'is-active': themeMode === theme}"
+          :key="theme"
+        >
+          <i :class="['fa', themeModes[theme].iconClass]" />
+        </li>
+      </ul>
+    </div>
+  </div>
+</template>
+<script>
+import { defineComponent } from "vue";
+
+export default defineComponent({
+  data() {
+    return {
+      themeMode: "",
+      themeModes: {
+        system: {
+          displayName: "System Theme",
+          iconClass: "fa-desktop",
+        },
+        light: {
+          displayName: "Light Theme",
+          iconClass: "fa-sun-o",
+        },
+        dark: {
+          displayName: "Dark Theme",
+          iconClass: "fa-moon-o",
+        }
+      }
+    };
+  },
+
+  emits: ['set:theme'],
+
+  mounted() {
+    // get theme mode from localStorage or set default one
+    this.themeMode = localStorage.getItem("themeMode") || "light";
+  },
+
+  destroyed() {
+    this.removeColorSchemeEventListener();
+  },
+
+  watch: {
+    themeMode: {
+      handler(n) {
+        this.onThemeModeChange(n);
+      }
+    }
+  },
+
+  methods: {
+    // handle theme mode button click
+    toggleTheme() {
+      if(this.themeMode === "light")
+        this.themeMode = "dark";
+      else if(this.themeMode === "dark")
+        this.themeMode = "system";
+      else if(this.themeMode === "system")
+        this.themeMode = "light";
+    },
+
+    // triggered when theme mode is updated
+    onThemeModeChange(n) {
+      localStorage.setItem("themeMode", n);
+
+      let theme = n;
+      if(n === "system") {
+        const isDarkMode = window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches;
+        this.addColorSchemeEventListener();
+        theme = isDarkMode ? "dark" : "light";
+      } else {
+        this.removeColorSchemeEventListener();
+      }
+      this.$emit("set:theme", theme);
+      this.handleDarkThemeClass(theme);
+    },
+
+    // add proper css class to update the ui theme
+    handleDarkThemeClass(currentTheme) {
+      if(currentTheme === "light") {
+        document.documentElement.classList.remove("is-dark-theme");
+      } else {
+        document.documentElement.classList.add("is-dark-theme");
+      }
+    },
+
+    // add system theme listener event
+    addColorSchemeEventListener() {
+      window
+        .matchMedia("(prefers-color-scheme: dark)")
+        .addEventListener(
+          "change", this.handleSystemThemeChange
+        );
+    },
+
+    // remove system theme listener event
+    removeColorSchemeEventListener() {
+      window
+        .matchMedia("(prefers-color-scheme: dark)")
+        .removeEventListener(
+          "change", this.handleSystemThemeChange
+        );
+    },
+
+    handleSystemThemeChange() {
+      this.onThemeModeChange(this.themeMode);
+    },
+  }
+});
+</script>