@griddo/ax 10.1.96 → 10.2.0

package/src/routes/site.tsx

@@ -19,14 +19,29 @@ import IntegrationForm from "./../modules/Settings/Integrations/IntegrationForm"
 const BASE_PATH = "/sites";
 
 export default [
-  { path: `${BASE_PATH}/pages`, component: Content, name: "Content", showInNav: true, icon: "page" },
-  { path: `${BASE_PATH}/pages/editor`, component: Editor, name: "Page Editor", showInNav: false, hideNav: true },
+  {
+    path: `${BASE_PATH}/pages`,
+    component: Content,
+    name: "Content",
+    showInNav: true,
+    icon: "page",
+    permission: "content.accessToPages",
+  },
+  {
+    path: `${BASE_PATH}/pages/editor`,
+    component: Editor,
+    name: "Page Editor",
+    showInNav: false,
+    hideNav: true,
+    permission: "content.accessToPages",
+  },
   {
     path: `${BASE_PATH}/pages/editor/new`,
     component: Editor,
     name: "New Page Editor",
     showInNav: false,
     hideNav: true,
+    permission: "content.createPages",
   },
   {
     path: `${BASE_PATH}/categories`,
@@ -34,6 +49,7 @@ export default [
     name: "Categories",
     showInNav: true,
     icon: "Category",
+    permission: "categories.accessToSiteCategories",
   },
   {
     path: `${BASE_PATH}/data/:id/editor`,
@@ -41,6 +57,7 @@ export default [
     showInNav: false,
     icon: "",
     name: "New StructuredData",
+    permission: "content.accessToPages",
   },
   { path: `${BASE_PATH}/profile`, component: Profile, name: "Profile", showInNav: false, icon: "User" },
   {
@@ -49,19 +66,56 @@ export default [
     name: "Navigation",
     showInNav: true,
     icon: "Menu",
+    permission: "navigation.accessToNavigationSettings",
     routesGroups: [
       {
         name: "Navigation",
         routes: [
-          { path: `${BASE_PATH}/navigations/menus`, component: Menus, name: "Menus" },
-          { path: `${BASE_PATH}/navigations/modules`, component: Defaults, name: "Navigation modules" },
+          {
+            path: `${BASE_PATH}/navigations/menus`,
+            component: Menus,
+            name: "Menus",
+            permission: "navigation.accessToNavigationSettings",
+          },
+          {
+            path: `${BASE_PATH}/navigations/modules`,
+            component: Defaults,
+            name: "Navigation modules",
+            permission: "navigation.accessToNavigationSettings",
+          },
         ],
       },
     ],
   },
-  { path: `${BASE_PATH}/users`, component: Users, name: "Users", showInNav: true, icon: "Users" },
-  { path: `${BASE_PATH}/users/new`, component: UserCreate, name: "New User", showInNav: false },
-  { path: `${BASE_PATH}/users/edit`, component: UserEdit, name: "New User", showInNav: false },
+  {
+    path: `${BASE_PATH}/users`,
+    component: Users,
+    name: "Users",
+    showInNav: true,
+    icon: "Users",
+    permission: "usersRoles.accessToUsersRoles",
+  },
+  {
+    path: `${BASE_PATH}/roles`,
+    component: Users,
+    name: "Roles",
+    showInNav: false,
+    permission: "usersRoles.accessToUsersRoles",
+  },
+  {
+    path: `${BASE_PATH}/users/new`,
+    component: UserCreate,
+    name: "New User",
+    showInNav: false,
+    permission: "usersRoles.createUsers",
+  },
+  {
+    path: `${BASE_PATH}/users/edit`,
+    component: UserEdit,
+    name: "New User",
+    showInNav: false,
+    permission: "usersRoles.editUsers",
+  },
   {
     path: `${BASE_PATH}/navigations/editor`,
     component: DefaultsEditor,
@@ -69,6 +123,7 @@ export default [
     showInNav: false,
     hideNav: true,
     isEditor: true,
+    permission: "",
   },
   {
     path: `${BASE_PATH}/settings/content-types/editor`,
@@ -77,6 +132,7 @@ export default [
     showInNav: false,
     hideNav: true,
     isEditor: true,
+    permission: "general.manageContentTypes",
   },
   {
     path: `${BASE_PATH}/settings`,
@@ -84,6 +140,12 @@ export default [
     name: "Settings",
     showInNav: true,
     icon: "Settings",
+    permission: [
+      "general.manageSiteSettings",
+      "general.manageContentTypes",
+      "seoAnalytics.manageAnalyticsSiteSettings",
+      "general.manageSiteThirdPartyIntegrations",
+    ],
     routesGroups: [
       {
         name: "Settings",
@@ -92,39 +154,63 @@ export default [
             path: `${BASE_PATH}/settings/globals`,
             component: Settings,
             name: "General",
+            permission: "general.manageSiteSettings",
           },
           {
             path: `${BASE_PATH}/settings/content-types`,
             component: ContentTypes,
             name: "Content types",
+            permission: "general.manageContentTypes",
           },
           {
             path: `${BASE_PATH}/settings/seo`,
             component: SeoAnalyticsSettings,
             name: "SEO & Analytics",
+            permission: "seoAnalytics.manageAnalyticsSiteSettings",
           },
           {
             path: `${BASE_PATH}/settings/addons`,
             component: Integrations,
             name: "Add-ons",
+            permission: "general.manageSiteThirdPartyIntegrations",
           },
         ],
       },
     ],
   },
+  {
+    path: `${BASE_PATH}/settings/languages`,
+    component: Settings,
+    name: "Languages",
+    showInNav: false,
+    permission: "general.accessToLanguages",
+  },
+  {
+    path: `${BASE_PATH}/settings/social`,
+    component: Settings,
+    name: "Social",
+    showInNav: false,
+    permission: "general.manageSocialMedia",
+  },
+  {
+    path: `${BASE_PATH}/settings/analytics`,
+    component: SeoAnalyticsSettings,
+    name: "Analytics",
+    showInNav: false,
+    permission: "seoAnalytics.manageAnalyticsSiteSettings",
+  },
   {
     path: `${BASE_PATH}/settings/addons/new`,
     component: IntegrationForm,
     name: "New Add-on",
     showInNav: false,
+    permission: "general.manageSiteThirdPartyIntegrations",
   },
   {
     path: `${BASE_PATH}/settings/addons/edit`,
     component: IntegrationForm,
     name: "Edit Add-on",
     showInNav: false,
+    permission: "general.manageSiteThirdPartyIntegrations",
   },
-  { path: `${BASE_PATH}/settings/languages`, component: Settings, name: "Languages", showInNav: false },
-  { path: `${BASE_PATH}/settings/social`, component: Settings, name: "Social", showInNav: false },
-  { path: `${BASE_PATH}/settings/analytics`, component: SeoAnalyticsSettings, name: "Analytics", showInNav: false },
 ];

package/src/types/index.tsx

@@ -131,6 +131,7 @@ export interface ISite {
   thumbnail: string;
   domain: number | null;
   lastAccess?: string;
+  navigationModules: any;
 }
 
 export interface IRecentSite {
@@ -585,7 +586,13 @@ export interface IUser {
   enabled?: boolean;
   timezone?: string;
   status?: string;
-  sites: (number | string)[];
+  roles: ISiteRoles[];
+  isSuperAdmin: boolean;
+}
+
+export interface ISiteRoles {
+  siteId: number | string;
+  roles: number[];
 }
 
 export interface ISelectOption {
@@ -597,6 +604,7 @@ export interface INavItem {
   title: string;
   path: string;
   component: any;
+  permission?: string;
 }
 
 export interface ModuleCategoryInfo {
@@ -663,6 +671,11 @@ export interface IStructuredDataQueryValues {
 export interface IUsersQueryValues {
   order: string;
   filterSites: string;
+  filterRoles: string;
+}
+
+export interface IRolesQueryValues {
+  order: string;
 }
 
 export interface ISitesQueryValues {
@@ -795,6 +808,34 @@ export interface ILinkField {
   modal: any;
 }
 
+export interface IRole {
+  id: number;
+  name: string;
+  hex: string;
+  description: string;
+  permissions: IPermissions;
+  active: boolean;
+  users: any;
+  editable?: boolean;
+}
+
+export interface IPermissions {
+  totalPermissions: string;
+  sitePermissions: { name: string; key: string }[];
+  globalPermissions: { name: string; key: string }[];
+}
+
+export interface IGetRoles {
+  siteId: number | string;
+  order?: string;
+}
+
+export interface IActivateRole {
+  id: number | number[];
+  siteId: number | string;
+  active: boolean;
+}
+
 export interface IIntegration {
   id?: number;
   name: string;

package/tsconfig.paths.json

@@ -6,6 +6,7 @@
       "@ax/components": ["src/components"],
       "@ax/components/*": ["src/components/*"],
       "@ax/containers/*": ["src/containers/*"],
+      "@ax/modules/*": ["src/modules/*"],
       "@ax/forms": ["src/forms"],
       "@ax/guards": ["src/guards"],
       "@ax/helpers": ["src/helpers"],

package/src/__tests__/components/Avatar/__snapshots__/Avatar.test.tsx.snap

@@ -1,61 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Avatar component rendering should render the component only with name 1`] = `
-<div
-  className="sc-ejdXBC fORGYU"
-  data-testid="avatar-wrapper"
->
-  <div
-    className="sc-ldFCYb iNdtRr"
-    data-testid="avatar"
-  />
-</div>
-`;
-
-exports[`Avatar component rendering should render the component with a wrong image url 1`] = `
-<div
-  className="sc-ejdXBC fORGYU"
-  data-testid="avatar-wrapper"
->
-  <div
-    className="sc-ldFCYb cpyHnO"
-    data-testid="avatar"
-  />
-</div>
-`;
-
-exports[`Avatar component rendering should render the component with an empty string as name 1`] = `
-<div
-  className="sc-ejdXBC fORGYU"
-  data-testid="avatar-wrapper"
->
-  <div
-    className="sc-ldFCYb iXxXyw"
-    data-testid="avatar"
-  />
-</div>
-`;
-
-exports[`Avatar component rendering should render the component with image null 1`] = `
-<div
-  className="sc-ejdXBC fORGYU"
-  data-testid="avatar-wrapper"
->
-  <div
-    className="sc-ldFCYb Tmium"
-    data-testid="avatar"
-  />
-</div>
-`;
-
-exports[`Avatar component rendering should render the component without name or image 1`] = `
-<div
-  className="sc-ejdXBC fORGYU"
-  data-testid="avatar-wrapper"
->
-  <div
-    className="sc-ldFCYb iXxXyw"
-    data-testid="avatar"
-  />
-</div>
-`;

package/src/modules/Users/UserList/HeaderMenus/Name/index.tsx

@@ -1,55 +0,0 @@
-import React from "react";
-
-import { Icon, FloatingMenu, ListTitle, ListItem } from "@ax/components";
-
-import * as S from "./style";
-
-const NameHeader = ({ sortItems, sortedState }: INameHeaderProps) => {
-  const { isAscending, sortedByName, sortedByDateCreated } = sortedState;
-  const sortAscendingName = () => sortItems("name", true);
-  const sortDescendingName = () => sortItems("name", false);
-  const sortAscendingDateCreated = () => sortItems("dateCreated", true);
-  const sortDescendingDateCreated = () => sortItems("dateCreated", false);
-
-  const SortedStateArrow = () =>
-    isAscending ? <Icon name="FullArrowUp" size="16" /> : <Icon name="FullArrowDown" size="16" />;
-  const isActive = sortedByName || sortedByDateCreated;
-
-  const Header = () => (
-    <S.NameHeader isActive={isActive}>
-      Name
-      <S.IconsWrapper>
-        {(sortedByName || sortedByDateCreated) && <SortedStateArrow />}
-        <S.InteractiveArrow>
-          <Icon name="DownArrow" size="16" />
-        </S.InteractiveArrow>
-      </S.IconsWrapper>
-    </S.NameHeader>
-  );
-
-  return (
-    <FloatingMenu Button={Header} position="left">
-      <ListTitle>Name Sorting</ListTitle>
-      <ListItem isSelected={sortedByName && isAscending} onClick={sortAscendingName}>
-        Ascendent
-      </ListItem>
-      <ListItem isSelected={sortedByName && !isAscending} onClick={sortDescendingName}>
-        Descendent
-      </ListItem>
-      <ListTitle>Date Created Sorting</ListTitle>
-      <ListItem isSelected={sortedByDateCreated && isAscending} onClick={sortAscendingDateCreated}>
-        Ascendent
-      </ListItem>
-      <ListItem isSelected={sortedByDateCreated && !isAscending} onClick={sortDescendingDateCreated}>
-        Descendent
-      </ListItem>
-    </FloatingMenu>
-  );
-};
-
-interface INameHeaderProps {
-  sortedState: any;
-  sortItems(orderPointer: string, isAscendent: boolean): any;
-}
-
-export default NameHeader;