@webiny/app-audit-logs 6.4.5-beta.0 → 6.6.0-alpha.0

package/config/list/AuditLogsListConfig.d.ts

@@ -1,10 +1,11 @@
 import React from "react";
-export declare const AuditLogsListConfig: {
+declare const ScopedAuditLogsListConfig: {
     ({ children }: {
         children: React.ReactNode;
     }): React.JSX.Element;
     displayName: string;
-} & {
+};
+export declare const AuditLogsListConfig: typeof ScopedAuditLogsListConfig & {
     Browser: {
         Filter: (({ name, element, after, before, remove }: import("./Browser/Filter.js").FilterProps) => React.JSX.Element) & {
             original: ({ name, element, after, before, remove }: import("./Browser/Filter.js").FilterProps) => React.JSX.Element;
@@ -33,9 +34,7 @@ export declare const AuditLogsListConfig: {
                 name: string;
             }) => React.JSX.Element;
         };
-        FiltersToWhere: ({ converter }: {
-            converter: import("./Browser/FiltersToWhere.js").FiltersToWhereConverter;
-        }) => React.JSX.Element;
+        FiltersToWhere: typeof import("./Browser/FiltersToWhere.js").FiltersToWhere;
     };
 };
 export declare const AuditLogsListWithConfig: ({ children }: {
@@ -47,3 +46,4 @@ export declare function useAuditLogsListConfig(): {
         filtersToWhere: import("./Browser/FiltersToWhere.js").FiltersToWhereConverter[];
     };
 };
+export {};

package/config/list/Browser/index.d.ts

@@ -1,5 +1,6 @@
 import type { FilterConfig } from "./Filter.js";
 import type { FiltersToWhereConverter } from "./FiltersToWhere.js";
+import { FiltersToWhere } from "./FiltersToWhere.js";
 export interface BrowserConfig {
     filters: FilterConfig[];
     filtersToWhere: FiltersToWhereConverter[];
@@ -32,7 +33,5 @@ export declare const Browser: {
             name: string;
         }) => React.JSX.Element;
     };
-    FiltersToWhere: ({ converter }: {
-        converter: FiltersToWhereConverter;
-    }) => import("react").JSX.Element;
+    FiltersToWhere: typeof FiltersToWhere;
 };

package/features/listAuditLogs/ListAuditLogsGateway.d.ts

@@ -0,0 +1,11 @@
+import { MainGraphQLClient } from "@webiny/app/features/mainGraphQLClient";
+import { ListAuditLogsGateway as GatewayAbstraction } from "./abstractions/index.js";
+declare class ListAuditLogsGatewayImpl implements GatewayAbstraction.Interface {
+    private readonly client;
+    constructor(client: MainGraphQLClient.Interface);
+    execute(params: GatewayAbstraction.Params): Promise<GatewayAbstraction.Result>;
+}
+export declare const ListAuditLogsGateway: typeof ListAuditLogsGatewayImpl & {
+    __abstraction: import("@webiny/di").Abstraction<import("./abstractions/ListAuditLogsGateway.js").IListAuditLogsGateway>;
+};
+export {};

package/features/listAuditLogs/ListAuditLogsGateway.js

@@ -0,0 +1,71 @@
+import { MainGraphQLClient } from "@webiny/app/features/mainGraphQLClient";
+import { ListAuditLogsGateway } from "./abstractions/index.js";
+const LIST_AUDIT_LOGS = `
+    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
+                }
+            }
+        }
+    }
+`;
+class ListAuditLogsGatewayImpl {
+    constructor(client){
+        this.client = client;
+    }
+    async execute(params) {
+        const response = await this.client.execute({
+            query: LIST_AUDIT_LOGS,
+            variables: params
+        });
+        const envelope = response.auditLogs.listAuditLogs;
+        if (envelope.error) throw new Error(envelope.error.message || "Could not fetch audit logs.");
+        return {
+            data: envelope.data || [],
+            meta: envelope.meta || {
+                hasMoreItems: false,
+                cursor: null
+            }
+        };
+    }
+}
+const ListAuditLogsGateway_ListAuditLogsGateway = ListAuditLogsGateway.createImplementation({
+    implementation: ListAuditLogsGatewayImpl,
+    dependencies: [
+        MainGraphQLClient
+    ]
+});
+export { ListAuditLogsGateway_ListAuditLogsGateway as ListAuditLogsGateway };
+
+//# sourceMappingURL=ListAuditLogsGateway.js.map

