@simitgroup/simpleapp-generator 2.0.0-e-alpha → 2.0.0-g-alpha

package/templates/nuxt/components/renderer/RendererDocHistories.vue._eta

@@ -1,65 +1,89 @@
 <template>
+  <!-- <div>histories</div> -->
   <div
-    class="flex flex-row text-xs cursor-pointer justify-end"
+    class="flex flex-row items-center gap-2 text-xs cursor-pointer justify-end"
     v-if="data?.updated && data?.updated != ''"
     @click="viewHistories"
   >
     <ImageAvatar
-      v-if="data?.updatedBy"
-      :id="data.updatedBy"
-      :size="36"
+      class="w-10 h-10"
+      v-if="data?.createdBy"
+      :uid="data.createdBy"
+      :size="PHOTOSIZE.S40"
+      :changable="false"
     ></ImageAvatar>
     <div class="flex flex-col flex-1">
       <TextDocStatus
         v-if="data?.documentStatus"
         :docStatus="data?.documentStatus"
       />
-      <!-- <TextSubsubtitle class="text-gray-400 italic"
-        >{{ t("updated") }}:</TextSubsubtitle
-      > -->
       <RendererDateAge :value="data?.updated" class="text-gray-400 italic" />
     </div>
 
-    <Dialog
+    <Drawer
       v-model:visible="visibleHistories"
       modal
+      position="right"
       :header="t(documentName) + ' ' + t('histories')"
       :pt="{ root: { class: 'w-1/3' } }"
     >
       <Timeline :value="events" class="w-full md:w-20rem">
-        <template #opposite="{ item }">
-          <div class="flex flex-row">
-            <ImageAvatar :email="item.email" :id="item.uid" />
-            <div class="flex flex-col">
-              <span>{{ item.fullName }}</span>
-              <RendererDateAge
-                class="italic text-gray-400 text-xs whitespace-nowrap"
-                :value="item.eventDate"
-              />
+        <template #opposite="{ item,index }">
+          <div class="flex flex-col">
+            <div class="flex items-center space-x-2">
+              <div class="flex-shrink-0">
+                <ImageAvatar :uid="item.uid" class="w-10 h-9" />
+              </div>
+              <span class="flex-1">{{ item.fullName }}</span>
             </div>
+            <RendererDateAge
+              class="italic text-gray-400 text-xs whitespace-nowrap"
+              v-tooltip="dateRenderToDateTimeStr(item.eventDate)"
+              :value="item.eventDate"
+            />
           </div>
         </template>
-        <template #content="{ item }">
+        <template #content="{ item,index }">
           <div>
             <div>{{ item.status }}</div>
+            <div v-if="item.eventData && hasAuditTrail">
+              <TextPrimary
+                @click="viewChanges(index)"
+                class="cursor-pointer"
+                >{{ t("details") }}{{ index }}</TextPrimary
+              >
+            </div>
+            <div v-else-if="item.eventData">
+              <TextSubtitle class="text-gray-500">{{
+                t("upgradeToEnt")
+              }}</TextSubtitle>
+            </div>
+            <div v-else>
+              <!-- no event data available -->
+            </div>
           </div>
         </template>
       </Timeline>
-    </Dialog>
+
+      <Dialog v-model:visible="visibleAuditTrailDetail" modal :header="t('modificationDetails')">
+        <pre class="text-xs text-gray-500">{{eventData}}</pre>
+      </Dialog>
+    </Drawer>
   </div>
 </template>
 <script lang="ts" setup>
-/**
- * This file was automatically generated by simpleapp generator during initialization. It is changable.
- * --remove-this-line-to-prevent-override--
- * last change 2024-02-22
- * author: Ks Tan
- */
+import { PHOTOSIZE } from "~/types";
 import TextSubsubtitle from "../text/TextSubsubtitle.vue";
 import RendererDateTime from "./RendererDateTime.vue";
-import { Documentevent, User } from "~/simpleapp/generate/openapi";
-const eventDoc = useNuxtApp().$DocumenteventDoc();
+import { LOGApi } from "~/simpleapp/generate/openapi";
+import TextPrimary from "../text/TextPrimary.vue";
+import { diff, addedDiff, deletedDiff, updatedDiff, detailedDiff } from 'deep-object-diff';
+const logDoc = new LOGApi(getAxiosConfig());
+const hasAuditTrail = true; //getUserProfile().tenantInfo?.package==='enterprise'
 const visibleHistories = ref(false);
