adminforth 1.4.3-next.7 → 1.4.3-next.9

package/dist/spa/src/afcl/Button.vue

@@ -0,0 +1,21 @@
+<template>
+  <button 
+    v-bind="$attrs"
+    type="submit" 
+    class="flex items-center justify-center gap-1 text-lightPrimaryContrast bg-lightPrimary dark:bg-darkPrimary hover:brightness-110 
+      focus:ring-4 focus:outline-none focus:ring-lightPrimary focus:ring-opacity-50 font-medium rounded-lg text-sm px-5 py-2.5 text-center dark:focus:ring-darkPrimary dark:focus:ring-opacity-50"
+  >
+    <svg v-if="props.loader"
+      aria-hidden="true" class="w-4 h-4 text-gray-200 animate-spin dark:text-gray-600 fill-lightPrimary dark:fill-darkPrimary"
+        viewBox="0 0 100 101" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z" fill="currentColor"/><path d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z" fill="currentFill"/></svg>
+    <slot></slot>
+  </button>
+</template>
+
+<script setup lang="ts">
+
+const props = defineProps({
+  loader: Boolean,
+});
+
+</script>

package/dist/spa/src/afcl/Input.vue

@@ -0,0 +1,32 @@
+<template>
+
+  <div class="flex">
+    <span
+        v-if="$slots.prefix"
+        class="inline-flex items-center px-3 text-sm text-gray-900 bg-gray-200 border border-s-0 border-gray-300 rounded-e-md dark:bg-gray-600 dark:text-gray-400 dark:border-gray-600">
+      <slot name="prefix"></slot>
+    </span>
+    <input
+      v-bind="$attrs"
+      :type="type"
+      aria-describedby="helper-text-explanation"
+      class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-0 focus:ring-lightPrimary focus:border-lightPrimary dark:focus:ring-darkPrimary dark:focus:border-darkPrimary 
+      blue-500 focus:border-blue-500 block w-20 p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white z-10"
+      :class="{'rounded-l-md': !$slots.prefix, 'rounded-r-md': !$slots.suffix}"
+    >
+    <span
+        v-if="$slots.suffix"
+        class="inline-flex items-center px-3 text-sm text-gray-900 bg-gray-200 border border-s-0 border-gray-300 rounded-e-md dark:bg-gray-600 dark:text-gray-400 dark:border-gray-600">
+      <slot name="suffix"></slot>
+    </span>
+  </div>
+</template>
+
+<script setup lang="ts">
+
+const props = defineProps({
+  type: String,
+})
+
+</script>
+  

package/dist/spa/src/afcl/Link.vue

@@ -0,0 +1,9 @@
+<template>
+  <router-link 
+    v-bind="$attrs"
+    class="text-lightPrimary underline dark:text-darkPrimary hover:no-underline hover:brightness-110
+      cursor-pointer"
+  >
+    <slot></slot>
+  </router-link>
+</template>

package/dist/spa/src/afcl/Select.vue