package/features/listAuditLogs/ListAuditLogsGateway.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"features/listAuditLogs/ListAuditLogsGateway.js","sources":["../../../src/features/listAuditLogs/ListAuditLogsGateway.ts"],"sourcesContent":["import { MainGraphQLClient } from \"@webiny/app/features/mainGraphQLClient\";\nimport type { IAuditLogRaw, IAuditLogsMeta, IAuditLogsError } from \"~/types.js\";\nimport { ListAuditLogsGateway as GatewayAbstraction } from \"./abstractions/index.js\";\n\nconst LIST_AUDIT_LOGS = /* GraphQL */ `\n    query ListAuditLogs(\n        $where: ListAuditLogsWhere!\n        $sort: AuditLogsSort\n        $after: String\n        $limit: Number\n    ) {\n        auditLogs {\n            listAuditLogs(where: $where, after: $after, sort: $sort, limit: $limit) {\n                data {\n                    id\n                    createdBy {\n                        id\n                        displayName\n                        type\n                    }\n                    createdOn\n                    app\n                    action\n                    message\n                    entity\n                    entityId\n                    tags\n                    expiresAt\n                    content\n                }\n                meta {\n                    hasMoreItems\n                    cursor\n                }\n                error {\n                    message\n                    code\n                    data\n                    stack\n                }\n            }\n        }\n    }\n`;\n\ninterface ListAuditLogsResponse {\n    auditLogs: {\n        listAuditLogs: {\n            data: IAuditLogRaw[] | null;\n            meta: IAuditLogsMeta | null;\n            error: IAuditLogsError | null;\n        };\n    };\n}\n\nclass ListAuditLogsGatewayImpl implements GatewayAbstraction.Interface {\n    constructor(private readonly client: MainGraphQLClient.Interface) {}\n\n    async execute(params: GatewayAbstraction.Params): Promise<GatewayAbstraction.Result> {\n        const response = await this.client.execute<ListAuditLogsResponse>({\n            query: LIST_AUDIT_LOGS,\n            variables: params\n        });\n\n        const envelope = response.auditLogs.listAuditLogs;\n\n        if (envelope.error) {\n            throw new Error(envelope.error.message || \"Could not fetch audit logs.\");\n        }\n\n        return {\n            data: envelope.data || [],\n            meta: envelope.meta || { hasMoreItems: false, cursor: null }\n        };\n    }\n}\n\nexport const ListAuditLogsGateway = GatewayAbstraction.createImplementation({\n    implementation: ListAuditLogsGatewayImpl,\n    dependencies: [MainGraphQLClient]\n});\n"],"names":["LIST_AUDIT_LOGS","ListAuditLogsGatewayImpl","client","params","response","envelope","Error","ListAuditLogsGateway","GatewayAbstraction","MainGraphQLClient"],"mappings":";;AAIA,MAAMA,kBAAgC,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAuCvC,CAAC;AAYD,MAAMC;IACF,YAA6BC,MAAmC,CAAE;aAArCA,MAAM,GAANA;IAAsC;IAEnE,MAAM,QAAQC,MAAiC,EAAsC;QACjF,MAAMC,WAAW,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CAAwB;YAC9D,OAAOJ;YACP,WAAWG;QACf;QAEA,MAAME,WAAWD,SAAS,SAAS,CAAC,aAAa;QAEjD,IAAIC,SAAS,KAAK,EACd,MAAM,IAAIC,MAAMD,SAAS,KAAK,CAAC,OAAO,IAAI;QAG9C,OAAO;YACH,MAAMA,SAAS,IAAI,IAAI,EAAE;YACzB,MAAMA,SAAS,IAAI,IAAI;gBAAE,cAAc;gBAAO,QAAQ;YAAK;QAC/D;IACJ;AACJ;AAEO,MAAME,4CAAuBC,qBAAAA,oBAAuC,CAAC;IACxE,gBAAgBP;IAChB,cAAc;QAACQ;KAAkB;AACrC"}

package/features/listAuditLogs/ListAuditLogsRepository.d.ts

@@ -0,0 +1,11 @@
+import { ListAuditLogsGateway } from "./abstractions/index.js";
+import { ListAuditLogsRepository as RepositoryAbstraction } from "./abstractions/index.js";
+declare class ListAuditLogsRepositoryImpl implements RepositoryAbstraction.Interface {
+    private readonly gateway;
+    constructor(gateway: ListAuditLogsGateway.Interface);
+    execute(params: RepositoryAbstraction.Params): Promise<RepositoryAbstraction.Result>;
+}
+export declare const ListAuditLogsRepository: typeof ListAuditLogsRepositoryImpl & {
+    __abstraction: import("@webiny/di").Abstraction<import("./abstractions/ListAuditLogsRepository.js").IListAuditLogsRepository>;
+};
+export {};

package/features/listAuditLogs/ListAuditLogsRepository.js

@@ -0,0 +1,35 @@
+import { ListAuditLogsGateway, ListAuditLogsRepository } from "./abstractions/index.js";
+import { listAuditLogsSchema } from "../../hooks/schema.js";
+import { transformRawAuditLog } from "../../utils/transformRawAuditLog.js";
+class ListAuditLogsRepositoryImpl {
+    constructor(gateway){
+        this.gateway = gateway;
+    }
+    async execute(params) {
+        const response = await this.gateway.execute(params);
+        const parsed = listAuditLogsSchema.safeParse(response.data);
+        if (!parsed.success) {
+            console.error(parsed.error);
+            return {
+                records: [],
+                meta: response.meta
+            };
+        }
+        const records = parsed.data.map((auditLog)=>transformRawAuditLog({
+                auditLog
+            }));
+        return {
+            records,
+            meta: response.meta
+        };
+    }
+}
+const ListAuditLogsRepository_ListAuditLogsRepository = ListAuditLogsRepository.createImplementation({
+    implementation: ListAuditLogsRepositoryImpl,
+    dependencies: [
+        ListAuditLogsGateway
+    ]
+});
+export { ListAuditLogsRepository_ListAuditLogsRepository as ListAuditLogsRepository };
+
+//# sourceMappingURL=ListAuditLogsRepository.js.map

