@webiny/app-audit-logs 6.3.0-beta.4 → 6.4.0-beta.0

package/hooks/schema.js

@@ -1,34 +1,28 @@
 import zod from "zod";
 import { ActionType } from "../types.js";
-export const auditLogSchema = zod.object({
-  id: zod.string(),
-  createdBy: zod.object({
+const auditLogSchema = zod.object({
     id: zod.string(),
-    displayName: zod.string().optional(),
-    type: zod.string().optional()
-  }),
-  createdOn: zod.preprocess(value => {
-    if (typeof value === "string" || value instanceof Date) {
-      return new Date(value);
-    }
-    return value;
-  }, zod.date()),
-  app: zod.string(),
-  action: zod.nativeEnum(ActionType),
-  message: zod.string(),
-  entity: zod.string(),
-  entityId: zod.string(),
-  tags: zod.array(zod.string()),
-  expiresAt: zod.preprocess(value => {
-    if (typeof value === "string" || value instanceof Date) {
-      return new Date(value);
-    }
-    return undefined;
-  }, zod.date().optional().nullish()).optional().nullish().transform(value => {
-    return value || undefined;
-  }),
-  content: zod.string()
+    createdBy: zod.object({
+        id: zod.string(),
+        displayName: zod.string().optional(),
+        type: zod.string().optional()
+    }),
+    createdOn: zod.preprocess((value)=>{
+        if ("string" == typeof value || value instanceof Date) return new Date(value);
+        return value;
+    }, zod.date()),
+    app: zod.string(),
+    action: zod.nativeEnum(ActionType),
+    message: zod.string(),
+    entity: zod.string(),
+    entityId: zod.string(),
+    tags: zod.array(zod.string()),
+    expiresAt: zod.preprocess((value)=>{
+        if ("string" == typeof value || value instanceof Date) return new Date(value);
+    }, zod.date().optional().nullish()).optional().nullish().transform((value)=>value || void 0),
+    content: zod.string()
 });
-export const listAuditLogsSchema = zod.array(auditLogSchema);
+const listAuditLogsSchema = zod.array(auditLogSchema);
+export { auditLogSchema, listAuditLogsSchema };
 
 //# sourceMappingURL=schema.js.map

package/hooks/schema.js.map

@@ -1 +1 @@
-{"version":3,"names":["zod","ActionType","auditLogSchema","object","id","string","createdBy","displayName","optional","type","createdOn","preprocess","value","Date","date","app","action","nativeEnum","message","entity","entityId","tags","array","expiresAt","undefined","nullish","transform","content","listAuditLogsSchema"],"sources":["schema.ts"],"sourcesContent":["import zod from \"zod\";\nimport { ActionType } from \"~/types.js\";\n\nexport const auditLogSchema = zod.object({\n    id: zod.string(),\n    createdBy: zod.object({\n        id: zod.string(),\n        displayName: zod.string().optional(),\n        type: zod.string().optional()\n    }),\n    createdOn: zod.preprocess(value => {\n        if (typeof value === \"string\" || value instanceof Date) {\n            return new Date(value);\n        }\n        return value;\n    }, zod.date()),\n    app: zod.string(),\n    action: zod.nativeEnum(ActionType),\n    message: zod.string(),\n    entity: zod.string(),\n    entityId: zod.string(),\n    tags: zod.array(zod.string()),\n    expiresAt: zod\n        .preprocess(value => {\n            if (typeof value === \"string\" || value instanceof Date) {\n                return new Date(value);\n            }\n            return undefined;\n        }, zod.date().optional().nullish())\n        .optional()\n        .nullish()\n        .transform(value => {\n            return value || undefined;\n        }),\n    content: zod.string()\n});\n\nexport const listAuditLogsSchema = zod.array(auditLogSchema);\n"],"mappings":"AAAA,OAAOA,GAAG,MAAM,KAAK;AACrB,SAASC,UAAU;AAEnB,OAAO,MAAMC,cAAc,GAAGF,GAAG,CAACG,MAAM,CAAC;EACrCC,EAAE,EAAEJ,GAAG,CAACK,MAAM,CAAC,CAAC;EAChBC,SAAS,EAAEN,GAAG,CAACG,MAAM,CAAC;IAClBC,EAAE,EAAEJ,GAAG,CAACK,MAAM,CAAC,CAAC;IAChBE,WAAW,EAAEP,GAAG,CAACK,MAAM,CAAC,CAAC,CAACG,QAAQ,CAAC,CAAC;IACpCC,IAAI,EAAET,GAAG,CAACK,MAAM,CAAC,CAAC,CAACG,QAAQ,CAAC;EAChC,CAAC,CAAC;EACFE,SAAS,EAAEV,GAAG,CAACW,UAAU,CAACC,KAAK,IAAI;IAC/B,IAAI,OAAOA,KAAK,KAAK,QAAQ,IAAIA,KAAK,YAAYC,IAAI,EAAE;MACpD,OAAO,IAAIA,IAAI,CAACD,KAAK,CAAC;IAC1B;IACA,OAAOA,KAAK;EAChB,CAAC,EAAEZ,GAAG,CAACc,IAAI,CAAC,CAAC,CAAC;EACdC,GAAG,EAAEf,GAAG,CAACK,MAAM,CAAC,CAAC;EACjBW,MAAM,EAAEhB,GAAG,CAACiB,UAAU,CAAChB,UAAU,CAAC;EAClCiB,OAAO,EAAElB,GAAG,CAACK,MAAM,CAAC,CAAC;EACrBc,MAAM,EAAEnB,GAAG,CAACK,MAAM,CAAC,CAAC;EACpBe,QAAQ,EAAEpB,GAAG,CAACK,MAAM,CAAC,CAAC;EACtBgB,IAAI,EAAErB,GAAG,CAACsB,KAAK,CAACtB,GAAG,CAACK,MAAM,CAAC,CAAC,CAAC;EAC7BkB,SAAS,EAAEvB,GAAG,CACTW,UAAU,CAACC,KAAK,IAAI;IACjB,IAAI,OAAOA,KAAK,KAAK,QAAQ,IAAIA,KAAK,YAAYC,IAAI,EAAE;MACpD,OAAO,IAAIA,IAAI,CAACD,KAAK,CAAC;IAC1B;IACA,OAAOY,SAAS;EACpB,CAAC,EAAExB,GAAG,CAACc,IAAI,CAAC,CAAC,CAACN,QAAQ,CAAC,CAAC,CAACiB,OAAO,CAAC,CAAC,CAAC,CAClCjB,QAAQ,CAAC,CAAC,CACViB,OAAO,CAAC,CAAC,CACTC,SAAS,CAACd,KAAK,IAAI;IAChB,OAAOA,KAAK,IAAIY,SAAS;EAC7B,CAAC,CAAC;EACNG,OAAO,EAAE3B,GAAG,CAACK,MAAM,CAAC;AACxB,CAAC,CAAC;AAEF,OAAO,MAAMuB,mBAAmB,GAAG5B,GAAG,CAACsB,KAAK,CAACpB,cAAc,CAAC","ignoreList":[]}
+{"version":3,"file":"hooks/schema.js","sources":["../../src/hooks/schema.ts"],"sourcesContent":["import zod from \"zod\";\nimport { ActionType } from \"~/types.js\";\n\nexport const auditLogSchema = zod.object({\n    id: zod.string(),\n    createdBy: zod.object({\n        id: zod.string(),\n        displayName: zod.string().optional(),\n        type: zod.string().optional()\n    }),\n    createdOn: zod.preprocess(value => {\n        if (typeof value === \"string\" || value instanceof Date) {\n            return new Date(value);\n        }\n        return value;\n    }, zod.date()),\n    app: zod.string(),\n    action: zod.nativeEnum(ActionType),\n    message: zod.string(),\n    entity: zod.string(),\n    entityId: zod.string(),\n    tags: zod.array(zod.string()),\n    expiresAt: zod\n        .preprocess(value => {\n            if (typeof value === \"string\" || value instanceof Date) {\n                return new Date(value);\n            }\n            return undefined;\n        }, zod.date().optional().nullish())\n        .optional()\n        .nullish()\n        .transform(value => {\n            return value || undefined;\n        }),\n    content: zod.string()\n});\n\nexport const listAuditLogsSchema = zod.array(auditLogSchema);\n"],"names":["auditLogSchema","zod","value","Date","ActionType","undefined","listAuditLogsSchema"],"mappings":";;AAGO,MAAMA,iBAAiBC,IAAI,MAAM,CAAC;IACrC,IAAIA,IAAI,MAAM;IACd,WAAWA,IAAI,MAAM,CAAC;QAClB,IAAIA,IAAI,MAAM;QACd,aAAaA,IAAI,MAAM,GAAG,QAAQ;QAClC,MAAMA,IAAI,MAAM,GAAG,QAAQ;IAC/B;IACA,WAAWA,IAAI,UAAU,CAACC,CAAAA;QACtB,IAAI,AAAiB,YAAjB,OAAOA,SAAsBA,iBAAiBC,MAC9C,OAAO,IAAIA,KAAKD;QAEpB,OAAOA;IACX,GAAGD,IAAI,IAAI;IACX,KAAKA,IAAI,MAAM;IACf,QAAQA,IAAI,UAAU,CAACG;IACvB,SAASH,IAAI,MAAM;IACnB,QAAQA,IAAI,MAAM;IAClB,UAAUA,IAAI,MAAM;IACpB,MAAMA,IAAI,KAAK,CAACA,IAAI,MAAM;IAC1B,WAAWA,IAAAA,UACI,CAACC,CAAAA;QACR,IAAI,AAAiB,YAAjB,OAAOA,SAAsBA,iBAAiBC,MAC9C,OAAO,IAAIA,KAAKD;IAGxB,GAAGD,IAAI,IAAI,GAAG,QAAQ,GAAG,OAAO,IAC/B,QAAQ,GACR,OAAO,GACP,SAAS,CAACC,CAAAA,QACAA,SAASG;IAExB,SAASJ,IAAI,MAAM;AACvB;AAEO,MAAMK,sBAAsBL,IAAI,KAAK,CAACD"}

package/hooks/useAuditLogsList.d.ts

@@ -1,6 +1,6 @@
 import { type IListAuditLogsVariablesWhere } from "../hooks/graphql.js";
 import type { IAuditLog, IAuditLogsMeta } from "../types.js";
-import type { OnSortingChange, Sorting } from "@webiny/ui/DataTable/index.js";
+import type { OnDataTableSortingChange, DataTableSorting } from "@webiny/admin-ui";
 export interface UseAuditLogs {
     isListLoading: boolean;
     isListLoadingMore: boolean;
@@ -10,8 +10,8 @@ export interface UseAuditLogs {
     setWhere: (where: Partial<IListAuditLogsVariablesWhere>) => void;
     setLimit: (limit: number) => void;
     after?: string;
-    sorting: Sorting;
-    setSorting: OnSortingChange;
+    sorting: DataTableSorting;
+    setSorting: OnDataTableSortingChange;
     showingFilters: boolean;
     showFilters: () => void;
     hideFilters: () => void;

package/hooks/useAuditLogsList.js

@@ -3,100 +3,107 @@ import { useQuery } from "@apollo/react-hooks";
 import { LIST_AUDIT_LOGS } from "./graphql.js";
 import { transformRawAuditLog } from "../utils/transformRawAuditLog.js";
 import { listAuditLogsSchema } from "./schema.js";
-export const useAuditLogsList = () => {
-  const [variables, setVariables] = useState({
-    where: {},
-    after: undefined,
-    sort: "DESC",
-    limit: 25
-  });
-  const setWhere = useCallback(where => {
-    setVariables(prev => ({
-      ...prev,
-      where
-    }));
-  }, [variables]);
-  const setSort = useCallback(sort => {
-    setVariables(prev => ({
-      ...prev,
-      sort
-    }));
-  }, [variables]);
-  const setAfter = useCallback(after => {
-    setVariables(prev => ({
-      ...prev,
-      after
-    }));
-  }, [variables]);
-  const setLimit = useCallback(limit => {
-    setVariables(prev => ({
-      ...prev,
-      limit
-    }));
-  }, [variables]);
-  const [showingFilters, setShowingFilters] = useState(false);
-  const [acoSorting, setAcoSorting] = useState([]);
-  useEffect(() => {
-    const sort = acoSorting[0];
-    if (!sort) {
-      return;
-    }
-    setSort(sort.desc ? "DESC" : "ASC");
-  }, [acoSorting]);
-  const logs = useQuery(LIST_AUDIT_LOGS, {
-    variables,
-    fetchPolicy: "network-only"
-  });
-  const records = useMemo(() => {
-    if (!logs.data?.auditLogs.listAuditLogs.data) {
-      return [];
-    }
-    const items = listAuditLogsSchema.safeParse(logs.data.auditLogs.listAuditLogs.data);
-    if (!items.success) {
-      console.error(items.error);
-      return [];
-    }
-    return items.data.map(auditLog => {
-      return transformRawAuditLog({
-        auditLog
-      });
+const useAuditLogsList = ()=>{
+    const [variables, setVariables] = useState({
+        where: {},
+        after: void 0,
+        sort: "DESC",
+        limit: 25
     });
-  }, [logs.data?.auditLogs]);
-  const meta = useMemo(() => {
-    if (!logs.data?.auditLogs.listAuditLogs.meta) {
-      return {
-        hasMoreItems: false,
-        cursor: null
-      };
-    }
-    return logs.data.auditLogs.listAuditLogs.meta;
-  }, [logs.data?.auditLogs]);
-  const sorting = useMemo(() => {
-    return [{
-      id: "createdOn",
-      desc: variables.sort === "DESC"
-    }];
-  }, [variables.sort]);
-  return {
-    isListLoading: logs.loading,
-    records,
-    meta,
-    listMoreRecords: () => {
-      setAfter(meta.cursor || undefined);
-    },
-    setWhere,
-    sorting,
-    setSorting: setAcoSorting,
-    setLimit,
-    isListLoadingMore: logs.loading && !!variables.after,
-    showingFilters,
-    showFilters: () => {
-      setShowingFilters(true);
-    },
-    hideFilters: () => {
-      setShowingFilters(false);
-    }
-  };
+    const [accumulatedRecords, setAccumulatedRecords] = useState([]);
+    const setWhere = useCallback((where)=>{
+        setVariables((prev)=>({
+                ...prev,
+                where,
+                after: void 0
+            }));
+        setAccumulatedRecords([]);
+    }, []);
+    const setSort = useCallback((sort)=>{
+        setVariables((prev)=>({
+                ...prev,
+                sort,
+                after: void 0
+            }));
+        setAccumulatedRecords([]);
+    }, []);
+    const setAfter = useCallback((after)=>{
+        setVariables((prev)=>({
+                ...prev,
+                after
+            }));
+    }, []);
+    const setLimit = useCallback((limit)=>{
+        setVariables((prev)=>({
+                ...prev,
+                limit
+            }));
+    }, []);
+    const [showingFilters, setShowingFilters] = useState(false);
+    const [acoSorting, setAcoSorting] = useState([]);
+    useEffect(()=>{
+        const sort = acoSorting[0];
+        if (!sort) return;
+        setSort(sort.desc ? "DESC" : "ASC");
+    }, [
+        acoSorting
+    ]);
+    const logs = useQuery(LIST_AUDIT_LOGS, {
+        variables,
+        fetchPolicy: "network-only"
+    });
+    useEffect(()=>{
+        if (!logs.data?.auditLogs.listAuditLogs.data) return;
+        const items = listAuditLogsSchema.safeParse(logs.data.auditLogs.listAuditLogs.data);
+        if (!items.success) return void console.error(items.error);
+        const newRecords = items.data.map((auditLog)=>transformRawAuditLog({
+                auditLog
+            }));
+        variables.after ? setAccumulatedRecords((prev)=>[
+                ...prev,
+                ...newRecords
+            ]) : setAccumulatedRecords(newRecords);
+    }, [
+        logs.data?.auditLogs
+    ]);
+    const meta = useMemo(()=>{
+        if (!logs.data?.auditLogs.listAuditLogs.meta) return {
+            hasMoreItems: false,
+            cursor: null
+        };
+        return logs.data.auditLogs.listAuditLogs.meta;
+    }, [
+        logs.data?.auditLogs
+    ]);
+    const sorting = useMemo(()=>[
+            {
+                id: "createdOn",
+                desc: "DESC" === variables.sort
+            }
+        ], [
+        variables.sort
+    ]);
+    return {
+        isListLoading: logs.loading,
+        records: accumulatedRecords,
+        meta,
+        listMoreRecords: ()=>{
+            setAfter(meta.cursor || void 0);
+        },
+        setWhere,
+        sorting,
+        setSorting: setAcoSorting,
+        setLimit,
+        isListLoadingMore: logs.loading && !!variables.after,
+        showingFilters,
+        showFilters: ()=>{
+            setShowingFilters(true);
+        },
+        hideFilters: ()=>{
+            setShowingFilters(false);
+        }
+    };
 };
+export { useAuditLogsList };
 
 //# sourceMappingURL=useAuditLogsList.js.map

package/hooks/useAuditLogsList.js.map

@@ -1 +1 @@
-{"version":3,"names":["useCallback","useEffect","useMemo","useState","useQuery","LIST_AUDIT_LOGS","transformRawAuditLog","listAuditLogsSchema","useAuditLogsList","variables","setVariables","where","after","undefined","sort","limit","setWhere","prev","setSort","setAfter","setLimit","showingFilters","setShowingFilters","acoSorting","setAcoSorting","desc","logs","fetchPolicy","records","data","auditLogs","listAuditLogs","items","safeParse","success","console","error","map","auditLog","meta","hasMoreItems","cursor","sorting","id","isListLoading","loading","listMoreRecords","setSorting","isListLoadingMore","showFilters","hideFilters"],"sources":["useAuditLogsList.ts"],"sourcesContent":["import { useCallback, useEffect, useMemo, useState } from \"react\";\nimport { useQuery } from \"@apollo/react-hooks\";\nimport {\n    type IListAuditLogsResponse,\n    type IListAuditLogsVariablesPartial,\n    type IListAuditLogsVariablesWhere,\n    LIST_AUDIT_LOGS\n} from \"~/hooks/graphql.js\";\nimport type { IAuditLog, IAuditLogsMeta } from \"~/types.js\";\nimport type { OnSortingChange, Sorting } from \"@webiny/ui/DataTable/index.js\";\nimport { transformRawAuditLog } from \"~/utils/transformRawAuditLog.js\";\nimport { listAuditLogsSchema } from \"~/hooks/schema.js\";\n\nexport interface UseAuditLogs {\n    isListLoading: boolean;\n    isListLoadingMore: boolean;\n    records: IAuditLog[];\n    meta: IAuditLogsMeta;\n    listMoreRecords: () => void;\n    setWhere: (where: Partial<IListAuditLogsVariablesWhere>) => void;\n    setLimit: (limit: number) => void;\n    after?: string;\n    sorting: Sorting;\n    setSorting: OnSortingChange;\n    showingFilters: boolean;\n    showFilters: () => void;\n    hideFilters: () => void;\n}\n\nexport const useAuditLogsList = (): UseAuditLogs => {\n    const [variables, setVariables] = useState<IListAuditLogsVariablesPartial>({\n        where: {},\n        after: undefined,\n        sort: \"DESC\",\n        limit: 25\n    });\n\n    const setWhere = useCallback(\n        (where: Partial<IListAuditLogsVariablesWhere>) => {\n            setVariables(prev => ({\n                ...prev,\n                where\n            }));\n        },\n        [variables]\n    );\n    const setSort = useCallback(\n        (sort: \"ASC\" | \"DESC\") => {\n            setVariables(prev => ({\n                ...prev,\n                sort\n            }));\n        },\n        [variables]\n    );\n    const setAfter = useCallback(\n        (after?: string) => {\n            setVariables(prev => ({\n                ...prev,\n                after\n            }));\n        },\n        [variables]\n    );\n    const setLimit = useCallback(\n        (limit: number) => {\n            setVariables(prev => ({\n                ...prev,\n                limit\n            }));\n        },\n        [variables]\n    );\n\n    const [showingFilters, setShowingFilters] = useState(false);\n    const [acoSorting, setAcoSorting] = useState<Sorting>([]);\n\n    useEffect(() => {\n        const sort = acoSorting[0];\n        if (!sort) {\n            return;\n        }\n        setSort(sort.desc ? \"DESC\" : \"ASC\");\n    }, [acoSorting]);\n\n    const logs = useQuery<IListAuditLogsResponse, IListAuditLogsVariablesPartial>(LIST_AUDIT_LOGS, {\n        variables,\n        fetchPolicy: \"network-only\"\n    });\n\n    const records = useMemo((): IAuditLog[] => {\n        if (!logs.data?.auditLogs.listAuditLogs.data) {\n            return [];\n        }\n        const items = listAuditLogsSchema.safeParse(logs.data.auditLogs.listAuditLogs.data);\n        if (!items.success) {\n            console.error(items.error);\n            return [];\n        }\n        return items.data.map(auditLog => {\n            return transformRawAuditLog({\n                auditLog\n            });\n        });\n    }, [logs.data?.auditLogs]);\n    const meta = useMemo(() => {\n        if (!logs.data?.auditLogs.listAuditLogs.meta) {\n            return {\n                hasMoreItems: false,\n                cursor: null\n            };\n        }\n        return logs.data.auditLogs.listAuditLogs.meta;\n    }, [logs.data?.auditLogs]);\n\n    const sorting = useMemo((): Sorting => {\n        return [\n            {\n                id: \"createdOn\",\n                desc: variables.sort === \"DESC\"\n            }\n        ];\n    }, [variables.sort]);\n\n    return {\n        isListLoading: logs.loading,\n        records,\n        meta,\n        listMoreRecords: () => {\n            setAfter(meta.cursor || undefined);\n        },\n        setWhere,\n        sorting,\n        setSorting: setAcoSorting,\n        setLimit,\n        isListLoadingMore: logs.loading && !!variables.after,\n        showingFilters,\n        showFilters: () => {\n            setShowingFilters(true);\n        },\n        hideFilters: () => {\n            setShowingFilters(false);\n        }\n    };\n};\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"hooks/useAuditLogsList.js","sources":["../../src/hooks/useAuditLogsList.ts"],"sourcesContent":["import { useCallback, useEffect, useMemo, useState } from \"react\";\nimport { useQuery } from \"@apollo/react-hooks\";\nimport {\n    type IListAuditLogsResponse,\n    type IListAuditLogsVariablesPartial,\n    type IListAuditLogsVariablesWhere,\n    LIST_AUDIT_LOGS\n} from \"~/hooks/graphql.js\";\nimport type { IAuditLog, IAuditLogsMeta } from \"~/types.js\";\nimport type { OnDataTableSortingChange, DataTableSorting } from \"@webiny/admin-ui\";\nimport { transformRawAuditLog } from \"~/utils/transformRawAuditLog.js\";\nimport { listAuditLogsSchema } from \"~/hooks/schema.js\";\n\nexport interface UseAuditLogs {\n    isListLoading: boolean;\n    isListLoadingMore: boolean;\n    records: IAuditLog[];\n    meta: IAuditLogsMeta;\n    listMoreRecords: () => void;\n    setWhere: (where: Partial<IListAuditLogsVariablesWhere>) => void;\n    setLimit: (limit: number) => void;\n    after?: string;\n    sorting: DataTableSorting;\n    setSorting: OnDataTableSortingChange;\n    showingFilters: boolean;\n    showFilters: () => void;\n    hideFilters: () => void;\n}\n\nexport const useAuditLogsList = (): UseAuditLogs => {\n    const [variables, setVariables] = useState<IListAuditLogsVariablesPartial>({\n        where: {},\n        after: undefined,\n        sort: \"DESC\",\n        limit: 25\n    });\n\n    const [accumulatedRecords, setAccumulatedRecords] = useState<IAuditLog[]>([]);\n\n    const setWhere = useCallback((where: Partial<IListAuditLogsVariablesWhere>) => {\n        setVariables(prev => ({ ...prev, where, after: undefined }));\n        setAccumulatedRecords([]);\n    }, []);\n\n    const setSort = useCallback((sort: \"ASC\" | \"DESC\") => {\n        setVariables(prev => ({ ...prev, sort, after: undefined }));\n        setAccumulatedRecords([]);\n    }, []);\n\n    const setAfter = useCallback((after?: string) => {\n        setVariables(prev => ({ ...prev, after }));\n    }, []);\n\n    const setLimit = useCallback((limit: number) => {\n        setVariables(prev => ({ ...prev, limit }));\n    }, []);\n\n    const [showingFilters, setShowingFilters] = useState(false);\n    const [acoSorting, setAcoSorting] = useState<DataTableSorting>([]);\n\n    useEffect(() => {\n        const sort = acoSorting[0];\n        if (!sort) {\n            return;\n        }\n        setSort(sort.desc ? \"DESC\" : \"ASC\");\n    }, [acoSorting]);\n\n    const logs = useQuery<IListAuditLogsResponse, IListAuditLogsVariablesPartial>(LIST_AUDIT_LOGS, {\n        variables,\n        fetchPolicy: \"network-only\"\n    });\n\n    useEffect(() => {\n        if (!logs.data?.auditLogs.listAuditLogs.data) {\n            return;\n        }\n        const items = listAuditLogsSchema.safeParse(logs.data.auditLogs.listAuditLogs.data);\n        if (!items.success) {\n            console.error(items.error);\n            return;\n        }\n        const newRecords = items.data.map(auditLog => transformRawAuditLog({ auditLog }));\n        if (variables.after) {\n            setAccumulatedRecords(prev => [...prev, ...newRecords]);\n        } else {\n            setAccumulatedRecords(newRecords);\n        }\n    }, [logs.data?.auditLogs]);\n\n    const meta = useMemo(() => {\n        if (!logs.data?.auditLogs.listAuditLogs.meta) {\n            return {\n                hasMoreItems: false,\n                cursor: null\n            };\n        }\n        return logs.data.auditLogs.listAuditLogs.meta;\n    }, [logs.data?.auditLogs]);\n\n    const sorting = useMemo((): DataTableSorting => {\n        return [\n            {\n                id: \"createdOn\",\n                desc: variables.sort === \"DESC\"\n            }\n        ];\n    }, [variables.sort]);\n\n    return {\n        isListLoading: logs.loading,\n        records: accumulatedRecords,\n        meta,\n        listMoreRecords: () => {\n            setAfter(meta.cursor || undefined);\n        },\n        setWhere,\n        sorting,\n        setSorting: setAcoSorting,\n        setLimit,\n        isListLoadingMore: logs.loading && !!variables.after,\n        showingFilters,\n        showFilters: () => {\n            setShowingFilters(true);\n        },\n        hideFilters: () => {\n            setShowingFilters(false);\n        }\n    };\n};\n"],"names":["useAuditLogsList","variables","setVariables","useState","undefined","accumulatedRecords","setAccumulatedRecords","setWhere","useCallback","where","prev","setSort","sort","setAfter","after","setLimit","limit","showingFilters","setShowingFilters","acoSorting","setAcoSorting","useEffect","logs","useQuery","LIST_AUDIT_LOGS","items","listAuditLogsSchema","console","newRecords","auditLog","transformRawAuditLog","meta","useMemo","sorting"],"mappings":";;;;;AA6BO,MAAMA,mBAAmB;IAC5B,MAAM,CAACC,WAAWC,aAAa,GAAGC,SAAyC;QACvE,OAAO,CAAC;QACR,OAAOC;QACP,MAAM;QACN,OAAO;IACX;IAEA,MAAM,CAACC,oBAAoBC,sBAAsB,GAAGH,SAAsB,EAAE;IAE5E,MAAMI,WAAWC,YAAY,CAACC;QAC1BP,aAAaQ,CAAAA,OAAS;gBAAE,GAAGA,IAAI;gBAAED;gBAAO,OAAOL;YAAU;QACzDE,sBAAsB,EAAE;IAC5B,GAAG,EAAE;IAEL,MAAMK,UAAUH,YAAY,CAACI;QACzBV,aAAaQ,CAAAA,OAAS;gBAAE,GAAGA,IAAI;gBAAEE;gBAAM,OAAOR;YAAU;QACxDE,sBAAsB,EAAE;IAC5B,GAAG,EAAE;IAEL,MAAMO,WAAWL,YAAY,CAACM;QAC1BZ,aAAaQ,CAAAA,OAAS;gBAAE,GAAGA,IAAI;gBAAEI;YAAM;IAC3C,GAAG,EAAE;IAEL,MAAMC,WAAWP,YAAY,CAACQ;QAC1Bd,aAAaQ,CAAAA,OAAS;gBAAE,GAAGA,IAAI;gBAAEM;YAAM;IAC3C,GAAG,EAAE;IAEL,MAAM,CAACC,gBAAgBC,kBAAkB,GAAGf,SAAS;IACrD,MAAM,CAACgB,YAAYC,cAAc,GAAGjB,SAA2B,EAAE;IAEjEkB,UAAU;QACN,MAAMT,OAAOO,UAAU,CAAC,EAAE;QAC1B,IAAI,CAACP,MACD;QAEJD,QAAQC,KAAK,IAAI,GAAG,SAAS;IACjC,GAAG;QAACO;KAAW;IAEf,MAAMG,OAAOC,SAAiEC,iBAAiB;QAC3FvB;QACA,aAAa;IACjB;IAEAoB,UAAU;QACN,IAAI,CAACC,KAAK,IAAI,EAAE,UAAU,cAAc,MACpC;QAEJ,MAAMG,QAAQC,oBAAoB,SAAS,CAACJ,KAAK,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,IAAI;QAClF,IAAI,CAACG,MAAM,OAAO,EAAE,YAChBE,QAAQ,KAAK,CAACF,MAAM,KAAK;QAG7B,MAAMG,aAAaH,MAAM,IAAI,CAAC,GAAG,CAACI,CAAAA,WAAYC,qBAAqB;gBAAED;YAAS;QAC1E5B,UAAU,KAAK,GACfK,sBAAsBI,CAAAA,OAAQ;mBAAIA;mBAASkB;aAAW,IAEtDtB,sBAAsBsB;IAE9B,GAAG;QAACN,KAAK,IAAI,EAAE;KAAU;IAEzB,MAAMS,OAAOC,QAAQ;QACjB,IAAI,CAACV,KAAK,IAAI,EAAE,UAAU,cAAc,MACpC,OAAO;YACH,cAAc;YACd,QAAQ;QACZ;QAEJ,OAAOA,KAAK,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,IAAI;IACjD,GAAG;QAACA,KAAK,IAAI,EAAE;KAAU;IAEzB,MAAMW,UAAUD,QAAQ,IACb;YACH;gBACI,IAAI;gBACJ,MAAM/B,AAAmB,WAAnBA,UAAU,IAAI;YACxB;SACH,EACF;QAACA,UAAU,IAAI;KAAC;IAEnB,OAAO;QACH,eAAeqB,KAAK,OAAO;QAC3B,SAASjB;QACT0B;QACA,iBAAiB;YACblB,SAASkB,KAAK,MAAM,IAAI3B;QAC5B;QACAG;QACA0B;QACA,YAAYb;QACZL;QACA,mBAAmBO,KAAK,OAAO,IAAI,CAAC,CAACrB,UAAU,KAAK;QACpDgB;QACA,aAAa;YACTC,kBAAkB;QACtB;QACA,aAAa;YACTA,kBAAkB;QACtB;IACJ;AACJ"}

package/index.js

@@ -1,45 +1,41 @@
-import React from "react";
-import { useRouter } from "@webiny/app-admin";
-import { ReactComponent as Icon } from "@webiny/icons/manage_search.svg";
-import { AdminConfig, AdminLayout, RegisterFeature, useWcp } from "@webiny/app-admin";
-import { HasPermission } from "@webiny/app-admin";
+import react from "react";
+import { AdminConfig, AdminLayout, HasPermission, RegisterFeature, useRouter, useWcp } from "@webiny/app-admin";
+import { ReactComponent } from "@webiny/icons/manage_search.svg";
 import { LogsModule } from "./views/Logs/LogsModule.js";
 import { SecurityPermission } from "./SecurityPermission.js";
 import { LogsView } from "./views/Logs/LogsView.js";
 import { AuditLogsListWithConfig } from "./config/list/index.js";
 import { Routes } from "./routes.js";
 import { AlPermissionsFeature } from "./features/permissions/feature.js";
-const {
-  Menu,
-  Route
-} = AdminConfig;
-export const AuditLogs = () => {
-  const wcp = useWcp();
-  const router = useRouter();
-  if (!wcp.canUseAuditLogs()) {
-    return null;
-  }
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(RegisterFeature, {
-    feature: AlPermissionsFeature
-  }), /*#__PURE__*/React.createElement(LogsModule, null), /*#__PURE__*/React.createElement(SecurityPermission, null), /*#__PURE__*/React.createElement(AdminConfig, null, /*#__PURE__*/React.createElement(HasPermission, {
-    any: ["al.*"]
-  }, /*#__PURE__*/React.createElement(Menu, {
-    name: "auditLogs",
-    pinnable: true,
-    element: /*#__PURE__*/React.createElement(Menu.Link, {
-      text: "Audit Logs",
-      icon: /*#__PURE__*/React.createElement(Menu.Link.Icon, {
-        element: /*#__PURE__*/React.createElement(Icon, null),
-        label: "Audit Logs"
-      }),
-      to: router.getLink(Routes.AuditLogsList)
-    })
-  }), /*#__PURE__*/React.createElement(Route, {
-    route: Routes.AuditLogsList,
-    element: /*#__PURE__*/React.createElement(AdminLayout, {
-      title: "Audit Logs - Logs"
-    }, /*#__PURE__*/React.createElement(AuditLogsListWithConfig, null, /*#__PURE__*/React.createElement(LogsView, null)))
-  }))));
+const { Menu: Menu, Route: Route } = AdminConfig;
+const AuditLogs = ()=>{
+    const wcp = useWcp();
+    const router = useRouter();
+    if (!wcp.canUseAuditLogs()) return null;
+    return /*#__PURE__*/ react.createElement(react.Fragment, null, /*#__PURE__*/ react.createElement(RegisterFeature, {
+        feature: AlPermissionsFeature
+    }), /*#__PURE__*/ react.createElement(LogsModule, null), /*#__PURE__*/ react.createElement(SecurityPermission, null), /*#__PURE__*/ react.createElement(AdminConfig, null, /*#__PURE__*/ react.createElement(HasPermission, {
+        any: [
+            "al.*"
+        ]
+    }, /*#__PURE__*/ react.createElement(Menu, {
+        name: "auditLogs",
+        pinnable: true,
+        element: /*#__PURE__*/ react.createElement(Menu.Link, {
+            text: "Audit Logs",
+            icon: /*#__PURE__*/ react.createElement(Menu.Link.Icon, {
+                element: /*#__PURE__*/ react.createElement(ReactComponent, null),
+                label: "Audit Logs"
+            }),
+            to: router.getLink(Routes.AuditLogsList)
+        })
+    }), /*#__PURE__*/ react.createElement(Route, {
+        route: Routes.AuditLogsList,
+        element: /*#__PURE__*/ react.createElement(AdminLayout, {
+            title: "Audit Logs - Logs"
+        }, /*#__PURE__*/ react.createElement(AuditLogsListWithConfig, null, /*#__PURE__*/ react.createElement(LogsView, null)))
+    }))));
 };
+export { AuditLogs };
 
 //# sourceMappingURL=index.js.map

package/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","useRouter","ReactComponent","Icon","AdminConfig","AdminLayout","RegisterFeature","useWcp","HasPermission","LogsModule","SecurityPermission","LogsView","AuditLogsListWithConfig","Routes","AlPermissionsFeature","Menu","Route","AuditLogs","wcp","router","canUseAuditLogs","createElement","Fragment","feature","any","name","pinnable","element","Link","text","icon","label","to","getLink","AuditLogsList","route","title"],"sources":["index.tsx"],"sourcesContent":["import React from \"react\";\nimport { useRouter } from \"@webiny/app-admin\";\nimport { ReactComponent as Icon } from \"@webiny/icons/manage_search.svg\";\nimport { AdminConfig, AdminLayout, RegisterFeature, useWcp } from \"@webiny/app-admin\";\nimport { HasPermission } from \"@webiny/app-admin\";\nimport { LogsModule } from \"~/views/Logs/LogsModule.js\";\nimport { SecurityPermission } from \"~/SecurityPermission.js\";\nimport { LogsView } from \"~/views/Logs/LogsView.js\";\nimport { AuditLogsListWithConfig } from \"~/config/list/index.js\";\nimport { Routes } from \"~/routes.js\";\nimport { AlPermissionsFeature } from \"~/features/permissions/feature.js\";\n\nconst { Menu, Route } = AdminConfig;\n\nexport const AuditLogs = () => {\n    const wcp = useWcp();\n    const router = useRouter();\n\n    if (!wcp.canUseAuditLogs()) {\n        return null;\n    }\n\n    return (\n        <>\n            <RegisterFeature feature={AlPermissionsFeature} />\n            <LogsModule />\n            <SecurityPermission />\n            <AdminConfig>\n                <HasPermission any={[\"al.*\"]}>\n                    <Menu\n                        name=\"auditLogs\"\n                        pinnable\n                        element={\n                            <Menu.Link\n                                text={\"Audit Logs\"}\n                                icon={<Menu.Link.Icon element={<Icon />} label={\"Audit Logs\"} />}\n                                to={router.getLink(Routes.AuditLogsList)}\n                            />\n                        }\n                    />\n                    <Route\n                        route={Routes.AuditLogsList}\n                        element={\n                            <AdminLayout title={\"Audit Logs - Logs\"}>\n                                <AuditLogsListWithConfig>\n                                    <LogsView />\n                                </AuditLogsListWithConfig>\n                            </AdminLayout>\n                        }\n                    />\n                </HasPermission>\n            </AdminConfig>\n        </>\n    );\n};\n"],"mappings":"AAAA,OAAOA,KAAK,MAAM,OAAO;AACzB,SAASC,SAAS,QAAQ,mBAAmB;AAC7C,SAASC,cAAc,IAAIC,IAAI,QAAQ,iCAAiC;AACxE,SAASC,WAAW,EAAEC,WAAW,EAAEC,eAAe,EAAEC,MAAM,QAAQ,mBAAmB;AACrF,SAASC,aAAa,QAAQ,mBAAmB;AACjD,SAASC,UAAU;AACnB,SAASC,kBAAkB;AAC3B,SAASC,QAAQ;AACjB,SAASC,uBAAuB;AAChC,SAASC,MAAM;AACf,SAASC,oBAAoB;AAE7B,MAAM;EAAEC,IAAI;EAAEC;AAAM,CAAC,GAAGZ,WAAW;AAEnC,OAAO,MAAMa,SAAS,GAAGA,CAAA,KAAM;EAC3B,MAAMC,GAAG,GAAGX,MAAM,CAAC,CAAC;EACpB,MAAMY,MAAM,GAAGlB,SAAS,CAAC,CAAC;EAE1B,IAAI,CAACiB,GAAG,CAACE,eAAe,CAAC,CAAC,EAAE;IACxB,OAAO,IAAI;EACf;EAEA,oBACIpB,KAAA,CAAAqB,aAAA,CAAArB,KAAA,CAAAsB,QAAA,qBACItB,KAAA,CAAAqB,aAAA,CAACf,eAAe;IAACiB,OAAO,EAAET;EAAqB,CAAE,CAAC,eAClDd,KAAA,CAAAqB,aAAA,CAACZ,UAAU,MAAE,CAAC,eACdT,KAAA,CAAAqB,aAAA,CAACX,kBAAkB,MAAE,CAAC,eACtBV,KAAA,CAAAqB,aAAA,CAACjB,WAAW,qBACRJ,KAAA,CAAAqB,aAAA,CAACb,aAAa;IAACgB,GAAG,EAAE,CAAC,MAAM;EAAE,gBACzBxB,KAAA,CAAAqB,aAAA,CAACN,IAAI;IACDU,IAAI,EAAC,WAAW;IAChBC,QAAQ;IACRC,OAAO,eACH3B,KAAA,CAAAqB,aAAA,CAACN,IAAI,CAACa,IAAI;MACNC,IAAI,EAAE,YAAa;MACnBC,IAAI,eAAE9B,KAAA,CAAAqB,aAAA,CAACN,IAAI,CAACa,IAAI,CAACzB,IAAI;QAACwB,OAAO,eAAE3B,KAAA,CAAAqB,aAAA,CAAClB,IAAI,MAAE,CAAE;QAAC4B,KAAK,EAAE;MAAa,CAAE,CAAE;MACjEC,EAAE,EAAEb,MAAM,CAACc,OAAO,CAACpB,MAAM,CAACqB,aAAa;IAAE,CAC5C;EACJ,CACJ,CAAC,eACFlC,KAAA,CAAAqB,aAAA,CAACL,KAAK;IACFmB,KAAK,EAAEtB,MAAM,CAACqB,aAAc;IAC5BP,OAAO,eACH3B,KAAA,CAAAqB,aAAA,CAAChB,WAAW;MAAC+B,KAAK,EAAE;IAAoB,gBACpCpC,KAAA,CAAAqB,aAAA,CAACT,uBAAuB,qBACpBZ,KAAA,CAAAqB,aAAA,CAACV,QAAQ,MAAE,CACU,CAChB;EAChB,CACJ,CACU,CACN,CACf,CAAC;AAEX,CAAC","ignoreList":[]}
+{"version":3,"file":"index.js","sources":["../src/index.tsx"],"sourcesContent":["import React from \"react\";\nimport { useRouter } from \"@webiny/app-admin\";\nimport { ReactComponent as Icon } from \"@webiny/icons/manage_search.svg\";\nimport { AdminConfig, AdminLayout, RegisterFeature, useWcp } from \"@webiny/app-admin\";\nimport { HasPermission } from \"@webiny/app-admin\";\nimport { LogsModule } from \"~/views/Logs/LogsModule.js\";\nimport { SecurityPermission } from \"~/SecurityPermission.js\";\nimport { LogsView } from \"~/views/Logs/LogsView.js\";\nimport { AuditLogsListWithConfig } from \"~/config/list/index.js\";\nimport { Routes } from \"~/routes.js\";\nimport { AlPermissionsFeature } from \"~/features/permissions/feature.js\";\n\nconst { Menu, Route } = AdminConfig;\n\nexport const AuditLogs = () => {\n    const wcp = useWcp();\n    const router = useRouter();\n\n    if (!wcp.canUseAuditLogs()) {\n        return null;\n    }\n\n    return (\n        <>\n            <RegisterFeature feature={AlPermissionsFeature} />\n            <LogsModule />\n            <SecurityPermission />\n            <AdminConfig>\n                <HasPermission any={[\"al.*\"]}>\n                    <Menu\n                        name=\"auditLogs\"\n                        pinnable\n                        element={\n                            <Menu.Link\n                                text={\"Audit Logs\"}\n                                icon={<Menu.Link.Icon element={<Icon />} label={\"Audit Logs\"} />}\n                                to={router.getLink(Routes.AuditLogsList)}\n                            />\n                        }\n                    />\n                    <Route\n                        route={Routes.AuditLogsList}\n                        element={\n                            <AdminLayout title={\"Audit Logs - Logs\"}>\n                                <AuditLogsListWithConfig>\n                                    <LogsView />\n                                </AuditLogsListWithConfig>\n                            </AdminLayout>\n                        }\n                    />\n                </HasPermission>\n            </AdminConfig>\n        </>\n    );\n};\n"],"names":["Menu","Route","AdminConfig","AuditLogs","wcp","useWcp","router","useRouter","RegisterFeature","AlPermissionsFeature","LogsModule","SecurityPermission","HasPermission","Icon","Routes","AdminLayout","AuditLogsListWithConfig","LogsView"],"mappings":";;;;;;;;;AAYA,MAAM,EAAEA,MAAAA,IAAI,EAAEC,OAAAA,KAAK,EAAE,GAAGC;AAEjB,MAAMC,YAAY;IACrB,MAAMC,MAAMC;IACZ,MAAMC,SAASC;IAEf,IAAI,CAACH,IAAI,eAAe,IACpB,OAAO;IAGX,OAAO,WAAP,GACI,wDACI,oBAACI,iBAAeA;QAAC,SAASC;sBAC1B,oBAACC,YAAUA,OAAAA,WAAAA,GACX,oBAACC,oBAAkBA,OAAAA,WAAAA,GACnB,oBAACT,aAAWA,MAAAA,WAAAA,GACR,oBAACU,eAAaA;QAAC,KAAK;YAAC;SAAO;qBACxB,oBAACZ,MAAIA;QACD,MAAK;QACL;QACA,uBACI,oBAACA,KAAK,IAAI;YACN,MAAM;YACN,oBAAM,oBAACA,KAAK,IAAI,CAAC,IAAI;gBAAC,uBAAS,oBAACa,gBAAIA;gBAAK,OAAO;;YAChD,IAAIP,OAAO,OAAO,CAACQ,OAAO,aAAa;;sBAInD,oBAACb,OAAKA;QACF,OAAOa,OAAO,aAAa;QAC3B,uBACI,oBAACC,aAAWA;YAAC,OAAO;yBAChB,oBAACC,yBAAuBA,MAAAA,WAAAA,GACpB,oBAACC,UAAQA;;AAS7C"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webiny/app-audit-logs",
-	"version": "6.3.0-beta.4",
+	"version": "6.4.0-beta.0",
 	"type": "module",
 	"exports": {
 		".": "./index.js",
@@ -17,25 +17,25 @@
 		"@emotion/css": "11.13.5",
 		"@emotion/react": "11.14.0",
 		"@emotion/styled": "11.14.1",
-		"@webiny/app": "6.3.0-beta.4",
-		"@webiny/app-admin": "6.3.0-beta.4",
-		"@webiny/common-audit-logs": "6.3.0-beta.4",
-		"@webiny/form": "6.3.0-beta.4",
-		"@webiny/icons": "6.3.0-beta.4",
-		"@webiny/react-composition": "6.3.0-beta.4",
-		"@webiny/react-properties": "6.3.0-beta.4",
-		"@webiny/ui": "6.3.0-beta.4",
+		"@webiny/admin-ui": "6.4.0-beta.0",
+		"@webiny/app": "6.4.0-beta.0",
+		"@webiny/app-admin": "6.4.0-beta.0",
+		"@webiny/common-audit-logs": "6.4.0-beta.0",
+		"@webiny/form": "6.4.0-beta.0",
+		"@webiny/icons": "6.4.0-beta.0",
+		"@webiny/react-composition": "6.4.0-beta.0",
+		"@webiny/react-properties": "6.4.0-beta.0",
 		"date-fns": "4.1.0",
 		"graphql-tag": "2.12.6",
 		"lodash": "4.18.1",
-		"zod": "4.3.6"
+		"zod": "4.4.3"
 	},
 	"peerDependencies": {
 		"react": "18.3.1"
 	},
 	"devDependencies": {
 		"@types/react": "18.3.28",
-		"@webiny/build-tools": "6.3.0-beta.4",
+		"@webiny/build-tools": "6.4.0-beta.0",
 		"execa": "5.1.1",
 		"rimraf": "6.1.3",
 		"typescript": "6.0.3"
@@ -44,5 +44,5 @@
 		"access": "public",
 		"directory": "dist"
 	},
-	"gitHead": "7cefe15431dbd65504e1f58147dc9e55bcbfa693"
+	"gitHead": "a545d7529828af07d08d49c3da1bcb967483b9ce"
 }

package/routes.js

@@ -1,9 +1,10 @@
 import { Route } from "@webiny/app-admin";
-export const Routes = {
-  AuditLogsList: new Route({
-    name: "AuditLogs/List",
-    path: "/audit-logs"
-  })
+const Routes = {
+    AuditLogsList: new Route({
+        name: "AuditLogs/List",
+        path: "/audit-logs"
+    })
 };
+export { Routes };
 
 //# sourceMappingURL=routes.js.map

package/routes.js.map

@@ -1 +1 @@
-{"version":3,"names":["Route","Routes","AuditLogsList","name","path"],"sources":["routes.ts"],"sourcesContent":["import { Route } from \"@webiny/app-admin\";\n\nexport const Routes = {\n    AuditLogsList: new Route({\n        name: \"AuditLogs/List\",\n        path: \"/audit-logs\"\n    })\n};\n"],"mappings":"AAAA,SAASA,KAAK,QAAQ,mBAAmB;AAEzC,OAAO,MAAMC,MAAM,GAAG;EAClBC,aAAa,EAAE,IAAIF,KAAK,CAAC;IACrBG,IAAI,EAAE,gBAAgB;IACtBC,IAAI,EAAE;EACV,CAAC;AACL,CAAC","ignoreList":[]}
+{"version":3,"file":"routes.js","sources":["../src/routes.ts"],"sourcesContent":["import { Route } from \"@webiny/app-admin\";\n\nexport const Routes = {\n    AuditLogsList: new Route({\n        name: \"AuditLogs/List\",\n        path: \"/audit-logs\"\n    })\n};\n"],"names":["Routes","Route"],"mappings":";AAEO,MAAMA,SAAS;IAClB,eAAe,IAAIC,MAAM;QACrB,MAAM;QACN,MAAM;IACV;AACJ"}

package/types.js

@@ -1,4 +1 @@
-import { ActionType } from "@webiny/common-audit-logs";
-export { ActionType };
-
-//# sourceMappingURL=types.js.map
+export { ActionType } from "@webiny/common-audit-logs";

package/utils/transformRawAuditLog.js

@@ -1,28 +1,26 @@
 import { apps } from "@webiny/common-audit-logs";
-export const transformRawAuditLog = params => {
-  const {
-    auditLog
-  } = params;
-  const app = apps.find(app => app.app === auditLog.app);
-  const entity = app?.entities?.find(entity => entity.type === auditLog.entity);
-  const action = entity?.actions?.find(action => action.type === auditLog.action);
-  return {
-    ...auditLog,
-    createdBy: {
-      ...auditLog.createdBy,
-      // TODO load users?
-      role: "-"
-    },
-    action: {
-      label: action?.displayName || "-",
-      value: auditLog.action
-    },
-    entity: {
-      label: entity?.displayName || "-",
-      value: auditLog.entity,
-      link: entity?.linkToEntity && entity.linkToEntity(encodeURIComponent(auditLog.entityId))
-    }
-  };
+const transformRawAuditLog = (params)=>{
+    const { auditLog } = params;
+    const app = apps.find((app)=>app.app === auditLog.app);
+    const entity = app?.entities?.find((entity)=>entity.type === auditLog.entity);
+    const action = entity?.actions?.find((action)=>action.type === auditLog.action);
+    return {
+        ...auditLog,
+        createdBy: {
+            ...auditLog.createdBy,
+            role: "-"
+        },
+        action: {
+            label: action?.displayName || "-",
+            value: auditLog.action
+        },
+        entity: {
+            label: entity?.displayName || "-",
+            value: auditLog.entity,
+            link: entity?.linkToEntity && entity.linkToEntity(encodeURIComponent(auditLog.entityId))
+        }
+    };
 };
+export { transformRawAuditLog };
 
 //# sourceMappingURL=transformRawAuditLog.js.map

package/utils/transformRawAuditLog.js.map

@@ -1 +1 @@
-{"version":3,"names":["apps","transformRawAuditLog","params","auditLog","app","find","entity","entities","type","action","actions","createdBy","role","label","displayName","value","link","linkToEntity","encodeURIComponent","entityId"],"sources":["transformRawAuditLog.ts"],"sourcesContent":["import { apps } from \"@webiny/common-audit-logs\";\nimport type { IAuditLog, IAuditLogRaw } from \"~/types.js\";\n\nexport interface ITransformRawAuditLogParams {\n    auditLog: IAuditLogRaw;\n}\n\nexport const transformRawAuditLog = (params: ITransformRawAuditLogParams): IAuditLog => {\n    const { auditLog } = params;\n\n    const app = apps.find(app => app.app === auditLog.app);\n    const entity = app?.entities?.find(entity => entity.type === auditLog.entity);\n    const action = entity?.actions?.find(action => action.type === auditLog.action);\n    return {\n        ...auditLog,\n        createdBy: {\n            ...auditLog.createdBy,\n            // TODO load users?\n            role: \"-\"\n        },\n        action: {\n            label: action?.displayName || \"-\",\n            value: auditLog.action\n        },\n        entity: {\n            label: entity?.displayName || \"-\",\n            value: auditLog.entity,\n            link: entity?.linkToEntity && entity.linkToEntity(encodeURIComponent(auditLog.entityId))\n        }\n    };\n};\n"],"mappings":"AAAA,SAASA,IAAI,QAAQ,2BAA2B;AAOhD,OAAO,MAAMC,oBAAoB,GAAIC,MAAmC,IAAgB;EACpF,MAAM;IAAEC;EAAS,CAAC,GAAGD,MAAM;EAE3B,MAAME,GAAG,GAAGJ,IAAI,CAACK,IAAI,CAACD,GAAG,IAAIA,GAAG,CAACA,GAAG,KAAKD,QAAQ,CAACC,GAAG,CAAC;EACtD,MAAME,MAAM,GAAGF,GAAG,EAAEG,QAAQ,EAAEF,IAAI,CAACC,MAAM,IAAIA,MAAM,CAACE,IAAI,KAAKL,QAAQ,CAACG,MAAM,CAAC;EAC7E,MAAMG,MAAM,GAAGH,MAAM,EAAEI,OAAO,EAAEL,IAAI,CAACI,MAAM,IAAIA,MAAM,CAACD,IAAI,KAAKL,QAAQ,CAACM,MAAM,CAAC;EAC/E,OAAO;IACH,GAAGN,QAAQ;IACXQ,SAAS,EAAE;MACP,GAAGR,QAAQ,CAACQ,SAAS;MACrB;MACAC,IAAI,EAAE;IACV,CAAC;IACDH,MAAM,EAAE;MACJI,KAAK,EAAEJ,MAAM,EAAEK,WAAW,IAAI,GAAG;MACjCC,KAAK,EAAEZ,QAAQ,CAACM;IACpB,CAAC;IACDH,MAAM,EAAE;MACJO,KAAK,EAAEP,MAAM,EAAEQ,WAAW,IAAI,GAAG;MACjCC,KAAK,EAAEZ,QAAQ,CAACG,MAAM;MACtBU,IAAI,EAAEV,MAAM,EAAEW,YAAY,IAAIX,MAAM,CAACW,YAAY,CAACC,kBAAkB,CAACf,QAAQ,CAACgB,QAAQ,CAAC;IAC3F;EACJ,CAAC;AACL,CAAC","ignoreList":[]}
+{"version":3,"file":"utils/transformRawAuditLog.js","sources":["../../src/utils/transformRawAuditLog.ts"],"sourcesContent":["import { apps } from \"@webiny/common-audit-logs\";\nimport type { IAuditLog, IAuditLogRaw } from \"~/types.js\";\n\nexport interface ITransformRawAuditLogParams {\n    auditLog: IAuditLogRaw;\n}\n\nexport const transformRawAuditLog = (params: ITransformRawAuditLogParams): IAuditLog => {\n    const { auditLog } = params;\n\n    const app = apps.find(app => app.app === auditLog.app);\n    const entity = app?.entities?.find(entity => entity.type === auditLog.entity);\n    const action = entity?.actions?.find(action => action.type === auditLog.action);\n    return {\n        ...auditLog,\n        createdBy: {\n            ...auditLog.createdBy,\n            // TODO load users?\n            role: \"-\"\n        },\n        action: {\n            label: action?.displayName || \"-\",\n            value: auditLog.action\n        },\n        entity: {\n            label: entity?.displayName || \"-\",\n            value: auditLog.entity,\n            link: entity?.linkToEntity && entity.linkToEntity(encodeURIComponent(auditLog.entityId))\n        }\n    };\n};\n"],"names":["transformRawAuditLog","params","auditLog","app","apps","entity","action","encodeURIComponent"],"mappings":";AAOO,MAAMA,uBAAuB,CAACC;IACjC,MAAM,EAAEC,QAAQ,EAAE,GAAGD;IAErB,MAAME,MAAMC,KAAK,IAAI,CAACD,CAAAA,MAAOA,IAAI,GAAG,KAAKD,SAAS,GAAG;IACrD,MAAMG,SAASF,KAAK,UAAU,KAAKE,CAAAA,SAAUA,OAAO,IAAI,KAAKH,SAAS,MAAM;IAC5E,MAAMI,SAASD,QAAQ,SAAS,KAAKC,CAAAA,SAAUA,OAAO,IAAI,KAAKJ,SAAS,MAAM;IAC9E,OAAO;QACH,GAAGA,QAAQ;QACX,WAAW;YACP,GAAGA,SAAS,SAAS;YAErB,MAAM;QACV;QACA,QAAQ;YACJ,OAAOI,QAAQ,eAAe;YAC9B,OAAOJ,SAAS,MAAM;QAC1B;QACA,QAAQ;YACJ,OAAOG,QAAQ,eAAe;YAC9B,OAAOH,SAAS,MAAM;YACtB,MAAMG,QAAQ,gBAAgBA,OAAO,YAAY,CAACE,mBAAmBL,SAAS,QAAQ;QAC1F;IACJ;AACJ"}