adminforth 1.1.65 → 1.1.67

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

@@ -1,21 +1,38 @@
 <template>
   <div class="relative">
+    <component 
+      v-for="c in coreStore?.resourceOptions?.pageInjections?.show?.beforeBreadcrumbs || []"
+      :is="getCustomComponent(c)"
+      :meta="c.meta"
+      :record="coreStore.record"
+      :resource="coreStore.resource"
+      :adminUser="coreStore.adminUser"
+    />
     <BreadcrumbsWithButtons>
-      <RouterLink :to="{ name: 'resource-edit', params: { resourceId: $route.params.resourceId, primaryKey: $route.params.primaryKey } }" 
-        class="flex items-center py-1 px-3 me-2 mb-2 text-sm font-medium text-gray-900 focus:outline-none bg-white rounded border border-gray-300 hover:bg-gray-100 hover:text-blue-700 focus:z-10 focus:ring-4 focus:ring-gray-100 dark:focus:ring-gray-700 dark:bg-gray-800 dark:text-gray-400 dark:border-gray-600 dark:hover:text-white dark:hover:bg-gray-700"
+      <RouterLink v-if="coreStore?.resourceOptions?.allowedActions?.edit" :to="{ name: 'resource-edit', params: { resourceId: $route.params.resourceId, primaryKey: $route.params.primaryKey } }" 
+        class="flex items-center py-1 px-3 text-sm font-medium text-gray-900 focus:outline-none bg-white rounded-default border border-gray-300 hover:bg-gray-100 hover:text-blue-700 focus:z-10 focus:ring-4 focus:ring-gray-100 dark:focus:ring-gray-700 dark:bg-gray-800 dark:text-gray-400 dark:border-gray-600 dark:hover:text-white dark:hover:bg-gray-700"
       >
         <IconPenSolid class="w-4 h-4" />
         Edit
       </RouterLink>
 
-      <button  @click="deleteRecord"
-        class="flex items-center py-1 px-3 mb-2 text-sm font-medium text-red-600 focus:outline-none bg-white rounded border border-gray-300 hover:bg-gray-100 hover:text-red-700 focus:z-10 focus:ring-4 focus:ring-gray-100 dark:focus:ring-gray-700 dark:bg-gray-800 dark:text-red-500 dark:border-gray-600 dark:hover:text-white dark:hover:bg-gray-700"
+      <button v-if="coreStore?.resourceOptions?.allowedActions?.delete"  @click="deleteRecord"
+        class="flex items-center py-1 px-3 text-sm font-medium rounded-default text-red-600 focus:outline-none bg-white  border border-gray-300 hover:bg-gray-100 hover:text-red-700 focus:z-10 focus:ring-4 focus:ring-gray-100 dark:focus:ring-gray-700 dark:bg-gray-800 dark:text-red-500 dark:border-gray-600 dark:hover:text-white dark:hover:bg-gray-700"
       >
         <IconTrashBinSolid class="w-4 h-4" />
         Delete
       </button>
     </BreadcrumbsWithButtons>
 
+    <component 
+      v-for="c in coreStore?.resourceOptions?.pageInjections?.show?.afterBreadcrumbs || []"
+      :is="getCustomComponent(c)"
+      :meta="c.meta"
+      :record="coreStore.record"
+      :resource="coreStore.resource"
+      :adminUser="coreStore.adminUser"
+    />
+
     <div v-if="loading" role="status" class="max-w-sm animate-pulse">
         <div class="h-2.5 bg-gray-200 rounded-full dark:bg-gray-700 w-48 mb-4"></div>
         <div class="h-2 bg-gray-200 rounded-full dark:bg-gray-700 max-w-[360px] mb-2.5"></div>
@@ -29,7 +46,7 @@
       v-else
       class="relative overflow-x-auto shadow-resourse-form-shadow "
     >
-     <table class="w-full text-sm text-left rtl:text-right text-gray-500 dark:text-gray-400">
+     <table class="w-full text-sm text-left rtl:text-right text-gray-500 dark:text-gray-400 rounded-default">
         <thead class="text-xs text-gray-700 uppercase bg-form-view-heading dark:bg-gray-700 dark:text-gray-400">
             <tr>
                 <th scope="col" class="px-6 py-3">
@@ -41,23 +58,49 @@
             </tr>
         </thead>
         <tbody>
