@hostlink/nuxt-light 0.0.104 → 0.0.106

package/dist/module.json

@@ -1,5 +1,5 @@
 {
   "name": "light",
   "configKey": "light",
-  "version": "0.0.104"
+  "version": "0.0.106"
 }

package/dist/runtime/components/l-audit-card.vue

@@ -11,10 +11,10 @@ defineProps({
 <template>
     <l-card title="Audit info">
         <l-list>
-            <l-item label="Created time">{{ modelValue.createdTime }}</l-item>
-            <l-item label="Created by">{{ modelValue.createdBy }}</l-item>
-            <l-item label="Updated time">{{ modelValue.updatedTime }}</l-item>
-            <l-item label="Updated by">{{ modelValue.updateBy }}</l-item>
+            <l-item label="Created time" v-if="modelValue.createdTime">{{ modelValue.createdTime }}</l-item>
+            <l-item label="Created by" v-if="modelValue.createdBy">{{ modelValue.createdBy }}</l-item>
+            <l-item label="Updated time" v-if="modelValue.updatedTime">{{ modelValue.updatedTime }}</l-item>
+            <l-item label="Updated by" v-if="modelValue.updatedBy">{{ modelValue.updatedBy }}</l-item>
         </l-list>
     </l-card>
 </template>

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

@@ -1,8 +1,8 @@
 <script setup>
 import { ref } from "vue";
 import { useRouter, useRoute } from "vue-router";
-import { useQuasar } from "quasar";
-import { addObject, updateObject } from '../';
+import { Dialog } from "quasar";
+import { model } from "@hostlink/light"
 
 const route = useRoute();
 const router = useRouter();
@@ -32,7 +32,6 @@ const props = defineProps({
 
 const loading = ref(false)
 
-const que = useQuasar();
 const emit = defineEmits(["save", "submit"]);
 const save = async () => {
 
@@ -44,37 +43,30 @@ const save = async () => {
         emit('submit');
     }
 
-
-
     if (props.modelValue) {
         const [module, id_name] = route.name.split("-");
 
-
-        if (route.params[id_name]) {//edit
-
-
-
-            try {
-                if (await updateObject(module, parseInt(route.params[id_name]), props.modelValue)) {
+        try {
+            if (route.params[id_name]) {//edit
+                if (await model(module).update(parseInt(route.params[id_name]), props.modelValue)) {
+                    router.push(`/${module}`);
+                    return;
+                }
+            } else {
+                if (await model(module).add(props.modelValue)) {
                     router.push(`/${module}`);
                     return;
                 }
-            } catch (e) {
-                //show error
-                que.dialog({
-                    title: "Error",
-                    message: e.message,
-                    ok: "OK"
-                });
-
-            }
-        } else { // add
-            if (await addObject(module, props.modelValue)) {
-                router.push(`/${module}`);
-                return;
             }
+        } catch (e) {
+            Dialog.create({
+                title: "Error",
+                message: e.message,
+                ok: "OK"
+            });
         }
     }
+
     loading.value = false
 }
 const onSubmit = (e) => {

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

@@ -1,7 +1,7 @@
 <script setup>
 import { useHead, useLight } from "#imports";
 import { useRouter, useRoute } from "vue-router"
-import { removeObject, getID } from '../'
+import { model, getID } from '../'
 
 const router = useRouter();
 const route = useRoute();
@@ -80,7 +80,7 @@ title = title.trim()
 const module = route.path.split("/")[1];
 const onDelete = async () => {
 
-    if (await removeObject(module, getID())) {
+    if (await model(module).delete(getID())) {
         router.push(`/${module}`);
     }
 }

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

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { useQuasar, QTable, is } from 'quasar';
 import { ref, computed, onMounted, useSlots, useAttrs } from "vue";
-import { t, deleteObject, q, useLight, GQLFieldBuilder } from '../';
+import { t, q, useLight, GQLFieldBuilder, model } from '../';
 import { toQuery } from '@hostlink/light';
 
 const errors = ref<InstanceType<any>>([]);
@@ -436,7 +436,7 @@ const qua = useQuasar();
 const onDelete = async (id: any) => {
 
     try {
-        await deleteObject(modelName.value, id)
+        await model(modelName.value).delete(id);
     } catch (e: any) {
         qua.notify({
             message: e.message,

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

@@ -1,4 +1,3 @@
-import addObject from "./addObject";
 import f from "./f";
 import getApiUrl from "./getApiUrl";
 import getCurrentUser from "./getCurrentUser";
@@ -6,8 +5,6 @@ import getObject from "./getObject";
 import list from "./list";
 import m from "./m";
 import q from "./q";
-import removeObject from "./removeObject";
-import deleteObject from "./deleteObject";
 import t from "./t";
 import updateObject from "./updateObject";
 import listObject from "./listObject";
@@ -23,4 +20,4 @@ declare const notify: (message: string, color?: string) => void;
 import getID from "./getID";
 declare const getApiBase: () => {};
 import { getGQLFields } from '@hostlink/light';
-export { addObject, f, getApiUrl, getCurrentUser, getObject, list, m, q, removeObject, t, updateObject, notify, getID, deleteObject, listObject, isGranted, getApiBase, loadObject, GQLFieldBuilder, getModelField, getModelFields, getModelColumns, getGQLFields, sv, model };
+export { f, getApiUrl, getCurrentUser, getObject, list, m, q, t, updateObject, notify, getID, listObject, isGranted, getApiBase, loadObject, GQLFieldBuilder, getModelField, getModelFields, getModelColumns, getGQLFields, sv, model };

package/dist/runtime/lib/index.mjs

@@ -1,6 +1,5 @@
 import { useRuntimeConfig } from "nuxt/app";
 import { Notify } from "quasar";
-import addObject from "./addObject.mjs";
 import f from "./f.mjs";
 import getApiUrl from "./getApiUrl.mjs";
 import getCurrentUser from "./getCurrentUser.mjs";
@@ -8,8 +7,6 @@ import getObject from "./getObject.mjs";
 import list from "./list.mjs";
 import m from "./m.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 listObject from "./listObject.mjs";
@@ -35,7 +32,6 @@ const getApiBase = () => {
 };
 import { getGQLFields } from "@hostlink/light";
 export {
-  addObject,
   f,
   getApiUrl,
   getCurrentUser,
@@ -43,12 +39,10 @@ export {
   list,
   m,
   q,
-  removeObject,
   t,
   updateObject,
   notify,
   getID,
-  deleteObject,
   listObject,
   isGranted,
   getApiBase,

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

@@ -1,4 +1,4 @@
-import { Fields } from "@hostlink/light";
+import { type Fields } from "@hostlink/light";
 export default function list(name: string, props?: {
     sort?: string;
     filters?: object;

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

@@ -1,5 +1,10 @@
 declare const _default: (name: string) => {
-    get(filters: any, fields: Array<string | object>): Promise<any>;
-    list(filters: any, fields: Array<string | object>): Promise<any>;
+    name: string;
+    update(id: number, data: Object): Promise<any>;
+    delete(id: number): Promise<any>;
+    add(data: Object): Promise<any>;
+    fields(fields: string[]): import("@hostlink/light").ModelField[];
+    get(filters: any, fields: import("@hostlink/light").Fields): Promise<any>;
+    list(filters: any, fields: import("@hostlink/light").Fields): Promise<any>;
 };
 export default _default;

package/dist/runtime/lib/model.mjs

@@ -1,35 +1,19 @@
-import { toQuery, query } from "@hostlink/light";
+import { model, getModelField } from "@hostlink/light";
 export default (name) => {
-  const _name = name;
-  return {
-    async get(filters, fields) {
-      const resp = await query({
-        ["list" + _name]: {
-          __args: {
-            filters
-          },
-          data: {
-            __args: {
-              limit: 1
-            },
-            ...toQuery(fields)
-          }
-        }
-      });
-      return resp["list" + _name]["data"][0];
-    },
-    async list(filters, fields) {
-      const resp = await query({
-        ["list" + _name]: {
-          __args: {
-            filters
-          },
-          data: {
-            ...toQuery(fields)
-          }
-        }
-      });
-      return resp["list" + _name]["data"];
+  const m = model(name);
+  return Object.assign(m, {
+    columns(fields) {
+      let columns = [];
+      for (let f of fields) {
+        const field = getModelField(name, f);
+        if (!field)
+          continue;
+        const option = field.getRaw();
+        option.name = field.getName();
+        columns.push(option);
+      }
+      return columns;
     }
-  };
+  });
+  return m;
 };

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

@@ -1,9 +1,7 @@
 <script setup>
-import { getModelColumns } from "#imports"
-const columns = getModelColumns('EventLog', ['eventlog_id', 'class', 'id', 'action', 'created_time', 'username'])
-
+import { model } from "#imports"
+const columns = model('EventLog').columns(['eventlog_id', 'class', 'id', 'action', 'created_time', 'username'])
 </script>
-
 <template>
     <l-page>
         <l-table @request="$event.loadObjects('EventLog')" :columns="columns" sort-by="eventlog_id:desc"

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

@@ -1,7 +1,7 @@
 <script setup>
-import { getModelColumns } from "#imports"
+import { model } from "#imports"
 import { ref } from 'vue'
-const columns = getModelColumns("MailLog", ["maillog_id", "from", "to", "subject", "created_time"])
+const columns = model("MailLog").columns(["maillog_id", "from", "to", "subject", "created_time"])
 
 
 columns.push({
@@ -16,7 +16,7 @@ const content = ref("")
 <template>
     <l-page>
         <q-dialog v-model="show" full-width>
-            <l-card>
+            <l-card title="Mail content">
                 <q-card-section>
                     <iframe width="100%" height="500px" :srcdoc="content" frameborder="0"></iframe>
                 </q-card-section>

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

@@ -1,11 +1,11 @@
 <script setup>
 import { ref } from 'vue'
-import getModelColumns from "../../lib/getModelColumns";
+import { model } from "#imports"
 const onRequest = async (request) => {
     request.loadObjects("User", { status: status.value });
     //request.loadObjects("User");
 };
-const columns = getModelColumns("User", [ "username", "first_name", "label_name", "email", "phone", "join_date", "status"]);
+const columns = model("User").columns(["username", "first_name", "label_name", "email", "phone", "join_date", "status"]);
 const status = ref("0");
 </script>
 

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

@@ -1,6 +1,6 @@
 <script setup>
-import getModelColumns from "../../lib/getModelColumns";
-const columns = getModelColumns("UserLog", ["userlog_id", "username", "login_dt", "logout_dt", "result", "user_agent"]);
+import { model } from "#imports"
+const columns = model("UserLog").columns(["userlog_id", "username", "login_dt", "logout_dt", "result", "user_agent"]);
 </script>
 <template>
     <l-page>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hostlink/nuxt-light",
-  "version": "0.0.104",
+  "version": "0.0.106",
   "description": "HostLink Nuxt Light Framework",
   "repository": "@hostlink/nuxt-light",
   "license": "MIT",

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

@@ -1,2 +0,0 @@
-declare const _default: (name: string, data: Object) => Promise<any>;
-export default _default;

package/dist/runtime/lib/addObject.mjs

@@ -1,23 +0,0 @@
-import { Dialog } from "quasar";
-import m from "./m.mjs";
-import { VariableType } from "json-to-graphql-query";
-export default async (name, data) => {
-  try {
-    const variables = {};
-    Object.entries(data).forEach(([key, value]) => {
-      if (value instanceof File) {
-        variables[key] = {
-          type: "Upload!",
-          value
-        };
-        data[key] = new VariableType(key);
-      }
-    });
-    return await m(`add${name}`, { data }, [{ __variables: variables }]);
-  } catch (e) {
-    Dialog.create({
-      title: "Error",
-      message: e.message
-    });
-  }
-};

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

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

package/dist/runtime/lib/deleteObject.mjs

@@ -1,12 +0,0 @@
-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/removeObject.d.ts

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

package/dist/runtime/lib/removeObject.mjs

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