@@ -0,0 +1,205 @@
+<template>
+  <div class="relative inline-block afcl-select">
+    <div class="relative">
+      <input
+        type="text"
+        v-model="search"
+        @click="inputClick"
+        @input="inputInput"
+        class="block w-full pl-3 pr-10 py-2 border border-gray-300 rounded-md leading-5 bg-white placeholder-gray-500 sm:text-sm transition duration-150 ease-in-out dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white focus:ring-lightPrimary focus:border-lightPrimary dark:focus:ring-darkPrimary dark:focus:border-darkPrimary"
+        :placeholder="
+          selectedItems.length && !multiple ? '' :  (showDropdown ? 'Search' : placeholder || 'Select...') 
+        "
+      />
+
+      <div v-if="!multiple && selectedItems.length" class="absolute pointer-events-none inset-y-0 left-2 flex items-center pr-2 px-1">
+        <slot 
+          name="selected-item" 
+          :option="selectedItems[0]"
+        ></slot>
+        <span v-if="!$slots['selected-item']" class="text-lightPrimary dark:text-white font-medium  ">
+          {{ selectedItems[0]?.label }}
+        </span>
+      </div>
+
+      <div class="absolute inset-y-0 right-2 flex items-center pointer-events-none">
+        <!-- triangle icon -->
+        <IconCaretDownSolid v-if="!showDropdown" class="h-5 w-5 text-lightPrimary dark:text-gray-400 opacity-50" />
+        <IconCaretUpSolid v-else class="h-5 w-5 text-lightPrimary dark:text-gray-400 opacity-50" />
+      </div>
+    </div>
+    <div v-if="showDropdown" class="absolute z-10 mt-1 w-full bg-white shadow-lg dark:shadow-black dark:bg-gray-700 dark:border-gray-600 rounded-md py-1 text-base ring-1 ring-black ring-opacity-5 overflow-auto focus:outline-none sm:text-sm">
+      <div
+        v-for="item in filteredItems"
+        :key="item.value"
+        class="px-4 py-2 cursor-pointer hover:bg-gray-100 dark:hover:bg-gray-600 dark:text-gray-400"
+        :class="{ 'bg-lightPrimaryOpacity dark:bg-darkPrimaryOpacity': selectedItems.includes(item) }"
+        @click="toogleItem(item)"
+      >
+        <slot name="item" :option="item"></slot>
+        <label v-if="!$slots.item" :for="item.value">{{ item.label }}</label>
+      </div>
+      <div v-if="!filteredItems.length" class="px-4 py-2 cursor-pointer text-gray-400 dark:text-gray-300">
+        No results found
+      </div>
+    </div>
+
+    <div v-if="multiple && selectedItems.length"
+      class="inset-y-0 left-2 flex items-center pr-2 flex-wrap gap-y-2 py-2"
+    >
+      <template v-for="item in selectedItems" :key="`afcl-select-${item.value}`">
+        <slot name="selected-item" :item="item"></slot>
+        <div v-if="!$slots['selected-item']"
+          class="bg-lightPrimaryOpacity text-lightPrimary text-xs font-medium me-2 px-2.5 py-0.5 rounded dark:bg-darkPrimaryOpacity dark:text-darkPrimary">
+          <span>{{ item.label }}</span>
+          <button
+            type="button"
+            @click="toogleItem(item)"
+            class="z-index-100 flex-shrink-0 ml-1 h-4 w-4 -mr-1 rounded-full inline-flex items-center justify-center text-gray-400 hover:text-gray-500 focus:outline-none focus:text-gray-500 focus:bg-gray-100"
+          >
+            <span class="sr-only">Remove item</span>
+            <svg class="h-2 w-2" stroke="currentColor" fill="none" viewBox="0 0 8 8">
+              <path
+                stroke-linecap="round"
+                stroke-linejoin="round"
+                stroke-width="1.5"
+                d="M1 1l6 6m0-6L1 7"
+              />
+            </svg>
+          </button>
+        </div> 
+      </template>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { ref, computed, onMounted, onUnmounted, watch } from 'vue';
+import { IconCaretDownSolid, IconCaretUpSolid } from '@iconify-prerendered/vue-flowbite';
+
+
+const props = defineProps({
+  options: Array,
+  modelValue: {
+    default: undefined,
+  },
+  multiple: {
+    type: Boolean,
+    default: false,
+  },
+  placeholder: {
+    type: String,
+    default: '',
+  },
+});
+
+const emit = defineEmits(['update:modelValue']);
+
+const search = ref('');
+const showDropdown = ref(false);
+
+const selectedItems = ref([]);
+
+function inputInput() {
+  if (!props.multiple && selectedItems.value.length) {
+    selectedItems.value = [];
+    emit('update:modelValue', null);
+  }
+}
+
+function updateFromProps() {
+  if (props.modelValue !== undefined) {
+    if (!props.multiple) {
+      const el = props.options.find(item => item.value === props.modelValue);
+      if (el) {
+        selectedItems.value = [el];
+      } else {
+        selectedItems.value = [];
+      }
+    } else {
+      selectedItems.value = props.options.filter(item => props.modelValue.includes(item.value));
+    }
+  }
+}
+
+function inputClick() {
+  if (!showDropdown.value) {
+    showDropdown.value = true;
+  } else {
+    if (!search.value) {
+      showDropdown.value = false;
+    }
+  }
+}
+
+onMounted(() => {
+  updateFromProps();
+
+  watch(() => props.modelValue, (value) => {
+    updateFromProps();
+  });
+
+  watch(() => props.options, () => {
+    updateFromProps();
+  });
+
+  addClickListener();
+
+});
+
+const filteredItems = computed(() => {
+  return props.options.filter(item =>
+    item.label.toLowerCase().includes(search.value.toLowerCase())
+  );
+});
+
+const handleClickOutside = (event) => {
+  if (!event.target.closest('.afcl-select')) {
+    showDropdown.value = false;
+  }
+};
+
+const addClickListener = () => {
+  document.addEventListener('click', handleClickOutside);
+};
+
+const removeClickListener = () => {
+  document.removeEventListener('click', handleClickOutside);
+};
+
+const toogleItem = (item) => {
+  if (selectedItems.value.includes(item)) {
+    selectedItems.value = selectedItems.value.filter(i => i !== item);
+  } else {
+    if (!props.multiple) {
+      selectedItems.value = [item];
+    } else {
+      selectedItems.value = [...selectedItems.value, item];
+    }
+  }
+  if (!props.multiple) {
+    showDropdown.value = false;
+  }
+  if (!props.multiple && search.value) {
+    search.value = '';
+  }
+  
+  const list = selectedItems.value.map(item => item.value);
+  const updValue = list.length ? list : null;
+  let emitValue;
+  if (!props.multiple) {
+    emitValue = updValue ? updValue[0] : null;
+  } else {
+    emitValue = updValue;
+  }
+  emit('update:modelValue', emitValue);
+
+};
+
+
+onUnmounted(() => {
+  removeClickListener();
+});
+
+
+</script>