-            <tr v-for="column in coreStore.resourceColumns?.filter(c => c.showIn.includes('show'))" :key="column.name"
+            <tr v-for="column in coreStore.resource?.columns.filter(c => c.showIn.includes('show'))" :key="column.name"
                 class="bg-form-view-bg odd:dark:bg-gray-900  even:dark:bg-gray-800 border-b  dark:border-gray-700"
             >
-                <td class="px-6 py-4 whitespace-nowrap">
-                    {{ column.label }}
+              <component
+                v-if="column.components?.showRow"
+                  :is="getCustomComponent(column.components.showRow)"
+                  :meta="column.components.showRow.meta"
+                  :column="column"
+                  :resource="coreStore.resource"
+                  :record="coreStore.record"
+              />
+              <template v-else>
+                <td class="px-6 py-4 whitespace-nowrap "> <!--align-top-->
+                  {{ column.label }}
                 </td>
                 <td class="px-6 py-4 whitespace-nowrap whitespace-pre-wrap">
-                    <component
-                        :is="showComponentsPerColumn[column.name] || ValueRenderer"
-                        :column="column"
-                        :row="coreStore.record"
-                    />
+                  <component
+                    v-if="showComponentsPerColumn[column.name]"
+                    :is="showComponentsPerColumn[column.name]"
+                    :resource="coreStore.resource"
+                    :meta="column.components.show.meta"
+                    :column="column"
+                    :record="coreStore.record"
+                  />
+                  <ValueRenderer v-else 
+                    :column="column" 
+                    :record="coreStore.record"
+                  />
                 </td>
+              </template>
             </tr>
-            
         </tbody>
     </table>
+
+    <component 
+      v-for="c in coreStore?.resourceOptions?.pageInjections?.show?.bottom || []"
+      :is="getCustomComponent(c)"
+      :meta="c.meta"
+      :column="column"
+      :record="coreStore.record"
+      :resource="coreStore.resource"
+      :adminUser="coreStore.adminUser"
+    />
 </div>
 
 
@@ -68,37 +111,78 @@
 <script setup>
 
 import BreadcrumbsWithButtons from '@/components/BreadcrumbsWithButtons.vue';
+
 import ValueRenderer from '@/components/ValueRenderer.vue';
 import { useCoreStore } from '@/stores/core';
-import { getCustomComponent } from '@/utils';
+import { useModalStore } from '@/stores/modal';
+import { getCustomComponent, checkAcessByAllowedActions } from '@/utils';
 import { IconPenSolid, IconTrashBinSolid } from '@iconify-prerendered/vue-flowbite';
 import { onMounted, ref } from 'vue';
-import { useRoute } from 'vue-router';
+import { useRoute,useRouter } from 'vue-router';
+import {callAdminForthApi} from '@/utils';
+import {showSuccesTost} from '@/composables/useFrontendApi';
 
 
 const item = ref(null);
 const route = useRoute();
+const router = useRouter();
 const loading = ref(false);
 let showComponentsPerColumn = {};
 
+console.log(route.params,'showWiev');
+
+
 const coreStore = useCoreStore();