package/features/listAuditLogs/ListAuditLogsRepository.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"features/listAuditLogs/ListAuditLogsRepository.js","sources":["../../../src/features/listAuditLogs/ListAuditLogsRepository.ts"],"sourcesContent":["import { ListAuditLogsGateway } from \"./abstractions/index.js\";\nimport { ListAuditLogsRepository as RepositoryAbstraction } from \"./abstractions/index.js\";\nimport { listAuditLogsSchema } from \"~/hooks/schema.js\";\nimport { transformRawAuditLog } from \"~/utils/transformRawAuditLog.js\";\n\nclass ListAuditLogsRepositoryImpl implements RepositoryAbstraction.Interface {\n    constructor(private readonly gateway: ListAuditLogsGateway.Interface) {}\n\n    async execute(params: RepositoryAbstraction.Params): Promise<RepositoryAbstraction.Result> {\n        const response = await this.gateway.execute(params);\n\n        const parsed = listAuditLogsSchema.safeParse(response.data);\n        if (!parsed.success) {\n            console.error(parsed.error);\n            return {\n                records: [],\n                meta: response.meta\n            };\n        }\n\n        const records = parsed.data.map(auditLog => transformRawAuditLog({ auditLog }));\n\n        return {\n            records,\n            meta: response.meta\n        };\n    }\n}\n\nexport const ListAuditLogsRepository = RepositoryAbstraction.createImplementation({\n    implementation: ListAuditLogsRepositoryImpl,\n    dependencies: [ListAuditLogsGateway]\n});\n"],"names":["ListAuditLogsRepositoryImpl","gateway","params","response","parsed","listAuditLogsSchema","console","records","auditLog","transformRawAuditLog","ListAuditLogsRepository","RepositoryAbstraction","ListAuditLogsGateway"],"mappings":";;;AAKA,MAAMA;IACF,YAA6BC,OAAuC,CAAE;aAAzCA,OAAO,GAAPA;IAA0C;IAEvE,MAAM,QAAQC,MAAoC,EAAyC;QACvF,MAAMC,WAAW,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAACD;QAE5C,MAAME,SAASC,oBAAoB,SAAS,CAACF,SAAS,IAAI;QAC1D,IAAI,CAACC,OAAO,OAAO,EAAE;YACjBE,QAAQ,KAAK,CAACF,OAAO,KAAK;YAC1B,OAAO;gBACH,SAAS,EAAE;gBACX,MAAMD,SAAS,IAAI;YACvB;QACJ;QAEA,MAAMI,UAAUH,OAAO,IAAI,CAAC,GAAG,CAACI,CAAAA,WAAYC,qBAAqB;gBAAED;YAAS;QAE5E,OAAO;YACHD;YACA,MAAMJ,SAAS,IAAI;QACvB;IACJ;AACJ;AAEO,MAAMO,kDAA0BC,wBAAAA,oBAA0C,CAAC;IAC9E,gBAAgBX;IAChB,cAAc;QAACY;KAAqB;AACxC"}

package/features/listAuditLogs/ListAuditLogsUseCase.d.ts

@@ -0,0 +1,10 @@
+import { ListAuditLogsRepository, ListAuditLogsUseCase as UseCaseAbstraction } from "./abstractions/index.js";
+declare class ListAuditLogsUseCaseImpl implements UseCaseAbstraction.Interface {
+    private readonly repository;
+    constructor(repository: ListAuditLogsRepository.Interface);
+    execute(params: UseCaseAbstraction.Params): Promise<UseCaseAbstraction.Result>;
+}
+export declare const ListAuditLogsUseCase: typeof ListAuditLogsUseCaseImpl & {
+    __abstraction: import("@webiny/di").Abstraction<import("./abstractions/ListAuditLogsUseCase.js").IListAuditLogsUseCase>;
+};
+export {};

package/features/listAuditLogs/ListAuditLogsUseCase.js

@@ -0,0 +1,19 @@
+import { ListAuditLogsRepository, ListAuditLogsUseCase } from "./abstractions/index.js";
+class ListAuditLogsUseCaseImpl {
+    constructor(repository){
+        this.repository = repository;
+    }
+    async execute(params) {
+        const result = await this.repository.execute(params);
+        return result;
+    }
+}
+const ListAuditLogsUseCase_ListAuditLogsUseCase = ListAuditLogsUseCase.createImplementation({
+    implementation: ListAuditLogsUseCaseImpl,
+    dependencies: [
+        ListAuditLogsRepository
+    ]
+});
+export { ListAuditLogsUseCase_ListAuditLogsUseCase as ListAuditLogsUseCase };
+
+//# sourceMappingURL=ListAuditLogsUseCase.js.map

package/features/listAuditLogs/ListAuditLogsUseCase.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"features/listAuditLogs/ListAuditLogsUseCase.js","sources":["../../../src/features/listAuditLogs/ListAuditLogsUseCase.ts"],"sourcesContent":["import {\n    ListAuditLogsRepository,\n    ListAuditLogsUseCase as UseCaseAbstraction\n} from \"./abstractions/index.js\";\n\nclass ListAuditLogsUseCaseImpl implements UseCaseAbstraction.Interface {\n    constructor(private readonly repository: ListAuditLogsRepository.Interface) {}\n\n    async execute(params: UseCaseAbstraction.Params): Promise<UseCaseAbstraction.Result> {\n        const result = await this.repository.execute(params);\n        return result;\n    }\n}\n\nexport const ListAuditLogsUseCase = UseCaseAbstraction.createImplementation({\n    implementation: ListAuditLogsUseCaseImpl,\n    dependencies: [ListAuditLogsRepository]\n});\n"],"names":["ListAuditLogsUseCaseImpl","repository","params","result","ListAuditLogsUseCase","UseCaseAbstraction","ListAuditLogsRepository"],"mappings":";AAKA,MAAMA;IACF,YAA6BC,UAA6C,CAAE;aAA/CA,UAAU,GAAVA;IAAgD;IAE7E,MAAM,QAAQC,MAAiC,EAAsC;QACjF,MAAMC,SAAS,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAACD;QAC7C,OAAOC;IACX;AACJ;AAEO,MAAMC,4CAAuBC,qBAAAA,oBAAuC,CAAC;IACxE,gBAAgBL;IAChB,cAAc;QAACM;KAAwB;AAC3C"}

package/features/listAuditLogs/abstractions/ListAuditLogsGateway.d.ts

@@ -0,0 +1,20 @@
+import type { IAuditLogRaw, IAuditLogsMeta } from "../../../types.js";
+export interface IListAuditLogsGatewayParams {
+    where?: Record<string, unknown>;
+    after?: string;
+    sort?: "ASC" | "DESC";
+    limit?: number;
+}
+export interface IListAuditLogsGatewayResult {
+    data: IAuditLogRaw[];
+    meta: IAuditLogsMeta;
+}
+export interface IListAuditLogsGateway {
+    execute(params: IListAuditLogsGatewayParams): Promise<IListAuditLogsGatewayResult>;
+}
+export declare const ListAuditLogsGateway: import("@webiny/di").Abstraction<IListAuditLogsGateway>;
+export declare namespace ListAuditLogsGateway {
+    type Interface = IListAuditLogsGateway;
+    type Params = IListAuditLogsGatewayParams;
+    type Result = IListAuditLogsGatewayResult;
+}