+const visibleAuditTrailDetail = ref(false);
+const auditTrailIndex=ref(-1)
+const eventData = ref<Object>({})
 const props = defineProps<{ data: any; documentName: string }>();
 type EventHistory = {
   status: string;
@@ -67,6 +91,7 @@ type EventHistory = {
   uid?: string;
   fullName?: string;
   email?: string;
+  eventData?: any;
 };
 const events = ref<EventHistory[]>([]);
 const getEvents = async () => {
@@ -74,6 +99,7 @@ const getEvents = async () => {
     {
       status: t("created"),
       eventDate: props.data.created,
+      fullName: "",
       uid: props.data.createdBy,
     },
   ];
@@ -81,32 +107,30 @@ const getEvents = async () => {
     simplelog.push({
       status: t("lastUpdate"),
       eventDate: props.data.updated,
+      fullName: "",
       uid: props.data.updatedBy,
     });
   }
 
-  // events.value=[];
-  // console.log("Renderer getEvents histories");
-  const list: (Documentevent & { _user: User })[] = await eventDoc.search({
-    filter: {
-      documentName: props.documentName,
-      documentId: props.data._id,
-    },
-    fields: ["created", "createdBy", "eventType"],
-    sorts: [["created", "asc"]],
-    lookup: { "user.uid": "createdBy" },
-  });
-  if (list.length > 0) {
-    events.value = list.map((item) => ({
-      _id: <string>item._id,
-      status: t(<string>item.eventType),
-      eventDate: <string>item.created,
-      uid: <string>item.createdBy,
-      fullName: <string>item._user.fullName,
-      email: <string>item._user.email,
-    }));
-  } else {
-    events.value = simplelog;
+  events.value = simplelog;
+
+  if (hasAuditTrail) {
+    const tmp = await logDoc.searchDocumentEvent(
+      props.documentName,
+      props.data._id,
+    );
+    const list = tmp.data;
+
+    if (list.length > 0) {
+      events.value = list.map((item) => ({
+        _id: <string>item._id,
+        status: t(<string>item.eventType),
+        eventDate: <string>item.created,
+        uid: <string>item.createdBy,
+        fullName: <string>item.fullName,
+        eventData: item?.eventData,
+      }));
+    }
   }
 };
 const severity = computed(() => {
@@ -114,7 +138,7 @@ const severity = computed(() => {
   if (props.data.docStatus == "confirm") return "success";
   else if (props.data.docStatus == "void") return "danger";
   else if (props.data.docStatus == "draft") return "secondary";
-  else return "warning";
+  else return "warn";
 });
 
 const viewHistories = async () => {
@@ -122,4 +146,20 @@ const viewHistories = async () => {
   await getEvents();
   // console.log("histories");
 };
+
+const viewChanges = async (index:number) => {
+  auditTrailIndex.value=index
+  const lastIndex = events.value.length-1
+  if(index == lastIndex){
+    eventData.value = events.value[index].eventData
+  }else{
+  
+    const lastEvent = events.value[index+1].eventData
+    const thisEvent = events.value[index].eventData
+    eventData.value= diff(thisEvent, lastEvent)
+  }
+  
+  visibleAuditTrailDetail.value = true;
+  
+};
 </script>

package/templates/nuxt/components/user/UserTenantPicker.vue._eta

@@ -13,7 +13,12 @@
           <NuxtLink :to="`/${item.xOrg}`" external>
             <div class="flex flex-row gap-2 hover:bg-primary-100">
               <div class="min-w-14 p=2">
-                <ImageOrganization :orgRecordId="item.orgRecordId" :size="12" />
+                <ImageOrganization
+                  v-if="tenant?.permissions.length > 0"
+                  class="w-10 h-10"
+                  :orgRecordId="tenant?.permissions[0]?.orgRecordId"
+                  :size="PHOTOSIZE.S40"
+                />
               </div>
               <div class="flex flex-col w-full justify-end gap-2">
                 <div class="flex flex-row gap-2">

package/templates/nuxt/composables/docformat.generate.ts.eta

@@ -4,10 +4,10 @@
  * last change 2023-10-28
  * Author: Ks Tan
  */
-import {DOCNOApi} from '~/simpleapp/generate/openapi'
+import {DOCUMENTNOFORMATApi} from '~/simpleapp/generate/openapi'
 
 export const getDocFormats = async (doctype:string)=>{    
-    const docno = new DOCNOApi(getAxiosConfig())
+    const docno = new DOCUMENTNOFORMATApi(getAxiosConfig())
     const docnoformats = await docno.runListDocFormats(doctype)
     return docnoformats.data
 }

package/templates/nuxt/plugins/19.simpleapp-mini-app-store.ts.eta

@@ -6,10 +6,10 @@
 
 import _, { min } from "lodash";
 import {
-  Miniapp,
+  MiniApp,
   MiniAppDetail,
   MiniAppDetailPermission,
-  MiniappIntegrationCustomPagePages,
+  MiniAppIntegrationCustomPagePages,
   MINIAPPMANAGERApi,
 } from "~/simpleapp/generate/openapi";
 import { MiniAppFormWithMiniAppCode } from "~/simpleapp/generate/features/miniApp/app/types/miniApp";