@webiny/app-security-access-management 5.23.0 → 5.24.0-beta.0

package/components/GroupAutocomplete/graphql.d.ts

@@ -1 +1 @@
-export declare const LIST_GROUPS: any;
+export declare const LIST_GROUPS: import("graphql").DocumentNode;

package/components/GroupAutocomplete/index.d.ts

@@ -1,2 +1,5 @@
-/// <reference types="react" />
-export declare const GroupAutocomplete: (props: any) => JSX.Element;
+import React from "react";
+import { AutoCompleteProps } from "@webiny/ui/AutoComplete";
+declare type GroupAutocompleteProps = Partial<AutoCompleteProps>;
+export declare const GroupAutocomplete: React.FC<GroupAutocompleteProps>;
+export {};

package/components/NotAuthorizedError/NotAuthorizedError.d.ts

@@ -1,2 +1,2 @@
-/// <reference types="react" />
-export declare const NotAuthorizedError: () => JSX.Element;
+import * as React from "react";
+export declare const NotAuthorizedError: React.FC;

package/index.d.ts

@@ -1,5 +1,9 @@
 import React from "react";
 declare const _default: () => any[];
+/**
+ * TODO @ts-refactor
+ * Find out why is there empty default export
+ */
 export default _default;
 export declare const AccessManagementExtension: () => JSX.Element;
 export declare const AccessManagement: React.MemoExoticComponent<() => JSX.Element>;

package/index.js

@@ -6,6 +6,12 @@ import { Permission } from "./plugins/constants";
 import { Groups } from "./ui/views/Groups";
 import { ApiKeys } from "./ui/views/ApiKeys";
 import accessManagementPugins from "./plugins";
+/**
+ * TODO @ts-refactor
+ * Find out why is there empty default export
+ */
+// @ts-ignore
+
 export default (function () {
   return [];
 });

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webiny/app-security-access-management",
-	"version": "5.23.0",
+	"version": "5.24.0-beta.0",
 	"main": "index.js",
 	"repository": {
 		"type": "git",
@@ -15,14 +15,14 @@
 	"dependencies": {
 		"@apollo/react-hooks": "3.1.5",
 		"@emotion/styled": "10.3.0",
-		"@webiny/app": "5.23.0",
-		"@webiny/app-admin": "5.23.0",
-		"@webiny/app-security": "5.23.0",
-		"@webiny/form": "5.23.0",
-		"@webiny/plugins": "5.23.0",
-		"@webiny/react-router": "5.23.0",
-		"@webiny/ui": "5.23.0",
-		"@webiny/validation": "5.23.0",
+		"@webiny/app": "5.24.0-beta.0",
+		"@webiny/app-admin": "5.24.0-beta.0",
+		"@webiny/app-security": "5.24.0-beta.0",
+		"@webiny/form": "5.24.0-beta.0",
+		"@webiny/plugins": "5.24.0-beta.0",
+		"@webiny/react-router": "5.24.0-beta.0",
+		"@webiny/ui": "5.24.0-beta.0",
+		"@webiny/validation": "5.24.0-beta.0",
 		"emotion": "10.0.27",
 		"graphql-tag": "2.12.6",
 		"lodash": "4.17.21",
@@ -37,8 +37,9 @@
 		"@babel/preset-env": "^7.16.4",
 		"@babel/preset-react": "^7.16.0",
 		"@babel/preset-typescript": "^7.16.0",
-		"@webiny/cli": "^5.23.0",
-		"@webiny/project-utils": "^5.23.0",
+		"@types/react-helmet": "^6.1.5",
+		"@webiny/cli": "^5.24.0-beta.0",
+		"@webiny/project-utils": "^5.24.0-beta.0",
 		"babel-plugin-emotion": "^9.2.8",
 		"babel-plugin-lodash": "^3.3.4",
 		"rimraf": "^3.0.2",
@@ -60,5 +61,5 @@
 			]
 		}
 	},
-	"gitHead": "eaa0003e39194d687ab5397c08eeccdb3557fb28"
+	"gitHead": "05b90b92bbaf2ef3adf275d008c4641580cf5f42"
 }

package/plugins/permissionRenderer/SecurityPermissions.d.ts

@@ -1,5 +1,8 @@
-/// <reference types="react" />
-export declare const SecurityPermissions: ({ value, onChange }: {
-    value: any;
-    onChange: any;
-}) => JSX.Element;
+import React from "react";
+import { SecurityPermission } from "@webiny/app-security/types";
+interface SecurityPermissionsProps {
+    value: SecurityPermission[];
+    onChange: (value: SecurityPermission[]) => void;
+}
+export declare const SecurityPermissions: React.FC<SecurityPermissionsProps>;
+export {};

