@griddo/ax 10.4.36 → 10.5.0

package/src/modules/Categories/CategoriesList/style.tsx

@@ -14,7 +14,7 @@ const TableWrapper = styled.div`
 `;
 
 const EmptyWrapper = styled.div`
-  height: ${p => (`calc(100vh - (${p.theme.spacing.xl} * 3))`)};
+  height: ${(p) => `calc(100vh - (${p.theme.spacing.xl} * 3))`};
   display: flex;
   align-items: center;
 `;
@@ -27,4 +27,56 @@ const ModalContent = styled.div`
   }
 `;
 
-export { CategoryListWrapper, TableWrapper, EmptyWrapper, ModalContent };
+const Droppable = styled.div`
+  width: 100%;
+
+  [data-react-beautiful-dnd-droppable] {
+    padding-bottom: 100px;
+  }
+`;
+
+const Draggable = styled.div``;
+
+const Notification = styled.div`
+  ${(p) => p.theme.textStyle.uiXS};
+  color: ${(p) => p.theme.color.textMediumEmphasis};
+  background-color: ${(p) => p.theme.color.uiBackground03};
+  margin-bottom: ${(p) => p.theme.spacing.xs};
+  border-radius: ${(p) => p.theme.radii.s};
+  padding: ${(p) => p.theme.spacing.s};
+`;
+
+const Intro = styled.div`
+  ${(p) => p.theme.textStyle.uiM};
+  color: ${(p) => p.theme.color.textMediumEmphasis};
+  padding: ${(p) => p.theme.spacing.m};
+  border-bottom: 1px solid ${(p) => p.theme.color.uiLine};
+`;
+
+const IntroTitle = styled.div`
+  ${(p) => p.theme.textStyle.headingM};
+  color: ${(p) => p.theme.color.textHighEmphasis};
+  margin-bottom: ${(p) => p.theme.spacing.xs};
+`;
+
+const SearchTags = styled.div`
+  & > div:nth-child(1) {
+    margin-bottom: ${(p) => p.theme.spacing.xs};
+  }
+  & > div:nth-child(2) {
+    margin-bottom: ${(p) => p.theme.spacing.xs};
+  }
+`;
+
+export {
+  CategoryListWrapper,
+  TableWrapper,
+  EmptyWrapper,
+  ModalContent,
+  Draggable,
+  Droppable,
+  Notification,
+  Intro,
+  IntroTitle,
+  SearchTags,
+};

package/src/modules/Categories/CategoriesList/utils.tsx

@@ -1,20 +1,40 @@
-import { IDataLanguage, IStructuredDataContent } from "@ax/types";
+import { ICategoryGroup, IDataLanguage, IStructuredDataCategory } from "@ax/types";
 
 const getAllLangCategoriesIds = (
-  currentCategories: IStructuredDataContent[],
-  selectedItems: Record<string, number[]>,
-  getAllVersions: boolean
+  currentCategories: (IStructuredDataCategory | ICategoryGroup)[],
+  selectedItems: Record<string, number[]>
 ): number[] => {
   let langsCategoryIds: number[] = [];
-  if (getAllVersions) {
-    const selectedCategories = currentCategories.filter((category) => selectedItems.all.includes(category.id));
-    langsCategoryIds = selectedCategories.reduce((ids: number[], category: IStructuredDataContent) => {
-      const langsCategoryIds = category.dataLanguages.map((lang: IDataLanguage) => lang.id);
-      return [...ids, ...langsCategoryIds];
-    }, []);
-  }
-
-  return langsCategoryIds.length ? langsCategoryIds : selectedItems.all;
+
+  const selectedCategories = currentCategories.filter((category) => selectedItems.all.includes(category.id));
+  langsCategoryIds = selectedCategories.reduce((ids: number[], category: IStructuredDataCategory | ICategoryGroup) => {
+    const langsCategoryIds = category.dataLanguages.map((lang: IDataLanguage) => lang.id);
+    return [...ids, ...langsCategoryIds];
+  }, []);
+
+  return langsCategoryIds;
+};
+
+const filterCategoriesAndGroups = (
+  currentCategories: (IStructuredDataCategory | ICategoryGroup)[]
+): { groups: ICategoryGroup[]; categories: IStructuredDataCategory[] } => {
+  const groups = currentCategories.filter(
+    (cat: IStructuredDataCategory | ICategoryGroup) => cat.type === "group"
+  ) as ICategoryGroup[];
+
+  const categories = currentCategories.filter(
+    (cat: IStructuredDataCategory | ICategoryGroup) => cat.type === "category"
+  ) as IStructuredDataCategory[];
+
+  return { groups, categories };
+};
+
+const isCategoryGroup = (obj: any): obj is ICategoryGroup => {
+  return obj && Object.prototype.hasOwnProperty.call(obj, "type") && obj.type === "group";
+};
+
+const isCategory = (obj: any): obj is IStructuredDataCategory => {
+  return obj && Object.prototype.hasOwnProperty.call(obj, "type") && obj.type === "category";
 };
 
