adminforth 1.3.56-next.2 → 1.3.56-next.20

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

@@ -1,14 +1,13 @@
 <template>
   <div>
-    <div class="flex items-center justify-between mb-3 flex-wrap gap-y-2">
+    <div class="flex items-center justify-between mb-3 flex-wrap gap-y-2 gap-2">
       <Breadcrumbs />
       <div class="flex items-center space-x-1 flex-wrap gap-y-1">
         <slot></slot>
       </div>
     </div>
-    <div class="flex items-center justify-between mb-3 flex-wrap gap-y-2">
-      <div class="p-4 mb-4 text-sm text-red-800 rounded-lg bg-red-50 dark:bg-gray-800 dark:text-red-400" role="alert"
-        v-if="coreStore.resourceColumnsError">
+    <div class="flex items-center justify-between mb-3 flex-wrap gap-y-2 gap-2" v-if="coreStore.resourceColumnsError">
+      <div class="p-4 mb-4 text-sm text-red-800 rounded-lg bg-red-50 dark:bg-gray-800 dark:text-red-400" role="alert">
         <span class="font-medium">Error!</span> {{ coreStore.resourceColumnsError }}
       </div>
     </div>

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

@@ -35,11 +35,11 @@
         <IconCaretUpSolid v-else class="h-5 w-5 text-gray-400" />
       </div>
     </div>
-    <div v-if="showDropdown" class="absolute z-10 mt-1 w-full bg-white shadow-lg dark:shadow-black rounded-md py-1 text-base ring-1 ring-black ring-opacity-5 overflow-auto focus:outline-none sm:text-sm">
+    <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"
+        class="px-4 py-2 cursor-pointer hover:bg-gray-100 dark:hover:bg-gray-600"
         :class="{ 'bg-lightPrimaryOpacity': selectedItems.includes(item) }"
         @click="toogleItem(item)"
       >

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