package/features/listAuditLogs/abstractions/ListAuditLogsGateway.js

@@ -0,0 +1,5 @@
+import { createAbstraction } from "@webiny/feature/admin";
+const ListAuditLogsGateway = createAbstraction("ListAuditLogsGateway");
+export { ListAuditLogsGateway };
+
+//# sourceMappingURL=ListAuditLogsGateway.js.map

package/features/listAuditLogs/abstractions/ListAuditLogsGateway.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"features/listAuditLogs/abstractions/ListAuditLogsGateway.js","sources":["../../../../src/features/listAuditLogs/abstractions/ListAuditLogsGateway.ts"],"sourcesContent":["import { createAbstraction } from \"@webiny/feature/admin\";\nimport type { IAuditLogRaw, IAuditLogsMeta } from \"~/types.js\";\n\nexport interface IListAuditLogsGatewayParams {\n    where?: Record<string, unknown>;\n    after?: string;\n    sort?: \"ASC\" | \"DESC\";\n    limit?: number;\n}\n\nexport interface IListAuditLogsGatewayResult {\n    data: IAuditLogRaw[];\n    meta: IAuditLogsMeta;\n}\n\nexport interface IListAuditLogsGateway {\n    execute(params: IListAuditLogsGatewayParams): Promise<IListAuditLogsGatewayResult>;\n}\n\nexport const ListAuditLogsGateway =\n    createAbstraction<IListAuditLogsGateway>(\"ListAuditLogsGateway\");\n\nexport namespace ListAuditLogsGateway {\n    export type Interface = IListAuditLogsGateway;\n    export type Params = IListAuditLogsGatewayParams;\n    export type Result = IListAuditLogsGatewayResult;\n}\n"],"names":["ListAuditLogsGateway","createAbstraction"],"mappings":";AAmBO,MAAMA,uBACTC,kBAAyC"}

package/features/listAuditLogs/abstractions/ListAuditLogsRepository.d.ts

@@ -0,0 +1,20 @@
+import type { IAuditLog, IAuditLogsMeta } from "../../../types.js";
+export interface IListAuditLogsRepositoryParams {
+    where?: Record<string, unknown>;
+    after?: string;
+    sort?: "ASC" | "DESC";
+    limit?: number;
+}
+export interface IListAuditLogsRepositoryResult {
+    records: IAuditLog[];
+    meta: IAuditLogsMeta;
+}
+export interface IListAuditLogsRepository {
+    execute(params: IListAuditLogsRepositoryParams): Promise<IListAuditLogsRepositoryResult>;
+}
+export declare const ListAuditLogsRepository: import("@webiny/di").Abstraction<IListAuditLogsRepository>;
+export declare namespace ListAuditLogsRepository {
+    type Interface = IListAuditLogsRepository;
+    type Params = IListAuditLogsRepositoryParams;
+    type Result = IListAuditLogsRepositoryResult;
+}

package/features/listAuditLogs/abstractions/ListAuditLogsRepository.js

@@ -0,0 +1,5 @@
+import { createAbstraction } from "@webiny/feature/admin";
+const ListAuditLogsRepository = createAbstraction("ListAuditLogsRepository");
+export { ListAuditLogsRepository };
+
+//# sourceMappingURL=ListAuditLogsRepository.js.map

package/features/listAuditLogs/abstractions/ListAuditLogsRepository.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"features/listAuditLogs/abstractions/ListAuditLogsRepository.js","sources":["../../../../src/features/listAuditLogs/abstractions/ListAuditLogsRepository.ts"],"sourcesContent":["import { createAbstraction } from \"@webiny/feature/admin\";\nimport type { IAuditLog, IAuditLogsMeta } from \"~/types.js\";\n\nexport interface IListAuditLogsRepositoryParams {\n    where?: Record<string, unknown>;\n    after?: string;\n    sort?: \"ASC\" | \"DESC\";\n    limit?: number;\n}\n\nexport interface IListAuditLogsRepositoryResult {\n    records: IAuditLog[];\n    meta: IAuditLogsMeta;\n}\n\nexport interface IListAuditLogsRepository {\n    execute(params: IListAuditLogsRepositoryParams): Promise<IListAuditLogsRepositoryResult>;\n}\n\nexport const ListAuditLogsRepository =\n    createAbstraction<IListAuditLogsRepository>(\"ListAuditLogsRepository\");\n\nexport namespace ListAuditLogsRepository {\n    export type Interface = IListAuditLogsRepository;\n    export type Params = IListAuditLogsRepositoryParams;\n    export type Result = IListAuditLogsRepositoryResult;\n}\n"],"names":["ListAuditLogsRepository","createAbstraction"],"mappings":";AAmBO,MAAMA,0BACTC,kBAA4C"}

package/features/listAuditLogs/abstractions/ListAuditLogsUseCase.d.ts

@@ -0,0 +1,20 @@
+import type { IAuditLog, IAuditLogsMeta } from "../../../types.js";
+export interface IListAuditLogsUseCaseParams {
+    where?: Record<string, unknown>;
+    after?: string;
+    sort?: "ASC" | "DESC";
+    limit?: number;
+}
+export interface IListAuditLogsUseCaseResult {
+    records: IAuditLog[];
+    meta: IAuditLogsMeta;
+}
+export interface IListAuditLogsUseCase {
+    execute(params: IListAuditLogsUseCaseParams): Promise<IListAuditLogsUseCaseResult>;
+}
+export declare const ListAuditLogsUseCase: import("@webiny/di").Abstraction<IListAuditLogsUseCase>;
+export declare namespace ListAuditLogsUseCase {
+    type Interface = IListAuditLogsUseCase;
+    type Params = IListAuditLogsUseCaseParams;
+    type Result = IListAuditLogsUseCaseResult;
+}

