@headless-adminapp/app 0.0.17-alpha.25 → 0.0.17-alpha.28

package/app/LayoutProvider.d.ts

@@ -1,4 +1,4 @@
-import { IDataService } from '@headless-adminapp/core/transport';
+import { IDataService, IFileService } from '@headless-adminapp/core/transport';
 import { QueryClient } from '@tanstack/react-query';
 import { FC, PropsWithChildren } from 'react';
 import { AuthProviderPlaceholderProps, AuthProviderProps } from '../auth';
@@ -10,6 +10,7 @@ export interface LayoutProviderProps {
     queryClient: QueryClient;
     localeProps: LocaleProviderProps;
     dataService: IDataService;
+    fileService?: IFileService;
     authProps?: AuthProviderProps;
     authPlaceholder?: FC<AuthProviderPlaceholderProps>;
     metadataProps: MetadataProviderProps;

package/app/LayoutProvider.js

@@ -12,8 +12,9 @@ const recordset_1 = require("../recordset");
 const route_1 = require("../route");
 const toast_notification_1 = require("../toast-notification");
 const transport_1 = require("../transport");
+const context_1 = require("../transport/context");
 const AuthWrapper_1 = require("./AuthWrapper");
-const LayoutProvider = ({ authPlaceholder, authProps, dataService, localeProps, metadataProps, queryClient, routeProps, children, containers: { DialogContainer, ProgressIndicatorContainer, ToastNotificationContainer, }, }) => {
-    return ((0, jsx_runtime_1.jsx)(route_1.RouteProvider, Object.assign({}, routeProps, { children: (0, jsx_runtime_1.jsx)(react_query_1.QueryClientProvider, { client: queryClient, children: (0, jsx_runtime_1.jsx)(locale_1.LocaleProvider, Object.assign({}, localeProps, { children: (0, jsx_runtime_1.jsx)(metadata_1.MetadataProvider, Object.assign({}, metadataProps, { children: (0, jsx_runtime_1.jsx)(transport_1.DataServiceContext.Provider, { value: dataService, children: (0, jsx_runtime_1.jsx)(dialog_1.DialogProvider, { children: (0, jsx_runtime_1.jsx)(progress_indicator_1.ProgressIndicatorProvider, { children: (0, jsx_runtime_1.jsxs)(toast_notification_1.ToastNotificationProvider, { children: [(0, jsx_runtime_1.jsx)(DialogContainer, {}), (0, jsx_runtime_1.jsx)(ProgressIndicatorContainer, {}), (0, jsx_runtime_1.jsx)(ToastNotificationContainer, {}), (0, jsx_runtime_1.jsx)(auth_1.AuthProvider, Object.assign({}, authProps, { children: (0, jsx_runtime_1.jsx)(AuthWrapper_1.AuthWrapper, { Placeholder: authPlaceholder, children: (0, jsx_runtime_1.jsx)(recordset_1.RecordSetProvider, { children: children }) }) }))] }) }) }) }) })) })) }) })));
+const LayoutProvider = ({ authPlaceholder, authProps, dataService, fileService, localeProps, metadataProps, queryClient, routeProps, children, containers: { DialogContainer, ProgressIndicatorContainer, ToastNotificationContainer, }, }) => {
+    return ((0, jsx_runtime_1.jsx)(route_1.RouteProvider, Object.assign({}, routeProps, { children: (0, jsx_runtime_1.jsx)(react_query_1.QueryClientProvider, { client: queryClient, children: (0, jsx_runtime_1.jsx)(locale_1.LocaleProvider, Object.assign({}, localeProps, { children: (0, jsx_runtime_1.jsx)(metadata_1.MetadataProvider, Object.assign({}, metadataProps, { children: (0, jsx_runtime_1.jsx)(transport_1.DataServiceContext.Provider, { value: dataService, children: (0, jsx_runtime_1.jsx)(context_1.FileServiceContext.Provider, { value: fileService !== null && fileService !== void 0 ? fileService : context_1.noopFileService, children: (0, jsx_runtime_1.jsx)(dialog_1.DialogProvider, { children: (0, jsx_runtime_1.jsx)(progress_indicator_1.ProgressIndicatorProvider, { children: (0, jsx_runtime_1.jsxs)(toast_notification_1.ToastNotificationProvider, { children: [(0, jsx_runtime_1.jsx)(DialogContainer, {}), (0, jsx_runtime_1.jsx)(ProgressIndicatorContainer, {}), (0, jsx_runtime_1.jsx)(ToastNotificationContainer, {}), (0, jsx_runtime_1.jsx)(auth_1.AuthProvider, Object.assign({}, authProps, { children: (0, jsx_runtime_1.jsx)(AuthWrapper_1.AuthWrapper, { Placeholder: authPlaceholder, children: (0, jsx_runtime_1.jsx)(recordset_1.RecordSetProvider, { children: children }) }) }))] }) }) }) }) }) })) })) }) })));
 };
 exports.LayoutProvider = LayoutProvider;

package/command/hooks/useBaseCommandHandlerContext.js

@@ -4,6 +4,7 @@ exports.useUtility = useUtility;
 exports.useBaseCommandHandlerContext = useBaseCommandHandlerContext;
 const navigation_1 = require("@headless-adminapp/app/navigation");
 const react_query_1 = require("@tanstack/react-query");
+const react_1 = require("react");
 const hooks_1 = require("../../dialog/hooks");
 const locale_1 = require("../../locale");
 const hooks_2 = require("../../metadata/hooks");
@@ -17,7 +18,7 @@ function useUtility() {
     const openErrorDialog = (0, hooks_1.useOpenErrorDialog)();
     const openPromptDialog = (0, hooks_1.useOpenPromptDialog)();
     const openToastNotification = (0, useOpenToastNotification_1.useOpenToastNotification)();
-    return {
+    return (0, react_1.useMemo)(() => ({
         hideProgressIndicator,
         showProgressIndicator,
         openAlertDialog,
@@ -25,13 +26,21 @@ function useUtility() {
         openErrorDialog,
         openPromptDialog,
         showNotification: openToastNotification,
-    };
+    }), [
+        hideProgressIndicator,
+        openAlertDialog,
+        openConfirmDialog,
+        openErrorDialog,
+        openPromptDialog,
+        openToastNotification,
+        showProgressIndicator,
+    ]);
 }
 function useNavigation() {
     const openForm = (0, navigation_1.useOpenForm)();
-    return {
+    return (0, react_1.useMemo)(() => ({
         openForm,
-    };
+    }), [openForm]);
 }
 function useBaseCommandHandlerContext() {
     const dataService = (0, transport_1.useDataService)();
@@ -40,12 +49,12 @@ function useBaseCommandHandlerContext() {
     const utility = useUtility();
     const locale = (0, locale_1.useLocale)();
     const navigation = useNavigation();
-    return {
+    return (0, react_1.useMemo)(() => ({
         dataService,
         queryClient,
         utility,
         stores,
         locale,
         navigation,
-    };
+    }), [dataService, queryClient, stores, utility, locale, navigation]);
 }

package/datagrid/DataGridProvider/utils.js

@@ -75,17 +75,17 @@ function transformColumnFilter(filter, schema, schemaStore) {
     return transformedResult;
 }
 function mergeConditions(schema, filter, extraFilter, columnFilters, schemaStore) {
-    const conditions = [];
+    const filters = [];
     if (filter) {
-        conditions.push(filter);
+        filters.push(filter);
     }
     if (extraFilter) {
-        conditions.push(extraFilter);
+        filters.push(extraFilter);
     }
     if (columnFilters) {
         const transformedColumnFilters = transformColumnFilter(columnFilters, schema, schemaStore);
         if (transformedColumnFilters) {
-            conditions.push({
+            filters.push({
                 type: 'and',
                 conditions: Object.entries(transformedColumnFilters).map(([field, condition]) => {
                     return {
@@ -98,15 +98,15 @@ function mergeConditions(schema, filter, extraFilter, columnFilters, schemaStore
             });
         }
     }
-    if (conditions.length === 0) {
+    if (filters.length === 0) {
         return null;
     }
-    if (conditions.length === 1) {
-        return conditions[0];
+    if (filters.length === 1) {
+        return filters[0];
     }
     return {
         type: 'and',
-        conditions,
+        filters: filters,
     };
 }
 function collectExpandedKeys(columns) {

package/datagrid/hooks/useMainGridCommands.js

@@ -64,7 +64,7 @@ function useGridControlContext() {
         var _a;
         return ((_a = data === null || data === void 0 ? void 0 : data.records) !== null && _a !== void 0 ? _a : []).filter((record) => selectedIdsObj[record[schema.idAttribute]]);
     }, [data, schema, selectedIdsObj]);
-    return {
+    return (0, react_1.useMemo)(() => ({
         data,
         logicalName: schema.logicalName,
         schema,
@@ -79,12 +79,25 @@ function useGridControlContext() {
         openRecord,
         gridColumns,
         sorting,
-    };
+    }), [
+        columnFilter,
+        data,
+        extraFilter,
+        gridColumns,
+        openRecord,
+        refresh,
+        schema,
+        searchText,
+        selectedIds,
+        selectedRecords,
+        sorting,
+        view,
+    ]);
 }
 function useMainGridCommandHandlerContext() {
     const baseHandlerContext = (0, command_1.useBaseCommandHandlerContext)();
     const primaryControl = useGridControlContext();
-    return Object.assign(Object.assign({}, baseHandlerContext), { primaryControl });
+    return (0, react_1.useMemo)(() => (Object.assign(Object.assign({}, baseHandlerContext), { primaryControl })), [baseHandlerContext, primaryControl]);
 }
 const emptyCommands = [];
 function useGridCommands() {

package/metadata/hooks/useMetadata.js

@@ -18,7 +18,7 @@ function useMetadata() {
     const getSchema = (0, react_1.useCallback)((logicalName) => {
         return schemaStore.getSchema(logicalName);
     }, [schemaStore]);
-    return {
+    return (0, react_1.useMemo)(() => ({
         schemas,
         schemaLoading,
         /*** @deprecated */
@@ -26,5 +26,5 @@ function useMetadata() {
         schemaStore,
         appStore,
         experienceStore,
-    };
+    }), [schemas, schemaLoading, schemaStore, appStore, experienceStore, getSchema]);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@headless-adminapp/app",
-  "version": "0.0.17-alpha.25",
+  "version": "0.0.17-alpha.28",
   "description": "",
   "main": "index.js",
   "types": "index.d.ts",
@@ -39,5 +39,5 @@
     "react-hook-form": "7.52.2",
     "yup": "^1.4.0"
   },
-  "gitHead": "0a42b982d6113067cd2f9739ec646d138c1a5274"
+  "gitHead": "e25bcf7611efad55ef448866d149ff5e5d19cd64"
 }

package/transport/context.d.ts

@@ -1,2 +1,4 @@
-import { IDataService } from '@headless-adminapp/core/transport';
+import { IDataService, IFileService } from '@headless-adminapp/core/transport';
 export declare const DataServiceContext: import("react").Context<IDataService | undefined>;
+export declare const noopFileService: IFileService;
+export declare const FileServiceContext: import("react").Context<IFileService>;

package/transport/context.js

@@ -1,5 +1,20 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DataServiceContext = void 0;
+exports.FileServiceContext = exports.noopFileService = exports.DataServiceContext = void 0;
 const react_1 = require("react");
 exports.DataServiceContext = (0, react_1.createContext)(undefined);
+exports.noopFileService = {
+    uploadFile: () => __awaiter(void 0, void 0, void 0, function* () {
+        throw new Error('File service not implemented');
+    }),
+};
+exports.FileServiceContext = (0, react_1.createContext)(exports.noopFileService);

package/transport/hooks/index.d.ts

@@ -1 +1,2 @@
 export * from './useDataService';
+export * from './useFileService';

package/transport/hooks/index.js

@@ -15,3 +15,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./useDataService"), exports);
+__exportStar(require("./useFileService"), exports);

package/transport/hooks/useFileService.d.ts

@@ -0,0 +1 @@
+export declare function useFileService(): import("@headless-adminapp/core/transport").IFileService;

package/transport/hooks/useFileService.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.useFileService = useFileService;
+const react_1 = require("react");
+const context_1 = require("../context");
+function useFileService() {
+    const context = (0, react_1.useContext)(context_1.FileServiceContext);
+    if (!context) {
+        throw new Error('FileServiceContext must be used within a FileServiceProvider');
+    }
+    return context;
+}

package/datagrid/DataGridProvider/DataSelectionResolve.d.ts

@@ -1 +0,0 @@
-export declare function DataSelectionResolver(): null;

package/datagrid/DataGridProvider/DataSelectionResolve.js

@@ -1,13 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.DataSelectionResolver = DataSelectionResolver;
-const react_1 = require("react");
-const hooks_1 = require("../hooks");
-function DataSelectionResolver() {
-    const data = (0, hooks_1.useGridData)();
-    const [selectedIds] = (0, hooks_1.useGridSelection)();
-    const selectedIdsRef = (0, react_1.useRef)(selectedIds);
-    selectedIdsRef.current = selectedIds;
-    (0, react_1.useEffect)(() => { }, [data]);
-    return null;
-}