@webiny/api-headless-cms 5.17.4 → 5.18.0-beta.3

package/migrateCMSPermissions.d.ts

@@ -1,4 +1,4 @@
-import { CmsContentModel } from "./types";
+import { CmsModel } from "./types";
 declare type Group = {
     [code: string]: string[];
 };
@@ -13,5 +13,5 @@ declare type CMSPermission = {
     groups?: Group;
     models?: Model;
 };
-export declare const migrateCMSPermissions: (permissions: CMSPermission[], getModel: (modelId: string) => Promise<CmsContentModel>) => Promise<CMSPermission[]>;
+export declare const migrateCMSPermissions: (permissions: CMSPermission[], getModel: (modelId: string) => Promise<CmsModel>) => Promise<CMSPermission[]>;
 export {};

package/migrateCMSPermissions.js

@@ -190,5 +190,4 @@ const setAccessScopeToOwn = (permissions, entity) => {
   delete permissions[entity].groups; // Remove "models" from content model permission
 
   delete permissions[entity].models;
-};
-//# sourceMappingURL=migrateCMSPermissions.js.map
+};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webiny/api-headless-cms",
-	"version": "5.17.4",
+	"version": "5.18.0-beta.3",
 	"main": "index.js",
 	"keywords": [
 		"cms:base"
@@ -21,21 +21,23 @@
 		"@babel/runtime": "7.16.3",
 		"@commodo/fields": "1.1.2-beta.20",
 		"@graphql-tools/schema": "7.1.5",
-		"@webiny/api-file-manager": "5.17.4",
-		"@webiny/api-i18n": "5.17.4",
-		"@webiny/api-i18n-content": "5.17.4",
-		"@webiny/api-i18n-ddb": "5.17.4",
-		"@webiny/api-security": "5.17.4",
-		"@webiny/api-tenancy": "5.17.4",
-		"@webiny/api-upgrade": "5.17.4",
-		"@webiny/error": "5.17.4",
-		"@webiny/handler": "5.17.4",
-		"@webiny/handler-aws": "5.17.4",
-		"@webiny/handler-db": "5.17.4",
-		"@webiny/handler-graphql": "5.17.4",
-		"@webiny/handler-http": "5.17.4",
-		"@webiny/plugins": "5.17.4",
-		"@webiny/validation": "5.17.4",
+		"@webiny/api-file-manager": "5.18.0-beta.3",
+		"@webiny/api-i18n": "5.18.0-beta.3",
+		"@webiny/api-i18n-content": "5.18.0-beta.3",
+		"@webiny/api-i18n-ddb": "5.18.0-beta.3",
+		"@webiny/api-security": "5.18.0-beta.3",
+		"@webiny/api-tenancy": "5.18.0-beta.3",
+		"@webiny/api-upgrade": "5.18.0-beta.3",
+		"@webiny/error": "5.18.0-beta.3",
+		"@webiny/handler": "5.18.0-beta.3",
+		"@webiny/handler-aws": "5.18.0-beta.3",
+		"@webiny/handler-db": "5.18.0-beta.3",
+		"@webiny/handler-graphql": "5.18.0-beta.3",
+		"@webiny/handler-http": "5.18.0-beta.3",
+		"@webiny/plugins": "5.18.0-beta.3",
+		"@webiny/pubsub": "5.18.0-beta.3",
+		"@webiny/utils": "5.18.0-beta.3",
+		"@webiny/validation": "5.18.0-beta.3",
 		"boolean": "3.1.4",
 		"commodo-fields-object": "1.0.6",
 		"dataloader": "2.0.0",
@@ -51,10 +53,10 @@
 		"@babel/core": "^7.5.5",
 		"@babel/preset-env": "^7.5.5",
 		"@babel/preset-flow": "^7.0.0",
-		"@webiny/api-security-so-ddb": "^5.17.4",
-		"@webiny/api-tenancy-so-ddb": "^5.17.4",
-		"@webiny/cli": "^5.17.4",
-		"@webiny/project-utils": "^5.17.4",
+		"@webiny/api-security-so-ddb": "^5.18.0-beta.3",
+		"@webiny/api-tenancy-so-ddb": "^5.18.0-beta.3",
+		"@webiny/cli": "^5.18.0-beta.3",
+		"@webiny/project-utils": "^5.18.0-beta.3",
 		"apollo-graphql": "^0.4.1",
 		"get-yarn-workspaces": "^1.0.2",
 		"graphql": "^14.6.0",
@@ -74,5 +76,5 @@
 		"build": "yarn webiny run build",
 		"watch": "yarn webiny run watch"
 	},
-	"gitHead": "bdfaa377704bf7f51d73561b4c6129f682bf24d2"
+	"gitHead": "9c86670476a62348ce391b091bf768e425ab6ee9"
 }

