@webiny/app-security-access-management 5.20.0 → 5.22.0-beta.1

package/index.d.ts

@@ -1,2 +1,5 @@
-declare const _default: () => import("@webiny/plugins/types").PluginCollection;
+import React from "react";
+declare const _default: () => any[];
 export default _default;
+export declare const AccessManagementExtension: () => JSX.Element;
+export declare const AccessManagement: React.MemoExoticComponent<() => JSX.Element>;

package/index.js

@@ -1,4 +1,49 @@
-import plugins from "./plugins";
+import React, { memo } from "react";
+import { plugins } from "@webiny/plugins";
+import { Layout, Plugins, AddMenu, AddRoute } from "@webiny/app-admin";
+import { HasPermission } from "@webiny/app-security";
+import { Permission } from "./plugins/constants";
+import { Groups } from "./ui/views/Groups";
+import { ApiKeys } from "./ui/views/ApiKeys";
+import accessManagementPugins from "./plugins";
 export default (function () {
-  return plugins();
-});
+  return [];
+});
+export var AccessManagementExtension = function AccessManagementExtension() {
+  plugins.register(accessManagementPugins());
+  return /*#__PURE__*/React.createElement(Plugins, null, /*#__PURE__*/React.createElement(HasPermission, {
+    name: Permission.Groups
+  }, /*#__PURE__*/React.createElement(AddRoute, {
+    exact: true,
+    path: "/access-management/groups"
+  }, /*#__PURE__*/React.createElement(Layout, {
+    title: "Access Management - Groups"
+  }, /*#__PURE__*/React.createElement(Groups, null)))), /*#__PURE__*/React.createElement(HasPermission, {
+    name: Permission.ApiKeys
+  }, /*#__PURE__*/React.createElement(AddRoute, {
+    exact: true,
+    path: "/access-management/api-keys"
+  }, /*#__PURE__*/React.createElement(Layout, {
+    title: "Access Management - API Keys"
+  }, /*#__PURE__*/React.createElement(ApiKeys, null)))), /*#__PURE__*/React.createElement(HasPermission, {
+    any: [Permission.Groups, Permission.ApiKeys]
+  }, /*#__PURE__*/React.createElement(AddMenu, {
+    name: "settings"
+  }, /*#__PURE__*/React.createElement(AddMenu, {
+    name: "settings.accessManagement",
+    label: "Access Management"
+  }, /*#__PURE__*/React.createElement(HasPermission, {
+    name: Permission.Groups
+  }, /*#__PURE__*/React.createElement(AddMenu, {
+    name: "settings.accessManagement.groups",
+    label: "Groups",
+    path: "/access-management/groups"
+  })), /*#__PURE__*/React.createElement(HasPermission, {
+    name: Permission.ApiKeys
+  }, /*#__PURE__*/React.createElement(AddMenu, {
+    name: "settings.accessManagement.apiKeys",
+    label: "API Keys",
+    path: "/access-management/api-keys"
+  }))))));
+};
+export var AccessManagement = /*#__PURE__*/memo(AccessManagementExtension);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webiny/app-security-access-management",
-	"version": "5.20.0",
+	"version": "5.22.0-beta.1",
 	"main": "index.js",
 	"repository": {
 		"type": "git",
@@ -14,34 +14,33 @@
 	"license": "MIT",
 	"dependencies": {
 		"@apollo/react-hooks": "3.1.5",
-		"@emotion/styled": "10.0.27",
-		"@webiny/app": "5.20.0",
-		"@webiny/app-admin": "5.20.0",
-		"@webiny/app-security": "5.20.0",
-		"@webiny/form": "5.20.0",
-		"@webiny/plugins": "5.20.0",
-		"@webiny/react-router": "5.20.0",
-		"@webiny/ui": "5.20.0",
-		"@webiny/validation": "5.20.0",
+		"@emotion/styled": "10.3.0",
+		"@webiny/app": "5.22.0-beta.1",
+		"@webiny/app-admin": "5.22.0-beta.1",
+		"@webiny/app-security": "5.22.0-beta.1",
+		"@webiny/form": "5.22.0-beta.1",
+		"@webiny/plugins": "5.22.0-beta.1",
+		"@webiny/react-router": "5.22.0-beta.1",
+		"@webiny/ui": "5.22.0-beta.1",
+		"@webiny/validation": "5.22.0-beta.1",
 		"emotion": "10.0.27",
 		"graphql-tag": "2.12.6",
 		"lodash": "4.17.21",
 		"react": "16.14.0",
 		"react-dom": "16.14.0",
-		"react-helmet": "5.2.1"
+		"react-helmet": "6.1.0"
 	},
 	"devDependencies": {
-		"@babel/cli": "^7.5.5",
-		"@babel/core": "^7.5.5",
-		"@babel/plugin-proposal-class-properties": "^7.5.5",
-		"@babel/preset-env": "^7.5.5",
-		"@babel/preset-react": "^7.0.0",
-		"@babel/preset-typescript": "^7.8.3",
-		"@webiny/cli": "^5.20.0",
-		"@webiny/project-utils": "^5.20.0",
+		"@babel/cli": "^7.16.0",
+		"@babel/core": "^7.16.0",
+		"@babel/plugin-proposal-class-properties": "^7.16.0",
+		"@babel/preset-env": "^7.16.4",
+		"@babel/preset-react": "^7.16.0",
+		"@babel/preset-typescript": "^7.16.0",
+		"@webiny/cli": "^5.22.0-beta.1",
+		"@webiny/project-utils": "^5.22.0-beta.1",
 		"babel-plugin-emotion": "^9.2.8",
 		"babel-plugin-lodash": "^3.3.4",
-		"babel-plugin-named-asset-import": "^1.0.0-next.3e165448",
 		"rimraf": "^3.0.2",
 		"ttypescript": "^1.5.12",
 		"typescript": "^4.1.3"
@@ -54,11 +53,6 @@
 		"build": "yarn webiny run build",
 		"watch": "yarn webiny run watch"
 	},
-	"svgo": {
-		"plugins": {
-			"removeViewBox": false
-		}
-	},
 	"adio": {
 		"ignore": {
 			"peerDependencies": [
@@ -66,5 +60,5 @@
 			]
 		}
 	},
-	"gitHead": "816632961750d4ae7f3af0d32d4e8a46c3f287a6"
+	"gitHead": "b651010b23f28b3ce1c27130713322ce65b32dcd"
 }