+const modalStore = useModalStore();
 
 onMounted(async () => {
   loading.value = true;
-  await coreStore.fetchColumns({
+  await coreStore.fetchResourceFull({
     resourceId: route.params.resourceId
   });
   await coreStore.fetchRecord({
     resourceId: route.params.resourceId, 
     primaryKey: route.params.primaryKey,
   });
-  showComponentsPerColumn = coreStore.resourceColumns.reduce((acc, column) => {
-      if (column.component?.show) {
-          acc[column.name] = getCustomComponent(column.component.show);
+  checkAcessByAllowedActions(coreStore.resourceOptions.allowedActions,'show');
+
+  showComponentsPerColumn = coreStore.resource.columns.reduce((acc, column) => {
+      if (column.components?.show) {
+          acc[column.name] = getCustomComponent(column.components.show);
       }
       return acc;
-    }, {});
+  }, {});
   loading.value = false;
 });
 
+async function deleteRecord(row) {
+  const data = await window.adminforth.confirm({
+    message: 'Are you sure you want to delete this item?',
+    yes: 'Delete',
+    no: 'Cancel',
+  });
+  if (data) {
+    try {
+      const res = await callAdminForthApi({
+      path: '/delete_record',
+      method: 'POST',
+      body: {
+        resourceId: route.params.resourceId,
+        primaryKey: route.params.primaryKey,
+      }});
+      if (!res.error){
+        router.push({ name: 'resource-list', params: { resourceId: route.params.resourceId } });
+        showSuccesTost('Record deleted successfully')
+      } else {
+        console.error(res.error)
+      }
+
+    } catch (e) {
+      console.error(e);
+      };
+    }
+
+    
+}
+
 </script>

package/dist/spa/tailwind.config.js

@@ -1,6 +1,6 @@
 /** @type {import('tailwindcss').Config} */
 export default {
-  content:  ["./src/**/*.{vue, js}","./src/*.{vue, js}", "./index.html", "./node_modules/flowbite/**/*.js"],
+  content:  ["./src/**/*.{vue, js, ts, tsx}","./src/*.{vue, js, ts, tsx}", "./index.html", "./node_modules/flowbite/**/*.js"],
   theme: {
     extend: {
       /* IMPORTANT:ADMINFORTH TAILWIND STYLES */

package/dist/spa/vite.config.ts

@@ -11,6 +11,12 @@ const customLogger = {
       console.log(msg);
     }
   },
+  warnOnce(msg: string) {
+    console.warn('warn once', msg);
+    if (!this.hasWarned) {
+      this.hasWarned = true;
+    }
+  },
   warn(msg: string) {
     console.warn(msg);
   },

package/index.ts

@@ -19,6 +19,7 @@ import { AdminForthConfig, AdminForthClass, AdminForthComponentDeclaration, Admi
   AllowedActionsEnum,
   AllowedActions,
   ActionCheckSource,
+  AdminForthDataSourceConnector,
 } from './types/AdminForthConfig.js';
 import path from 'path';
 import AdminForthPlugin from './plugins/base.js';
@@ -45,7 +46,7 @@ class AdminForth implements AdminForthClass {
   express: ExpressServer;
   auth: AdminForthAuth;
   codeInjector: CodeInjector;
-  connectors: any;
+  connectors;
   connectorClasses: any;
   runningHotReload: boolean;
   activatedPlugins: Array<AdminForthPlugin>;
@@ -496,7 +497,7 @@ class AdminForth implements AdminForthClass {
       if (!this.config.databaseConnectors[dbType]) {
         throw new Error(`Database type ${dbType} is not supported, consider using databaseConnectors in AdminForth config`);
       }
-      this.connectors[ds.id] = new this.config.databaseConnectors[dbType]({url: ds.url});
+      this.connectors[ds.id] = new this.config.databaseConnectors[dbType]({url: ds.url});  
     });
 
     await Promise.all(this.config.resources.map(async (res) => {
@@ -625,7 +626,7 @@ class AdminForth implements AdminForthClass {
         const { username, password } = body;
         let token;
         if (username === this.config.rootUser.username && password === this.config.rootUser.password) {
-          token = this.auth.issueJWT({ username, pk: null  });
+          this.auth.setAuthCookie({ response, username, pk: null });
         } else {
           // get resource from db
           if (!this.config.auth) {
@@ -663,15 +664,11 @@ class AdminForth implements AdminForthClass {
           console.log('User record', userRecord, passwordHash)  // why does it has no hash?
           const valid = await AdminForthAuth.verifyPassword(password, passwordHash);
           if (valid) {
-            token = this.auth.issueJWT({ 
-              username, pk: userRecord[userResource.columns.find((col) => col.primaryKey).name]
-            });
+            this.auth.setAuthCookie({ response, username, pk: userRecord[userResource.columns.find((col) => col.primaryKey).name] });
           } else {
             return { error: INVALID_MESSAGE };
           }
         }
-
-        response.setHeader('Set-Cookie', `adminforth_jwt=${token}; Path=${this.config.baseUrl || '/'}; HttpOnly; SameSite=Strict`);
         return { ok: true };
       },
     });
@@ -689,7 +686,7 @@ class AdminForth implements AdminForthClass {
         method: 'POST',
         path: '/logout',
         handler: async ({ response }) => {
-          response.setHeader('Set-Cookie', `adminforth_jwt=; Path=${this.config.baseUrl || '/'}; HttpOnly; SameSite=Strict; Expires=Thu, 01 Jan 1970 00:00:00 GMT`);
+          this.auth.removeAuthCookie({ response });
           return { ok: true };
         },
     })
@@ -725,10 +722,8 @@ class AdminForth implements AdminForthClass {
         let userFullName = ''
         if (adminUser.isRoot) {
             username = this.config.rootUser.username;
-            console.log(username, 'this is the root')
         } else {
             const dbUser = adminUser.dbUser;
-            console.log(dbUser,'this is the db user',adminUser,'this is the admin user')
             username = dbUser[this.config.auth.usernameField]; 
             userFullName =dbUser[this.config.auth.userFullNameField];
         }
@@ -1172,7 +1167,7 @@ class AdminForth implements AdminForthClass {
             
             // execute hook if needed
             for (const hook of listify(resource.hooks?.edit?.afterSave as AfterSaveFunction[])) {
-              const resp = await hook({ resource, record, adminUser });
+              const resp = await hook({ resource, record, adminUser, oldRecord });
               if (!resp || (!resp.ok && !resp.error)) {
                 throw new Error(`Hook afterSave must return object with {ok: true} or { error: 'Error' } `);
               }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adminforth",
-  "version": "1.1.65",
+  "version": "1.1.67",
   "description": "OpenSource Vue3 powered forth-generation admin panel",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/plugins/AuditLogPlugin/custom/AuditLogView.vue

@@ -2,19 +2,20 @@
 import VueDiff from 'vue-diff';
 import { ref } from 'vue';
 import 'vue-diff/dist/index.css';
-
-const props = defineProps(['prev', 'current', 'meta']);
+import { app } from '@/main';
 
 app.use(VueDiff);
+
+const props = defineProps(['column', 'record', 'meta', 'resource', 'adminUser']);
 </script>
 
 <template>
     <Diff
       :mode="'split'"
       :theme="'light'"
-      :language="'plaintext'"
-      :prev="props.prev"
-      :current="props.current"
+      :language="'JSON'"
+      :prev="JSON.stringify(JSON.parse(props.record[props.meta.resourceColumns.resourceDataColumnName]).oldRecord, null, 2)"
+      :current="JSON.stringify(JSON.parse(props.record[props.meta.resourceColumns.resourceDataColumnName]).newRecord, null, 2)"
     />
-  </template>
+</template>
   

package/plugins/AuditLogPlugin/index.ts

@@ -4,7 +4,9 @@ import {
   AllowedActionsEnum,
   BeforeSaveFunction,
   AdminUser,
-  AdminForthDataTypes
+  AdminForthDataTypes,
+  AdminForthResourcePages,
+  AdminForthFilterOperators
 } from "../../types/AdminForthConfig.js";
 import AdminForthPlugin from "../base.js";
 import { PluginOptions } from "./types.js";
@@ -24,19 +26,25 @@ export default class AuditLogPlugin extends AdminForthPlugin {
 
   static defaultError = 'Sorry, you do not have access to this resource.'
 
-  createLogRecord = async (resource: AdminForthResource, action: AllowedActionsEnum, data: Object, user: AdminUser) => {
+  createLogRecord = async (resource: AdminForthResource, action: AllowedActionsEnum, data: Object, user: AdminUser, oldRecord: Object) => {
     const recordIdFieldName = resource.columns.find((c) => c.primaryKey === true)?.name;
-    const recordId = data[recordIdFieldName];
+    const recordId = data?.[recordIdFieldName] || oldRecord?.[recordIdFieldName];
+    const connector = this.adminforth.connectors[resource.dataSource];
+    const newRecord = await connector.getRecordByPrimaryKey(resource, recordId);
+
+    let newData = {
+        'oldRecord': oldRecord || {},
+        'newRecord': newRecord
+    }
     const record = {
       [this.options.resourceColumns.resourceIdColumnName]: resource.resourceId,
       [this.options.resourceColumns.resourceActionColumnName]: action,
-      [this.options.resourceColumns.resourceDataColumnName]: data,
+      [this.options.resourceColumns.resourceDataColumnName]: newData,
       [this.options.resourceColumns.resourceUserIdColumnName]: user.pk,
       [this.options.resourceColumns.resourceRecordIdColumnName]: recordId,
       [this.options.resourceColumns.resourceCreatedColumnName]: new Date()
     }
     const auditLogResource = this.adminforth.config.resources.find((r) => r.resourceId === this.auditLogResource);
-    console.log('rec', record);
     await this.adminforth.createResourceRecord({ resource: auditLogResource, record, adminUser: user});
     return {ok: true};
   }
@@ -60,9 +68,9 @@ export default class AuditLogPlugin extends AdminForthPlugin {
             // type: AdminForthDataTypes.STRING
           }
         }
-      
+
         diffColumn.components = {
-          showRow: { 
+          show: { 
             file: this.componentPath('AuditLogView.vue'),
             meta: {
               ...this.options, 
@@ -70,14 +78,13 @@ export default class AuditLogPlugin extends AdminForthPlugin {
             }
           }
         }
-        resource.columns.push(diffColumn);
         return;
       }
 
       const defaultHooks = {
-        create: { beforeSave: [] },
-        edit: { beforeSave: [] },
-        delete: { beforeSave: [] }
+        create: { afterSave: [] },
+        edit: { afterSave: [] },
+        delete: { afterSave: [] }
       }
 
       if ( !resource.hooks ) {
@@ -87,11 +94,11 @@ export default class AuditLogPlugin extends AdminForthPlugin {
       }
 
       Object.keys(resource.hooks).forEach((hook) => {
-        if(!Array.isArray(resource.hooks[hook].beforeSave)){
-          resource.hooks[hook].beforeSave = [resource.hooks[hook].beforeSave]
+        if(!Array.isArray(resource.hooks[hook].afterSave)){
+          resource.hooks[hook].afterSave = [resource.hooks[hook].afterSave]
         }
-        resource.hooks[hook].beforeSave.push(async ({resource, record, adminUser}) => {
-          return await this.createLogRecord(resource, hook as AllowedActionsEnum, record, adminUser)
+        resource.hooks[hook].afterSave.push(async ({resource, record, adminUser, oldRecord}) => {
+          return await this.createLogRecord(resource, hook as AllowedActionsEnum, record, adminUser, oldRecord)
         })
       })
     })

package/servers/express.ts

@@ -157,7 +157,7 @@ class ExpressServer implements ExpressHttpServer {
         res.status(401).send('Unauthorized by AdminForth');
         return
       }
-      const adminforthUser = await this.adminforth.auth.verify(jwt);
+      const adminforthUser = await this.adminforth.auth.verify(jwt, 'auth');
       if (!adminforthUser) {
         res.status(401).send('Unauthorized by AdminForth');
       } else {

package/spa/src/App.vue

@@ -163,7 +163,7 @@
 </style>
 
 <script setup lang="ts">
-import { computed, onMounted, ref, watch, defineComponent } from 'vue';
+import { computed, onMounted, ref, watch, defineComponent, onBeforeMount } from 'vue';
 import { RouterLink, RouterView } from 'vue-router';
 import { initFlowbite } from 'flowbite'
 import './index.scss'
@@ -211,6 +211,8 @@ const theme = ref('light');
 function toggleTheme() {
   theme.value = theme.value === 'light' ? 'dark' : 'light';
   document.documentElement.classList.toggle('dark');
+  window.localStorage.setItem('theme', theme.value);
+
 }
 
 function clickOnMenuItem (label: string) {
@@ -237,14 +239,8 @@ async function initRouter() {
 }
 
 async function loadMenu() {
-  await coreStore.fetchMenuAndResource()
+  await coreStore.fetchMenuAndResource();
   loginRedirectCheckIsReady.value = true;
-  
-  coreStore.menu.forEach((item, i) => {
-    if (item.open) {
-      opened.value.push(i);
-    }
-  });
 }
 
 
@@ -256,16 +252,32 @@ watch(route, () => {
   })
 });
 
+watch (()=>coreStore.menu, () => {
+    coreStore.menu.forEach((item, i) => {
+    if (item.open) {
+      opened.value.push(i);
+    };
+  });
+})
+
+watch([loggedIn,  routerIsReady, loginRedirectCheckIsReady], ([l,r,lr]) => {
+  if (l && r && lr) {
+    setTimeout(() => {
+    initFlowbite();
+  }); 
+  }
+})
+
 // initialize components based on data attribute selectors
 onMounted(async () => {
   loadMenu(); // run this in async mode
   // before init flowbite we have to wait router initialized because it affects dom(our v-ifs) and fetch menu
   await initRouter()
-  setTimeout(() => {
-    initFlowbite();
-  }); 
-
+})
 
+onBeforeMount(()=>{
+  theme.value = window.localStorage.getItem('theme') || 'light';
+  document.documentElement.classList.toggle('dark', theme.value === 'dark');
 })
 
 </script>

package/spa/src/composables/useStores.ts

@@ -1,4 +1,5 @@
-import type { FrontendAPIInterface, ConfirmParams, AlertParams, FilterParams,Operator } from '../types/FrontendAPI';
+import type { FrontendAPIInterface, ConfirmParams, AlertParams, } from '../types/FrontendAPI';
+import type { AdminForthFilterOperators } from '@/types/AdminForthConfig';
 import { useToastStore } from '../stores/toast';
 import { useModalStore } from '../stores/modal';
 import { useCoreStore } from '@/stores/core';
@@ -6,9 +7,20 @@ import { useFiltersStore } from '@/stores/filters';
 import router from '@/router'
 import type { AdminForthResourceColumn } from '@/types/AdminForthConfig';
 
-
-
-
+ type FilterParams = {
+  /**
+   * Field of resource to filter
+   */
+  field: string;
+  /**
+   * Operator of filter
+   */
+  operator: AdminForthFilterOperators;
+  /**
+   * Value of filter
+   */
+  value: string | number | boolean ;
+}
 
 declare global {
   interface Window {

package/spa/src/main.ts

@@ -6,7 +6,7 @@ import { createPinia } from 'pinia'
 import App from './App.vue'
 import router from './router'
 
-const app = createApp(App)
+export const app = createApp(App)
 /* IMPORTANT:ADMINFORTH COMPONENT REGISTRATIONS */
 
  

package/types/AdminForthConfig.ts

@@ -77,6 +77,17 @@ export interface ExpressHttpServer extends GenericHttpServer {
   authorize(callable: Function): void;
 }
 
+export interface AdminForthDataSourceConnector {
+  
+  /**
+   * Function which will be called to fetch record from database.
+   */
+  getRecordByPrimaryKey(resource: AdminForthResource, recordId: string): Promise<any>;
+}
+
+export interface AdminForthDataSourceConnectorConstructor {
+  new ({ url }: { url: string }): AdminForthDataSourceConnector;
+}
 
 export interface AdminForthClass {
   config: AdminForthConfig;
@@ -84,14 +95,15 @@ export interface AdminForthClass {
   express: GenericHttpServer;
 
   connectors: {
-    [key: string]: AdminForthDataSource
+    [key: string]: AdminForthDataSourceConnector,
   };
 
   createResourceRecord(params: { resource: AdminForthResource, record: any, adminUser: AdminUser }): Promise<any>;
 
   auth: {
+    verify(jwt : string, mustHaveType: string): Promise<any>;
 
-    verify(jwt : string): Promise<any>;
+    issueJWT(payload: Object, type: string): string;
   }
 
   /**
@@ -534,11 +546,11 @@ export type AdminForthResource = {
     },
     options?: {
       bulkActions?: Array<{
+        id?: string,
         label: string,
         state: string,
         icon?: string,
         action: Function,
-        id?: string,
         confirm?: string,
       }>,
       allowedActions?: AllowedActions,
@@ -715,7 +727,9 @@ export type AdminForthConfig = {
      * If you want use custom DataSource which is not supported by AdminForth yet, you can define it's class here
      * 
      */
-    databaseConnectors?: any,  // TODO Define interface for database connector
+    databaseConnectors?: {
+        [key: string]: AdminForthDataSourceConnectorConstructor,
+    }, 
 
     /**
      * List of data sources which will be used to fetch data for resources.

package/types/FrontendAPI.ts

@@ -99,20 +99,7 @@ export type AlertParams = {
     
 }
 
-export type FilterParams = {
-    /**
-     * Field of resource to filter
-     */
-    field: string;
-    /**
-     * Operator of filter
-     */
-    operator: Operator;
-    /**
-     * Value of filter
-     */
-    value: string | number | boolean ;
-}
+
 
 export enum AlertVariant {
     danger = 'danger',
@@ -121,7 +108,6 @@ export enum AlertVariant {
     info = 'info'
   }
 
-export type Operator = 'in' | 'ilike' | 'gte' | 'lte'  ;