package/types.d.ts

@@ -0,0 +1,15 @@
+import { SecurityPermission } from "@webiny/app-security/types";
+export interface Group {
+    id: string;
+    name: string;
+    description: string;
+    slug: string;
+    system?: boolean;
+}
+export interface ApiKey {
+    id: string;
+    token: string;
+    name: string;
+    description: string;
+    permissions: SecurityPermission[];
+}

package/types.js

@@ -0,0 +1 @@
+export {};

package/ui/elements/GroupAutocompleteElement.d.ts

@@ -1,5 +1,6 @@
 import React from "react";
 import { InputElement } from "@webiny/app-admin/ui/elements/form/InputElement";
+import { FormFieldElementRenderProps } from "@webiny/app-admin/ui/elements/form/FormFieldElement";
 export declare class GroupAutocompleteElement extends InputElement {
-    render({ formProps }: any): React.ReactElement;
+    render(props: FormFieldElementRenderProps): React.ReactElement;
 }

package/ui/elements/GroupAutocompleteElement.js

@@ -18,10 +18,10 @@ export var GroupAutocompleteElement = /*#__PURE__*/function (_InputElement) {
 
   _createClass(GroupAutocompleteElement, [{
     key: "render",
-    value: function render(_ref) {
-      var formProps = _ref.formProps;
-      var _ref2 = formProps,
-          Bind = _ref2.Bind;
+    value: function render(props) {
+      var formProps = props.formProps;
+      var _ref = formProps,
+          Bind = _ref.Bind;
       return /*#__PURE__*/React.createElement(Bind, {
         name: this.id,
         validators: this.config.validators

package/ui/views/ApiKeys/ApiKeyForm.d.ts

@@ -1,3 +1,5 @@
-/// <reference types="react" />
-declare const ApiKeyForm: () => JSX.Element;
-export default ApiKeyForm;
+import React from "react";
+export interface ApiKeyFormProps {
+    [key: string]: any;
+}
+export declare const ApiKeyForm: React.FC<ApiKeyFormProps>;

package/ui/views/ApiKeys/ApiKeyForm.js

@@ -36,8 +36,7 @@ var ButtonWrapper = /*#__PURE__*/styled("div", {
   display: "flex",
   justifyContent: "space-between"
 });
-
-var ApiKeyForm = function ApiKeyForm() {
+export var ApiKeyForm = function ApiKeyForm() {
   var _useRouter = useRouter(),
       location = _useRouter.location,
       history = _useRouter.history;
@@ -239,6 +238,4 @@ var ApiKeyForm = function ApiKeyForm() {
       onClick: form.submit
     }, t(_templateObject10 || (_templateObject10 = _taggedTemplateLiteral(["Save API key"])))))));
   });
-};
-
-export default ApiKeyForm;
+};

package/ui/views/ApiKeys/ApiKeys.d.ts

@@ -1,3 +1,8 @@
-/// <reference types="react" />
-declare const ApiKeys: ({ formProps, listProps }: any) => JSX.Element;
-export default ApiKeys;
+import * as React from "react";
+import { ApiKeysDataListProps } from "./ApiKeysDataList";
+import { ApiKeyFormProps } from "./ApiKeyForm";
+export interface ApiKeysProps {
+    listProps?: ApiKeysDataListProps;
+    formProps?: ApiKeyFormProps;
+}
+export declare const ApiKeys: React.FC<ApiKeysProps>;

package/ui/views/ApiKeys/ApiKeys.js

@@ -1,12 +1,11 @@
 import * as React from "react";
 import { SplitView, LeftPanel, RightPanel } from "@webiny/app-admin/components/SplitView";
-import ApiKeysDataList from "./ApiKeysDataList";
-import ApiKeyForm from "./ApiKeyForm";
-
-var ApiKeys = function ApiKeys(_ref) {
-  var formProps = _ref.formProps,
-      listProps = _ref.listProps;
+import { ApiKeysDataList } from "./ApiKeysDataList";
+import { ApiKeyForm } from "./ApiKeyForm";
+export var ApiKeys = function ApiKeys(_ref) {
+  var _ref$formProps = _ref.formProps,
+      formProps = _ref$formProps === void 0 ? {} : _ref$formProps,
+      _ref$listProps = _ref.listProps,
+      listProps = _ref$listProps === void 0 ? {} : _ref$listProps;
   return /*#__PURE__*/React.createElement(SplitView, null, /*#__PURE__*/React.createElement(LeftPanel, null, /*#__PURE__*/React.createElement(ApiKeysDataList, listProps)), /*#__PURE__*/React.createElement(RightPanel, null, /*#__PURE__*/React.createElement(ApiKeyForm, formProps)));
-};
-
-export default ApiKeys;
+};

package/ui/views/ApiKeys/ApiKeysDataList.d.ts

@@ -1,3 +1,5 @@
-/// <reference types="react" />
-declare const ApiKeysDataList: () => JSX.Element;
-export default ApiKeysDataList;
+import React from "react";
+export interface ApiKeysDataListProps {
+    [key: string]: any;
+}
+export declare const ApiKeysDataList: React.FC<ApiKeysDataListProps>;

package/ui/views/ApiKeys/ApiKeysDataList.js

@@ -21,37 +21,28 @@ import { useConfirmationDialog } from "@webiny/app-admin/hooks/useConfirmationDi
 import * as GQL from "./graphql";
 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";
+import { deserializeSorters } from "../utils";
 var t = i18n.ns("app-security/admin/groups/data-list");
 var SORTERS = [{
   label: t(_templateObject || (_templateObject = _taggedTemplateLiteral(["Newest to oldest"]))),
-  sorters: {
-    createdOn: "desc"
-  }
+  sorter: "createdOn_DESC"
 }, {
   label: t(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["Oldest to newest"]))),
-  sorters: {
-    createdOn: "asc"
-  }
+  sorter: "createdOn_ASC"
 }, {
   label: t(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["Name A-Z"]))),
