@griddo/ax 10.6.0 → 10.6.2

package/src/modules/Users/UserForm/index.tsx

@@ -2,9 +2,9 @@ import React, { useState, useEffect } from "react";
 import { connect } from "react-redux";
 
 import { appActions } from "@ax/containers/App";
-import { Button, ErrorToast, FieldsBehavior, SearchField, Tooltip } from "@ax/components";
+import { Button, ErrorToast, FieldsBehavior, SearchField } from "@ax/components";
 import { IImage, IRootState, IUser, ISite, IRole, ISiteRoles } from "@ax/types";
-import { useModal, usePermission } from "@ax/hooks";
+import { useModal } from "@ax/hooks";
 import { RouteLeavingGuard } from "@ax/guards";
 
 import { timezones } from "../../Settings/Globals/constants";
@@ -45,16 +45,11 @@ const UserForm = (props: IProps) => {
   const [sitesList, setSiteList] = useState(sortedByNameSites);
   const [showMore, setShowMore] = useState(false);
 
-  const isAllowedToAccessSiteGallery = usePermission("mediaGallery.accessToSiteGallery");
-  const isAllowedToAccessGlobalGallery = usePermission("global.mediaGallery.accessToGlobalGallery");
-
   const allowedRoutes = ["/profile"];
   const { isDirty } = shouldBeSaved(user, form);
 
   const isSameUser = currentUser && currentUser.id === user.id;
   const isEditDisabled = currentUser && !currentUser.isSuperAdmin && isSiteView && !isSameUser;
-  const isAvatarDisabled =
-    (isSiteView && !isAllowedToAccessSiteGallery) || (!isSiteView && !isAllowedToAccessGlobalGallery);
 
   useEffect(() => {
     if (form.roles.length === 0) {
@@ -189,19 +184,6 @@ const UserForm = (props: IProps) => {
   const rolesGlobal = form.roles.find((roleSite: ISiteRoles) => roleSite.siteId === "global");
   const globalDescription = "Global data will be accessible to the user based on the permissions assigned to the role.";
 
-  const AvatarField = () => (
-    <FieldsBehavior
-      title="Avatar profile"
-      name="image"
-      value={image}
-      fieldType="ImageField"
-      onChange={handleImageChange}
-      helptext="Customize how people see you."
-      disabled={isEditDisabled || isAvatarDisabled}
-      site={site}
-    />
-  );
-
   return (
     <>
       <RouteLeavingGuard when={isDirty} action={action} text={text} allowedRoutes={allowedRoutes} />
@@ -209,13 +191,17 @@ const UserForm = (props: IProps) => {
       <S.Wrapper>
         <S.SubTitle>USER DATA</S.SubTitle>
         <S.NameTitle>{user.name}</S.NameTitle>
-        {isAvatarDisabled ? (
-          <Tooltip content="You don't have the permissions to access the images gallery." top={10}>
-            <AvatarField />
-          </Tooltip>
-        ) : (
-          <AvatarField />
-        )}
+        <FieldsBehavior
+          title="Avatar profile"
+          name="image"
+          value={image}
+          fieldType="ImageField"
+          onChange={handleImageChange}
+          helptext="Customize how people see you."
+          disabled={isEditDisabled}
+          site={site}
+          noGallery={true}
+        />
         <FieldsBehavior
           title="Name"
           name="name"

package/src/routes/multisite.tsx

@@ -24,7 +24,7 @@ export default [
   {
     path: "/data",
     component: StructuredDataList,
-    name: "Global Data",
+    name: "Global Content",
     showInNav: true,
     icon: "Data",
     permission: "global.globalData.accessToGlobalData",

package/src/routes/site.tsx

@@ -23,7 +23,7 @@ export default [
   {
     path: `${BASE_PATH}/pages`,
     component: Content,
-    name: "Content",
+    name: "Site Content",
     showInNav: true,
     icon: "page",
     permission: "content.accessToPages",

package/src/types/index.tsx

@@ -1044,6 +1044,21 @@ export interface IBulkAction {
   action: () => void;
 }
 
+export interface IContentFilter {
+  label: string;
+  value: string;
+  description?: JSX.Element | string;
+  items?: IDynamicFilter[];
+}
+
+export interface IDynamicFilter {
+  label: string;
+  value: string;
+  fromPage: boolean;
+  firstTemplate: string | null;
+  editable?: boolean;
+}
+
 export interface IGriddoTheme {
   label: string;
   value: string;

package/src/modules/Content/ContentFilters/constants.tsx

@@ -1,15 +0,0 @@
-export const filterStructure = [
-  {
-    title: "Unique pages",
-    filters: [
-      {
-        name: "All",
-        value: "unique-pages"
-      }
-    ]
-  },
-  {
-    title: "Content Types",
-    filters: []
-  }
-];

package/src/modules/StructuredData/StructuredDataList/ContentFilters/constants.tsx

@@ -1,21 +0,0 @@
-export const filterStructure = [
-  {
-    fromPage: true,
-    filters: [
-      {
-        name: "All Pages",
-        value: "all-pages",
-      },
-    ],
-  },
-  {
-    title: "Pages",
-    fromPage: true,
-    filters: [],
-  },
-  {
-    title: "Simple Content",
-    fromPage: false,
-    filters: [],
-  },
-];