package/features/listAuditLogs/abstractions/ListAuditLogsUseCase.js

@@ -0,0 +1,5 @@
+import { createAbstraction } from "@webiny/feature/admin";
+const ListAuditLogsUseCase = createAbstraction("ListAuditLogsUseCase");
+export { ListAuditLogsUseCase };
+
+//# sourceMappingURL=ListAuditLogsUseCase.js.map

package/features/listAuditLogs/abstractions/ListAuditLogsUseCase.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"features/listAuditLogs/abstractions/ListAuditLogsUseCase.js","sources":["../../../../src/features/listAuditLogs/abstractions/ListAuditLogsUseCase.ts"],"sourcesContent":["import { createAbstraction } from \"@webiny/feature/admin\";\nimport type { IAuditLog, IAuditLogsMeta } from \"~/types.js\";\n\nexport interface IListAuditLogsUseCaseParams {\n    where?: Record<string, unknown>;\n    after?: string;\n    sort?: \"ASC\" | \"DESC\";\n    limit?: number;\n}\n\nexport interface IListAuditLogsUseCaseResult {\n    records: IAuditLog[];\n    meta: IAuditLogsMeta;\n}\n\nexport interface IListAuditLogsUseCase {\n    execute(params: IListAuditLogsUseCaseParams): Promise<IListAuditLogsUseCaseResult>;\n}\n\nexport const ListAuditLogsUseCase =\n    createAbstraction<IListAuditLogsUseCase>(\"ListAuditLogsUseCase\");\n\nexport namespace ListAuditLogsUseCase {\n    export type Interface = IListAuditLogsUseCase;\n    export type Params = IListAuditLogsUseCaseParams;\n    export type Result = IListAuditLogsUseCaseResult;\n}\n"],"names":["ListAuditLogsUseCase","createAbstraction"],"mappings":";AAmBO,MAAMA,uBACTC,kBAAyC"}

package/features/listAuditLogs/abstractions/index.d.ts

@@ -0,0 +1,6 @@
+export { ListAuditLogsGateway } from "./ListAuditLogsGateway.js";
+export type { IListAuditLogsGateway } from "./ListAuditLogsGateway.js";
+export { ListAuditLogsRepository } from "./ListAuditLogsRepository.js";
+export type { IListAuditLogsRepository } from "./ListAuditLogsRepository.js";
+export { ListAuditLogsUseCase } from "./ListAuditLogsUseCase.js";
+export type { IListAuditLogsUseCase } from "./ListAuditLogsUseCase.js";

package/features/listAuditLogs/abstractions/index.js

@@ -0,0 +1,3 @@
+export { ListAuditLogsGateway } from "./ListAuditLogsGateway.js";
+export { ListAuditLogsRepository } from "./ListAuditLogsRepository.js";
+export { ListAuditLogsUseCase } from "./ListAuditLogsUseCase.js";

package/features/listAuditLogs/feature.d.ts

@@ -0,0 +1,3 @@
+export declare const ListAuditLogsFeature: import("@webiny/feature/admin").FeatureDefinition<{
+    useCase: import("./abstractions/ListAuditLogsUseCase.js").IListAuditLogsUseCase;
+}, []>;

package/features/listAuditLogs/feature.js

@@ -0,0 +1,21 @@
+import { createFeature } from "@webiny/feature/admin";
+import { ListAuditLogsUseCase } from "./abstractions/index.js";
+import { ListAuditLogsUseCase as external_ListAuditLogsUseCase_js_ListAuditLogsUseCase } from "./ListAuditLogsUseCase.js";
+import { ListAuditLogsRepository } from "./ListAuditLogsRepository.js";
+import { ListAuditLogsGateway } from "./ListAuditLogsGateway.js";
+const ListAuditLogsFeature = createFeature({
+    name: "AuditLogs/ListAuditLogs",
+    register (container) {
+        container.register(external_ListAuditLogsUseCase_js_ListAuditLogsUseCase);
+        container.register(ListAuditLogsRepository).inSingletonScope();
+        container.register(ListAuditLogsGateway).inSingletonScope();
+    },
+    resolve (container) {
+        return {
+            useCase: container.resolve(ListAuditLogsUseCase)
+        };
+    }
+});
+export { ListAuditLogsFeature };
+
+//# sourceMappingURL=feature.js.map

package/features/listAuditLogs/feature.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"features/listAuditLogs/feature.js","sources":["../../../src/features/listAuditLogs/feature.ts"],"sourcesContent":["import { createFeature } from \"@webiny/feature/admin\";\nimport { ListAuditLogsUseCase as UseCaseAbstraction } from \"./abstractions/index.js\";\nimport { ListAuditLogsUseCase } from \"./ListAuditLogsUseCase.js\";\nimport { ListAuditLogsRepository } from \"./ListAuditLogsRepository.js\";\nimport { ListAuditLogsGateway } from \"./ListAuditLogsGateway.js\";\n\nexport const ListAuditLogsFeature = createFeature({\n    name: \"AuditLogs/ListAuditLogs\",\n    register(container) {\n        container.register(ListAuditLogsUseCase);\n        container.register(ListAuditLogsRepository).inSingletonScope();\n        container.register(ListAuditLogsGateway).inSingletonScope();\n    },\n    resolve(container) {\n        return {\n            useCase: container.resolve(UseCaseAbstraction)\n        };\n    }\n});\n"],"names":["ListAuditLogsFeature","createFeature","container","ListAuditLogsUseCase","ListAuditLogsRepository","ListAuditLogsGateway","UseCaseAbstraction"],"mappings":";;;;;AAMO,MAAMA,uBAAuBC,cAAc;IAC9C,MAAM;IACN,UAASC,SAAS;QACdA,UAAU,QAAQ,CAACC;QACnBD,UAAU,QAAQ,CAACE,yBAAyB,gBAAgB;QAC5DF,UAAU,QAAQ,CAACG,sBAAsB,gBAAgB;IAC7D;IACA,SAAQH,SAAS;QACb,OAAO;YACH,SAASA,UAAU,OAAO,CAACI;QAC/B;IACJ;AACJ"}