-  sorters: {
-    name: "asc"
-  }
+  sorter: "name_ASC"
 }, {
   label: t(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["Name Z-A"]))),
-  sorters: {
-    name: "desc"
-  }
+  sorter: "name_DESC"
 }];
-
-var ApiKeysDataList = function ApiKeysDataList() {
+export var ApiKeysDataList = function ApiKeysDataList() {
   var _useState = useState(""),
       _useState2 = _slicedToArray(_useState, 2),
       filter = _useState2[0],
       setFilter = _useState2[1];
 
-  var _useState3 = useState(serializeSorters(SORTERS[0].sorters)),
+  var _useState3 = useState(SORTERS[0].sorter),
       _useState4 = _slicedToArray(_useState3, 2),
       sort = _useState4[0],
       setSort = _useState4[1];
@@ -78,11 +69,10 @@ var ApiKeysDataList = function ApiKeysDataList() {
       return list;
     }
 
-    var _Object$entries = Object.entries(deserializeSorters(sort)),
-        _Object$entries2 = _slicedToArray(_Object$entries, 1),
-        _Object$entries2$ = _slicedToArray(_Object$entries2[0], 2),
-        key = _Object$entries2$[0],
-        value = _Object$entries2$[1];
+    var _deserializeSorters = deserializeSorters(sort),
+        _deserializeSorters2 = _slicedToArray(_deserializeSorters, 2),
+        key = _deserializeSorters2[0],
+        value = _deserializeSorters2[1];
 
     return orderBy(list, [key], [value]);
   }, [sort]);
@@ -153,10 +143,10 @@ var ApiKeysDataList = function ApiKeysDataList() {
       label: t(_templateObject6 || (_templateObject6 = _taggedTemplateLiteral(["Sort by"])))
     }, SORTERS.map(function (_ref3) {
       var label = _ref3.label,
-          sorters = _ref3.sorters;
+          sorter = _ref3.sorter;
       return /*#__PURE__*/React.createElement("option", {
         key: label,
-        value: serializeSorters(sorters)
+        value: sorter
       }, label);
     })))));
   }, [sort]);
@@ -204,6 +194,4 @@ var ApiKeysDataList = function ApiKeysDataList() {
       }))));
     }));
   });
-};
-
-export default ApiKeysDataList;
+};

package/ui/views/ApiKeys/graphql.d.ts

@@ -1,5 +1,5 @@
-export declare const LIST_API_KEYS: any;
-export declare const READ_API_KEY: any;
-export declare const CREATE_API_KEY: any;
-export declare const UPDATE_API_KEY: any;
-export declare const DELETE_API_KEY: any;
+export declare const LIST_API_KEYS: import("graphql").DocumentNode;
+export declare const READ_API_KEY: import("graphql").DocumentNode;
+export declare const CREATE_API_KEY: import("graphql").DocumentNode;
+export declare const UPDATE_API_KEY: import("graphql").DocumentNode;
+export declare const DELETE_API_KEY: import("graphql").DocumentNode;

package/ui/views/ApiKeys/index.d.ts

@@ -1 +1 @@
-export { default as ApiKeys } from "./ApiKeys";
+export * from "./ApiKeys";

package/ui/views/ApiKeys/index.js