@@ -0,0 +1,168 @@
+<template>
+  <div class="shadow-resourseFormShadow dark:shadow-darkResourseFormShadow dark:shadow-2xl">
+    <div v-if="group.groupName" class="text-md font-semibold px-6 py-3 flex flex-1 items-center dark:border-gray-600 text-gray-700 bg-lightFormHeading dark:bg-gray-700 dark:text-gray-400 rounded-t-lg">
+      {{ group.groupName }}
+    </div>
+    <table class="w-full text-sm text-left rtl:text-right text-gray-500 dark:text-gray-400">
+      <thead class="text-xs text-gray-700 uppercase dark:text-gray-400 bg-lightFormHeading dark:bg-gray-700 block md:table-row-group ">
+        <tr>
+          <th scope="col" class="px-6 py-3 hidden md:table-cell">
+              Field
+          </th>
+          <th scope="col" class="px-6 py-3 w-5/6 hidden md:table-cell">
+              Value
+          </th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr
+          v-for="(column, i) in group.columns"
+          :key="column.name"
+          v-if="currentValues !== null"
+          class="bg-ligftForm dark:bg-gray-800 dark:border-gray-700 block md:table-row"
+          :class="{ 'border-b': i !== group.columns.length - 1 }"
+        >
+          <td class="px-6 py-4 whitespace-nowrap flex items-center block md:table-cell" :class="{'rounded-bl-lg border-b-none': i === group.columns.length - 1}"> <!--align-top-->
+            <span class="flex items-center gap-1">                     
+              {{ column.label }}
+              <AfTooltip v-if="column.required[mode]">
+
+                <IconExclamationCircleSolid v-if="column.required[mode]" class="w-4 h-4" 
+                  :class="(columnError(column) && validating) ? 'text-red-500 dark:text-red-400' : 'text-gray-400 dark:text-gray-500'"
+                />
+
+                <template #tooltip>
+                  Required field
+                </template>
+              </AfTooltip>
+            </span>
+            
+            
+          </td>
+          <td class="px-6 py-4 whitespace-nowrap whitespace-pre-wrap relative block md:table-cell rounded-br-lg" :class="{'rounded-br-lg': i === group.columns.length - 1}">
+            <template v-if="column?.components?.[props.source]?.file">
+              <component
+                :is="getCustomComponent(column.components[props.source])"
+                :column="column"
+                :value="currentValues[column.name]"
+                @update:value="setCurrentValue(column.name, $event)"
+                :meta="column.components[props.source].meta"
+                :record="currentValues"
+                @update:inValidity="customComponentsInValidity[column.name] = $event"
+                @update:emptiness="customComponentsEmptiness[column.name] = $event"
+              />
+            </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)"
+              />
+              <input 
+                  v-else-if="['integer'].includes(column.type)"
+                  type="number" 
+                  step="1"
+                  class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-40 p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500"
+                  placeholder="0"
+                  :value="currentValues[column.name]"
+                  @input="setCurrentValue(column.name, $event.target.value)"
+              >
+              <CustomDatePicker
+                  v-else-if="['datetime'].includes(column.type)"
+                  :column="column"
+                  :valueStart="currentValues[column.name]"
+                  auto-hide
+                  @update:valueStart="setCurrentValue(column.name, $event)"
+              />
+              <input
+                  v-else-if="['decimal', 'float'].includes(column.type)"
+                  type="number"
+                  step="0.1"
+                  class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-40 p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500"
+                  placeholder="0.0"
+                  :value="currentValues[column.name]"
+                  @input="setCurrentValue(column.name, $event.target.value)"
+              />
+              <textarea
+                  v-else-if="['text', 'richtext'].includes(column.type)"
+                  class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500"
+                  placeholder="Text"
+                  :value="currentValues[column.name]"
+                  @input="setCurrentValue(column.name, $event.target.value)"
+              >
+              </textarea>
+              <textarea
+                  v-else-if="['json'].includes(column.type)"
+                  class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500"
+                  placeholder="Text"
+                  :value="currentValues[column.name]"
+                  @input="setCurrentValue(column.name, $event.target.value)"
+              >
+              </textarea>
+              <input
+                  v-else
+                  :type="!column.masked || unmasked[column.name] ? 'text' : 'password'"
+                  class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500"
+                  placeholder="Text"
+                  :value="currentValues[column.name]"
+                  @input="setCurrentValue(column.name, $event.target.value)"
+                  autocomplete="false"
+                  data-lpignore="true"
+                  readonly
+                  onfocus="this.removeAttribute('readonly');"
+              >
+
+              <button
+                  v-if="column.masked"
+                  type="button"
+                  @click="unmasked[column.name] = !unmasked[column.name]"
+                  class="h-6 absolute inset-y-2 top-6 right-6 flex items-center pr-2 z-index-100 focus:outline-none"
+              >
+                  <IconEyeSolid class="w-6 h-6 text-gray-400"  v-if="!unmasked[column.name]" />
+                  <IconEyeSlashSolid class="w-6 h-6 text-gray-400" v-else />
+              </button>
+            </template>
+            <div v-if="columnError(column) && validating" class="mt-1 text-xs text-red-500 dark:text-red-400">{{ columnError(column) }}</div>
+            <div v-if="column.editingNote && column.editingNote[mode]" class="mt-1 text-xs text-gray-400 dark:text-gray-500">{{ column.editingNote[mode] }}</div>
+          </td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+</template>
+
+<script setup>
+  import { defineProps } from 'vue';
+  import { IconExclamationCircleSolid, IconEyeSlashSolid, IconEyeSolid } from '@iconify-prerendered/vue-flowbite';
+  import CustomDatePicker from "@/components/CustomDatePicker.vue";
+  import Dropdown from '@/components/Dropdown.vue';
+  import AfTooltip from "./AfTooltip.vue";
+
+  const props = defineProps({
+    group: Object,
+    mode: String,
+    validating: Boolean,
+    currentValues: Object,
+    unmasked: Object,
+    columnError: Function,
+    setCurrentValue: Function,
+    columnOptions: Object
+  });
+</script>

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

@@ -1,164 +1,62 @@
 <template>
   <div class="rounded-default">