package/dist/spa/src/afcl/index.ts

@@ -0,0 +1,6 @@
+
+
+export { default as Select } from './Select.vue';
+export { default as Link } from './Link.vue';
+export { default as Button } from './Button.vue';
+export { default as Input } from './Input.vue';

package/dist/spa/src/components/Filters.vue

@@ -11,7 +11,7 @@
     <h5 id="drawer-navigation-label" class="text-base font-semibold text-gray-500 uppercase dark:text-gray-400">
       Filters
 
-      <button type="button"   @click="$emit('hide')"  class="text-gray-400 bg-transparent hover:bg-gray-200 hover:text-gray-900 rounded-lg text-sm p-1.5 absolute end-2.5 inline-flex items-center dark:hover:bg-gray-600 dark:hover:text-white" >
+      <button type="button" @click="$emit('hide')" class="text-gray-400 bg-transparent hover:bg-gray-200 hover:text-gray-900 rounded-lg text-sm p-1.5 absolute end-2.5 inline-flex items-center dark:hover:bg-gray-600 dark:hover:text-white" >
         <svg aria-hidden="true" class="w-5 h-5" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4.293 4.293a1 1 0 011.414 0L10 8.586l4.293-4.293a1 1 0 111.414 1.414L11.414 10l4.293 4.293a1 1 0 01-1.414 1.414L10 11.414l-4.293 4.293a1 1 0 01-1.414-1.414L8.586 10 4.293 5.707a1 1 0 010-1.414z" clip-rule="evenodd"></path></svg>
         <span class="sr-only">Close menu</span>
       </button>
@@ -22,23 +22,28 @@
          <li v-for="c in columnsWithFilter" :key="c">
             <p class="dark:text-gray-400">{{ c.label }}</p>
 
-            <Dropdown
+            <Select
               v-if="c.foreignResource"
+              multiple
+              class="w-full"
               :options="columnOptions[c.name] || []"
               @update:modelValue="setFilterItem({ column: c, operator: 'in', value: $event || undefined })"
               :modelValue="filtersStore.filters.find(f => f.field === c.name && f.operator === 'in')?.value || []"
             />
-            <Dropdown
+            <Select
+              multiple
+              class="w-full"
               v-else-if="c.type === 'boolean'"
               :options="[{ label: 'Yes', value: true }, { label: 'No', value: false }, { label: 'Unset', value: undefined }]"
               @update:modelValue="setFilterItem({ column: c, operator: 'in', value: $event || undefined })"
               :modelValue="filtersStore.filters.find(f => f.field === c.name && f.operator === 'in')?.value || []"
             />
             
