@compill/admin 1.0.42 → 1.0.44

package/index.cjs.js

@@ -836,11 +836,12 @@ function PageQueryStateContainerInner(_a) {
       children
     } = _a,
     props = __rest$1(_a, ["queryId", "api", "apiFn", "loadingStyles", "errorStyles", "children"]);
+  // @ts-ignore
   const {
     data,
     isLoading,
     isError
-  } = apiFn == "get" ? api.useApiQuery(api$1.queryKey, api$1.get, queryId) : api.useApiQuery(api$1.queryKey, api$1.getAll);
+  } = apiFn == "getAll" ? api.useApiQuery(api$1.queryKey, api$1.getAll, props.apiParams) : api.useApiQuery(api$1.queryKey, api$1.get, queryId);
   const invalidate = api.useInvalidateQuery(api$1.queryKey, queryId);
   if (isLoading) return jsxRuntime.jsx(components.QueryLoadingState, Object.assign({
     w: "full",
@@ -1132,8 +1133,14 @@ function Internal({
   });
   const save = api.useMutate(mutation, {
     processInput,
-    successMsg: (item, values) => `${item.title} updated.`,
-    errorMsg: (error, item) => `Error updating ${item.title}: ${error}`
+    successMsg: (item, values) => {
+      var _a;
+      return `${(_a = item.title) !== null && _a !== void 0 ? _a : item.name} updated.`;
+    },
+    errorMsg: (error, item) => {
+      var _a;
+      return `Error updating ${(_a = item.title) !== null && _a !== void 0 ? _a : item.name}: ${error}`;
+    }
   });
   let editorMaxW = undefined;
   if (!type || type == "post") editorMaxW = "calc(1280px - 28rem)";else if (type == "section") editorMaxW = "calc(1280px - 22rem)";
@@ -1497,7 +1504,7 @@ function nonNullValues$1(data) {
   return data;
 }
 function ItemEditDialog$1(_a) {
-  var _b, _c, _d;
+  var _b, _c, _d, _e;
   var {
       initialValues,
       itemLabel,
@@ -1574,7 +1581,7 @@ function ItemEditDialog$1(_a) {
     transition: true
   }, props, {
     children: [jsxRuntime.jsxs(ui.Modal.Header, {
-      children: [!isInitialLoading && queryId && `Edit ${title ? title(data) : (_c = (_b = data === null || data === void 0 ? void 0 : data["name"]) !== null && _b !== void 0 ? _b : data === null || data === void 0 ? void 0 : data["title"]) !== null && _c !== void 0 ? _c : ""}`, !queryId && `Create new ${itemLabel !== null && itemLabel !== void 0 ? itemLabel : "item"}`, Array.isArray(form$1) && jsxRuntime.jsx(jsxRuntime.Fragment, {})
+      children: [!isInitialLoading && queryId && `Edit ${title ? title(data) : (_d = (_c = (_b = data === null || data === void 0 ? void 0 : data["name"]) !== null && _b !== void 0 ? _b : data === null || data === void 0 ? void 0 : data["title"]) !== null && _c !== void 0 ? _c : data === null || data === void 0 ? void 0 : data["name"]) !== null && _d !== void 0 ? _d : ""}`, !queryId && `Create new ${itemLabel !== null && itemLabel !== void 0 ? itemLabel : "item"}`, Array.isArray(form$1) && jsxRuntime.jsx(jsxRuntime.Fragment, {})
       // <ul className="nav nav-bold nav-pills">
       //     {form.map(item =>
       //         <li key={item.key} className="nav-item cursor-pointer bg-hover-light rounded" onClick={() => switchTab(item.key)}>
@@ -1597,7 +1604,7 @@ function ItemEditDialog$1(_a) {
       // initialValues={fetchToFormData && queryId && data ? fetchToFormData(nonNullValues(data)) : nonNullValues(data) ?? initialValues(data) ?? {}}
       , Object.assign({
         // initialValues={fetchToFormData && queryId && data ? fetchToFormData(nonNullValues(data)) : nonNullValues(data) ?? initialValues(data) ?? {}}
-        initialValues: fetchToFormData && queryId && data ? fetchToFormData(nonNullValues$1(data)) : (_d = nonNullValues$1(initialValues(data))) !== null && _d !== void 0 ? _d : {},
+        initialValues: fetchToFormData && queryId && data ? fetchToFormData(nonNullValues$1(data)) : (_e = nonNullValues$1(initialValues(data))) !== null && _e !== void 0 ? _e : {},
         onSubmit: saveItem
       }, formikProps, {
         children: ({

package/index.esm.js

@@ -827,11 +827,12 @@ function PageQueryStateContainerInner(_a) {
       children
     } = _a,
     props = __rest$1(_a, ["queryId", "api", "apiFn", "loadingStyles", "errorStyles", "children"]);
+  // @ts-ignore
   const {
     data,
     isLoading,
     isError
-  } = apiFn == "get" ? useApiQuery(api.queryKey, api.get, queryId) : useApiQuery(api.queryKey, api.getAll);
+  } = apiFn == "getAll" ? useApiQuery(api.queryKey, api.getAll, props.apiParams) : useApiQuery(api.queryKey, api.get, queryId);
   const invalidate = useInvalidateQuery(api.queryKey, queryId);
   if (isLoading) return jsx(QueryLoadingState, Object.assign({
     w: "full",
@@ -1123,8 +1124,14 @@ function Internal({
   });
   const save = useMutate(mutation, {
     processInput,
-    successMsg: (item, values) => `${item.title} updated.`,
-    errorMsg: (error, item) => `Error updating ${item.title}: ${error}`
+    successMsg: (item, values) => {
+      var _a;
+      return `${(_a = item.title) !== null && _a !== void 0 ? _a : item.name} updated.`;
+    },
+    errorMsg: (error, item) => {
+      var _a;
+      return `Error updating ${(_a = item.title) !== null && _a !== void 0 ? _a : item.name}: ${error}`;
+    }
   });
   let editorMaxW = undefined;
   if (!type || type == "post") editorMaxW = "calc(1280px - 28rem)";else if (type == "section") editorMaxW = "calc(1280px - 22rem)";
@@ -1488,7 +1495,7 @@ function nonNullValues$1(data) {
   return data;
 }
 function ItemEditDialog$1(_a) {
-  var _b, _c, _d;
+  var _b, _c, _d, _e;
   var {
       initialValues,
       itemLabel,
@@ -1565,7 +1572,7 @@ function ItemEditDialog$1(_a) {
     transition: true
   }, props, {
     children: [jsxs(Modal.Header, {
-      children: [!isInitialLoading && queryId && `Edit ${title ? title(data) : (_c = (_b = data === null || data === void 0 ? void 0 : data["name"]) !== null && _b !== void 0 ? _b : data === null || data === void 0 ? void 0 : data["title"]) !== null && _c !== void 0 ? _c : ""}`, !queryId && `Create new ${itemLabel !== null && itemLabel !== void 0 ? itemLabel : "item"}`, Array.isArray(form) && jsx(Fragment, {})
+      children: [!isInitialLoading && queryId && `Edit ${title ? title(data) : (_d = (_c = (_b = data === null || data === void 0 ? void 0 : data["name"]) !== null && _b !== void 0 ? _b : data === null || data === void 0 ? void 0 : data["title"]) !== null && _c !== void 0 ? _c : data === null || data === void 0 ? void 0 : data["name"]) !== null && _d !== void 0 ? _d : ""}`, !queryId && `Create new ${itemLabel !== null && itemLabel !== void 0 ? itemLabel : "item"}`, Array.isArray(form) && jsx(Fragment, {})
       // <ul className="nav nav-bold nav-pills">
       //     {form.map(item =>
       //         <li key={item.key} className="nav-item cursor-pointer bg-hover-light rounded" onClick={() => switchTab(item.key)}>
@@ -1588,7 +1595,7 @@ function ItemEditDialog$1(_a) {
       // initialValues={fetchToFormData && queryId && data ? fetchToFormData(nonNullValues(data)) : nonNullValues(data) ?? initialValues(data) ?? {}}
       , Object.assign({
         // initialValues={fetchToFormData && queryId && data ? fetchToFormData(nonNullValues(data)) : nonNullValues(data) ?? initialValues(data) ?? {}}
-        initialValues: fetchToFormData && queryId && data ? fetchToFormData(nonNullValues$1(data)) : (_d = nonNullValues$1(initialValues(data))) !== null && _d !== void 0 ? _d : {},
+        initialValues: fetchToFormData && queryId && data ? fetchToFormData(nonNullValues$1(data)) : (_e = nonNullValues$1(initialValues(data))) !== null && _e !== void 0 ? _e : {},
         onSubmit: saveItem
       }, formikProps, {
         children: ({

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@compill/admin",
-    "version": "1.0.42",
+    "version": "1.0.44",
     "module": "./index.esm.js",
     "main": "./index.cjs.js"
 }

package/src/lib/page/PageQueryStateContainer.d.ts

@@ -12,6 +12,7 @@ type PageQueryContainerProps<T extends CRUD_MODEL> = Omit<ContainerProps, "child
     children: (data: T) => React.ReactElement;
 } | {
     apiFn: "getAll";
+    apiParams?: any;
     children: (data: T[]) => React.ReactElement;
 }));
 export declare const PageQueryStateContainer: <T extends CRUD_MODEL>(p: PageQueryContainerProps<T> & {