package/features/listAuditLogs/index.d.ts

@@ -0,0 +1 @@
+export { ListAuditLogsFeature } from "./feature.js";

package/features/listAuditLogs/index.js

@@ -0,0 +1 @@
+export { ListAuditLogsFeature } from "./feature.js";

package/graphql.d.ts

@@ -1 +1 @@
-export declare const LIST_USERS: any;
+export declare const LIST_USERS = "\n    query ListUsers {\n        adminUsers {\n            users: listUsers {\n                data {\n                    id\n                    firstName\n                    lastName\n                    roles {\n                        name\n                    }\n                }\n                error {\n                    \n    code\n    message\n    data\n\n                }\n            }\n        }\n    }\n";

package/graphql.js

@@ -1,10 +1,9 @@
-import graphql_tag from "graphql-tag";
 const ERROR_FIELDS = `
     code
     message
     data
 `;
-const LIST_USERS = graphql_tag`
+const LIST_USERS = `
     query ListUsers {
         adminUsers {
             users: listUsers {

package/graphql.js.map

@@ -1 +1 @@
-{"version":3,"file":"graphql.js","sources":["../src/graphql.ts"],"sourcesContent":["import gql from \"graphql-tag\";\n\nconst ERROR_FIELDS = /* GraphQL */ `\n    code\n    message\n    data\n`;\n\nexport const LIST_USERS: any = gql`\n    query ListUsers {\n        adminUsers {\n            users: listUsers {\n                data {\n                    id\n                    firstName\n                    lastName\n                    roles {\n                        name\n                    }\n                }\n                error {\n                    ${ERROR_FIELDS}\n                }\n            }\n        }\n    }\n`;\n"],"names":["ERROR_FIELDS","LIST_USERS","gql"],"mappings":";AAEA,MAAMA,eAA6B,CAAC;;;;AAIpC,CAAC;AAEM,MAAMC,aAAkBC,WAAG,CAAC;;;;;;;;;;;;;oBAaf,EAAEF,aAAa;;;;;AAKnC,CAAC"}
+{"version":3,"file":"graphql.js","sources":["../src/graphql.ts"],"sourcesContent":["const ERROR_FIELDS = /* GraphQL */ `\n    code\n    message\n    data\n`;\n\nexport const LIST_USERS = /* GraphQL */ `\n    query ListUsers {\n        adminUsers {\n            users: listUsers {\n                data {\n                    id\n                    firstName\n                    lastName\n                    roles {\n                        name\n                    }\n                }\n                error {\n                    ${ERROR_FIELDS}\n                }\n            }\n        }\n    }\n`;\n"],"names":["ERROR_FIELDS","LIST_USERS"],"mappings":"AAAA,MAAMA,eAA6B,CAAC;;;;AAIpC,CAAC;AAEM,MAAMC,aAA2B,CAAC;;;;;;;;;;;;;oBAarB,EAAED,aAAa;;;;;AAKnC,CAAC"}

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/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 {

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,6 +10,11 @@ const useAuditLogsList = ()=>{
         limit: 25
     });
     const [accumulatedRecords, setAccumulatedRecords] = useState([]);
+    const [loading, setLoading] = useState(true);
+    const [meta, setMeta] = useState({
+        hasMoreItems: false,
+        cursor: null
+    });
     const setWhere = useCallback((where)=>{
         setVariables((prev)=>({
                 ...prev,
@@ -48,32 +52,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);
-    }, [
-        logs.data?.auditLogs
-    ]);
-    const meta = useMemo(()=>{
-        if (!logs.data?.auditLogs.listAuditLogs.meta) return {
-            hasMoreItems: false,
-            cursor: null
-        };
-        return logs.data.auditLogs.listAuditLogs.meta;
+        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
+        variables
     ]);
     const sorting = useMemo(()=>[
             {
@@ -84,7 +77,7 @@ const useAuditLogsList = ()=>{
         variables.sort
     ]);
     return {
-        isListLoading: logs.loading,
+        isListLoading: loading,
         records: accumulatedRecords,
         meta,
         listMoreRecords: ()=>{
@@ -94,7 +87,7 @@ const useAuditLogsList = ()=>{
         sorting,
         setSorting: setAcoSorting,
         setLimit,
-        isListLoadingMore: logs.loading && !!variables.after,
+        isListLoadingMore: loading && !!variables.after,
         showingFilters,
         showFilters: ()=>{
             setShowingFilters(true);

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    showingFilters: boolean;\n    showFilters: () => void;\n    hideFilters: () => void;\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 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 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            setAfter(meta.cursor || undefined);\n        },\n        setWhere,\n        sorting,\n        setSorting: setAcoSorting,\n        setLimit,\n        isListLoadingMore: loading && !!variables.after,\n        showingFilters,\n        showFilters: () => {\n            setShowingFilters(true);\n        },\n        hideFilters: () => {\n            setShowingFilters(false);\n        }\n    };\n};\n"],"names":["useAuditLogsList","useCase","useFeature","ListAuditLogsFeature","variables","setVariables","useState","undefined","accumulatedRecords","setAccumulatedRecords","loading","setLoading","meta","setMeta","setWhere","useCallback","where","prev","setSort","sort","setAfter","after","setLimit","limit","showingFilters","setShowingFilters","acoSorting","setAcoSorting","useEffect","requestIdRef","useRef","requestId","result","sorting","useMemo"],"mappings":";;;AA8BO,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,WAAWC,YAAY,CAACC;QAC1BX,aAAaY,CAAAA,OAAS;gBAAE,GAAGA,IAAI;gBAAED;gBAAO,OAAOT;YAAU;QACzDE,sBAAsB,EAAE;IAC5B,GAAG,EAAE;IAEL,MAAMS,UAAUH,YAAY,CAACI;QACzBd,aAAaY,CAAAA,OAAS;gBAAE,GAAGA,IAAI;gBAAEE;gBAAM,OAAOZ;YAAU;QACxDE,sBAAsB,EAAE;IAC5B,GAAG,EAAE;IAEL,MAAMW,WAAWL,YAAY,CAACM;QAC1BhB,aAAaY,CAAAA,OAAS;gBAAE,GAAGA,IAAI;gBAAEI;YAAM;IAC3C,GAAG,EAAE;IAEL,MAAMC,WAAWP,YAAY,CAACQ;QAC1BlB,aAAaY,CAAAA,OAAS;gBAAE,GAAGA,IAAI;gBAAEM;YAAM;IAC3C,GAAG,EAAE;IAEL,MAAM,CAACC,gBAAgBC,kBAAkB,GAAGnB,SAAS;IACrD,MAAM,CAACoB,YAAYC,cAAc,GAAGrB,SAA2B,EAAE;IAEjEsB,UAAU;QACN,MAAMT,OAAOO,UAAU,CAAC,EAAE;QAC1B,IAAI,CAACP,MACD;QAEJD,QAAQC,KAAK,IAAI,GAAG,SAAS;IACjC,GAAG;QAACO;KAAW;IAEf,MAAMG,eAAeC,OAAO;IAE5BF,UAAU;QACNjB,WAAW;QACX,MAAMoB,YAAY,EAAEF,aAAa,OAAO;QAExC5B,QAAQ,OAAO,CAACG,WAAW,IAAI,CAAC4B,CAAAA;YAC5B,IAAID,cAAcF,aAAa,OAAO,EAClC;YAGAzB,UAAU,KAAK,GACfK,sBAAsBQ,CAAAA,OAAQ;uBAAIA;uBAASe,OAAO,OAAO;iBAAC,IAE1DvB,sBAAsBuB,OAAO,OAAO;YAGxCnB,QAAQmB,OAAO,IAAI;YACnBrB,WAAW;QACf;IACJ,GAAG;QAACP;KAAU;IAEd,MAAM6B,UAAUC,QAAQ,IACb;YACH;gBACI,IAAI;gBACJ,MAAM9B,AAAmB,WAAnBA,UAAU,IAAI;YACxB;SACH,EACF;QAACA,UAAU,IAAI;KAAC;IAEnB,OAAO;QACH,eAAeM;QACf,SAASF;QACTI;QACA,iBAAiB;YACbQ,SAASR,KAAK,MAAM,IAAIL;QAC5B;QACAO;QACAmB;QACA,YAAYN;QACZL;QACA,mBAAmBZ,WAAW,CAAC,CAACN,UAAU,KAAK;QAC/CoB;QACA,aAAa;YACTC,kBAAkB;QACtB;QACA,aAAa;YACTA,kBAAkB;QACtB;IACJ;AACJ"}

package/index.js

@@ -7,6 +7,7 @@ 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";
 const { Menu: Menu, Route: Route } = AdminConfig;
 const AuditLogs = ()=>{
     const wcp = useWcp();
@@ -14,6 +15,8 @@ const AuditLogs = ()=>{
     if (!wcp.canUseAuditLogs()) return null;
     return /*#__PURE__*/ react.createElement(react.Fragment, null, /*#__PURE__*/ react.createElement(RegisterFeature, {
         feature: AlPermissionsFeature
+    }), /*#__PURE__*/ react.createElement(RegisterFeature, {
+        feature: ListAuditLogsFeature
     }), /*#__PURE__*/ react.createElement(LogsModule, null), /*#__PURE__*/ react.createElement(SecurityPermission, null), /*#__PURE__*/ react.createElement(AdminConfig, null, /*#__PURE__*/ react.createElement(HasPermission, {
         any: [
             "al.*"

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, 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\";\nimport { ListAuditLogsFeature } from \"~/features/listAuditLogs/index.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            <RegisterFeature feature={ListAuditLogsFeature} />\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","ListAuditLogsFeature","LogsModule","SecurityPermission","HasPermission","Icon","Routes","AdminLayout","AuditLogsListWithConfig","LogsView"],"mappings":";;;;;;;;;;AAaA,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,oBAACD,iBAAeA;QAAC,SAASE;sBAC1B,oBAACC,YAAUA,OAAAA,WAAAA,GACX,oBAACC,oBAAkBA,OAAAA,WAAAA,GACnB,oBAACV,aAAWA,MAAAA,WAAAA,GACR,oBAACW,eAAaA;QAAC,KAAK;YAAC;SAAO;qBACxB,oBAACb,MAAIA;QACD,MAAK;QACL;QACA,uBACI,oBAACA,KAAK,IAAI;YACN,MAAM;YACN,oBAAM,oBAACA,KAAK,IAAI,CAAC,IAAI;gBAAC,uBAAS,oBAACc,gBAAIA;gBAAK,OAAO;;YAChD,IAAIR,OAAO,OAAO,CAACS,OAAO,aAAa;;sBAInD,oBAACd,OAAKA;QACF,OAAOc,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.4.5-beta.0",
+	"version": "6.6.0-alpha.0",
 	"type": "module",
 	"exports": {
 		".": "./index.js",
@@ -13,20 +13,19 @@
 	"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.5-beta.0",
-		"@webiny/app": "6.4.5-beta.0",
-		"@webiny/app-admin": "6.4.5-beta.0",
-		"@webiny/common-audit-logs": "6.4.5-beta.0",
-		"@webiny/form": "6.4.5-beta.0",
-		"@webiny/icons": "6.4.5-beta.0",
-		"@webiny/react-composition": "6.4.5-beta.0",
-		"@webiny/react-properties": "6.4.5-beta.0",
+		"@webiny/admin-ui": "6.6.0-alpha.0",
+		"@webiny/app": "6.6.0-alpha.0",
+		"@webiny/app-admin": "6.6.0-alpha.0",
+		"@webiny/common-audit-logs": "6.6.0-alpha.0",
+		"@webiny/feature": "6.6.0-alpha.0",
+		"@webiny/form": "6.6.0-alpha.0",
+		"@webiny/icons": "6.6.0-alpha.0",
+		"@webiny/react-composition": "6.6.0-alpha.0",
+		"@webiny/react-properties": "6.6.0-alpha.0",
 		"date-fns": "4.4.0",
-		"graphql-tag": "2.12.7",
 		"lodash": "4.18.1",
 		"zod": "4.4.3"
 	},
@@ -35,10 +34,10 @@
 	},
 	"devDependencies": {
 		"@types/react": "18.3.31",
-		"@webiny/build-tools": "6.4.5-beta.0",
-		"execa": "5.1.1",
+		"@webiny/build-tools": "6.6.0-alpha.0",
+		"execa": "10.0.0",
 		"rimraf": "6.1.3",
-		"typescript": "6.0.3"
+		"typescript": "7.0.2"
 	},
 	"publishConfig": {
 		"access": "public"

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,9 +34,8 @@ const FilterByCreatedBy = ()=>{
                     label: `${user.firstName} ${user.lastName}`,
                     value: user.id
                 }))
-        ];
-    }, [
-        listUsers
+        ], [
+        users
     ]);
     return /*#__PURE__*/ react.createElement(Select, {
         ...bind,

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 <Select {...bind} size={\"md\"} placeholder={\"Filter by Initiator\"} options={options} />;\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,GAAO,oBAACY,QAAMA;QAAE,GAAGN,IAAI;QAAE,MAAM;QAAM,aAAa;QAAuB,SAASG;;AACtF"}

package/views/Logs/Filters/FilterByInitiator.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 FilterByInitiator = ()=>{
-    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: "data.initiator",
         beforeChange (value, cb) {
             cb(getValidFilterValue(value));
         }
     });
-    const options = useMemo(()=>{
-        const users = listUsers?.adminUsers?.users?.data || [];
-        return [
+    const options = useMemo(()=>[
             {
                 label: "All",
                 value: "all"
@@ -26,9 +34,8 @@ const FilterByInitiator = ()=>{
                     label: `${user.firstName} ${user.lastName}`,
                     value: user.id
                 }))
-        ];
-    }, [
-        listUsers
+        ], [
+        users
     ]);
     return /*#__PURE__*/ react.createElement(Select, {
         ...bind,

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

@@ -1 +1 @@
-{"version":3,"file":"views/Logs/Filters/FilterByInitiator.js","sources":["../../../../src/views/Logs/Filters/FilterByInitiator.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 FilterByInitiator = () => {\n    const { data: listUsers } = useQuery(LIST_USERS);\n    const bind = useBind({\n        name: \"data.initiator\",\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","FilterByInitiator","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/FilterByInitiator.js","sources":["../../../../src/views/Logs/Filters/FilterByInitiator.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 FilterByInitiator = () => {\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: \"data.initiator\",\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 <Select {...bind} size={\"md\"} placeholder={\"Filter by Initiator\"} options={options} />;\n};\n"],"names":["getValidFilterValue","value","FilterByInitiator","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,GAAO,oBAACY,QAAMA;QAAE,GAAGN,IAAI;QAAE,MAAM;QAAM,aAAa;QAAuB,SAASG;;AACtF"}

package/hooks/graphql.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"hooks/graphql.js","sources":["../../src/hooks/graphql.ts"],"sourcesContent":["import gql from \"graphql-tag\";\nimport type { IAuditLogRaw, IAuditLogsError, IAuditLogsMeta } from \"~/types.js\";\n\nexport interface IListAuditLogsVariablesWhere {\n    app?: string;\n    action?: string;\n    createdBy?: string;\n    entity?: string;\n    entityId?: string;\n    createdOn_gte?: Date;\n    createdOn_lte?: Date;\n}\n\nexport interface IListAuditLogsVariables {\n    where: Partial<IListAuditLogsVariablesWhere>;\n    after: string | undefined;\n    sort: \"ASC\" | \"DESC\" | undefined;\n    limit: number | undefined;\n}\n\nexport type IListAuditLogsVariablesPartial = Partial<IListAuditLogsVariables>;\n\nexport interface IListAuditLogsResponse {\n    auditLogs: {\n        listAuditLogs: {\n            data: IAuditLogRaw[] | null;\n            meta: IAuditLogsMeta | null;\n            error: IAuditLogsError | null;\n        };\n    };\n}\n\nexport const LIST_AUDIT_LOGS = gql`\n    query ListAuditLogs(\n        $where: ListAuditLogsWhere!\n        $sort: AuditLogsSort\n        $after: String\n        $limit: Number\n    ) {\n        auditLogs {\n            listAuditLogs(where: $where, after: $after, sort: $sort, limit: $limit) {\n                data {\n                    id\n                    createdBy {\n                        id\n                        displayName\n                        type\n                    }\n                    createdOn\n                    app\n                    action\n                    message\n                    entity\n                    entityId\n                    tags\n                    expiresAt\n                    content\n                }\n                meta {\n                    hasMoreItems\n                    cursor\n                }\n                error {\n                    message\n                    code\n                    data\n                    stack\n                }\n            }\n        }\n    }\n`;\n"],"names":["LIST_AUDIT_LOGS","gql"],"mappings":";AAgCO,MAAMA,kBAAkBC,WAAG,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAuCnC,CAAC"}