package/plugins/index.js

@@ -1,8 +1,6 @@
-import routes from "./routes";
-import menus from "./menus";
 import installation from "./installation";
 import permissionRenderer from "./permissionRenderer";
 import secureRouteError from "./secureRouteError";
 export default (function () {
-  return [routes, menus, installation, permissionRenderer, secureRouteError];
+  return [installation, permissionRenderer, secureRouteError];
 });

package/plugins/permissionRenderer/index.js

@@ -5,7 +5,7 @@ var _templateObject, _templateObject2;
 import React from "react";
 import { i18n } from "@webiny/app/i18n";
 import { AccordionItem } from "@webiny/ui/Accordion";
-import { ReactComponent as SecurityIcon } from "@svgr/webpack!@webiny/app-admin/assets/icons/baseline-security-24px.svg";
+import { ReactComponent as SecurityIcon } from "@webiny/app-admin/assets/icons/baseline-security-24px.svg";
 import { SecurityPermissions } from "./SecurityPermissions";
 import { PermissionRendererPlugin } from "@webiny/app-admin/plugins/PermissionRendererPlugin";
 var t = i18n.ns("app-security-admin-users/plugins/permissionRenderer");

package/ui/views/ApiKeys/ApiKeyForm.js

@@ -26,7 +26,7 @@ import * as GQL from "./graphql";
 import { SnackbarAction } from "@webiny/ui/Snackbar";
 import isEmpty from "lodash/isEmpty";
 import EmptyView from "@webiny/app-admin/components/EmptyView";