-    <div 
-      class="relative shadow-resourseFormShadow dark:shadow-darkResourseFormShadow sm:rounded-lg dark:shadow-2xl  rounded-default"
-    >
-      <form autocomplete="off" @submit.prevent>
-        <table class="w-full text-sm text-left rtl:text-right text-gray-500 dark:text-gray-400 ">
-          <thead class="text-xs text-gray-700 uppercase bg-lightFormHeading dark:bg-gray-700 dark:text-gray-400 block md:table-row-group">
-            <tr>
-              <th scope="col" class="px-6 py-3 hidden md:table-cell">
-                  Field
-              </th>
-              <th scope="col" class="px-6 py-3 w-5/6 hidden md:table-cell">
-                  Value
-              </th>
-            </tr>
-          </thead>
-          <tbody>
-              <tr v-for="column, i in editableColumns" :key="column.name"
-                  v-if="currentValues !== null"
-                  class="bg-ligftForm dark:bg-gray-800 dark:border-gray-700 block md:table-row"
-                  :class="{ 'border-b': i !== editableColumns.length - 1 }"
-              >
-                    <td class="px-6 py-4 sm:pb-0 whitespace-nowrap flex items-center block md:table-cell"> <!--align-top-->
-                      {{ column.label }}
-                      <span :data-tooltip-target="`tooltip-show-${i}`" class="ml-1 relative inline-block">
-                          <IconExclamationCircleSolid v-if="column.required[mode]" class="w-4 h-4" 
-                          :class="(columnError(column) && validating) ? 'text-red-500 dark:text-red-400' : 'text-gray-400 dark:text-gray-500'"
-                          />
-                      </span>
-                      <div :id="`tooltip-show-${i}`"
-                          role="tooltip" 
-                          class="ml-1 absolute z-10 invisible inline-block px-3 py-2 text-sm font-medium text-white transition-opacity duration-300 bg-gray-900 rounded-lg shadow-sm opacity-0 tooltip dark:bg-gray-700">
-                          Required field
-                          <div class="tooltip-arrow" data-popper-arrow></div>
-                      </div>
-                    </td>
-                    <td class="px-6 py-4 whitespace-nowrap whitespace-pre-wrap relative block md:table-cell">
-                    <template v-if="column?.components?.[props.source]?.file">
-                      <component
-                        :is="getCustomComponent(column.components[props.source])"
-                        :column="column"
-                        :value="currentValues[column.name]"
-                        @update:value="setCurrentValue(column.name, $event)"
-                        :meta="column.components[props.source].meta"
-                        :record="currentValues"
-                        @update:inValidity="customComponentsInValidity[column.name] = $event"
-                        @update:emptiness="customComponentsEmptiness[column.name] = $event"
-                      />
-                    </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)"
-                      />
-                      <input 
-                          v-else-if="['integer'].includes(column.type)"
-                          type="number" 
-                          step="1"
-                          class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-40 p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500"
-                          placeholder="0"
-                          :value="currentValues[column.name]"
-                          @input="setCurrentValue(column.name, $event.target.value)"
-                      >
-                      <CustomDatePicker
-                          v-else-if="['datetime'].includes(column.type)"
-                          :column="column"
-                          :valueStart="currentValues[column.name]"
-                          auto-hide
-                          @update:valueStart="setCurrentValue(column.name, $event)"
-                      />
-                      <input
-                          v-else-if="['decimal', 'float'].includes(column.type)"
-                          type="number"
-                          step="0.1"
-                          class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-40 p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500"
-                          placeholder="0.0"
-                          :value="currentValues[column.name]"
-                          @input="setCurrentValue(column.name, $event.target.value)"
-                      />
-                      <textarea
-                          v-else-if="['text', 'richtext'].includes(column.type)"
-                          class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500"
-                          placeholder="Text"
-                          :value="currentValues[column.name]"
-                          @input="setCurrentValue(column.name, $event.target.value)"
-                      >
-                      </textarea>
-                      <textarea
-                          v-else-if="['json'].includes(column.type)"
-                          class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500"
-                          placeholder="Text"
-                          :value="currentValues[column.name]"
-                          @input="setCurrentValue(column.name, $event.target.value)"
-                      >
-                      </textarea>
-                      <input
-                          v-else
-                          :type="!column.masked || unmasked[column.name] ? 'text' : 'password'"
-                          class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500"
-                          placeholder="Text"
-                          :value="currentValues[column.name]"
-                          @input="setCurrentValue(column.name, $event.target.value)"
-                          autocomplete="false"
-                          data-lpignore="true"
-                          readonly
-                          onfocus="this.removeAttribute('readonly');"
-                      >
-
-                      <button
-                          v-if="column.masked"
-                          type="button"
-                          @click="unmasked[column.name] = !unmasked[column.name]"
-                          class="h-6 absolute inset-y-2 top-6 right-6 flex items-center pr-2 z-index-100 focus:outline-none"
-                      >
-                          <IconEyeSolid class="w-6 h-6 text-gray-400"  v-if="!unmasked[column.name]" />
-                          <IconEyeSlashSolid class="w-6 h-6 text-gray-400" v-else />
-                      </button>
-                    </template>
-                    <div v-if="columnError(column) && validating" class="mt-1 text-xs text-red-500 dark:text-red-400">{{ columnError(column) }}</div>
-                    <div v-if="column.editingNote && column.editingNote[mode]" class="mt-1 text-xs text-gray-400 dark:text-gray-500">{{ column.editingNote[mode] }}</div>
-
-                </td>
-              </tr>
-              
-          </tbody>
-        </table>
-      </form>
-    </div>
+    <form autocomplete="off" @submit.prevent>
+      <div v-if="!coreStore.resource.options.createEditGroups || coreStore.resource.options.createEditGroups.length === 0">
+        <GroupsTable
+        :group="{groupName: '', columns: editableColumns}"
+        :currentValues="currentValues"
+        :editableColumns="editableColumns"
+        :mode="mode"
+        :unmasked="unmasked"
+        :columnOptions="columnOptions"
+        :validating="validating"
+        :columnError="columnError"
+        :setCurrentValue="setCurrentValue"
+        />
+      </div>
+      <div v-else class="flex flex-col gap-4">
+        <template v-for="group in groupedColumns" :key="group.groupName" class="flex flex-col gap-4"> 
+          <GroupsTable
+          :group="group"
+          :currentValues="currentValues"
+          :editableColumns="editableColumns"
+          :mode="mode"
+          :unmasked="unmasked"
+          :columnOptions="columnOptions"
+          :validating="validating"
+          :columnError="columnError"
+          :setCurrentValue="setCurrentValue"
+          />
+        </template>
+        <div v-if="otherColumns.length > 0">
+          <GroupsTable
+          :group="{groupName: 'Other', columns: otherColumns}"
+          :currentValues="currentValues"
+          :editableColumns="editableColumns"
+          :mode="mode"
+          :unmasked="unmasked"
+          :columnOptions="columnOptions"
+          :validating="validating"
+          :columnError="columnError"
+          :setCurrentValue="setCurrentValue"
+          />
+        </div>
+      </div>
+    </form>
   </div>
 
 </template>
 
 <script setup>
 