-            <Dropdown 
+            <Select 
+              multiple
+              class="w-full"
               v-else-if="c.enum"
               :options="c.enum"
-              :allowCustom="c.allowCustom"
               @update:modelValue="setFilterItem({ column: c, operator: 'in', value: $event || undefined })"
               :modelValue="filtersStore.filters.find(f => f.field === c.name && f.operator === 'in')?.value || []"
             />
@@ -123,6 +128,7 @@ import { useRouter } from 'vue-router';
 import { computedAsync } from '@vueuse/core'
 import CustomRangePicker from "@/components/CustomRangePicker.vue";
 import { useFiltersStore } from '@/stores/filters';
+import Select from '@/afcl/Select.vue';
 
 const filtersStore = useFiltersStore();
 

package/dist/spa/src/components/GroupsTable.vue

@@ -55,28 +55,28 @@
               />
             </template>
             <template v-else>
-              <Dropdown
-                  single
-                  v-if="column.foreignResource"
-                  :options="columnOptions[column.name] || []"
-                  :placeholder = "columnOptions[column.name]?.length ?'Select...': 'There are no options available'"
-                  :modelValue="currentValues[column.name]"
-                  @update:modelValue="setCurrentValue(column.name, $event)"
-              ></Dropdown>
-              <Dropdown
-                  single
-                  v-else-if="column.enum"
-                  :options="column.enum"
-                  :modelValue="currentValues[column.name]"
-                  @update:modelValue="setCurrentValue(column.name, $event)"
-              />
-              <Dropdown
-                  single
-                  v-else-if="column.type === 'boolean'"
-                  :options="[{ label: 'Yes', value: true }, { label: 'No', value: false }, { label: 'Unset', value: null }]"
-                  :modelValue="currentValues[column.name]"
-                  @update:modelValue="setCurrentValue(column.name, $event)"
-              />
+              <Select
+                class="w-full"
+                v-if="column.foreignResource"
+                :options="columnOptions[column.name] || []"
+                :placeholder = "columnOptions[column.name]?.length ?'Select...': 'There are no options available'"
+                :modelValue="currentValues[column.name]"
+                @update:modelValue="setCurrentValue(column.name, $event)"
+              ></Select>
+              <Select
+                class="w-full"
+                v-else-if="column.enum"
+                :options="column.enum"
+                :modelValue="currentValues[column.name]"
+                @update:modelValue="setCurrentValue(column.name, $event)"
+              ></Select>
+              <Select
+                class="w-full"
+                v-else-if="column.type === 'boolean'"
+                :options="[{ label: 'Yes', value: true }, { label: 'No', value: false }, { label: 'Unset', value: null }]"
+                :modelValue="currentValues[column.name]"
+                @update:modelValue="setCurrentValue(column.name, $event)"
+              ></Select>
               <input 
                   v-else-if="['integer'].includes(column.type)"
                   type="number" 
@@ -153,7 +153,7 @@
 <script setup>
   import { IconExclamationCircleSolid, IconEyeSlashSolid, IconEyeSolid } from '@iconify-prerendered/vue-flowbite';
   import CustomDatePicker from "@/components/CustomDatePicker.vue";
-  import Dropdown from '@/components/Dropdown.vue';
+  import Select from '@/afcl/Select.vue';
   import AfTooltip from "./AfTooltip.vue";
   import { getCustomComponent } from '@/utils';
 

package/dist/spa/src/views/LoginView.vue

@@ -123,7 +123,7 @@ import { useUserStore } from '@/stores/user';
 import { IconEyeSolid, IconEyeSlashSolid } from '@iconify-prerendered/vue-flowbite';
 import { callAdminForthApi, loadFile } from '@/utils';
 import { useRouter } from 'vue-router';
-import Button from '@/acl/Button.vue';
+import Button from '@/afcl/Button.vue';
 
 const passwordInput = ref(null);
 const usernameInput = ref(null);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adminforth",
-  "version": "1.4.3-next.7",
+  "version": "1.4.3-next.9",
   "description": "OpenSource Vue3 powered forth-generation admin panel",
   "main": "dist/index.js",
   "module": "dist/index.js",