package/plugins/context.js

@@ -31,5 +31,4 @@ var _default = () => {
   });
 };
 
-exports.default = _default;
-//# sourceMappingURL=context.js.map
+exports.default = _default;

package/plugins/crud/index.d.ts

@@ -1,2 +1,6 @@
-declare const _default: () => (import("@webiny/handler/plugins/ContextPlugin").ContextPlugin<import("../../types").CmsContext> | import("@webiny/handler/types").ContextPlugin<import("../../types").CmsContext, import("@webiny/handler/types").Context<Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>>, import("@webiny/handler/types").Context<Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>>, import("@webiny/handler/types").Context<Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>>, import("@webiny/handler/types").Context<Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>>, import("@webiny/handler/types").Context<Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>>, import("@webiny/handler/types").Context<Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>>, import("@webiny/handler/types").Context<Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>>, import("@webiny/handler/types").Context<Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>>, import("@webiny/handler/types").Context<Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>>>)[];
-export default _default;
+import { CmsContext, HeadlessCmsStorageOperations } from "../../types";
+import { ContextPlugin } from "@webiny/handler/plugins/ContextPlugin";
+export interface Params {
+    storageOperations: HeadlessCmsStorageOperations;
+}
+export declare const createAdminCruds: (params: Params) => ContextPlugin<CmsContext>;

package/plugins/crud/index.js

@@ -5,13 +5,76 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.createAdminCruds = void 0;
 
-var _settings = _interopRequireDefault(require("./settings.crud"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
-var _system = _interopRequireDefault(require("./system.crud"));
+var _settings = require("./settings.crud");
 
-var _default = () => [_settings.default, _system.default];
+var _system = require("./system.crud");
 
-exports.default = _default;
-//# sourceMappingURL=index.js.map
+var _ContextPlugin = require("@webiny/handler/plugins/ContextPlugin");
+
+var _contentModelGroup = require("../../content/plugins/crud/contentModelGroup.crud");
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
+const createAdminCruds = params => {
+  const {
+    storageOperations
+  } = params;
+  return new _ContextPlugin.ContextPlugin(async context => {
+    /**
+     * This should never happen in the actual project.
+     * It is to make sure that we load setup context before the CRUD init in our internal code.
+     */
+    if (!context.cms) {
+      console.log(`Missing initial "cms" on the context. Make sure that you set it up before creating Admin CRUDs.`);
+      return;
+    }
+
+    const getLocale = () => {
+      return context.i18n.getCurrentLocale();
+    };
+
+    const getIdentity = () => {
+      return context.security.getIdentity();
+    };
+
+    const getTenant = () => {
+      return context.tenancy.getCurrentTenant();
+    };
+
+    if (storageOperations.plugins && storageOperations.plugins.length > 0) {
+      context.plugins.register(storageOperations.plugins);
+    }
+
+    context.cms = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, context.cms), (0, _system.createSystemCrud)({
+      context,
+      getTenant,
+      getIdentity,
+      storageOperations
+    })), (0, _settings.createSettingsCrud)({
+      context,
+      getTenant,
+      getLocale,
+      storageOperations
+    })), (0, _contentModelGroup.createModelGroupsCrud)({
+      context,
+      getTenant,
+      getLocale,
+      getIdentity,
+      storageOperations
+    }));
+
+    if (!storageOperations.init) {
+      return;
+    }
+
+    await storageOperations.init(context.cms);
+  });
+};
+
+exports.createAdminCruds = createAdminCruds;

package/plugins/crud/settings.crud.d.ts

@@ -1,4 +1,10 @@
-import { ContextPlugin } from "@webiny/handler/types";
-import { CmsContext } from "../../types";
-declare const _default: ContextPlugin<CmsContext, import("@webiny/handler/types").Context<Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>>, import("@webiny/handler/types").Context<Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>>, import("@webiny/handler/types").Context<Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>>, import("@webiny/handler/types").Context<Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>>, import("@webiny/handler/types").Context<Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>>, import("@webiny/handler/types").Context<Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>>, import("@webiny/handler/types").Context<Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>>, import("@webiny/handler/types").Context<Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>>, import("@webiny/handler/types").Context<Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>>>;
-export default _default;
+import { CmsContext, HeadlessCmsStorageOperations, CmsSettingsContext } from "../../types";
+import { Tenant } from "@webiny/api-tenancy/types";
+import { I18NLocale } from "@webiny/api-i18n/types";
+export interface Params {
+    getTenant: () => Tenant;
+    getLocale: () => I18NLocale;
+    storageOperations: HeadlessCmsStorageOperations;
+    context: CmsContext;
+}
+export declare const createSettingsCrud: (params: Params) => CmsSettingsContext;

package/plugins/crud/settings.crud.js

