@hostlink/nuxt-light 0.0.18 → 0.0.21

package/dist/runtime/components/l-table.vue

@@ -1,16 +1,24 @@
-<script setup>
-import { useQuasar } from 'quasar';
+<script setup lang="ts">
+import { useQuasar, QTable } from 'quasar';
 import { useRoute } from 'vue-router';
-import { ref, computed, onMounted,useSlots } from "vue";
-import { t } from '../light';
+import { ref, computed, onMounted, useSlots, reactive } from "vue";
+import { t, deleteObject, listObject } from '../';
 
 const route = useRoute();
 const module = route.path.split("/")[1];
-const errors = ref([]);
+const errors = ref<InstanceType<any>>([]);
 
 const props = defineProps({
     columns: {
-        type: Array,
+        type: Array<{
+            label: string,
+            name: string,
+            align?: string,
+            sortable?: boolean,
+            searchable?: boolean,
+            searchType?: string,
+            field?: string | Object,
+        }>,
         required: true
     },
     showActions: {
@@ -27,6 +35,7 @@ const props = defineProps({
     },
 })
 
+
 //apply all aligns to the columns 
 props.columns.forEach((col) => {
     if (!col.align) {
@@ -55,7 +64,14 @@ const renderColumns = computed(() => {
     return cols;
 })
 
-const emits = defineEmits(["request"])
+interface LTableRequest {
+    loadData: (model: string, filters: any, fields: Array<any>) => void
+
+}
+
+const emits = defineEmits<{
+    request: [p: LTableRequest]
+}>()
 
 const loading = ref(false);
 
@@ -70,7 +86,7 @@ if (props.showActions && props.showActions instanceof Array) {
 
 
 const pagination = ref({
-    sortBy: null,
+    sortBy: "",
     descending: true,
     page: 1,
     rowsPerPage: 10,
@@ -89,100 +105,136 @@ const hasSearch = computed(() => {
     })
 })
 
-const table = ref(null);
+const table = ref<InstanceType<typeof QTable>>();
 
-const filters = ref({});
-const rows = ref([]);
+const filters = ref<InstanceType<any>>({});
+const rows = ref<InstanceType<any>>([]);
 
 onMounted(() => {
-    table.value.requestServerInteraction();
+    if (table.value) {
+        table.value.requestServerInteraction();
+    }
 })
 
-let primaryKey = ref("");
-const recordName = ref("");
-const onRequest = async (p) => {
+let primaryKey = ref(null);
+const modelName = ref("");
 
-    p.fields = [];
-    props.columns.forEach((col) => {
-        if (col.name.startsWith("_")) {
-            return;
-        }
-        if (p.fields.includes(col.name)) {
-            return;
+
+const validateData = () => {
+    if (props.showActions) {
+        if (props.showActions.includes("edit")) {
+            if (rows.value.length > 0) {
+                //get first row
+                let row = rows.value[0];
+                //check has primary key
+
+                if (!primaryKey.value) {
+                    errors.value.push("[edit] Primary key not found in the data");
+                }
+            }
         }
-        p.fields.push(col.name);
-    });
 
+        if (props.showActions.includes("delete")) {
+            if (rows.value.length > 0) {
+                //get first row
+                let row = rows.value[0];
+                //check has primary key
+
+                if (!row[primaryKey.value]) {
+                    errors.value.push("[delete] Primary key not found in the data");
+                }
+            }
+        }
 
-    if (actionDelete) {
-        p.fields.push("canDelete");
     }
 
-    p.filters = getFilterValue();
+}
 
-    loading.value = true;
-    p.done = (data) => {
-        loading.value = false;
-        rows.value = data.rows;
-        pagination.value.rowsPerPage = p.pagination.rowsPerPage;
-        pagination.value.page = p.pagination.page;
-        pagination.value.sortBy = p.pagination.sortBy;
-        pagination.value.descending = p.pagination.descending;
+const onRequest = async (p: any) => {
 
-        pagination.value = Object.assign(pagination.value, data.pagination);
 
-        pagination.value.rowsNumber = data.total;
+    const callback = {
+        async loadData(model: String, filters: null, fields: Array<any> = []) {
 
+            //
+            let localFields: Array<any> = [];
 
-        primaryKey.value = data.key;
-        recordName.value = data.name;
+            fields.forEach((f) => {
+                localFields.push(f);
+            });
 
+            props.columns.forEach((col) => {
+                if (col.name.startsWith("_")) {
+                    return;
+                }
+                if (localFields.includes(col.name)) {
+                    return;
+                }
+                localFields.push(col.name);
+            });
 
-        if (props.showActions) {
-            if (props.showActions.includes("edit")) {
-                if (rows.value.length > 0) {
-                    //get first row
-                    let row = rows.value[0];
-                    //check has primary key
+            if (actionView) {
+                localFields.push("canView");
+            }
 
-                    if (!row[primaryKey.value]) {
-                        errors.value.push("[edit] Primary key not found in the data");
-                    }
-                }
+            if (actionDelete) {
+                localFields.push("canDelete");
             }
 
-            if (props.showActions.includes("delete")) {
-                if (rows.value.length > 0) {
-                    //get first row
-                    let row = rows.value[0];
-                    //check has primary key
+            if (activeEdit) {
+                localFields.push("canUpdate");
+            }
 
-                    if (!row[primaryKey.value]) {
-                        errors.value.push("[delete] Primary key not found in the data");
-                    }
+
+
+            let localFilters = getFilterValue();
+            //merge the filters
+            if (filters) {
+                localFilters = {
+                    ...localFilters,
+                    ...filters
                 }
             }
 
-        }
 
 
-    }
+            let sort = "";
+            if (p.pagination.sortBy) {
+                sort = p.pagination.sortBy + ":" + (p.pagination.descending ? "desc" : "asc");
+            }
 
-    if (p.pagination.sortBy) {
-        p.sort = p.pagination.sortBy + ":" + (p.pagination.descending ? "desc" : "asc")
-    }
+            loading.value = true;
+            const offset = (p.pagination.page - 1) * p.pagination.rowsPerPage;
+            const limit = p.pagination.rowsPerPage;
+            const allData = await listObject(model, localFilters, sort, offset, limit, localFields);
+
+            rows.value = allData.data;
+
+
+            console.log(allData.meta)
+            //meta
+            primaryKey.value = allData.meta.key;
+            modelName.value = allData.meta.name;
 
-    p.limit = p.pagination.rowsPerPage;
-    p.offset = (p.pagination.page - 1) * p.pagination.rowsPerPage;
 
+            pagination.value.rowsPerPage = p.pagination.rowsPerPage;
+            pagination.value.page = p.pagination.page;
+            pagination.value.sortBy = p.pagination.sortBy;
+            pagination.value.descending = p.pagination.descending;
+            pagination.value.rowsNumber = allData.meta.total;
+            loading.value = false;
+            validateData()
 
+        }
+    }
 
-    emits("request", p);
+    //emits("request", p);
+    emits("request", callback);
 
 }
 
 const getFilterValue = () => {
-    let f = {};
+    let f: any = {};
 
     props.columns.forEach((col) => {
         if (col.searchable) {
@@ -202,24 +254,13 @@ const getFilterValue = () => {
 
             }
         }
-    });/* 
-    Object.entries(filters.value).forEach(([key, value]) => {
-
-
-        f[key] = {
-            contains: value
-        }
-    }) */
-
-
+    });
     return f;
 }
 
 
 const onFilters = () => {
     //clone the filters
-
-
     onRequest({
         pagination: {
             page: 1,
@@ -236,39 +277,22 @@ const ss = Object.entries(slots).map(([key, value]) => {
     return key;
 });
 
-
-/*
-let MyComp = h("div", null, ["abc"])
-
-console.log(MyComp)
- */
-
-
-
-
-
 const qua = useQuasar();
-const onDelete = async (id) => {
+const onDelete = async (id: any) => {
 
     try {
-        await removeObject(recordName.value, id)
-    } catch (e) {
-
+        await deleteObject(modelName.value, id)
+    } catch (e: any) {
         qua.notify({
             message: e.message,
-            color: "negative",
-            icon: "report_problem"
+            color: "negative"
         })
-
-
         return;
-
     }
-
-
     // refresh the table
-    table.value.requestServerInteraction();
-
+    if (table.value) {
+        table.value.requestServerInteraction();
+    }
 }
 
 
@@ -294,9 +318,10 @@ const onDelete = async (id) => {
             <q-td :props="props" auto-width>
                 <div class="text-grey-8">
 
-                    <l-view-btn :to="`/${recordName}/${props.row[primaryKey]}/view`" v-if="actionView"></l-view-btn>
+                    <l-view-btn v-if="actionView && props.row.canView"
+                        :to="`/${modelName}/${props.row[primaryKey]}/view`"></l-view-btn>
 
-                    <l-edit-btn :to="`/${recordName}/${props.row[primaryKey]}/edit`" v-if="activeEdit"></l-edit-btn>
+                    <l-edit-btn :to="`/${modelName}/${props.row[primaryKey]}/edit`" v-if="activeEdit"></l-edit-btn>
 
                     <l-delete-btn v-if="actionDelete && props.row.canDelete"
                         @submit="onDelete(props.row[primaryKey])"></l-delete-btn>

package/dist/runtime/components/l-time-picker.vue

@@ -1,6 +1,16 @@
 <script setup>
 import { computed, ref } from "vue";
-const props = defineProps(["modelValue"]);
+const props = defineProps({
+    modelValue: {
+        type: [String, Object],
+        required: false,
+        default: null
+    }, required: {
+        type: Boolean,
+        default: false
+    }
+});
+
 const emit = defineEmits(["update:modelValue"]);
 const popup = ref(null);
 const localValue = computed({
@@ -9,13 +19,22 @@ const localValue = computed({
         //  popup.value.hide();
         emit('update:modelValue', value)
     }
-
 });
+
+const rules = ["time"];
+if (props.required) {
+    rules.push(val => !!val || 'Required.');
+}
+
+
+
+
+
 </script>
 <template>
-    <q-input v-model="localValue" mask="time" :rules="['time']">
+    <q-input v-model="localValue" mask="time" :rules="rules">
         <template v-slot:prepend>
-            <q-icon name="access_time" class="cursor-pointer">
+            <q-btn icon="sym_o_access_time" round dense flat>
                 <q-popup-proxy cover transition-show="scale" transition-hide="scale" ref="popup">
                     <q-time v-model="localValue" format24h>
                         <div class="row items-center justify-end">
@@ -23,7 +42,7 @@ const localValue = computed({
                         </div>
                     </q-time>
                 </q-popup-proxy>
-            </q-icon>
+            </q-btn>
         </template>
     </q-input>
 </template>

package/dist/runtime/{light.d.ts → index.d.ts}

@@ -4,4 +4,4 @@ interface Light {
     removeError: (error: String) => void;
 }
 export declare function useLight(): Light;
-export { notify, addObject, f, getApiUrl, getCurrentUser, getObject, id, list, listData, login, m, mutation, q, removeObject, t, updateObject, viewAs } from "./lib";
+export { notify, addObject, f, getApiUrl, getCurrentUser, getObject, id, list, listData, login, m, mutation, q, removeObject, t, updateObject, getID, deleteObject, listObject } from "./lib";

package/dist/runtime/{light.mjs → index.mjs}

@@ -32,5 +32,7 @@ export {
   removeObject,
   t,
   updateObject,
-  viewAs
+  getID,
+  deleteObject,
+  listObject
 } from "./lib/index.mjs";

package/dist/runtime/lib/addObject.mjs

@@ -1,7 +1,12 @@
+import { Dialog } from "quasar";
 import m from "./m.mjs";
 export default async (name, data) => {
-  let resp = await m(`add${name}`, {
-    data
-  });
-  return resp.data[`add${name}`];
+  try {
+    return await m(`add${name}`, { data });
+  } catch (e) {
+    Dialog.create({
+      title: "Error",
+      message: e.message
+    });
+  }
 };

package/dist/runtime/lib/deleteObject.d.ts

@@ -0,0 +1 @@
+export default function deleteObject(name: string, id: number): Promise<any>;

package/dist/runtime/lib/deleteObject.mjs

@@ -0,0 +1,12 @@
+import { Dialog } from "quasar";
+import m from "./m.mjs";
+export default async function deleteObject(name, id) {
+  try {
+    return await m(`delete${name}`, { id });
+  } catch (e) {
+    Dialog.create({
+      title: "Error",
+      message: e.message
+    });
+  }
+}

package/dist/runtime/lib/getID.d.ts

@@ -0,0 +1,2 @@
+declare const _default: () => Number;
+export default _default;

package/dist/runtime/lib/getID.mjs

@@ -0,0 +1,13 @@
+import { useRoute } from "vue-router";
+const route = useRoute();
+export default () => {
+  let route2 = useRoute();
+  let name = route2.name?.toString();
+  if (name == void 0)
+    return 0;
+  let parts = name.split("-");
+  const module = parts[0];
+  const moduleLower = module.charAt(0).toLowerCase() + module.slice(1);
+  const keyname = parts[1];
+  return parseInt(route2.params[keyname]);
+};

package/dist/runtime/lib/index.d.ts

@@ -11,8 +11,10 @@ import m from "./m";
 import mutation from "./mutation";
 import q from "./q";
 import removeObject from "./removeObject";
+import deleteObject from "./deleteObject";
 import t from "./t";
 import updateObject from "./updateObject";
-import viewAs from "./viewAs";
+import listObject from "./listObject";
 declare const notify: (message: string, color?: string) => void;
-export { addObject, f, getApiUrl, getCurrentUser, getObject, id, list, listData, login, m, mutation, q, removeObject, t, updateObject, viewAs, notify };
+import getID from "./getID";
+export { addObject, f, getApiUrl, getCurrentUser, getObject, id, list, listData, login, m, mutation, q, removeObject, t, updateObject, notify, getID, deleteObject, listObject };

package/dist/runtime/lib/index.mjs

@@ -12,9 +12,10 @@ import m from "./m.mjs";
 import mutation from "./mutation.mjs";
 import q from "./q.mjs";
 import removeObject from "./removeObject.mjs";
+import deleteObject from "./deleteObject.mjs";
 import t from "./t.mjs";
 import updateObject from "./updateObject.mjs";
-import viewAs from "./viewAs.mjs";
+import listObject from "./listObject.mjs";
 const notify = function(message, color = "green") {
   Notify.create({
     message,
@@ -22,4 +23,5 @@ const notify = function(message, color = "green") {
     position: "top"
   });
 };
-export { addObject, f, getApiUrl, getCurrentUser, getObject, id, list, listData, login, m, mutation, q, removeObject, t, updateObject, viewAs, notify };
+import getID from "./getID.mjs";
+export { addObject, f, getApiUrl, getCurrentUser, getObject, id, list, listData, login, m, mutation, q, removeObject, t, updateObject, notify, getID, deleteObject, listObject };

package/dist/runtime/lib/listObject.d.ts

@@ -0,0 +1 @@
+export default function listObject(name: string, filters: {} | undefined, sort: String, offset: number, limit: number, fields?: Array<string>): Promise<any>;

package/dist/runtime/lib/listObject.mjs

@@ -0,0 +1,19 @@
+import q from "./q.mjs";
+import f from "./f.mjs";
+export default async function listObject(name, filters = {}, sort, offset, limit, fields = []) {
+  let offset_limit = {};
+  if (offset) {
+    offset_limit.offset = offset;
+  }
+  if (limit) {
+    offset_limit.limit = limit;
+  }
+  let params = {};
+  if (sort) {
+    params.sort = sort;
+  }
+  if (filters) {
+    params.filters = filters;
+  }
+  return await q(`list${name}`, params, [f("data", offset_limit, fields), f("meta", ["total", "key", "name"])]);
+}

package/dist/runtime/lib/login.d.ts

@@ -1,2 +1,2 @@
-declare const _default: (username: string, password: string) => Promise<boolean>;
+declare const _default: (username: string, password: string, code?: string) => Promise<boolean>;
 export default _default;

package/dist/runtime/lib/login.mjs

@@ -1,8 +1,9 @@
 import m from "./m.mjs";
-export default async (username, password) => {
+export default async (username, password, code) => {
   await m("login", {
     username,
-    password
+    password,
+    code
   });
   return true;
 };

package/dist/runtime/lib/m.d.ts

@@ -1 +1 @@
-export default function (operation: any, args: any, fields?: never[]): Promise<any>;
+export default function (operation: string, args: any, fields?: never[]): Promise<any>;

package/dist/runtime/lib/m.mjs

@@ -4,7 +4,11 @@ export default async function(operation, args, fields = []) {
   const mutation = {
     mutation: {}
   };
-  mutation.mutation[operation] = {};
+  if (arguments.length == 1) {
+    mutation.mutation[operation] = true;
+  } else {
+    mutation.mutation[operation] = {};
+  }
   if (args) {
     mutation.mutation[operation].__args = args;
   }

package/dist/runtime/lib/removeObject.mjs

@@ -1,15 +1,12 @@
-import { useQuasar } from "quasar";
+import { Dialog } from "quasar";
 import m from "./m.mjs";
-const qua = useQuasar();
 export default async function removeObject(name, id) {
-  let { data } = await m(`remove${name}`, { id });
-  let result = data[`remove${name}`];
-  if (result.errors) {
-    qua.dialog({
+  try {
+    return await m(`remove${name}`, { id });
+  } catch (e) {
+    Dialog.create({
       title: "Error",
-      message: result.errors[0].message
+      message: e.message
     });
-    throw new Error(result.errors[0].message);
   }
-  return result;
 }

package/dist/runtime/lib/updateObject.mjs

@@ -1,11 +1,12 @@
 import m from "./m.mjs";
+import { Dialog } from "quasar";
 export default async (name, id, data) => {
-  let resp = await m(`update${name}`, {
-    id,
-    data
-  });
-  if (resp.errors) {
-    throw new Error(resp.errors[0].message);
+  try {
+    return await m(`update${name}`, { id, data });
+  } catch (e) {
+    Dialog.create({
+      title: "Error",
+      message: e.message
+    });
   }
-  return resp.data[`update${name}`];
 };

package/dist/runtime/pages/EventLog/_eventlog_id/view.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { getObject } from "../../../light"
+import { getObject } from "../../../"
 const obj = await getObject(["eventlog_id", "class", "id", "action", "created_time", "username"]);
 </script>
 <template>

package/dist/runtime/pages/EventLog/index.vue

@@ -1,10 +1,4 @@
 <script setup>
-import { listData } from "../../light"
-
-const onRequest = async (params) => {
-    listData("EventLog", params, ["canRead"]);
-};
-
 const columns = [
     {
         label: "EventLog ID",
@@ -42,16 +36,14 @@ const columns = [
         sortable: true,
         searchable: true,
     }
-
-
-
 ]
 
 </script>
 
 <template>
     <l-page>
-        <l-table @request="onRequest" :columns="columns" sort-by="eventlog_id:desc" :show-actions="['view']">
+        <l-table @request="$event.loadData('EventLog')" :columns="columns" sort-by="eventlog_id:desc"
+            :show-actions="['view']">
 
         </l-table>
     </l-page>

package/dist/runtime/pages/MailLog/index.vue

@@ -1,9 +1,4 @@
 <script setup>
-import { listData } from "../../light"
-const onRequest = async (params) => {
-    listData("MailLog", params, ["body"]);
-};
-
 const columns = [
     {
         label: "ID",
@@ -33,7 +28,6 @@ const columns = [
         sortable: true,
         searchable: true,
         searchType: "date",
-
     }
 ]
 
@@ -41,8 +35,8 @@ const columns = [
 
 <template>
     <l-page>
-        <l-table @request="onRequest" :columns="columns" sort-by="maillog_id:desc">
-            
+        <l-table @request="$event.loadData('MailLog', null, ['body'])" :columns="columns" sort-by="maillog_id:desc">
+
 
         </l-table>
     </l-page>