@griddo/ax 1.69.8 → 1.72.0

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

@@ -16,6 +16,7 @@ import {
   IPage,
   ICheck,
   IColumn,
+  IStructuredDataQueryValues,
 } from "@ax/types";
 import {
   ISetCurrentPageIDAction,
@@ -86,6 +87,8 @@ const StructuredDataList = (props: IProps): JSX.Element => {
     resetCurrentSiteErrorPages,
     currentSiteErrorPages,
     skipReviewOnPublish,
+    setContentFilters,
+    contentFilters,
   } = props;
 
   const itemsPerPage = 50;
@@ -108,8 +111,12 @@ const StructuredDataList = (props: IProps): JSX.Element => {
   const { isOpen: isNewOpen, toggleModal: toggleNewModal } = useModal();
   const { isOpen: isDeleteOpen, toggleModal: toggleDeleteModal } = useModal();
   const { sortedListStatus, setSortedListStatus } = useSortedListStatus();
-  const { setFiltersSelection, setFilterQuery, filterValues, resetFilterQuery } = useFilterQuery(currentStructuredData);
-  const [currentFilterQuery, setCurrentFilterQuery] = useState("");
+  const {
+    setFiltersSelection,
+    filterValues,
+    resetFilterQuery,
+    query: currentFilterQuery,
+  } = useFilterQuery(currentStructuredData, contentFilters);
   const history = useHistory();
   const [isFirstRender, setIsFirstRender] = useState(true);
   const [deleteAllVersions, setDeleteAllVersions] = useState(false);
@@ -218,6 +225,7 @@ const StructuredDataList = (props: IProps): JSX.Element => {
     setIsFirstRender(false);
     resetPageEditor();
     resetCurrentSiteErrorPages();
+    resetForm();
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
@@ -264,10 +272,7 @@ const StructuredDataList = (props: IProps): JSX.Element => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [currentDataContent]);
 
-  const resetFilterValues = () => {
-    resetFilterQuery();
-    setCurrentFilterQuery("");
-  };
+  const resetFilterValues = () => resetFilterQuery();
 
   useEffect(() => {
     if (!isFirstRender && !isLoading) {
@@ -296,6 +301,11 @@ const StructuredDataList = (props: IProps): JSX.Element => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
+  useEffect(() => {
+    setContentFilters(filterValues);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [filterValues]);
+
   const handleClick = (isFromPage?: boolean, globalPage?: IPage, forceLive?: boolean) => {
     if (isFromPage && globalPage) {
       const pageID = globalPage.haveDraftPage && !forceLive ? globalPage.haveDraftPage : globalPage.id;
@@ -312,7 +322,7 @@ const StructuredDataList = (props: IProps): JSX.Element => {
 
   const createNewData = () => {
     setCurrentDataID(null);
-    resetForm();
+    resetForm(true);
     handleClick();
   };
 
@@ -404,17 +414,13 @@ const StructuredDataList = (props: IProps): JSX.Element => {
     const sortedState = getSortedListStatus(orderPointer, isAscending);
     setSortedListStatus(sortedState);
 
-    const filtersSelection = setFiltersSelection("order", orderPointer, isAscending);
-    const filterQuery = setFilterQuery(filtersSelection);
-    setCurrentFilterQuery(filterQuery);
+    setFiltersSelection("order", orderPointer, isAscending);
   };
 
   const filterItems = async (filterPointer: string, filtersSelected: string) => {
     setPage(firstPage);
     if (!isStructuredDataFromPage && filterPointer === "categories") filterPointer = "related";
-    const filtersSelection = setFiltersSelection(filterPointer, filtersSelected);
-    const filterQuery = setFilterQuery(filtersSelection);
-    setCurrentFilterQuery(filterQuery);
+    setFiltersSelection(filterPointer, filtersSelected);
   };
 
   const currentDataColumnsState = currentStructuredData ? columnsState[structuredDataType] || [] : columnsState["all"];
@@ -637,6 +643,7 @@ const mapStateToProps = (state: IRootState) => ({
   currentSitePages: state.sites.currentSitePages,
   currentSiteErrorPages: state.sites.currentSiteErrorPages,
   skipReviewOnPublish: state.app.globalSettings.skipReviewOnPublish,
+  contentFilters: state.structuredData.contentFilters,
 });
 
 const mapDispatchToProps = {
@@ -661,11 +668,12 @@ const mapDispatchToProps = {
   getAnalytics: analyticsActions.getAnalytics,
   setCurrentDataID: structuredDataActions.setCurrentDataID,
   resetCurrentSiteErrorPages: sitesActions.resetCurrentSiteErrorPages,
+  setContentFilters: structuredDataActions.setContentFilters,
 };
 
 interface IDispatchProps {
   setHistoryPush(route: string, isEditor?: boolean): void;
-  resetForm(): void;
+  resetForm(setDefault?: boolean): void;
   setLanguage(lang: { locale: string; id: number }): void;
   getStructuredDataContents(params: IGetStructuredDataParams): void;
   setSelectedStructuredData(id: string, scope: string): void;
@@ -685,6 +693,7 @@ interface IDispatchProps {
   getAnalytics(): void;
   setCurrentDataID(id: number | null): void;
   resetCurrentSiteErrorPages: () => Promise<void>;
+  setContentFilters(contentFilters: Record<string, IStructuredDataQueryValues> | null): void;
 }
 
 interface ICategoriesProps {
@@ -702,6 +711,7 @@ interface ICategoriesProps {
   currentSitePages: IPage[];
   currentSiteErrorPages: number[];
   skipReviewOnPublish?: boolean;
+  contentFilters: Record<string, IStructuredDataQueryValues> | null;
 }
 
 type IProps = ICategoriesProps & IDispatchProps;

package/src/types/index.tsx

@@ -140,20 +140,21 @@ export interface ISchemaField {
 export interface IImage {
   id?: number;
   name: string;
-  type: string;
+  title: string;
+  description: string;
   alt: string;
+  tags: string[];
   url: string;
+  thumb: string;
   publicId: string;
-  title: string;
+  damId: string;
+  published: Date;
   size: number;
   width: number;
   height: number;
-  published: Date;
-  description: string;
-  thumb: string;
-  tags: string[];
-  file: File;
   orientation: string;
+  site: string;
+  file?: File;
 }
 
 export interface IUrlField {