@@ -1 +1 @@
-export { default as ApiKeys } from "./ApiKeys";
+export * from "./ApiKeys";

package/ui/views/ApiKeys/utils.d.ts

@@ -1 +1,2 @@
-export declare const pickDataForAPI: (data: any) => any;
+import { ApiKey } from "../../../types";
+export declare const pickDataForAPI: (data: ApiKey) => Pick<ApiKey, "name" | "description" | "permissions">;

package/ui/views/Groups/Groups.d.ts

@@ -1,3 +1,8 @@
-/// <reference types="react" />
-declare const Groups: ({ formProps, listProps }: any) => JSX.Element;
-export default Groups;
+import React from "react";
+import { GroupsDataListProps } from "./GroupsDataList";
+import { GroupsFormProps } from "./GroupsForm";
+export interface GroupsProps {
+    listProps?: GroupsDataListProps;
+    formProps?: GroupsFormProps;
+}
+export declare const Groups: React.FC<GroupsProps>;

package/ui/views/Groups/Groups.js

@@ -1,12 +1,11 @@
-import * as React from "react";
+import React from "react";
 import { SplitView, LeftPanel, RightPanel } from "@webiny/app-admin/components/SplitView";
-import GroupsDataList from "./GroupsDataList";
-import GroupsForm from "./GroupsForm";
-
-var Groups = function Groups(_ref) {
-  var formProps = _ref.formProps,
-      listProps = _ref.listProps;
+import { GroupsDataList } from "./GroupsDataList";
+import { GroupsForm } from "./GroupsForm";
+export var Groups = function Groups(_ref) {
+  var _ref$formProps = _ref.formProps,
+      formProps = _ref$formProps === void 0 ? {} : _ref$formProps,
+      _ref$listProps = _ref.listProps,
+      listProps = _ref$listProps === void 0 ? {} : _ref$listProps;
   return /*#__PURE__*/React.createElement(SplitView, null, /*#__PURE__*/React.createElement(LeftPanel, null, /*#__PURE__*/React.createElement(GroupsDataList, listProps)), /*#__PURE__*/React.createElement(RightPanel, null, /*#__PURE__*/React.createElement(GroupsForm, formProps)));
-};
-
-export default Groups;
+};

package/ui/views/Groups/GroupsDataList.d.ts

@@ -1,3 +1,5 @@
-/// <reference types="react" />
-declare const GroupsDataList: () => JSX.Element;
-export default GroupsDataList;
+import React from "react";
+export interface GroupsDataListProps {
+    [key: string]: any;
+}
+export declare const GroupsDataList: React.FC<GroupsDataListProps>;

package/ui/views/Groups/GroupsDataList.js

@@ -22,37 +22,28 @@ import { Select } from "@webiny/ui/Select";
 import SearchUI from "@webiny/app-admin/components/SearchUI";
 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";
+import { deserializeSorters } from "../utils";
 var t = i18n.ns("app-security/admin/groups/data-list");
 var SORTERS = [{
   label: t(_templateObject || (_templateObject = _taggedTemplateLiteral(["Newest to oldest"]))),
-  sorters: {
-    createdOn: "desc"
-  }
+  sorter: "createdOn_DESC"
 }, {
   label: t(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["Oldest to newest"]))),
-  sorters: {
-    createdOn: "asc"
-  }
+  sorter: "createdOn_ASC"
 }, {
   label: t(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["Name A-Z"]))),
-  sorters: {
-    name: "asc"
-  }
+  sorter: "name_ASC"
 }, {
   label: t(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["Name Z-A"]))),
-  sorters: {
-    name: "desc"
-  }
+  sorter: "name_DESC"
 }];
