@griddo/ax 1.55.14 → 1.56.2

package/src/modules/Sites/SitesList/index.tsx

@@ -45,7 +45,7 @@ const SitesList = (props: IProps): JSX.Element => {
 
   return (
     <MainWrapper title="Sites" rightButton={rightButtonProps}>
-      {!isOpen && <ErrorToast />}
+      <ErrorToast />
       <S.Sites>
         {sites.map((site: ISite) => (
           <SiteItem key={site.id} site={site} />

package/src/modules/StructuredData/Form/ConnectedField/index.tsx

@@ -13,9 +13,7 @@ const ConnectedField = (props: IProps) => {
 
   const value = form.content && form.content[fieldKey];
 
-  const handleChange = (newValue: any) => {
-    updateFormValue({ [fieldKey]: newValue });
-  };
+  const handleChange = (newValue: any) => updateFormValue({ [fieldKey]: newValue });
 
   const isConditional = field.type === "ConditionalField";
   const isArrayGroup = field.type === "ArrayFieldGroup";
@@ -23,7 +21,7 @@ const ConnectedField = (props: IProps) => {
   let innerFields: JSX.Element[] = [];
 
   if (isConditional || isArrayGroup) {
-    innerFields = getStructuredDataInnerFields(field.fields);
+    innerFields = getStructuredDataInnerFields(field.fields, form.content, updateFormValue);
   }
 
   const fieldProps = {

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

@@ -3,7 +3,7 @@ import { connect } from "react-redux";
 
 import { IDataPack, IRootState } from "@ax/types";
 import { structuredDataActions } from "@ax/containers/StructuredData";
-import { MainWrapper, ErrorToast, Notification } from "@ax/components";
+import { MainWrapper, ErrorToast, Notification, Loading } from "@ax/components";
 import { getActivatedDataPacksIds } from "@ax/helpers";
 import { appActions } from "@ax/containers/App";
 import { RouteLeavingGuard } from "@ax/guards";
@@ -24,6 +24,7 @@ const Form = (props: IProps) => {
     createStructuredDataContent,
     updateStructuredDataContent,
     isSaving,
+    isLoading,
     siteLanguages,
     globalLangs,
     currentSite,
@@ -91,14 +92,12 @@ const Form = (props: IProps) => {
 
   const inversed = !currentSite;
 
-  const setIsNewTranslation = (value: boolean) => {
-    setisNewStructuredData(value);
-  };
+  const createNewTranslation = (value: boolean) => setisNewStructuredData(value);
 
   const languageActions = {
     setLanguage,
     getDataContent,
-    setIsNewTranslation,
+    createNewTranslation,
   };
 
   const languages = currentSite ? siteLanguages : globalLangs;
@@ -202,7 +201,9 @@ const Form = (props: IProps) => {
     languageActions: isDataTranslatable ? languageActions : null,
   };
 
-  return (
+  return isLoading ? (
+    <Loading />
+  ) : (
     <>
       <RouteLeavingGuard when={isDirty} action={setRoute} text={modalText} />
       <MainWrapper
@@ -218,6 +219,7 @@ const Form = (props: IProps) => {
         pageStatus={status}
         downArrowMenu={downArrowMenu}
         isFromEditor={true}
+        currentPageID={form.id}
       >
         {isDisabled && (
           <S.NotificationWrapper>
@@ -242,6 +244,7 @@ interface IProps {
   site: any;
   currentStructuredData: any;
   isSaving: boolean;
+  isLoading: boolean;
   siteLanguages: any[];
   globalLangs: any[];
   currentSite: any;
@@ -263,6 +266,7 @@ const mapStateToProps = (state: IRootState) => ({
   site: state.sites.currentSiteInfo,
   currentStructuredData: state.structuredData.currentStructuredData,
   isSaving: state.app.isSaving,
+  isLoading: state.app.isLoading,
   lang: state.app.lang,
   siteLanguages: state.sites.currentSiteLanguages,
   globalLangs: state.app.globalLangs,

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

@@ -42,7 +42,7 @@ const Live = (props: ILiveProps): JSX.Element => {
       .then((items) => {
         items.forEach((item: IPageLiveStatus) => {
           const newFilter = {
-            name: item.id,
+            name: item.status,
             value: item.status,
             title: item.title,
             icon: item.status,

package/src/types/index.tsx

@@ -7,6 +7,7 @@ import { IStructuredDataState } from "@ax/containers/StructuredData/reducer";
 import { ILanguageState } from "@ax/containers/Settings/Languages/reducer";
 import { IDataPacksState } from "@ax/containers/Settings/DataPacks/reducer";
 import { IUsersState } from "@ax/containers/Users/reducer";
+import { IGalleryState } from "@ax/containers/Gallery/reducer";
 
 export interface IBreadcrumbItem {
   editorID: number;
@@ -147,6 +148,7 @@ export interface IImage {
   thumb: string;
   tags: string[];
   file: File;
+  orientation: string;
 }
 
 export interface IUrlField {
@@ -175,6 +177,7 @@ export interface IRootState {
   dataPacks: IDataPacksState;
   social: ISocialState;
   users: IUsersState;
+  gallery: IGalleryState;
 }
 
 export interface IStyledProps {
@@ -618,6 +621,23 @@ export interface IUserEditing {
   username: string;
 }
 
+export interface IGetSiteImages {
+  site: number | string;
+  page?: number;
+  items: number;
+  query?: string;
+  search?: string;
+  more?: boolean;
+}
+
+export interface IImageForm {
+  id?: number;
+  alt: string;
+  title: string;
+  description: string;
+  tags: string[];
+}
+
 export type Field =
   | "AsyncCheckGroup"
   | "AsyncSelect"

package/src/components/Gallery/store.tsx

@@ -1,186 +0,0 @@
-import { isReqOk, compressImage } from "@ax/helpers";
-import { images, sites } from "@ax/api";
-
-const SET_DROP_DEPTH = "SET_DROP_DEPTH";
-const SET_IN_DROP_ZONE = "SET_IN_DROP_ZONE";
-const SET_IS_UPLOADING = "SET_IS_UPLOADING";
-const SET_UPLOAD_SUCCESS = "SET_UPLOAD_SUCCESS";
-const SET_UPLOAD_ERROR = "SET_UPLOAD_ERROR";
-const SET_INIT_FORM = "SET_INIT_FORM";
-const SET_FORM_FIELD = "SET_FORM_FIELD";
-const THUMB_WIDTH = 128;
-const THUMB_HEIGHT = 96;
-const MAX_SIZE = 10; // MB
-
-export const ITEMS_PER_PAGE = 50;
-
-export const reducer = (prevState: IGalleryStore, action: any): IGalleryStore => {
-  switch (action.type) {
-    case SET_DROP_DEPTH:
-      return { ...prevState, dropDepth: action.payload.dropDepth };
-    case SET_IN_DROP_ZONE:
-      return {
-        ...prevState,
-        inDropZone: action.payload.inDropZone,
-        isUploading: false,
-        isError: false,
-        isSuccess: false,
-        errorMsg: "",
-      };
-    case SET_IS_UPLOADING:
-      return { ...prevState, inDropZone: false, isUploading: true };
-    case SET_UPLOAD_SUCCESS:
-      return { ...prevState, isUploading: false, isSuccess: true };
-    case SET_UPLOAD_ERROR:
-      return { ...prevState, inDropZone: false, isUploading: false, isError: true, errorMsg: action.payload.msg };
-    case SET_INIT_FORM:
-      return {
-        ...prevState,
-        imageForm: {
-          id: action.payload.id,
-          alt: action.payload.alt,
-          title: action.payload.title,
-          description: action.payload.description,
-          tags: action.payload.tags,
-        },
-      };
-    case SET_FORM_FIELD:
-      return { ...prevState, imageForm: { ...prevState.imageForm, [action.payload.field]: action.payload.value } };
-    default:
-      return prevState;
-  }
-};
-
-export function setDropDepth(dropDepth: number) {
-  return { type: SET_DROP_DEPTH, payload: { dropDepth } };
-}
-
-export function setInDropZone(inDropZone: boolean) {
-  return { type: SET_IN_DROP_ZONE, payload: { inDropZone } };
-}
-
-export function setIsUploading() {
-  return { type: SET_IS_UPLOADING };
-}
-
-export function setUploadSuccess() {
-  return { type: SET_UPLOAD_SUCCESS };
-}
-
-export function setUploadError(errorMsg = "") {
-  return { type: SET_UPLOAD_ERROR, payload: { errorMsg } };
-}
-
-export function setInitForm(imageData: IImageForm) {
-  return {
-    type: SET_INIT_FORM,
-    payload: {
-      id: imageData.id,
-      title: imageData.title ? imageData.title : "",
-      alt: imageData.alt ? imageData.alt : "",
-      description: imageData.description ? imageData.description : "",
-      tags: imageData.tags ? imageData.tags : [],
-    },
-  };
-}
-
-export function setFormField(field: string, value: string) {
-  return { type: SET_FORM_FIELD, payload: { field, value } };
-}
-
-export const getSiteImages = async (props: IGetSiteImages): Promise<any> => {
-  const { site, page = 1, items = null, query, search } = props
-  try {
-    const result = await sites.getSiteImages(site, page, items, THUMB_WIDTH, THUMB_HEIGHT, query, search);
-    if (isReqOk(result.status)) {
-      return result.data.items;
-    }
-  } catch (e) {
-    console.log(e);
-  }
-  return false;
-};
-
-export const uploadImage = async (imageFile: File, site: number | string) => {
-  try {
-    const imageSize = imageFile.size / (1024 * 1024);
-    const image = imageSize >= MAX_SIZE ? await compressImage(imageFile, 9999, 9999, MAX_SIZE, false) : imageFile;
-
-    const form = new FormData();
-    form.append("file", image);
-    site && form.append("site", JSON.stringify(site));
-    const result = await images.createImage(form);
-    if (isReqOk(result.status)) {
-      return result.data;
-    }
-  } catch (e) {
-    console.log(e);
-  }
-  return false;
-};
-
-export const saveImageData = async (imageID: number, imageData: IImageForm) => {
-  try {
-    const result = await images.updateImage(imageID, imageData);
-    if (isReqOk(result.status)) {
-      return result.data;
-    }
-  } catch (e) {
-    console.log(e);
-  }
-  return false;
-};
-
-export const deleteImageData = async (imageID: number) => {
-  try {
-    const result = await images.deleteImage(imageID);
-    if (isReqOk(result.status)) {
-      return true;
-    }
-  } catch (e) {
-    console.log(e);
-  }
-  return false;
-};
-
-export const initialState: IGalleryStore = {
-  dropDepth: 0,
-  inDropZone: false,
-  isUploading: false,
-  isSuccess: false,
-  isError: false,
-  errorMsg: "",
-  imageForm: {
-    id: undefined,
-    alt: "",
-    title: "",
-    description: "",
-    tags: [],
-  },
-};
-
-interface IImageForm {
-  id?: number;
-  alt: string;
-  title: string;
-  description: string;
-  tags: string[];
-}
-
-interface IGalleryStore {
-  dropDepth: number;
-  inDropZone: boolean;
-  isUploading: boolean;
-  isSuccess: boolean;
-  isError: boolean;
-  errorMsg: string;
-  imageForm: IImageForm;
-}
-
-interface IGetSiteImages {
-  site: number | string;
-  page?: number;
-  items: number | null;
-  query?: string;
-  search?: string;
-}