Merge pull request #1101 from slntopp/dev

Dev

.github/workflows/ci.yml

@@ -83,7 +83,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@v4.1.1
+        uses: docker/build-push-action@v4.2.1
         with:
           context: .
           file: Dockerfile
@@ -120,7 +120,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@v4.1.1
+        uses: docker/build-push-action@v4.2.1
         id: build
         with:
           context: .

admin-ui/src/App.vue

@@ -7,7 +7,6 @@
       app
       permanent
       :color="asideColor"
-      style="position: relative; height: 100%"
       :mini-variant="isMenuMinimize"
     >
       <router-link to="/">
@@ -312,13 +311,7 @@
       <v-spacer></v-spacer>
     </v-app-bar>
 
-    <v-main
-      :class="{
-        main: true,
-        menuClosed: isMenuMinimize,
-        menuOpen: !isMenuMinimize,
-      }"
-    >
+    <v-main>
       <router-view />
     </v-main>
     <app-snackbar />
@@ -470,18 +463,22 @@ export default {
 </style>
 
 <style lang="scss">
-.v-application--wrap{
-  display: flex;
-  flex-direction: row;
-  max-width: unset;
+::-webkit-scrollbar {
+  width: 8px;
+  height: 8px;
+  border: none;
+  border-radius: unset;
+}
+
+::-webkit-scrollbar-track {
+  background: transparent;
 }
-.main {
-  padding: 64px 0px 0px 0px !important;
-  &.menuClosed {
-    max-width: calc(100vw - 70px);
-  }
-  &.menuOpen {
-    max-width: calc(100vw - 260px)
-  }
+
+::-webkit-scrollbar-thumb {
+  background: #000033;
+}
+
+::-webkit-scrollbar-thumb:hover {
+  background: #c921c9;
 }
 </style>

admin-ui/src/components/historyTable.vue

@@ -207,22 +207,38 @@ const getServiceProvider = (uuid) => {
 
 const getFilterItems = async () => {
   const { unique } = await api.logging.count({});
+  const actionItems = unique.actions.map((a) => ({ title: a, uuid: a }));
+  const scopeItems = unique.scopes.map((a) => ({ title: a, uuid: a }));
+
   store.commit("appSearch/pushVariant", {
     key: "action",
     value: {
-      items: unique.actions.map((a) => ({ title: a, uuid: a })),
+      items: actionItems,
+      isArray: true,
       key: "action",
       title: "Action",
     },
   });
   store.commit("appSearch/pushVariant", {
     key: "scope",
     value: {
-      items: unique.scopes.map((s) => ({ title: s, uuid: s })),
+      isArray: true,
+      items: scopeItems,
       key: "scope",
       title: "Scopes",
     },
   });
+  if (Object.keys(store.getters["appSearch/customParams"]).length === 0) {
+    const hiddenActions = ["monitoring", "regions"];
+
+    const defaultCustomParams = [];
+    actionItems.forEach(({ title, uuid }) => {
+      if (!hiddenActions.includes(title)) {
+        defaultCustomParams.push({ title, value: uuid });
+      }
+    });
+    store.commit("appSearch/setCustomParams", { action: defaultCustomParams });
+  }
 };
 
 const isLoading = computed(() => {
@@ -237,14 +253,8 @@ const requestOptions = computed(() => ({
   field: options.value.sortBy[0],
   sort: options.value.sortBy[0] && options.value.sortDesc[0] ? "DESC" : "ASC",
   filters: {
-    action:
-      (searchParams.value.action?.value && [
-        searchParams.value.action?.value,
-      ]) ||
-      undefined,
-    scope:
-      (searchParams.value.scope?.value && [searchParams.value.scope?.value]) ||
-      undefined,
+    action: searchParams.value.action?.map(({ value }) => value) || undefined,
+    scope: searchParams.value.scope?.map(({ value }) => value) || undefined,
     path: path.value || undefined,
   },
 }));

admin-ui/src/components/modules/virtual/instanceCreate.vue

@@ -29,13 +29,25 @@
           />
         </v-col>
         <v-col cols="6">
-          <v-select
+          <v-autocomplete
             label="product"
             :value="instance.product"
             v-if="products.length > 0"
             :items="products"
+            item-text="key"
+            item-value="key"
             @change="setValue('product', $event)"
-          />
+          >
+            <template v-slot:item="{ item }">
+              <div
+                style="width: 100%"
+                class="d-flex justify-space-between align-center"
+              >
+                <span>{{ item.key }}</span>
+                <span class="ml-4">{{ item.title }}</span>
+              </div>
+            </template>
+          </v-autocomplete>
         </v-col>
       </v-row>
     </v-card>
@@ -63,7 +75,10 @@ export default {
     changeBilling(val) {
       this.bilingPlan = this.plans.list.find((p) => p.uuid === val);
       if (this.bilingPlan) {
-        this.products = Object.keys(this.bilingPlan.products);
+        this.products = Object.keys(this.bilingPlan.products).map((key) => ({
+          key,
+          title: this.bilingPlan.products[key].title,
+        }));
       }
       this.setValue("billing_plan", this.bilingPlan);
     },

admin-ui/src/components/plan/cpanelPrices.vue

@@ -79,7 +79,7 @@ export default {
       { text: "lve_pmem", value: "lve_pmem" },
       { text: "Period", value: "period", width: 220 },
       { text: "Price", value: "price", width: 150 },
-      { text: "Sell", value: "enabled" },
+      { text: "Enabled", value: "enabled" },
     ],
   }),
   methods: {
@@ -140,7 +140,7 @@ export default {
             model: item.name,
             bandwidth: item.BWLIMIT || undefined,
             ssd: item.QUOTA || undefined,
-            email: item.MAX_EMAILACCT_QUOTA  || undefined,
+            email: item.MAX_EMAILACCT_QUOTA || undefined,
             mysql: item.MAXSQL || undefined,
             websites: 1 + +item.MAXADDON || undefined,
           },
@@ -158,7 +158,7 @@ export default {
         });
         this.showSnackbarSuccess({ message: "Plan save successfully" });
       } catch (e) {
-        console.log(e)
+        console.log(e);
         this.showSnackbarError({ message: "Error on save plan" });
       } finally {
         this.isSaveLoading = false;

admin-ui/src/components/search/search.vue

@@ -274,9 +274,16 @@ export default {
       }
 
       if (localStorage.getItem(val)) {
+        const savedValue = JSON.parse(localStorage.getItem(val));
+        const savedValueWithoutEmptys = {};
+        Object.keys(savedValue).forEach((key) => {
+          if (Object.keys(savedValue[key]).length > 0) {
+            savedValueWithoutEmptys[key] = savedValue[key];
+          }
+        });
         this.$store.commit(
           "appSearch/setCustomParams",
-          JSON.parse(localStorage.getItem(val))
+          savedValueWithoutEmptys
         );
       }
     },

admin-ui/src/components/table.vue

@@ -116,16 +116,23 @@
         </v-list>
       </v-menu>
     </template>
-    <!--  if show select show v-checkbox all, and dont hide v-checkbox on every row-->
-    <!--  Else hide v-checkbox all and hide checkboxes on every row-->
-
-    <template v-slot:[`header.data-table-select`]="{ props, on }">
-      <div class="d-flex">
-        <v-simple-checkbox
-          v-if="showSelect"
-          v-bind="props"
-          v-on="on"
-        ></v-simple-checkbox>
+
+    <template v-if="!showSelect" v-slot:[`item.data-table-select`]>
+      <div></div>
+    </template>
+
+    <template v-if="footerError.length > 0" v-slot:footer>
+      <v-toolbar class="mt-2" color="error" dark flat>
+        <v-toolbar-title class="subheading">
+          {{ footerError }}
+        </v-toolbar-title>
+      </v-toolbar>
+    </template>
+
+    <template
+      v-slot:[`footer.page-text`]="{ pageStart, pageStop, itemsLength }"
+    >
+      <div class="d-flex align-center">
         <v-dialog
           @click:outside="changeFiltres"
           max-width="60%"
@@ -162,19 +169,11 @@
         <v-icon @click="resetFilter" size="23" class="mr-1s"
           >mdi-filter-remove</v-icon
         >
+        <span class="ml-3">
+          {{ pageStart }}-{{ pageStop }} of {{ itemsLength }}
+        </span>
       </div>
     </template>
-    <template v-if="!showSelect" v-slot:[`item.data-table-select`]>
-      <div></div>
-    </template>
-
-    <template v-if="footerError.length > 0" v-slot:footer>
-      <v-toolbar class="mt-2" color="error" dark flat>
-        <v-toolbar-title class="subheading">
-          {{ footerError }}
-        </v-toolbar-title>
-      </v-toolbar>
-    </template>
   </components>
 </template>
 
@@ -614,4 +613,4 @@ export default {
   color: salmon;
   background-color: rgb(13, 16, 60);
 }
-</style>
+</style>

admin-ui/src/store/appSearch.js

@@ -28,7 +28,7 @@ export default {
       state.searchName = "";
     },
     pushVariant(state, { key, value }) {
-      state.variants[key] = value;
+      state.variants = { ...state.variants, [key]: value };
     },
     resetSearchParams(state) {
       state.searchParam = "";
@@ -64,8 +64,8 @@ export default {
     param(state) {
       return state.searchParam;
     },
-    customSearchParam(state){
-      return state.customParams.searchParam?.value
+    customSearchParam(state) {
+      return state.customParams.searchParam?.value;
     },
     variants(state) {
       const variants = { ...state.variants };
@@ -78,8 +78,8 @@ export default {
       return state.searchName + "_search";
     },
     customParams(state) {
-      const params={...state.customParams}
-      delete params['searchParam']
+      const params = { ...state.customParams };
+      delete params["searchParam"];
       return params;
     },
   },

admin-ui/src/views/Accounts.vue

@@ -256,7 +256,7 @@ export default {
       return this.$store.getters["currencies/default"];
     },
     currencies() {
-      return this.$store.getters["currencies/all"];
+      return this.$store.getters["currencies/all"].filter((c) => c !== "NCU");
     },
   },
   mounted() {