@@ -5,14 +5,12 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.createSettingsCrud = void 0;
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
 var utils = _interopRequireWildcard(require("../../utils"));
 
-var _error = _interopRequireDefault(require("@webiny/error"));
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -21,86 +19,75 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
-var _default = {
-  type: "context",
-  name: "context-settings-crud",
-  apply: async context => {
-    /**
-     * If cms is not defined on the context, do not continue, but log it.
-     */
-    if (!context.cms) {
-      return;
-    }
-
-    const pluginType = "cms-settings-storage-operations-provider";
-    const providerPlugins = context.plugins.byType(pluginType);
-    const providerPlugin = providerPlugins[providerPlugins.length - 1];
-
-    if (!providerPlugin) {
-      throw new _error.default(`Missing "${pluginType}" plugin.`, "PLUGIN_NOT_FOUND", {
-        type: pluginType
+const createSettingsCrud = params => {
+  const {
+    storageOperations,
+    context,
+    getTenant,
+    getLocale
+  } = params;
+
+  const checkPermissions = () => {
+    return utils.checkPermissions(context, "cms.settings");
+  };
+
+  return {
+    getSettings: async () => {
+      await checkPermissions();
+      return await storageOperations.settings.get({
+        tenant: getTenant().id,
+        locale: getLocale().code
+      });
+    },
+    updateModelLastChange: async () => {
+      const original = await storageOperations.settings.get({
+        tenant: getTenant().id,
+        locale: getLocale().code
       });
-    }
 
-    const storageOperations = await providerPlugin.provide({
-      context
-    });
+      const settings = _objectSpread(_objectSpread({}, original || {}), {}, {
+        contentModelLastChange: new Date(),
+        tenant: getTenant().id,
+        locale: getLocale().code
+      });
 
-    const checkPermissions = () => {
-      return utils.checkPermissions(context, "cms.settings");
-    };
+      if (!original) {
+        await storageOperations.settings.create({
+          settings
+        });
+        return;
+      }
 
-    const settings = {
-      noAuth: () => {
-        return {
-          get: async () => {
-            return await storageOperations.get();
-          }
-        };
-      },
-      get: async () => {
-        await checkPermissions();
-        return await storageOperations.get();
-      },
-      updateContentModelLastChange: async () => {
-        const data = {
-          contentModelLastChange: new Date()
-        };
-        const settings = await storageOperations.get();
-
-        if (!settings) {
-          await storageOperations.create(data);
-          return;
+      await storageOperations.settings.update({
+        original,
+        settings
+      });
+    },
+    getModelLastChange: async () => {
+      try {
+        const settings = await storageOperations.settings.get({
+          tenant: getTenant().id,
+          locale: getLocale().code
+        });
+
+        if (!settings || !settings.contentModelLastChange) {
+          return new Date();
         }
 
-        await storageOperations.update(data);
-      },
-      getContentModelLastChange: async () => {
-        try {
-          const settings = await storageOperations.get();
-
-          if (!settings || !settings.contentModelLastChange) {
-            return new Date();
+        return settings.contentModelLastChange;
+      } catch (ex) {
+        console.log({
+          error: {
+            message: ex.message,
+            code: ex.code || "COULD_NOT_FETCH_CONTENT_MODEL_LAST_CHANGE",
+            data: ex
           }
-
-          return settings.contentModelLastChange;
-        } catch (ex) {
-          console.log({
-            error: {
-              message: ex.message,
-              code: ex.code || "COULD_NOT_FETCH_CONTENT_MODEL_LAST_CHANGE",
-              data: ex
-            }
-          });
-        }
-
-        return new Date();
+        });
       }
-    };
-    context.cms = _objectSpread(_objectSpread({}, context.cms || {}), {}, {
-      settings
-    });
-  }
+
+      return new Date();
+    }
+  };
 };
-exports.default = _default;
-//# sourceMappingURL=settings.crud.js.map
+
+exports.createSettingsCrud = createSettingsCrud;

package/plugins/crud/system.crud.d.ts

@@ -1,4 +1,10 @@
-import { ContextPlugin } from "@webiny/handler/plugins/ContextPlugin";
-import { CmsContext } from "../../types";
-declare const _default: ContextPlugin<CmsContext>;
-export default _default;
+import { CmsContext, CmsSystemContext, HeadlessCmsStorageOperations } from "../../types";
+import { Tenant } from "@webiny/api-tenancy/types";
+import { SecurityIdentity } from "@webiny/api-security/types";
+export interface Params {
+    getTenant: () => Tenant;
+    storageOperations: HeadlessCmsStorageOperations;
+    context: CmsContext;
+    getIdentity: () => SecurityIdentity;
+}
+export declare const createSystemCrud: (params: Params) => CmsSystemContext;