@admin-layout/client 10.1.1-alpha.23 → 10.1.1-alpha.24

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/lib/components/UpdateSettings/UpdateSettings.server.js +6 -6
  2. package/package.json +2 -2
package/lib/components/UpdateSettings/UpdateSettings.server.js CHANGED
@@ -29,8 +29,8 @@ async function settingsLoaderUtil({ request, context, params, }) {
29
29
  const { apolloClient } = context;
30
30
  const { orgName: orgNameFromParams } = params || {};
31
31
  const orgName = request.headers.get('orgname') || orgNameFromParams || '';
32
- const result = await fetchPageSettings(apolloClient, orgName);
33
- const pageSettings = JSON.parse(JSON.stringify(result.data.pageSettings.settings));
32
+ const result = orgName ? await fetchPageSettings(apolloClient, orgName) : null;
33
+ const pageSettings = orgName ? JSON.parse(JSON.stringify(result.data.pageSettings.settings)) : null;
34
34
  let pageDefaultSettings = pageSettings?.uilayout || defaultSettings || {};
35
35
  try {
36
36
  settings = await settingsCookie.parse(cookieHeader);
@@ -61,8 +61,8 @@ const action = async ({ request, context, params, }) => {
61
61
  const { apolloClient } = context;
62
62
  //console.log('request', request);
63
63
  const orgName = request.headers.get('orgname') || '';
64
- const result = await fetchPageSettings(apolloClient, orgName);
65
- const pageSettings = JSON.parse(JSON.stringify(result.data.pageSettings.settings));
64
+ const result = orgName ? await fetchPageSettings(apolloClient, orgName) : null;
65
+ const pageSettings = orgName ? JSON.parse(JSON.stringify(result.data.pageSettings.settings)) : null;
66
66
  let pageDefaultSettings = pageSettings?.uilayout || defaultSettings || {};
67
67
  const jsonData = await request.json();
68
68
  console.log('jsonData....', jsonData);
@@ -113,8 +113,8 @@ const loader = async ({ request, context, params, }) => {
113
113
  const { apolloClient } = context;
114
114
  const { orgName: orgNameFromParams } = params || {};
115
115
  const orgName = request.headers.get('orgname') || orgNameFromParams || '';
116
- const result = await fetchPageSettings(apolloClient, orgName);
117
- const pageSettings = JSON.parse(JSON.stringify(result.data.pageSettings.settings));
116
+ const result = orgName ? await fetchPageSettings(apolloClient, orgName) : null;
117
+ const pageSettings = orgName ? JSON.parse(JSON.stringify(result.data.pageSettings.settings)) : null;
118
118
  let pageDefaultSettings = pageSettings?.uilayout || defaultSettings || {};
119
119
  return json({
120
120
  settings: merge({}, pageDefaultSettings, config.LAYOUT_SETTINGS),
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@admin-layout/client",
3
- "version": "10.1.1-alpha.23",
3
+ "version": "10.1.1-alpha.24",
4
4
  "description": "Sample client for higher packages to depend on",
5
5
  "license": "ISC",
6
6
  "author": "CDMBase LLC",
@@ -40,5 +40,5 @@
40
40
  "typescript": {
41
41
  "definition": "lib/index.d.ts"
42
42
  },
43
- "gitHead": "73dd894ad8c271ff66dc539da2c4d0bfd45b6ff8"
43
+ "gitHead": "698137c0ed59c4115841d621bb9c28b4f4c7a6b0"
44
44
  }