@webiny/app-audit-logs 6.4.11 → 6.6.0-alpha.1

package/hooks/graphql.d.ts

@@ -1,4 +1,3 @@
-import type { IAuditLogRaw, IAuditLogsError, IAuditLogsMeta } from "../types.js";
 export interface IListAuditLogsVariablesWhere {
     app?: string;
     action?: string;
@@ -8,20 +7,3 @@ export interface IListAuditLogsVariablesWhere {
     createdOn_gte?: Date;
     createdOn_lte?: Date;
 }
-export interface IListAuditLogsVariables {
-    where: Partial<IListAuditLogsVariablesWhere>;
-    after: string | undefined;
-    sort: "ASC" | "DESC" | undefined;
-    limit: number | undefined;
-}
-export type IListAuditLogsVariablesPartial = Partial<IListAuditLogsVariables>;
-export interface IListAuditLogsResponse {
-    auditLogs: {
-        listAuditLogs: {
-            data: IAuditLogRaw[] | null;
-            meta: IAuditLogsMeta | null;
-            error: IAuditLogsError | null;
-        };
-    };
-}
-export declare const LIST_AUDIT_LOGS: import("graphql").DocumentNode;

package/hooks/graphql.js

@@ -1,44 +0,0 @@
-import graphql_tag from "graphql-tag";
-const LIST_AUDIT_LOGS = graphql_tag`
-    query ListAuditLogs(
-        $where: ListAuditLogsWhere!
-        $sort: AuditLogsSort
-        $after: String
-        $limit: Number
-    ) {
-        auditLogs {
-            listAuditLogs(where: $where, after: $after, sort: $sort, limit: $limit) {
-                data {
-                    id
-                    createdBy {
-                        id
-                        displayName
-                        type
-                    }
-                    createdOn
-                    app
-                    action
-                    message
-                    entity
-                    entityId
-                    tags
-                    expiresAt
-                    content
-                }
-                meta {
-                    hasMoreItems
-                    cursor
-                }
-                error {
-                    message
-                    code
-                    data
-                    stack
-                }
-            }
-        }
-    }
-`;
-export { LIST_AUDIT_LOGS };
-
-//# sourceMappingURL=graphql.js.map

package/hooks/schema.d.ts

@@ -1,5 +1,4 @@
 import zod from "zod";
-import { ActionType } from "../types.js";
 export declare const auditLogSchema: zod.ZodObject<{
     id: zod.ZodString;
     createdBy: zod.ZodObject<{
@@ -9,7 +8,7 @@ export declare const auditLogSchema: zod.ZodObject<{
     }, zod.core.$strip>;
     createdOn: zod.ZodPreprocess<zod.ZodDate>;
     app: zod.ZodString;
-    action: zod.ZodEnum<typeof ActionType>;
+    action: zod.ZodString;
     message: zod.ZodString;
     entity: zod.ZodString;
     entityId: zod.ZodString;
@@ -26,7 +25,7 @@ export declare const listAuditLogsSchema: zod.ZodArray<zod.ZodObject<{
     }, zod.core.$strip>;
     createdOn: zod.ZodPreprocess<zod.ZodDate>;
     app: zod.ZodString;
-    action: zod.ZodEnum<typeof ActionType>;
+    action: zod.ZodString;
     message: zod.ZodString;
     entity: zod.ZodString;
     entityId: zod.ZodString;

package/hooks/schema.js

@@ -1,5 +1,4 @@
 import zod from "zod";
-import { ActionType } from "../types.js";
 const auditLogSchema = zod.object({
     id: zod.string(),
     createdBy: zod.object({
@@ -12,7 +11,7 @@ const auditLogSchema = zod.object({
         return value;
     }, zod.date()),
     app: zod.string(),
-    action: zod.nativeEnum(ActionType),
+    action: zod.string(),
     message: zod.string(),
     entity: zod.string(),
     entityId: zod.string(),

package/hooks/schema.js.map

@@ -1 +1 @@
-{"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"}
+{"version":3,"file":"hooks/schema.js","sources":["../../src/hooks/schema.ts"],"sourcesContent":["import zod from \"zod\";\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.string(),\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","undefined","listAuditLogsSchema"],"mappings":";AAEO,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,MAAM;IAClB,SAASA,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,SAASE;IAExB,SAASH,IAAI,MAAM;AACvB;AAEO,MAAMI,sBAAsBJ,IAAI,KAAK,CAACD"}

package/hooks/useAuditLogsList.d.ts

@@ -1,4 +1,4 @@
-import { type IListAuditLogsVariablesWhere } from "../hooks/graphql.js";
+import type { IListAuditLogsVariablesWhere } from "../hooks/graphql.js";
 import type { IAuditLog, IAuditLogsMeta } from "../types.js";
 import type { OnDataTableSortingChange, DataTableSorting } from "@webiny/admin-ui";
 export interface UseAuditLogs {
@@ -12,8 +12,5 @@ export interface UseAuditLogs {
     after?: string;
     sorting: DataTableSorting;
     setSorting: OnDataTableSortingChange;
-    showingFilters: boolean;
-    showFilters: () => void;
-    hideFilters: () => void;
 }
 export declare const useAuditLogsList: () => UseAuditLogs;

package/hooks/useAuditLogsList.js

@@ -1,9 +1,8 @@
-import { useCallback, useEffect, useMemo, useState } from "react";
-import { useQuery } from "@apollo/react-hooks";
-import { LIST_AUDIT_LOGS } from "./graphql.js";
-import { transformRawAuditLog } from "../utils/transformRawAuditLog.js";
-import { listAuditLogsSchema } from "./schema.js";
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { useFeature } from "@webiny/app";
+import { ListAuditLogsFeature } from "../features/listAuditLogs/index.js";
 const useAuditLogsList = ()=>{
+    const { useCase } = useFeature(ListAuditLogsFeature);
     const [variables, setVariables] = useState({
         where: {},
         after: void 0,
@@ -11,13 +10,25 @@ const useAuditLogsList = ()=>{
         limit: 25
     });
     const [accumulatedRecords, setAccumulatedRecords] = useState([]);
+    const [loading, setLoading] = useState(true);
+    const [meta, setMeta] = useState({
+        hasMoreItems: false,
+        cursor: null
+    });
+    const resetPagination = useCallback(()=>{
+        setAccumulatedRecords([]);
+        setMeta({
+            hasMoreItems: false,
+            cursor: null
+        });
+    }, []);
     const setWhere = useCallback((where)=>{
         setVariables((prev)=>({
                 ...prev,
                 where,
                 after: void 0
             }));
-        setAccumulatedRecords([]);
+        resetPagination();
     }, []);
     const setSort = useCallback((sort)=>{
         setVariables((prev)=>({
@@ -25,7 +36,7 @@ const useAuditLogsList = ()=>{
                 sort,
                 after: void 0
             }));
-        setAccumulatedRecords([]);
+        resetPagination();
     }, []);
     const setAfter = useCallback((after)=>{
         setVariables((prev)=>({
@@ -39,7 +50,6 @@ const useAuditLogsList = ()=>{
                 limit
             }));
     }, []);
-    const [showingFilters, setShowingFilters] = useState(false);
     const [acoSorting, setAcoSorting] = useState([]);
     useEffect(()=>{
         const sort = acoSorting[0];
@@ -48,32 +58,21 @@ const useAuditLogsList = ()=>{
     }, [
         acoSorting
     ]);
-    const logs = useQuery(LIST_AUDIT_LOGS, {
-        variables,
-        fetchPolicy: "network-only"
-    });
+    const requestIdRef = useRef(0);
     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);
+        setLoading(true);
+        const requestId = ++requestIdRef.current;
+        useCase.execute(variables).then((result)=>{
+            if (requestId !== requestIdRef.current) return;
+            variables.after ? setAccumulatedRecords((prev)=>[
+                    ...prev,
+                    ...result.records
+                ]) : setAccumulatedRecords(result.records);
+            setMeta(result.meta);
+            setLoading(false);
+        });
     }, [
-        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
+        variables
     ]);
     const sorting = useMemo(()=>[
             {
@@ -84,24 +83,17 @@ const useAuditLogsList = ()=>{
         variables.sort
     ]);
     return {
-        isListLoading: logs.loading,
+        isListLoading: loading,
         records: accumulatedRecords,
         meta,
         listMoreRecords: ()=>{
-            setAfter(meta.cursor || void 0);
+            if (!loading && meta.cursor) setAfter(meta.cursor);
         },
         setWhere,
         sorting,
         setSorting: setAcoSorting,
         setLimit,
-        isListLoadingMore: logs.loading && !!variables.after,
-        showingFilters,
-        showFilters: ()=>{
-            setShowingFilters(true);
-        },
-        hideFilters: ()=>{
-            setShowingFilters(false);
-        }
+        isListLoadingMore: loading && !!variables.after
     };
 };
 export { useAuditLogsList };

package/hooks/useAuditLogsList.js.map

@@ -1 +1 @@
-{"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"}
+{"version":3,"file":"hooks/useAuditLogsList.js","sources":["../../src/hooks/useAuditLogsList.ts"],"sourcesContent":["import { useCallback, useEffect, useMemo, useRef, useState } from \"react\";\nimport { useFeature } from \"@webiny/app\";\nimport { ListAuditLogsFeature } from \"~/features/listAuditLogs/index.js\";\nimport type { IListAuditLogsVariablesWhere } from \"~/hooks/graphql.js\";\nimport type { IAuditLog, IAuditLogsMeta } from \"~/types.js\";\nimport type { OnDataTableSortingChange, DataTableSorting } from \"@webiny/admin-ui\";\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}\n\ninterface ListVariables {\n    where: Record<string, unknown>;\n    after: string | undefined;\n    sort: \"ASC\" | \"DESC\";\n    limit: number;\n}\n\nexport const useAuditLogsList = (): UseAuditLogs => {\n    const { useCase } = useFeature(ListAuditLogsFeature);\n\n    const [variables, setVariables] = useState<ListVariables>({\n        where: {},\n        after: undefined,\n        sort: \"DESC\",\n        limit: 25\n    });\n\n    const [accumulatedRecords, setAccumulatedRecords] = useState<IAuditLog[]>([]);\n    const [loading, setLoading] = useState(true);\n    const [meta, setMeta] = useState<IAuditLogsMeta>({\n        hasMoreItems: false,\n        cursor: null\n    });\n\n    const resetPagination = useCallback(() => {\n        setAccumulatedRecords([]);\n        setMeta({ hasMoreItems: false, cursor: null });\n    }, []);\n\n    const setWhere = useCallback((where: Partial<IListAuditLogsVariablesWhere>) => {\n        setVariables(prev => ({ ...prev, where, after: undefined }));\n        resetPagination();\n    }, []);\n\n    const setSort = useCallback((sort: \"ASC\" | \"DESC\") => {\n        setVariables(prev => ({ ...prev, sort, after: undefined }));\n        resetPagination();\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 [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 requestIdRef = useRef(0);\n\n    useEffect(() => {\n        setLoading(true);\n        const requestId = ++requestIdRef.current;\n\n        useCase.execute(variables).then(result => {\n            if (requestId !== requestIdRef.current) {\n                return;\n            }\n\n            if (variables.after) {\n                setAccumulatedRecords(prev => [...prev, ...result.records]);\n            } else {\n                setAccumulatedRecords(result.records);\n            }\n\n            setMeta(result.meta);\n            setLoading(false);\n        });\n    }, [variables]);\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: loading,\n        records: accumulatedRecords,\n        meta,\n        listMoreRecords: () => {\n            if (!loading && meta.cursor) {\n                setAfter(meta.cursor);\n            }\n        },\n        setWhere,\n        sorting,\n        setSorting: setAcoSorting,\n        setLimit,\n        isListLoadingMore: loading && !!variables.after\n    };\n};\n"],"names":["useAuditLogsList","useCase","useFeature","ListAuditLogsFeature","variables","setVariables","useState","undefined","accumulatedRecords","setAccumulatedRecords","loading","setLoading","meta","setMeta","resetPagination","useCallback","setWhere","where","prev","setSort","sort","setAfter","after","setLimit","limit","acoSorting","setAcoSorting","useEffect","requestIdRef","useRef","requestId","result","sorting","useMemo"],"mappings":";;;AA2BO,MAAMA,mBAAmB;IAC5B,MAAM,EAAEC,OAAO,EAAE,GAAGC,WAAWC;IAE/B,MAAM,CAACC,WAAWC,aAAa,GAAGC,SAAwB;QACtD,OAAO,CAAC;QACR,OAAOC;QACP,MAAM;QACN,OAAO;IACX;IAEA,MAAM,CAACC,oBAAoBC,sBAAsB,GAAGH,SAAsB,EAAE;IAC5E,MAAM,CAACI,SAASC,WAAW,GAAGL,SAAS;IACvC,MAAM,CAACM,MAAMC,QAAQ,GAAGP,SAAyB;QAC7C,cAAc;QACd,QAAQ;IACZ;IAEA,MAAMQ,kBAAkBC,YAAY;QAChCN,sBAAsB,EAAE;QACxBI,QAAQ;YAAE,cAAc;YAAO,QAAQ;QAAK;IAChD,GAAG,EAAE;IAEL,MAAMG,WAAWD,YAAY,CAACE;QAC1BZ,aAAaa,CAAAA,OAAS;gBAAE,GAAGA,IAAI;gBAAED;gBAAO,OAAOV;YAAU;QACzDO;IACJ,GAAG,EAAE;IAEL,MAAMK,UAAUJ,YAAY,CAACK;QACzBf,aAAaa,CAAAA,OAAS;gBAAE,GAAGA,IAAI;gBAAEE;gBAAM,OAAOb;YAAU;QACxDO;IACJ,GAAG,EAAE;IAEL,MAAMO,WAAWN,YAAY,CAACO;QAC1BjB,aAAaa,CAAAA,OAAS;gBAAE,GAAGA,IAAI;gBAAEI;YAAM;IAC3C,GAAG,EAAE;IAEL,MAAMC,WAAWR,YAAY,CAACS;QAC1BnB,aAAaa,CAAAA,OAAS;gBAAE,GAAGA,IAAI;gBAAEM;YAAM;IAC3C,GAAG,EAAE;IAEL,MAAM,CAACC,YAAYC,cAAc,GAAGpB,SAA2B,EAAE;IAEjEqB,UAAU;QACN,MAAMP,OAAOK,UAAU,CAAC,EAAE;QAC1B,IAAI,CAACL,MACD;QAEJD,QAAQC,KAAK,IAAI,GAAG,SAAS;IACjC,GAAG;QAACK;KAAW;IAEf,MAAMG,eAAeC,OAAO;IAE5BF,UAAU;QACNhB,WAAW;QACX,MAAMmB,YAAY,EAAEF,aAAa,OAAO;QAExC3B,QAAQ,OAAO,CAACG,WAAW,IAAI,CAAC2B,CAAAA;YAC5B,IAAID,cAAcF,aAAa,OAAO,EAClC;YAGAxB,UAAU,KAAK,GACfK,sBAAsBS,CAAAA,OAAQ;uBAAIA;uBAASa,OAAO,OAAO;iBAAC,IAE1DtB,sBAAsBsB,OAAO,OAAO;YAGxClB,QAAQkB,OAAO,IAAI;YACnBpB,WAAW;QACf;IACJ,GAAG;QAACP;KAAU;IAEd,MAAM4B,UAAUC,QAAQ,IACb;YACH;gBACI,IAAI;gBACJ,MAAM7B,AAAmB,WAAnBA,UAAU,IAAI;YACxB;SACH,EACF;QAACA,UAAU,IAAI;KAAC;IAEnB,OAAO;QACH,eAAeM;QACf,SAASF;QACTI;QACA,iBAAiB;YACb,IAAI,CAACF,WAAWE,KAAK,MAAM,EACvBS,SAAST,KAAK,MAAM;QAE5B;QACAI;QACAgB;QACA,YAAYN;QACZH;QACA,mBAAmBb,WAAW,CAAC,CAACN,UAAU,KAAK;IACnD;AACJ"}

package/index.js

@@ -1,5 +1,5 @@
 import react from "react";
-import { AdminConfig, AdminLayout, HasPermission, RegisterFeature, useRouter, useWcp } from "@webiny/app-admin";
+import { AdminConfig, AdminLayout, HasPermission, RegisterFeature, useFeatureFlags, useRouter } from "@webiny/app-admin";
 import { ReactComponent } from "@webiny/icons/manage_search.svg";
 import { LogsModule } from "./views/Logs/LogsModule.js";
 import { SecurityPermission } from "./SecurityPermission.js";
@@ -7,14 +7,21 @@ 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";
+import { ListAuditLogsFeature } from "./features/listAuditLogs/index.js";
+import { AuditLogDetailsPresenterFeature } from "./views/Logs/Preview/feature.js";
+import { AiPromptPreviewTabs } from "./views/Logs/Preview/tabs/AiPromptTabs.js";
 const { Menu: Menu, Route: Route } = AdminConfig;
 const AuditLogs = ()=>{
-    const wcp = useWcp();
+    const featureFlags = useFeatureFlags();
     const router = useRouter();
-    if (!wcp.canUseAuditLogs()) return null;
+    if (!featureFlags.isEnabled("auditLogs")) 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, {
+    }), /*#__PURE__*/ react.createElement(RegisterFeature, {
+        feature: ListAuditLogsFeature
+    }), /*#__PURE__*/ react.createElement(RegisterFeature, {
+        feature: AuditLogDetailsPresenterFeature
+    }), /*#__PURE__*/ react.createElement(LogsModule, null), /*#__PURE__*/ react.createElement(SecurityPermission, null), /*#__PURE__*/ react.createElement(AiPromptPreviewTabs, null), /*#__PURE__*/ react.createElement(AdminConfig, null, /*#__PURE__*/ react.createElement(HasPermission, {
         any: [
             "al.*"
         ]
@@ -33,7 +40,10 @@ const AuditLogs = ()=>{
         route: Routes.AuditLogsList,
         element: /*#__PURE__*/ react.createElement(AdminLayout, {
             title: "Audit Logs - Logs"
-        }, /*#__PURE__*/ react.createElement(AuditLogsListWithConfig, null, /*#__PURE__*/ react.createElement(LogsView, null)))
+        }, /*#__PURE__*/ react.createElement(AdminConfig.Breadcrumb, {
+            name: "auditLogs",
+            label: "Audit Logs"
+        }), /*#__PURE__*/ react.createElement(AuditLogsListWithConfig, null, /*#__PURE__*/ react.createElement(LogsView, null)))
     }))));
 };
 export { AuditLogs };

package/index.js.map

@@ -1 +1 @@
-{"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"}
+{"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, useFeatureFlags } 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\";\nimport { ListAuditLogsFeature } from \"~/features/listAuditLogs/index.js\";\nimport { AuditLogDetailsPresenterFeature } from \"~/views/Logs/Preview/feature.js\";\nimport { AiPromptPreviewTabs } from \"~/views/Logs/Preview/tabs/AiPromptTabs.js\";\n\nconst { Menu, Route } = AdminConfig;\n\nexport const AuditLogs = () => {\n    const featureFlags = useFeatureFlags();\n    const router = useRouter();\n\n    if (!featureFlags.isEnabled(\"auditLogs\")) {\n        return null;\n    }\n\n    return (\n        <>\n            <RegisterFeature feature={AlPermissionsFeature} />\n            <RegisterFeature feature={ListAuditLogsFeature} />\n            <RegisterFeature feature={AuditLogDetailsPresenterFeature} />\n            <LogsModule />\n            <SecurityPermission />\n            <AiPromptPreviewTabs />\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                                <AdminConfig.Breadcrumb name={\"auditLogs\"} label={\"Audit Logs\"} />\n                                <AuditLogsListWithConfig>\n                                    <LogsView />\n                                </AuditLogsListWithConfig>\n                            </AdminLayout>\n                        }\n                    />\n                </HasPermission>\n            </AdminConfig>\n        </>\n    );\n};\n"],"names":["Menu","Route","AdminConfig","AuditLogs","featureFlags","useFeatureFlags","router","useRouter","RegisterFeature","AlPermissionsFeature","ListAuditLogsFeature","AuditLogDetailsPresenterFeature","LogsModule","SecurityPermission","AiPromptPreviewTabs","HasPermission","Icon","Routes","AdminLayout","AuditLogsListWithConfig","LogsView"],"mappings":";;;;;;;;;;;;AAeA,MAAM,EAAEA,MAAAA,IAAI,EAAEC,OAAAA,KAAK,EAAE,GAAGC;AAEjB,MAAMC,YAAY;IACrB,MAAMC,eAAeC;IACrB,MAAMC,SAASC;IAEf,IAAI,CAACH,aAAa,SAAS,CAAC,cACxB,OAAO;IAGX,OAAO,WAAP,GACI,wDACI,oBAACI,iBAAeA;QAAC,SAASC;sBAC1B,oBAACD,iBAAeA;QAAC,SAASE;sBAC1B,oBAACF,iBAAeA;QAAC,SAASG;sBAC1B,oBAACC,YAAUA,OAAAA,WAAAA,GACX,oBAACC,oBAAkBA,OAAAA,WAAAA,GACnB,oBAACC,qBAAmBA,OAAAA,WAAAA,GACpB,oBAACZ,aAAWA,MAAAA,WAAAA,GACR,oBAACa,eAAaA;QAAC,KAAK;YAAC;SAAO;qBACxB,oBAACf,MAAIA;QACD,MAAK;QACL;QACA,uBACI,oBAACA,KAAK,IAAI;YACN,MAAM;YACN,oBAAM,oBAACA,KAAK,IAAI,CAAC,IAAI;gBAAC,uBAAS,oBAACgB,gBAAIA;gBAAK,OAAO;;YAChD,IAAIV,OAAO,OAAO,CAACW,OAAO,aAAa;;sBAInD,oBAAChB,OAAKA;QACF,OAAOgB,OAAO,aAAa;QAC3B,uBACI,oBAACC,aAAWA;YAAC,OAAO;yBAChB,oBAAChB,YAAY,UAAU;YAAC,MAAM;YAAa,OAAO;0BAClD,oBAACiB,yBAAuBA,MAAAA,WAAAA,GACpB,oBAACC,UAAQA;;AAS7C"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webiny/app-audit-logs",
-	"version": "6.4.11",
+	"version": "6.6.0-alpha.1",
 	"type": "module",
 	"exports": {
 		".": "./index.js",
@@ -13,21 +13,18 @@
 	"description": "",
 	"license": "MIT",
 	"dependencies": {
-		"@apollo/react-hooks": "3.1.5",
-		"@emotion/css": "11.13.5",
-		"@emotion/react": "11.14.0",
-		"@emotion/styled": "11.14.1",
-		"@webiny/admin-ui": "6.4.11",
-		"@webiny/app": "6.4.11",
-		"@webiny/app-admin": "6.4.11",
-		"@webiny/common-audit-logs": "6.4.11",
-		"@webiny/form": "6.4.11",
-		"@webiny/icons": "6.4.11",
-		"@webiny/react-composition": "6.4.11",
-		"@webiny/react-properties": "6.4.11",
+		"@webiny/admin-ui": "6.6.0-alpha.1",
+		"@webiny/app": "6.6.0-alpha.1",
+		"@webiny/app-admin": "6.6.0-alpha.1",
+		"@webiny/common-audit-logs": "6.6.0-alpha.1",
+		"@webiny/feature": "6.6.0-alpha.1",
+		"@webiny/form": "6.6.0-alpha.1",
+		"@webiny/icons": "6.6.0-alpha.1",
+		"@webiny/react-composition": "6.6.0-alpha.1",
+		"@webiny/react-properties": "6.6.0-alpha.1",
 		"date-fns": "4.4.0",
-		"graphql-tag": "2.12.7",
 		"lodash": "4.18.1",
+		"mobx": "7.0.3",
 		"zod": "4.4.3"
 	},
 	"peerDependencies": {
@@ -35,10 +32,10 @@
 	},
 	"devDependencies": {
 		"@types/react": "18.3.31",
-		"@webiny/build-tools": "6.4.11",
-		"execa": "5.1.1",
+		"@webiny/build-tools": "6.6.0-alpha.1",
+		"execa": "10.0.1",
 		"rimraf": "6.1.3",
-		"typescript": "6.0.3"
+		"typescript": "7.0.2"
 	},
 	"publishConfig": {
 		"access": "public"

package/types.d.ts

@@ -22,7 +22,7 @@ export interface IAuditLogRaw {
     createdBy: IAuditLogCreatedByRaw;
     createdOn: Date;
     app: string;
-    action: ActionType;
+    action: string;
     message: string;
     entity: string;
     entityId: string;
@@ -36,7 +36,7 @@ export interface IAuditLogEntity {
     link?: string;
 }
 export interface IAuditLogAction {
-    value: ActionType;
+    value: string;
     label: string;
 }
 export interface IAuditLog extends Omit<IAuditLogRaw, "entity" | "action" | "createdBy"> {

package/views/Logs/Filters/FilterByAction.d.ts

@@ -1,2 +1,2 @@
 import React from "react";
-export declare const FilterByAction: () => React.JSX.Element | null;
+export declare const FilterByAction: () => React.JSX.Element;

package/views/Logs/Filters/FilterByAction.js

@@ -31,12 +31,14 @@ const FilterByAction = ()=>{
     }, [
         data
     ]);
-    if (!data.app || !data.entity) return null;
+    const disabled = !data.app || !data.entity;
     return /*#__PURE__*/ react.createElement(Select, {
         ...bind,
+        label: "Action",
         size: "md",
-        placeholder: "Filter by Action",
-        options: options
+        placeholder: "All actions",
+        options: disabled ? [] : options,
+        disabled: disabled
     });
 };
 export { FilterByAction };

package/views/Logs/Filters/FilterByAction.js.map

@@ -1 +1 @@
-{"version":3,"file":"views/Logs/Filters/FilterByAction.js","sources":["../../../../src/views/Logs/Filters/FilterByAction.tsx"],"sourcesContent":["import React, { useMemo } from \"react\";\nimport { useBind, useForm } from \"@webiny/form\";\nimport { Select } from \"@webiny/admin-ui\";\nimport { apps as auditLogsApps } from \"@webiny/common-audit-logs\";\nimport type { IFilterFormData } from \"~/views/Logs/Filters/types.js\";\n\nconst getValidFilterValue = (value: string): string | undefined => {\n    if (value === \"all\" || value === \"\") {\n        return undefined;\n    }\n    return value;\n};\n\nexport const FilterByAction = () => {\n    const { data } = useForm<IFilterFormData>();\n    const bind = useBind({\n        name: \"action\",\n        beforeChange(value, cb) {\n            cb(getValidFilterValue(value));\n        }\n    });\n\n    const options = useMemo(() => {\n        if (!data.app) {\n            return [];\n        }\n\n        const entities = auditLogsApps.find(app => app.app === data.app)?.entities || [];\n        const actions = entities.find(entity => entity.type === data.entity)?.actions || [];\n\n        return [\n            { label: \"All\", value: \"all\" },\n            ...actions.map(entity => ({ label: entity.displayName, value: entity.type }))\n        ];\n    }, [data]);\n\n    if (!data.app || !data.entity) {\n        return null;\n    }\n\n    return <Select {...bind} size={\"md\"} placeholder={\"Filter by Action\"} options={options} />;\n};\n"],"names":["getValidFilterValue","value","FilterByAction","data","useForm","bind","useBind","cb","options","useMemo","entities","auditLogsApps","app","actions","entity","Select"],"mappings":";;;;AAMA,MAAMA,sBAAsB,CAACC;IACzB,IAAIA,AAAU,UAAVA,SAAmBA,AAAU,OAAVA,OACnB;IAEJ,OAAOA;AACX;AAEO,MAAMC,iBAAiB;IAC1B,MAAM,EAAEC,IAAI,EAAE,GAAGC;IACjB,MAAMC,OAAOC,QAAQ;QACjB,MAAM;QACN,cAAaL,KAAK,EAAEM,EAAE;YAClBA,GAAGP,oBAAoBC;QAC3B;IACJ;IAEA,MAAMO,UAAUC,QAAQ;QACpB,IAAI,CAACN,KAAK,GAAG,EACT,OAAO,EAAE;QAGb,MAAMO,WAAWC,KAAc,IAAI,CAACC,CAAAA,MAAOA,IAAI,GAAG,KAAKT,KAAK,GAAG,GAAG,YAAY,EAAE;QAChF,MAAMU,UAAUH,SAAS,IAAI,CAACI,CAAAA,SAAUA,OAAO,IAAI,KAAKX,KAAK,MAAM,GAAG,WAAW,EAAE;QAEnF,OAAO;YACH;gBAAE,OAAO;gBAAO,OAAO;YAAM;eAC1BU,QAAQ,GAAG,CAACC,CAAAA,SAAW;oBAAE,OAAOA,OAAO,WAAW;oBAAE,OAAOA,OAAO,IAAI;gBAAC;SAC7E;IACL,GAAG;QAACX;KAAK;IAET,IAAI,CAACA,KAAK,GAAG,IAAI,CAACA,KAAK,MAAM,EACzB,OAAO;IAGX,OAAO,WAAP,GAAO,oBAACY,QAAMA;QAAE,GAAGV,IAAI;QAAE,MAAM;QAAM,aAAa;QAAoB,SAASG;;AACnF"}
+{"version":3,"file":"views/Logs/Filters/FilterByAction.js","sources":["../../../../src/views/Logs/Filters/FilterByAction.tsx"],"sourcesContent":["import React, { useMemo } from \"react\";\nimport { useBind, useForm } from \"@webiny/form\";\nimport { Select } from \"@webiny/admin-ui\";\nimport { apps as auditLogsApps } from \"@webiny/common-audit-logs\";\nimport type { IFilterFormData } from \"~/views/Logs/Filters/types.js\";\n\nconst getValidFilterValue = (value: string): string | undefined => {\n    if (value === \"all\" || value === \"\") {\n        return undefined;\n    }\n    return value;\n};\n\nexport const FilterByAction = () => {\n    const { data } = useForm<IFilterFormData>();\n    const bind = useBind({\n        name: \"action\",\n        beforeChange(value, cb) {\n            cb(getValidFilterValue(value));\n        }\n    });\n\n    const options = useMemo(() => {\n        if (!data.app) {\n            return [];\n        }\n\n        const entities = auditLogsApps.find(app => app.app === data.app)?.entities || [];\n        const actions = entities.find(entity => entity.type === data.entity)?.actions || [];\n\n        return [\n            { label: \"All\", value: \"all\" },\n            ...actions.map(entity => ({ label: entity.displayName, value: entity.type }))\n        ];\n    }, [data]);\n\n    const disabled = !data.app || !data.entity;\n\n    return (\n        <Select\n            {...bind}\n            label={\"Action\"}\n            size={\"md\"}\n            placeholder={\"All actions\"}\n            options={disabled ? [] : options}\n            disabled={disabled}\n        />\n    );\n};\n"],"names":["getValidFilterValue","value","FilterByAction","data","useForm","bind","useBind","cb","options","useMemo","entities","auditLogsApps","app","actions","entity","disabled","Select"],"mappings":";;;;AAMA,MAAMA,sBAAsB,CAACC;IACzB,IAAIA,AAAU,UAAVA,SAAmBA,AAAU,OAAVA,OACnB;IAEJ,OAAOA;AACX;AAEO,MAAMC,iBAAiB;IAC1B,MAAM,EAAEC,IAAI,EAAE,GAAGC;IACjB,MAAMC,OAAOC,QAAQ;QACjB,MAAM;QACN,cAAaL,KAAK,EAAEM,EAAE;YAClBA,GAAGP,oBAAoBC;QAC3B;IACJ;IAEA,MAAMO,UAAUC,QAAQ;QACpB,IAAI,CAACN,KAAK,GAAG,EACT,OAAO,EAAE;QAGb,MAAMO,WAAWC,KAAc,IAAI,CAACC,CAAAA,MAAOA,IAAI,GAAG,KAAKT,KAAK,GAAG,GAAG,YAAY,EAAE;QAChF,MAAMU,UAAUH,SAAS,IAAI,CAACI,CAAAA,SAAUA,OAAO,IAAI,KAAKX,KAAK,MAAM,GAAG,WAAW,EAAE;QAEnF,OAAO;YACH;gBAAE,OAAO;gBAAO,OAAO;YAAM;eAC1BU,QAAQ,GAAG,CAACC,CAAAA,SAAW;oBAAE,OAAOA,OAAO,WAAW;oBAAE,OAAOA,OAAO,IAAI;gBAAC;SAC7E;IACL,GAAG;QAACX;KAAK;IAET,MAAMY,WAAW,CAACZ,KAAK,GAAG,IAAI,CAACA,KAAK,MAAM;IAE1C,OAAO,WAAP,GACI,oBAACa,QAAMA;QACF,GAAGX,IAAI;QACR,OAAO;QACP,MAAM;QACN,aAAa;QACb,SAASU,WAAW,EAAE,GAAGP;QACzB,UAAUO;;AAGtB"}

package/views/Logs/Filters/FilterByApp.js

@@ -18,8 +18,9 @@ const FilterByApp = ()=>{
     });
     return /*#__PURE__*/ react.createElement(Select, {
         ...bind,
+        label: "Application",
         size: "md",
-        placeholder: "Filter by App",
+        placeholder: "All applications",
         options: [
             {
                 label: "All",

package/views/Logs/Filters/FilterByApp.js.map

@@ -1 +1 @@
-{"version":3,"file":"views/Logs/Filters/FilterByApp.js","sources":["../../../../src/views/Logs/Filters/FilterByApp.tsx"],"sourcesContent":["import React from \"react\";\nimport { useBind, useForm } from \"@webiny/form\";\nimport { Select } from \"@webiny/admin-ui\";\nimport { apps as auditLogsApps } from \"@webiny/common-audit-logs\";\nimport type { IFilterFormData } from \"~/views/Logs/Filters/types.js\";\n\nconst getValidFilterValue = (value: string): string | undefined => {\n    if (value === \"all\" || value === \"\") {\n        return undefined;\n    }\n    return value;\n};\n\nexport const FilterByApp = () => {\n    const { setValue } = useForm<IFilterFormData>();\n    const bind = useBind({\n        name: \"app\",\n        beforeChange(value, cb) {\n            setValue(\"entity\", undefined);\n            setValue(\"action\", undefined);\n            cb(getValidFilterValue(value));\n        }\n    });\n\n    return (\n        <Select\n            {...bind}\n            size={\"md\"}\n            placeholder={\"Filter by App\"}\n            options={[\n                { label: \"All\", value: \"all\" },\n                ...auditLogsApps.map(app => ({ label: app.displayName, value: app.app }))\n            ]}\n        />\n    );\n};\n"],"names":["getValidFilterValue","value","FilterByApp","setValue","useForm","bind","useBind","cb","undefined","Select","auditLogsApps","app"],"mappings":";;;;AAMA,MAAMA,sBAAsB,CAACC;IACzB,IAAIA,AAAU,UAAVA,SAAmBA,AAAU,OAAVA,OACnB;IAEJ,OAAOA;AACX;AAEO,MAAMC,cAAc;IACvB,MAAM,EAAEC,QAAQ,EAAE,GAAGC;IACrB,MAAMC,OAAOC,QAAQ;QACjB,MAAM;QACN,cAAaL,KAAK,EAAEM,EAAE;YAClBJ,SAAS,UAAUK;YACnBL,SAAS,UAAUK;YACnBD,GAAGP,oBAAoBC;QAC3B;IACJ;IAEA,OAAO,WAAP,GACI,oBAACQ,QAAMA;QACF,GAAGJ,IAAI;QACR,MAAM;QACN,aAAa;QACb,SAAS;YACL;gBAAE,OAAO;gBAAO,OAAO;YAAM;eAC1BK,KAAAA,GAAiB,CAACC,CAAAA,MAAQ;oBAAE,OAAOA,IAAI,WAAW;oBAAE,OAAOA,IAAI,GAAG;gBAAC;SACzE;;AAGb"}
+{"version":3,"file":"views/Logs/Filters/FilterByApp.js","sources":["../../../../src/views/Logs/Filters/FilterByApp.tsx"],"sourcesContent":["import React from \"react\";\nimport { useBind, useForm } from \"@webiny/form\";\nimport { Select } from \"@webiny/admin-ui\";\nimport { apps as auditLogsApps } from \"@webiny/common-audit-logs\";\nimport type { IFilterFormData } from \"~/views/Logs/Filters/types.js\";\n\nconst getValidFilterValue = (value: string): string | undefined => {\n    if (value === \"all\" || value === \"\") {\n        return undefined;\n    }\n    return value;\n};\n\nexport const FilterByApp = () => {\n    const { setValue } = useForm<IFilterFormData>();\n    const bind = useBind({\n        name: \"app\",\n        beforeChange(value, cb) {\n            setValue(\"entity\", undefined);\n            setValue(\"action\", undefined);\n            cb(getValidFilterValue(value));\n        }\n    });\n\n    return (\n        <Select\n            {...bind}\n            label={\"Application\"}\n            size={\"md\"}\n            placeholder={\"All applications\"}\n            options={[\n                { label: \"All\", value: \"all\" },\n                ...auditLogsApps.map(app => ({ label: app.displayName, value: app.app }))\n            ]}\n        />\n    );\n};\n"],"names":["getValidFilterValue","value","FilterByApp","setValue","useForm","bind","useBind","cb","undefined","Select","auditLogsApps","app"],"mappings":";;;;AAMA,MAAMA,sBAAsB,CAACC;IACzB,IAAIA,AAAU,UAAVA,SAAmBA,AAAU,OAAVA,OACnB;IAEJ,OAAOA;AACX;AAEO,MAAMC,cAAc;IACvB,MAAM,EAAEC,QAAQ,EAAE,GAAGC;IACrB,MAAMC,OAAOC,QAAQ;QACjB,MAAM;QACN,cAAaL,KAAK,EAAEM,EAAE;YAClBJ,SAAS,UAAUK;YACnBL,SAAS,UAAUK;YACnBD,GAAGP,oBAAoBC;QAC3B;IACJ;IAEA,OAAO,WAAP,GACI,oBAACQ,QAAMA;QACF,GAAGJ,IAAI;QACR,OAAO;QACP,MAAM;QACN,aAAa;QACb,SAAS;YACL;gBAAE,OAAO;gBAAO,OAAO;YAAM;eAC1BK,KAAAA,GAAiB,CAACC,CAAAA,MAAQ;oBAAE,OAAOA,IAAI,WAAW;oBAAE,OAAOA,IAAI,GAAG;gBAAC;SACzE;;AAGb"}

package/views/Logs/Filters/FilterByCreatedBy.js

@@ -1,5 +1,6 @@
-import react, { useMemo } from "react";
-import { useQuery } from "@apollo/react-hooks";
+import react, { useEffect, useMemo, useState } from "react";
+import { useContainer } from "@webiny/app";
+import { MainGraphQLClient } from "@webiny/app/features/mainGraphQLClient";
 import { useBind } from "@webiny/form";
 import { Select } from "@webiny/admin-ui";
 import { LIST_USERS } from "../../../graphql.js";
@@ -8,16 +9,23 @@ const getValidFilterValue = (value)=>{
     return value;
 };
 const FilterByCreatedBy = ()=>{
-    const { data: listUsers } = useQuery(LIST_USERS);
+    const container = useContainer();
+    const client = container.resolve(MainGraphQLClient);
+    const [users, setUsers] = useState([]);
+    useEffect(()=>{
+        client.execute({
+            query: LIST_USERS
+        }).then((response)=>{
+            setUsers(response.adminUsers.users.data || []);
+        });
+    }, []);
     const bind = useBind({
         name: "createdBy",
         beforeChange (value, cb) {
             cb(getValidFilterValue(value));
         }
     });
-    const options = useMemo(()=>{
-        const users = listUsers?.adminUsers?.users?.data || [];
-        return [
+    const options = useMemo(()=>[
             {
                 label: "All",
                 value: "all"
@@ -26,14 +34,14 @@ const FilterByCreatedBy = ()=>{
                     label: `${user.firstName} ${user.lastName}`,
                     value: user.id
                 }))
-        ];
-    }, [
-        listUsers
+        ], [
+        users
     ]);
     return /*#__PURE__*/ react.createElement(Select, {
         ...bind,
+        label: "Initiator",
         size: "md",
-        placeholder: "Filter by Initiator",
+        placeholder: "Anyone",
         options: options
     });
 };

package/views/Logs/Filters/FilterByCreatedBy.js.map

@@ -1 +1 @@
-{"version":3,"file":"views/Logs/Filters/FilterByCreatedBy.js","sources":["../../../../src/views/Logs/Filters/FilterByCreatedBy.tsx"],"sourcesContent":["import React, { useMemo } from \"react\";\nimport { useQuery } from \"@apollo/react-hooks\";\nimport { useBind } from \"@webiny/form\";\nimport { Select } from \"@webiny/admin-ui\";\nimport { LIST_USERS } from \"~/graphql.js\";\nimport type { User } from \"~/types.js\";\n\nconst getValidFilterValue = (value: string): string | undefined => {\n    if (value === \"all\" || value === \"\") {\n        return undefined;\n    }\n    return value;\n};\n\nexport const FilterByCreatedBy = () => {\n    const { data: listUsers } = useQuery(LIST_USERS);\n    const bind = useBind({\n        name: \"createdBy\",\n        beforeChange(value, cb) {\n            cb(getValidFilterValue(value));\n        }\n    });\n\n    const options = useMemo(() => {\n        const users: User[] = listUsers?.adminUsers?.users?.data || [];\n\n        return [\n            { label: \"All\", value: \"all\" },\n            ...users.map(user => ({ label: `${user.firstName} ${user.lastName}`, value: user.id }))\n        ];\n    }, [listUsers]);\n\n    return <Select {...bind} size={\"md\"} placeholder={\"Filter by Initiator\"} options={options} />;\n};\n"],"names":["getValidFilterValue","value","FilterByCreatedBy","listUsers","useQuery","LIST_USERS","bind","useBind","cb","options","useMemo","users","user","Select"],"mappings":";;;;;AAOA,MAAMA,sBAAsB,CAACC;IACzB,IAAIA,AAAU,UAAVA,SAAmBA,AAAU,OAAVA,OACnB;IAEJ,OAAOA;AACX;AAEO,MAAMC,oBAAoB;IAC7B,MAAM,EAAE,MAAMC,SAAS,EAAE,GAAGC,SAASC;IACrC,MAAMC,OAAOC,QAAQ;QACjB,MAAM;QACN,cAAaN,KAAK,EAAEO,EAAE;YAClBA,GAAGR,oBAAoBC;QAC3B;IACJ;IAEA,MAAMQ,UAAUC,QAAQ;QACpB,MAAMC,QAAgBR,WAAW,YAAY,OAAO,QAAQ,EAAE;QAE9D,OAAO;YACH;gBAAE,OAAO;gBAAO,OAAO;YAAM;eAC1BQ,MAAM,GAAG,CAACC,CAAAA,OAAS;oBAAE,OAAO,GAAGA,KAAK,SAAS,CAAC,CAAC,EAAEA,KAAK,QAAQ,EAAE;oBAAE,OAAOA,KAAK,EAAE;gBAAC;SACvF;IACL,GAAG;QAACT;KAAU;IAEd,OAAO,WAAP,GAAO,oBAACU,QAAMA;QAAE,GAAGP,IAAI;QAAE,MAAM;QAAM,aAAa;QAAuB,SAASG;;AACtF"}
+{"version":3,"file":"views/Logs/Filters/FilterByCreatedBy.js","sources":["../../../../src/views/Logs/Filters/FilterByCreatedBy.tsx"],"sourcesContent":["import React, { useEffect, useMemo, useState } from \"react\";\nimport { useContainer } from \"@webiny/app\";\nimport { MainGraphQLClient } from \"@webiny/app/features/mainGraphQLClient\";\nimport { useBind } from \"@webiny/form\";\nimport { Select } from \"@webiny/admin-ui\";\nimport { LIST_USERS } from \"~/graphql.js\";\nimport type { User } from \"~/types.js\";\n\ninterface ListUsersResponse {\n    adminUsers: {\n        users: {\n            data: User[];\n        };\n    };\n}\n\nconst getValidFilterValue = (value: string): string | undefined => {\n    if (value === \"all\" || value === \"\") {\n        return undefined;\n    }\n    return value;\n};\n\nexport const FilterByCreatedBy = () => {\n    const container = useContainer();\n    const client = container.resolve(MainGraphQLClient);\n    const [users, setUsers] = useState<User[]>([]);\n\n    useEffect(() => {\n        client.execute<ListUsersResponse>({ query: LIST_USERS }).then(response => {\n            setUsers(response.adminUsers.users.data || []);\n        });\n    }, []);\n\n    const bind = useBind({\n        name: \"createdBy\",\n        beforeChange(value, cb) {\n            cb(getValidFilterValue(value));\n        }\n    });\n\n    const options = useMemo(() => {\n        return [\n            { label: \"All\", value: \"all\" },\n            ...users.map(user => ({ label: `${user.firstName} ${user.lastName}`, value: user.id }))\n        ];\n    }, [users]);\n\n    return (\n        <Select\n            {...bind}\n            label={\"Initiator\"}\n            size={\"md\"}\n            placeholder={\"Anyone\"}\n            options={options}\n        />\n    );\n};\n"],"names":["getValidFilterValue","value","FilterByCreatedBy","container","useContainer","client","MainGraphQLClient","users","setUsers","useState","useEffect","LIST_USERS","response","bind","useBind","cb","options","useMemo","user","Select"],"mappings":";;;;;;AAgBA,MAAMA,sBAAsB,CAACC;IACzB,IAAIA,AAAU,UAAVA,SAAmBA,AAAU,OAAVA,OACnB;IAEJ,OAAOA;AACX;AAEO,MAAMC,oBAAoB;IAC7B,MAAMC,YAAYC;IAClB,MAAMC,SAASF,UAAU,OAAO,CAACG;IACjC,MAAM,CAACC,OAAOC,SAAS,GAAGC,SAAiB,EAAE;IAE7CC,UAAU;QACNL,OAAO,OAAO,CAAoB;YAAE,OAAOM;QAAW,GAAG,IAAI,CAACC,CAAAA;YAC1DJ,SAASI,SAAS,UAAU,CAAC,KAAK,CAAC,IAAI,IAAI,EAAE;QACjD;IACJ,GAAG,EAAE;IAEL,MAAMC,OAAOC,QAAQ;QACjB,MAAM;QACN,cAAab,KAAK,EAAEc,EAAE;YAClBA,GAAGf,oBAAoBC;QAC3B;IACJ;IAEA,MAAMe,UAAUC,QAAQ,IACb;YACH;gBAAE,OAAO;gBAAO,OAAO;YAAM;eAC1BV,MAAM,GAAG,CAACW,CAAAA,OAAS;oBAAE,OAAO,GAAGA,KAAK,SAAS,CAAC,CAAC,EAAEA,KAAK,QAAQ,EAAE;oBAAE,OAAOA,KAAK,EAAE;gBAAC;SACvF,EACF;QAACX;KAAM;IAEV,OAAO,WAAP,GACI,oBAACY,QAAMA;QACF,GAAGN,IAAI;QACR,OAAO;QACP,MAAM;QACN,aAAa;QACb,SAASG;;AAGrB"}