-export { getAllLangCategoriesIds }
+export { getAllLangCategoriesIds, filterCategoriesAndGroups, isCategoryGroup, isCategory };

package/src/modules/StructuredData/StructuredDataList/StructuredDataItem/index.tsx

@@ -264,7 +264,7 @@ interface IStructuredDataItemProps {
   updateForm: (form: any) => void;
   setLanguage(lang: { locale: string; id: number | null }): void;
   deleteStructuredDataContent(id: number): Promise<boolean>;
-  setEntity(entity: string): void;
+  setEntity(entity: string | null): void;
   getDataContent(id: number, lang: { locale: string; id: number }): void;
   resetForm(): void;
   isSelected: boolean;

package/src/modules/Users/UserList/hooks.tsx

@@ -31,9 +31,10 @@ const useFilterQuery = () => {
     let filterQuery = "";
 
     const currentQuery = (pointer: string, values: IQueryValue[]): string => {
-      const stringValues = Array.isArray(values) && values.length
-        ? values.map((value) => (value.value !== "all" ? value.value : "")).join(",")
-        : "";
+      const stringValues =
+        Array.isArray(values) && values.length
+          ? values.map((value) => (value.value !== "all" ? value.value : "")).join(",")
+          : "";
 
       return !stringValues.length
         ? filterQuery
@@ -69,7 +70,7 @@ const useFilterQuery = () => {
   const resetFilterQuery = () => {
     setQuery(initialQueryValues);
     setCurrentFilterQuery("");
-  }
+  };
 
   return {
     setFiltersSelection,

package/src/types/index.tsx

@@ -13,6 +13,7 @@ import { IRedirectsState } from "@ax/containers/Redirects/reducer";
 import { IAnalyticsState } from "@ax/containers/Analytics/reducer";
 import { IIntegrationsState } from "@ax/containers/Integrations/reducer";
 import { IFileDriveState } from "@ax/containers/FileDrive/reducer";
+import { Id } from "react-beautiful-dnd";
 
 export interface IBreadcrumbItem {
   editorID: number;
@@ -349,6 +350,7 @@ export interface IGetStructuredDataParams {
   relatedFields?: boolean;
   order?: string;
   lang?: number;
+  groupingCategories?: boolean;
 }
 
 export interface IMenu {
@@ -453,8 +455,9 @@ export interface IStructuredData {
 
 export interface IDataLanguage {
   id: number;
-  site: number;
   language: number;
+  site: null | number;
+  page: null | number;
 }
 
 export interface IPageLanguage {
@@ -490,15 +493,54 @@ export interface IStructuredDataContent {
   schema: any;
   modified: Date;
   language: number;
-  relatedSite?: number;
+  relatedSite?: number | null;
   relatedPage?: IRelatedPage;
   dataLanguages: IDataLanguage[];
-  entity: string;
+  entity: string | null;
   structuredData: string;
   fromPage: boolean;
   dataPacks: string[];
 }
 
+export interface IStructuredDataCategory {
+  contentId: number;
+  type: "category";
+  structuredData: string;
+  parentGroup: number;
+  position: number;
+  id: number;
+  relatedSite: number | null;
+  relatedPage: number | null;
+  content: { title: string; code: string };
+  entity: string | null;
+  draft: boolean;
+  published: Date;
+  modified: Date;
+  deleted: boolean;
+  pendingPublishing: boolean;
+  language: number;
+  originalLanguage: number;
+  canBeTranslated: boolean;
+  dataLanguages: IDataLanguage[];
+  children: [];
+  isExpanded?: boolean;
+}
+
+export interface ICategoryGroup {
+  id: number;
+  type: "group";
+  structuredData: string;
+  parentGroup: number;
+  position: number;
+  selectable: boolean;
+  content: { title: string };
+  language: number;
+  children: (ICategoryGroup | IStructuredDataCategory)[];
+  isExpanded?: boolean;
+  entity: string | null;
+  dataLanguages: IDataLanguage[];
+}
+
 export interface ICategory {
   id?: number;
   name: string;
@@ -508,6 +550,25 @@ export interface ICategory {
   isNew: boolean;
 }
 
+export interface ICategoryGroupParams {
+  title: string;
+  structuredData: string;
+  language?: number;
+  selectable: boolean;
+  entity: string | null;
+  relatedSite?: number | "global";
+}
+
+export interface IOrderCategoryParams {
+  contentId: number;
+  type: "category" | "group";
+  parentGroup: number;
+  position: number;
+  structuredData: string;
+  relatedSite: number | null;
+  language: number;
+}
+
 export interface ILanguage {
   id: number;
   locale: string;

package/tsconfig.paths.json

@@ -12,7 +12,6 @@
       "@ax/helpers": ["src/helpers"],
       "@ax/hooks": ["src/hooks"],
       "@ax/modules": ["src/modules"],
-      "@ax/modules/*": ["src/modules/*"],
       "@ax/routes": ["src/routes"],
       "@ax/routes/*": ["src/routes/*"],
       "@ax/types": ["src/types"],