-import { ReactComponent as AddIcon } from "@svgr/webpack!@webiny/app-admin/assets/icons/add-18px.svg";
+import { ReactComponent as AddIcon } from "@webiny/app-admin/assets/icons/add-18px.svg";
 import styled from "@emotion/styled";
 var t = i18n.ns("app-security-admin-users/admin/api-keys/form");
 var ButtonWrapper = /*#__PURE__*/styled("div", {

package/ui/views/ApiKeys/ApiKeysDataList.js

@@ -19,8 +19,8 @@ import { useSnackbar } from "@webiny/app-admin/hooks/useSnackbar";
 import { useQuery, useMutation } from "@apollo/react-hooks";
 import { useConfirmationDialog } from "@webiny/app-admin/hooks/useConfirmationDialog";
 import * as GQL from "./graphql";
-import { ReactComponent as AddIcon } from "@svgr/webpack!@webiny/app-admin/assets/icons/add-18px.svg";
-import { ReactComponent as FilterIcon } from "@svgr/webpack!@webiny/app-admin/assets/icons/filter-24px.svg";
+import { ReactComponent as AddIcon } from "@webiny/app-admin/assets/icons/add-18px.svg";
+import { ReactComponent as FilterIcon } from "@webiny/app-admin/assets/icons/filter-24px.svg";
 import { serializeSorters, deserializeSorters } from "../utils";
 var t = i18n.ns("app-security/admin/groups/data-list");
 var SORTERS = [{

package/ui/views/Groups/GroupsDataList.js

@@ -20,8 +20,8 @@ import { ButtonIcon, ButtonSecondary } from "@webiny/ui/Button";
 import { Cell, Grid } from "@webiny/ui/Grid";
 import { Select } from "@webiny/ui/Select";
 import SearchUI from "@webiny/app-admin/components/SearchUI";
-import { ReactComponent as AddIcon } from "@svgr/webpack!@webiny/app-admin/assets/icons/add-18px.svg";
-import { ReactComponent as FilterIcon } from "@svgr/webpack!@webiny/app-admin/assets/icons/filter-24px.svg";
+import { ReactComponent as AddIcon } from "@webiny/app-admin/assets/icons/add-18px.svg";
+import { ReactComponent as FilterIcon } from "@webiny/app-admin/assets/icons/filter-24px.svg";
 import { deserializeSorters, serializeSorters } from "../utils";
 var t = i18n.ns("app-security/admin/groups/data-list");
 var SORTERS = [{

package/ui/views/Groups/GroupsForm.js

@@ -27,7 +27,7 @@ import { CREATE_GROUP, LIST_GROUPS, READ_GROUP, UPDATE_GROUP } from "./graphql";
 import { SnackbarAction } from "@webiny/ui/Snackbar";
 import isEmpty from "lodash/isEmpty";
 import EmptyView from "@webiny/app-admin/components/EmptyView";
-import { ReactComponent as AddIcon } from "@svgr/webpack!@webiny/app-admin/assets/icons/add-18px.svg";
+import { ReactComponent as AddIcon } from "@webiny/app-admin/assets/icons/add-18px.svg";
 var t = i18n.ns("app-security/admin/groups/form");
 var ButtonWrapper = /*#__PURE__*/styled("div", {
   target: "euuiyav0",

package/plugins/menus.d.ts

@@ -1,4 +0,0 @@
-import { UIViewPlugin } from "@webiny/app-admin/ui/UIView";
-import { NavigationView } from "@webiny/app-admin/ui/views/NavigationView";
-declare const _default: UIViewPlugin<NavigationView>;
-export default _default;

package/plugins/menus.js

@@ -1,61 +0,0 @@
-import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
-import _regeneratorRuntime from "@babel/runtime/regenerator";
-import { NavigationMenuElement, TAGS } from "@webiny/app-admin/ui/elements/NavigationMenuElement";
-import { Permission } from "./constants";
-import { UIViewPlugin } from "@webiny/app-admin/ui/UIView";
-import { NavigationView } from "@webiny/app-admin/ui/views/NavigationView";
-export default new UIViewPlugin(NavigationView, /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(view) {
-    var _view$getSecurityHook, identity, groups, apiKeys, mainMenu;
-
-    return _regeneratorRuntime.wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            _context.next = 2;
-            return view.isRendered();
-
-          case 2:
-            _view$getSecurityHook = view.getSecurityHook(), identity = _view$getSecurityHook.identity;
-            groups = identity.getPermission(Permission.Groups);
-            apiKeys = identity.getPermission(Permission.ApiKeys);
-
-            if (!(!groups && !apiKeys)) {
-              _context.next = 7;
-              break;
-            }
-
-            return _context.abrupt("return");
-
-          case 7:
-            mainMenu = view.getSettingsMenuElement().addElement(new NavigationMenuElement("accessManagement", {
-              label: "Access Management",
-              tags: [TAGS.UTILS]
-            }));
-
-            if (groups) {
-              mainMenu.addElement(new NavigationMenuElement("groups", {
-                label: "Groups",
-                path: "/access-management/groups"
-              }));
-            }
-
-            if (apiKeys) {
-              mainMenu.addElement(new NavigationMenuElement("apiKeys", {
-                label: "API Keys",
-                path: "/access-management/api-keys"
-              }));
-            }
-
-          case 10:
-          case "end":
-            return _context.stop();
-        }
-      }
-    }, _callee);
-  }));
-
-  return function (_x) {
-    return _ref.apply(this, arguments);
-  };
-}());