-
-var GroupsDataList = function GroupsDataList() {
+export var GroupsDataList = function GroupsDataList() {
   var _useState = useState(""),
       _useState2 = _slicedToArray(_useState, 2),
       filter = _useState2[0],
       setFilter = _useState2[1];
 
-  var _useState3 = useState(serializeSorters(SORTERS[0].sorters)),
+  var _useState3 = useState(SORTERS[0].sorter),
       _useState4 = _slicedToArray(_useState3, 2),
       sort = _useState4[0],
       setSort = _useState4[1];
@@ -95,13 +86,12 @@ var GroupsDataList = function GroupsDataList() {
       return groups;
     }
 
-    var _Object$entries = Object.entries(deserializeSorters(sort)),
-        _Object$entries2 = _slicedToArray(_Object$entries, 1),
-        _Object$entries2$ = _slicedToArray(_Object$entries2[0], 2),
-        key = _Object$entries2$[0],
-        value = _Object$entries2$[1];
+    var _deserializeSorters = deserializeSorters(sort),
+        _deserializeSorters2 = _slicedToArray(_deserializeSorters, 2),
+        key = _deserializeSorters2[0],
+        sortBy = _deserializeSorters2[1];
 
-    return orderBy(groups, [key], [value]);
+    return orderBy(groups, [key], [sortBy]);
   }, [sort]);
   var deleteItem = useCallback(function (item) {
     showConfirmation( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
@@ -154,10 +144,10 @@ var GroupsDataList = function GroupsDataList() {
       label: t(_templateObject6 || (_templateObject6 = _taggedTemplateLiteral(["Sort by"])))
     }, SORTERS.map(function (_ref3) {
       var label = _ref3.label,
-          sorters = _ref3.sorters;
+          sorter = _ref3.sorter;
       return /*#__PURE__*/React.createElement("option", {
         key: label,
-        value: serializeSorters(sorters)
+        value: sorter
       }, label);
     })))));
   }, [sort]);
@@ -210,6 +200,4 @@ var GroupsDataList = function GroupsDataList() {
       })))));
     }));
   });
-};
-
-export default GroupsDataList;
+};

package/ui/views/Groups/GroupsForm.d.ts

@@ -1,3 +1,5 @@
-/// <reference types="react" />
-declare const GroupForm: () => JSX.Element;
-export default GroupForm;
+import React from "react";
+export interface GroupsFormProps {
+    [key: string]: any;
+}
+export declare const GroupsForm: React.FC<GroupsFormProps>;

package/ui/views/Groups/GroupsForm.js

@@ -36,8 +36,7 @@ var ButtonWrapper = /*#__PURE__*/styled("div", {
   display: "flex",
   justifyContent: "space-between"
 });
-
-var GroupForm = function GroupForm() {
+export var GroupsForm = function GroupsForm() {
   var _useRouter = useRouter(),
       location = _useRouter.location,
       history = _useRouter.history;
@@ -229,6 +228,4 @@ var GroupForm = function GroupForm() {
       onClick: form.submit
     }, t(_templateObject10 || (_templateObject10 = _taggedTemplateLiteral(["Save group"])))))));
   });
-};
-
-export default GroupForm;
+};

package/ui/views/Groups/graphql.d.ts

@@ -1,5 +1,5 @@
-export declare const LIST_GROUPS: any;
-export declare const READ_GROUP: any;
-export declare const CREATE_GROUP: any;
-export declare const UPDATE_GROUP: any;
-export declare const DELETE_GROUP: any;
+export declare const LIST_GROUPS: import("graphql").DocumentNode;
+export declare const READ_GROUP: import("graphql").DocumentNode;
+export declare const CREATE_GROUP: import("graphql").DocumentNode;
+export declare const UPDATE_GROUP: import("graphql").DocumentNode;
+export declare const DELETE_GROUP: import("graphql").DocumentNode;

package/ui/views/Groups/index.d.ts

@@ -1 +1 @@
-export { default as Groups } from "./Groups";
+export * from "./Groups";

package/ui/views/Groups/index.js

@@ -1 +1 @@
-export { default as Groups } from "./Groups";
+export * from "./Groups";

package/ui/views/utils.d.ts

@@ -1,2 +1,3 @@
-export declare const serializeSorters: (data: any) => any;
-export declare const deserializeSorters: (data: string) => Record<string, "asc" | "desc" | boolean>;
+declare type SortTypes = "asc" | "desc";
+export declare const deserializeSorters: (data: string) => [string, SortTypes];
+export {};

package/ui/views/utils.js

@@ -1,27 +1,14 @@
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
-export var serializeSorters = function serializeSorters(data) {
-  if (!data) {
-    return data;
-  }
-
-  var _Object$entries = Object.entries(data),
-      _Object$entries2 = _slicedToArray(_Object$entries, 1),
-      _Object$entries2$ = _slicedToArray(_Object$entries2[0], 2),
-      key = _Object$entries2$[0],
-      value = _Object$entries2$[1];
-
-  return "".concat(key, ":").concat(value);
-};
 export var deserializeSorters = function deserializeSorters(data) {
   if (typeof data !== "string") {
     return data;
   }
 
-  var _ref = data.split(":"),
+  var _ref = data.split("_"),
       _ref2 = _slicedToArray(_ref, 2),
-      key = _ref2[0],
-      value = _ref2[1];
+      field = _ref2[0],
+      orderBy = _ref2[1];
 
-  return _defineProperty({}, key, value);
+  var order = String(orderBy).toLowerCase() === "asc" ? "asc" : "desc";
+  return [field, order];
 };