-import CustomDatePicker from "@/components/CustomDatePicker.vue";
-import Dropdown from '@/components/Dropdown.vue';
-import { applyRegexValidation, callAdminForthApi, getCustomComponent } from '@/utils';
-import { IconExclamationCircleSolid, IconEyeSlashSolid, IconEyeSolid } from '@iconify-prerendered/vue-flowbite';
+import { applyRegexValidation, callAdminForthApi} from '@/utils';
 import { computedAsync } from '@vueuse/core';
-import { initFlowbite } from 'flowbite';
 import { computed, onMounted, ref, watch } from 'vue';
 import { useRouter, useRoute } from 'vue-router';
+import { useCoreStore } from "@/stores/core";
+import GroupsTable from '@/components/GroupsTable.vue';
+
+const coreStore = useCoreStore();
 
 const router = useRouter();
 const route = useRoute();
@@ -179,7 +77,6 @@ const currentValues = ref(null);
 
 const customComponentsInValidity = ref({});
 const customComponentsEmptiness = ref({});
-  
 
 const columnError = (column) => {
   const val = computed(() => {
@@ -281,9 +178,6 @@ onMounted(() => {
       currentValues.value[column.name] = JSON.stringify(currentValues.value[column.name], null, 2);
     }
   });
-  console.log('currentValues', currentValues.value);
-
-  initFlowbite();
   emit('update:isValid', isValid.value);
 });
 
@@ -310,14 +204,34 @@ const columnOptions = computedAsync(async () => {
 
 
 const editableColumns = computed(() => {
-  const mode = props.record ? 'edit' : 'create';
-  return props.resource?.columns?.filter(column => column.showIn.includes(mode));
+  return props.resource?.columns?.filter(column => column.showIn.includes(mode.value));
 });
 
 const isValid = computed(() => {
   return editableColumns.value?.every(column => !columnError(column));
 });
 
+
+const groups = coreStore.resource.options.createEditGroups;
+
+const groupedColumns = computed(() => {
+  if (!groups || groups.length === 0) return [];
+
+  return groups.map(group => ({
+    ...group,
+    columns: props.resource.columns.filter(col => group.columns.includes(col.name) && editableColumns.value.includes(col))
+  }));
+});
+
+const getOtherColumns = () => {
+  if (!groups || groups.length === 0) return;
+
+  const groupedColumnNames = new Set(groupedColumns.value.flatMap(group => group.columns.map(col => col.name)));
+  return editableColumns.value.filter(col => !groupedColumnNames.has(col.name));
+};
+
+const otherColumns = getOtherColumns();
+
 watch(() => isValid.value, (value) => {
   emit('update:isValid', value);
 });