@griddo/ax 11.7.13 → 11.8.0-rc.0

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

@@ -12,7 +12,15 @@ import {
   ISite,
 } from "@ax/types";
 import { structuredDataActions } from "@ax/containers/StructuredData";
-import { MainWrapper, ErrorToast, Notification, Loading, CancelScheduleModal, ScheduleModal } from "@ax/components";
+import {
+  MainWrapper,
+  ErrorToast,
+  Notification,
+  Loading,
+  CancelScheduleModal,
+  ScheduleModal,
+  RestoreModal,
+} from "@ax/components";
 import { dateToString, getActivatedDataPacksIds, getDefaultTheme } from "@ax/helpers";
 import { appActions } from "@ax/containers/App";
 import { RouteLeavingGuard } from "@ax/guards";
@@ -50,6 +58,8 @@ const Form = (props: IProps) => {
     skipReviewOnPublish,
     setFormValues,
     setCurrentDataID,
+    schemaVersion,
+    restoreDataContent,
   } = props;
 
   const [isNewStructuredData, setIsNewStructuredData] = useState(!currentStructuredDataId);
@@ -57,6 +67,7 @@ const Form = (props: IProps) => {
   const [scheduleDate, setScheduleDate] = useState({ date: dateToString(new Date(), "yyy/MM/dd"), time: "12:00 am" });
   const { isOpen: isScheduleOpen, toggleModal: toggleScheduleModal } = useModal();
   const { isOpen: isCancelScheduleOpen, toggleModal: toggleCancelScheduleModal } = useModal();
+  const { isOpen: isRestoreOpen, toggleModal: toggleRestoreModal } = useModal();
   const { isDirty, resetDirty, setIsDirty } = useIsDirty(form);
   const path = site ? "/sites/pages" : "/data";
 
@@ -75,9 +86,12 @@ const Form = (props: IProps) => {
   ];
 
   const activatedDataPacksIds = getActivatedDataPacksIds(activatedDataPacks);
-  const isDisabled =
+  const disabledDatapack =
     currentStructuredData.local &&
     !activatedDataPacksIds.some((pack: string) => currentStructuredData.dataPacks.includes(pack));
+  const isDeleted = !!form?.deleted;
+  const isDisabled = isDeleted || disabledDatapack;
+
   const isDataTranslatable = currentStructuredData && currentStructuredData.translate;
   const isScheduled = !!form && !!form.publicationScheduled;
   const status = isScheduled
@@ -88,6 +102,12 @@ const Form = (props: IProps) => {
 
   let title = "";
 
+  const packNotificationText =
+    "This content is part of disabled content type package. To edit it, you must first activate it.";
+
+  const deletedNotificationText =
+    "This content type has been deleted and can’t be edited. It will be permanently removed from the trash after 30 days.";
+
   const theme = getDefaultTheme();
 
   useEffect(() => {
@@ -194,9 +214,6 @@ const Form = (props: IProps) => {
     </>
   );
 
-  const packNotificationText =
-    "This content is part of disabled content type package. To edit it, you must first activate it.";
-
   const handleClickNotification = () => {
     getSiteDataPack(currentStructuredData.id);
     setHistoryPush("/sites/settings/content-types", false);
@@ -264,7 +281,7 @@ const Form = (props: IProps) => {
   };
 
   const downArrowMenu = {
-    displayed: true,
+    displayed: !isDeleted,
     button: getPublishButton(form?.draft),
     options: [
       {
@@ -316,6 +333,15 @@ const Form = (props: IProps) => {
     }
   };
 
+  const handleRestorePage = async () => {
+    if (!currentStructuredDataId) return;
+    const isRestored = await restoreDataContent(currentStructuredDataId);
+    if (isRestored) {
+      isRestoreOpen && toggleRestoreModal();
+      await getDataContent(currentStructuredDataId);
+    }
+  };
+
   const mainScheduleModalAction = {
     title: "Schedule",
     onClick: handleSchedulePublication,
@@ -352,7 +378,7 @@ const Form = (props: IProps) => {
         errors={errors}
         scheduledPublication={form?.publicationScheduled}
       >
-        {isDisabled && (
+        {disabledDatapack && (
           <S.NotificationWrapper>
             <Notification
               type="error"
@@ -362,6 +388,16 @@ const Form = (props: IProps) => {
             />
           </S.NotificationWrapper>
         )}
+        {isDeleted && (
+          <S.NotificationWrapper>
+            <Notification
+              type="error"
+              text={deletedNotificationText}
+              btnText="Restore content"
+              onClick={toggleRestoreModal}
+            />
+          </S.NotificationWrapper>
+        )}
         {notification && (
           <S.NotificationWrapper>
             <Notification
@@ -390,6 +426,15 @@ const Form = (props: IProps) => {
         mainModalAction={mainCancelScheduleModalAction}
         secondaryModalAction={secondaryCancelScheduleModalAction}
       />
+      <RestoreModal
+        isOpen={isRestoreOpen}
+        toggleModal={toggleRestoreModal}
+        {...{
+          isChild: false,
+          hasIssues: schemaVersion !== form?.schemaVersionTimestamp,
+          restorePage: handleRestorePage,
+        }}
+      />
     </>
   );
 };
@@ -408,6 +453,7 @@ interface IProps {
   errors: IErrorItem[];
   currentStructuredDataId: number | null;
   skipReviewOnPublish?: boolean;
+  schemaVersion: string;
   createStructuredDataContent: (payload: any) => Promise<boolean>;
   updateStructuredDataContent: (payload: any) => Promise<boolean>;
   setLanguage(lang: { locale: string; id: number | null }): void;
@@ -419,6 +465,7 @@ interface IProps {
   validateForm(publish?: boolean): Promise<boolean>;
   setFormValues(form: any): Promise<void>;
   setCurrentDataID(currentStructuredDataId: number | null): void;
+  restoreDataContent(dataID: number | number[]): Promise<boolean>;
 }
 
 const mapStateToProps = (state: IRootState) => ({
@@ -435,6 +482,7 @@ const mapStateToProps = (state: IRootState) => ({
   activatedDataPacks: state.dataPacks.activated,
   errors: state.structuredData.errors,
   skipReviewOnPublish: state.app.globalSettings.skipReviewOnPublish,
+  schemaVersion: state.structuredData.schemaVersion,
 });
 
 const mapDispatchToProps = {
@@ -449,6 +497,7 @@ const mapDispatchToProps = {
   validateForm: structuredDataActions.validateForm,
   setFormValues: structuredDataActions.setFormValues,
   setCurrentDataID: structuredDataActions.setCurrentDataID,
+  restoreDataContent: structuredDataActions.restoreStructuredDataContent,
 };
 
 export default connect(mapStateToProps, mapDispatchToProps)(Form);

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

@@ -12,7 +12,7 @@ import {
   TranslationsFilter,
   Tooltip,
 } from "@ax/components";
-import { IColumn, IQueryValue, ISchemaField, IStructuredDataQueryValues } from "@ax/types";
+import { IColumn, IQueryValue, ISchemaField } from "@ax/types";
 import { getGlobalPageTypes } from "@ax/helpers";
 
 import * as S from "./style";
@@ -152,7 +152,7 @@ interface IProps {
   filterItems: (filterPointer: string, filtersSelected: IQueryValue[]) => void;
   sortedListStatus: { isAscending: boolean; sortedByDate: boolean; sortedByTitle: boolean; sortedByURL: boolean };
   isAllPages: boolean;
-  filterValues: IStructuredDataQueryValues;
+  filterValues: Record<string, IQueryValue[]>;
   checkState: Record<string, boolean>;
   categoryColumns: ISchemaField[];
   columns: IColumn[];

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

@@ -1,12 +1,6 @@
 import React from "react";
 import { BulkSelectionOptions } from "@ax/components";
-import {
-  IColumn,
-  IQueryValue,
-  ISchemaField,
-  IStructuredDataQueryValues,
-  IStructuredDataSortedInitialState,
-} from "@ax/types";
+import { IColumn, IQueryValue, ISchemaField, IStructuredDataSortedInitialState } from "@ax/types";
 import { usePermission } from "@ax/hooks";
 import TableHeader from "./TableHeader";
 
@@ -108,7 +102,7 @@ interface IProps {
   filterItems: (filterPointer: string, filtersSelected: IQueryValue[]) => void;
   sortedListStatus: IStructuredDataSortedInitialState;
   isAllPages: boolean;
-  filterValues: IStructuredDataQueryValues;
+  filterValues: Record<string, IQueryValue[]>;
   categoryColumns: ISchemaField[];
   columns: IColumn[];
   setColumns: (columns: IColumn[]) => void;

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

@@ -1,5 +1,5 @@
 import { useEffect, useState } from "react";
-import { IQueryValue, IStructuredData, IStructuredDataQueryValues, IStructuredDataSortedInitialState } from "@ax/types";
+import { IQueryValue, IStructuredData, IStructuredDataSortedInitialState } from "@ax/types";
 
 const useSortedListStatus = (): IUseSortedListStatus => {
   const sortedInitialState: IStructuredDataSortedInitialState = {
@@ -19,10 +19,10 @@ const useSortedListStatus = (): IUseSortedListStatus => {
 
 const useFilterQuery = (
   currentStructuredData: IStructuredData | null,
-  values: Record<string, IStructuredDataQueryValues> | null
+  values: Record<string, Record<string, IQueryValue[]>> | null
 ): IUseFilterQuery => {
   const structuredDataType = currentStructuredData ? currentStructuredData.id : "all";
-  const initialQueryValues: IStructuredDataQueryValues = {
+  const initialQueryValues: Record<string, IQueryValue[]> = {
     types: [{ value: "all", label: "All" }],
     translated: [{ value: "all", label: "All" }],
     liveStatus: [{ value: "all", label: "All" }],
@@ -32,7 +32,7 @@ const useFilterQuery = (
     related: [{ value: "all", label: "All" }],
   };
 
-  const getFilterQuery = (filterValues: IStructuredDataQueryValues): string => {
+  const getFilterQuery = (filterValues: Record<string, IQueryValue[]>): string => {
     const { types, translated, liveStatus, order, filterSites, categories, related } = filterValues;
     let filterQuery = "";
 
@@ -45,11 +45,11 @@ const useFilterQuery = (
       return !stringValues.length
         ? filterQuery
         : filterQuery.length
-        ? filterQuery.concat(`&${pointer}=${stringValues}`)
-        : `&${pointer}=${stringValues}`;
+          ? filterQuery.concat(`&${pointer}=${stringValues}`)
+          : `&${pointer}=${stringValues}`;
     };
 
-    const isNotInitialValue = (pointer: keyof IStructuredDataQueryValues) => {
+    const isNotInitialValue = (pointer: keyof Record<string, IQueryValue[]>) => {
       return filterValues[pointer] && initialQueryValues[pointer] !== filterValues[pointer];
     };
 
@@ -65,7 +65,7 @@ const useFilterQuery = (
   };
 
   const initState = values ? values : { all: initialQueryValues };
-  const [state, setState] = useState<Record<string, IStructuredDataQueryValues>>(initState);
+  const [state, setState] = useState<Record<string, Record<string, IQueryValue[]>>>(initState);
 
   const initQuery = values && values[structuredDataType] ? getFilterQuery(values[structuredDataType]) : "";
   const [query, setQuery] = useState(initQuery);
@@ -118,7 +118,7 @@ interface IUseSortedListStatus {
 interface IUseFilterQuery {
   setFiltersSelection(pointer: string, filter: IQueryValue[], isAscendent?: boolean): void;
   resetFilterQuery(): void;
-  filterValues: Record<string, IStructuredDataQueryValues>;
+  filterValues: Record<string, Record<string, IQueryValue[]>>;
   query: string;
 }
 

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

@@ -16,7 +16,6 @@ import {
   IPage,
   ICheck,
   IColumn,
-  IStructuredDataQueryValues,
   IQueryValue,
   ISchemaField,
   IExportDataParams,
@@ -780,7 +779,7 @@ interface IDispatchProps {
   getStructuredDataContents(params: IGetStructuredDataParams): Promise<void>;
   setSelectedStructuredData(id: string, scope: string): void;
   deleteDataContent(dataID: number[]): Promise<boolean>;
-  restoreDataContent(dataID: number | number[]): void;
+  restoreDataContent(dataID: number | number[]): Promise<boolean>;
   setDataStatus(dataID: number[], status: string): void;
   setFilter(filter: string | null): void;
   setCurrentPageID(currentPageID: number | null): ISetCurrentPageIDAction;
@@ -795,7 +794,7 @@ interface IDispatchProps {
   getAnalytics(siteId?: number | null): Promise<void>;
   setCurrentDataID(id: number | null): void;
   resetCurrentSiteErrorPages: () => Promise<void>;
-  setContentFilters(contentFilters: Record<string, IStructuredDataQueryValues> | null): void;
+  setContentFilters(contentFilters: Record<string, Record<string, IQueryValue[]>> | null): void;
   checkUserSession(): Promise<void>;
   updateCurrentSearch(query: string): Promise<void>;
   resetCurrentData(): Promise<void>;
@@ -817,7 +816,7 @@ interface ICategoriesProps {
   currentSitePages: IPage[];
   currentSiteErrorPages: number[];
   skipReviewOnPublish?: boolean;
-  contentFilters: Record<string, IStructuredDataQueryValues> | null;
+  contentFilters: Record<string, Record<string, IQueryValue[]>> | null;
   currentSearch: string;
 }
 

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

@@ -232,13 +232,11 @@ const mapStateToProps = (state: IRootState) => ({
 const mapDispatchToProps = {
   getRoles: usersActions.getRoles,
   activateRoles: usersActions.activateRoles,
-  resetUserData: usersActions.resetUserData,
   setHistoryPush: appActions.setHistoryPush,
 };
 
 interface IDispatchProps {
   getRoles(params?: IGetRoles): Promise<void>;
-  resetUserData(): void;
   setHistoryPush(route: string): void;
   activateRoles(params: IActivateRole): Promise<boolean>;
 }

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

@@ -4,20 +4,20 @@ import { connect } from "react-redux";
 import { appActions } from "@ax/containers/App";
 import { usersActions } from "@ax/containers/Users";
 import { Loading, MainWrapper, Modal, Toast } from "@ax/components";
-import { IRootState, ISite, ISiteRoles, IUser } from "@ax/types";
+import { IRootState, ISite, IUser } from "@ax/types";
 import { useModal, useShouldBeSaved, useToast } from "@ax/hooks";
 import UserForm from "../UserForm";
 
 import * as S from "./style";
 
 const UserEdit = (props: IProps) => {
-  const { user, updateUser, isSaving, isLoading, deleteUser, currentUser, setHistoryPush, site, sites } = props;
+  const { user, updateUser, isSaving, isLoading, deleteUser, currentUser, setHistoryPush, site, removeUserFromSite } =
+    props;
 
   const { timezone } = user;
   const initForm = { ...user };
   if (!timezone) initForm.timezone = "Europe/Madrid";
   const isSiteView = !!site;
-  const sitesIds = sites.map((site: ISite) => site.id);
   const usersRoute = isSiteView ? "/sites/users" : "users";
   const [form, setForm] = useState<IUser>(initForm);
   const { isOpen, toggleModal } = useModal();
@@ -71,27 +71,10 @@ const UserEdit = (props: IProps) => {
         }
       : undefined;
 
-  const getUpdatedSites = () => {
-    const hasAll = form.roles.find((siteRole: ISiteRoles) => siteRole.siteId === "all");
-    if (hasAll) {
-      const oldRoleSites = form.roles.filter((siteRole: ISiteRoles) => siteRole.siteId !== "all");
-      const roleSites = sitesIds
-        .filter((siteId: number) => siteId !== site?.id)
-        .map((siteId: number) => {
-          return { siteId, roles: hasAll.roles };
-        });
-      return [...oldRoleSites, ...roleSites];
-    } else {
-      return form.roles.filter((siteRole: ISiteRoles) => siteRole.siteId !== site?.id);
-    }
-  };
-
-  const removeUserFromSite = async () => {
-    if (!user.id) return;
-    const updatedSites = getUpdatedSites();
-    const formWithUpdatedSites = { ...form, roles: updatedSites };
+  const handleRemoveUserFromSite = async () => {
+    if (!user.id || !site) return;
 
-    const updated = await updateUser(user.id, formWithUpdatedSites, false, false);
+    const updated = await removeUserFromSite(user.id, site.id);
     if (updated) {
       setHistoryPush(usersRoute);
     }
@@ -99,7 +82,7 @@ const UserEdit = (props: IProps) => {
 
   const mainDeleteAction = {
     title: isSiteView ? "Remove user" : "Delete User",
-    onClick: isSiteView ? removeUserFromSite : handleDelete,
+    onClick: isSiteView ? handleRemoveUserFromSite : handleDelete,
   };
 
   const secondaryDeleteAction = { title: "Cancel", onClick: toggleModal };
@@ -161,8 +144,9 @@ const UserEdit = (props: IProps) => {
         size="S"
       >
         <S.ModalContent>
-          Before editing an user, <strong>select the user's permissions and site access</strong>. If you proceed without
-          selecting any permissions, the user <strong>won't have access to anything or view any content</strong>.
+          Before editing an user, <strong>select the user&apos;s permissions and site access</strong>. If you proceed
+          without selecting any permissions, the user{" "}
+          <strong>won&apos;t have access to anything or view any content</strong>.
         </S.ModalContent>
       </Modal>
       {isVisible && <Toast {...toastProps} />}
@@ -173,7 +157,6 @@ const UserEdit = (props: IProps) => {
 const mapStateToProps = (state: IRootState) => ({
   user: state.users.userForm,
   site: state.sites.currentSiteInfo,
-  sites: state.sites.sites,
   isSaving: state.app.isSaving,
   isLoading: state.app.isLoading,
   currentUser: state.users.currentUser,
@@ -183,12 +166,14 @@ interface IDispatchProps {
   setHistoryPush(path: string): void;
   updateUser(id: number, data: IUser, isProfile: boolean, isList?: boolean): Promise<boolean>;
   deleteUser(id: number): Promise<boolean>;
+  removeUserFromSite(userID: number, siteID: number): Promise<boolean>;
 }
 
 const mapDispatchToProps = {
   setHistoryPush: appActions.setHistoryPush,
   updateUser: usersActions.updateUser,
   deleteUser: usersActions.deleteUser,
+  removeUserFromSite: usersActions.removeUserFromSite,
 };
 
 interface IProfileProps {
@@ -197,7 +182,6 @@ interface IProfileProps {
   isSaving: boolean;
   isLoading: boolean;
   currentUser: IUser | null;
-  sites: ISite[];
 }
 
 type IProps = IProfileProps & IDispatchProps;

package/src/modules/Users/UserList/BulkHeader/TableHeader/style.tsx

@@ -27,6 +27,7 @@ const ActionsHeader = styled(Header)`
 const SiteWrapper = styled.div`
   width: 210px;
   position: relative;
+  padding-left: ${(p) => p.theme.spacing.s};
 `;
 
 const RolesWrapper = styled.div<{ isSite: boolean }>`

package/src/modules/Users/UserList/UserItem/index.tsx

@@ -18,12 +18,13 @@ const UserItem = (props: IUserItemProps): JSX.Element => {
     onChange,
     onClick,
     deleteUser,
-    updateUser,
     resendInvitation,
     isSiteView = false,
     roles,
     hoverCheck,
     toggleDeleteToast,
+    removeUserFromSite,
+    getUsers,
   } = props;
 
   const { isOpen, toggleModal } = useModal();
@@ -36,8 +37,6 @@ const UserItem = (props: IUserItemProps): JSX.Element => {
 
   const handleOnChange = (value: ICheck) => onChange(value);
 
-  const sitesIds = sites.map((site: ISite) => site.id);
-
   const handleDeleteUser = async () => {
     const deleted = user.id ? await deleteUser(user.id) : false;
     if (deleted) {
@@ -78,35 +77,20 @@ const UserItem = (props: IUserItemProps): JSX.Element => {
 
   const menuOptions = user.status === "invited" ? [resendOption, deleteOption] : [deleteOption];
 
-  const getUpdatedSites = () => {
-    const hasAll = user.roles.find((siteRole: ISiteRoles) => siteRole.siteId === "all");
-    if (hasAll) {
-      const oldRoleSites = user.roles.filter((siteRole: ISiteRoles) => siteRole.siteId !== "all");
-      const roleSites = sitesIds
-        .filter((site: number) => site !== siteId)
-        .map((siteId: number) => {
-          return { siteId, roles: hasAll.roles };
-        });
-      return [...oldRoleSites, ...roleSites];
-    } else {
-      return user.roles.filter((siteRole: ISiteRoles) => siteRole.siteId !== siteId);
-    }
-  };
+  const handleRemoveUserFromSite = async () => {
+    if (!user.id || !siteId) return;
 
-  const removeUserFromSite = async () => {
-    if (!user.id) return;
-    const updatedSites = getUpdatedSites();
-    const updatedUser = { ...user, roles: updatedSites };
-    const updated = await updateUser(user.id, updatedUser, false, true);
+    const updated = await removeUserFromSite(user.id, siteId);
     if (updated) {
       toggleModal();
       toggleDeleteToast();
+      getUsers();
     }
   };
 
   const mainDeleteAction = {
     title: isSiteView ? "Remove user" : "Delete user",
-    onClick: isSiteView ? removeUserFromSite : handleDeleteUser,
+    onClick: isSiteView ? handleRemoveUserFromSite : handleDeleteUser,
   };
 
   const secondaryDeleteAction = { title: "Cancel", onClick: toggleModal };
@@ -253,18 +237,19 @@ interface IProps {
   onChange: (value: ICheck) => void;
   onClick: (id: number) => void;
   toggleDeleteToast: () => void;
+  getUsers: () => void;
 }
 
 const mapDispatchToProps = {
   deleteUser: usersActions.deleteUser,
-  updateUser: usersActions.updateUser,
   resendInvitation: usersActions.resendInvitation,
+  removeUserFromSite: usersActions.removeUserFromSite,
 };
 
 interface IDispatchProps {
-  updateUser(id: number, data: any, isProfile: boolean, isList?: boolean): Promise<boolean>;
   deleteUser(id: number): Promise<boolean>;
   resendInvitation(id: number): Promise<boolean>;
+  removeUserFromSite(userID: number, siteID: number): Promise<boolean>;
 }
 
 export type IUserItemProps = IProps & IDispatchProps;

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

@@ -35,7 +35,6 @@ const UserList = (props: IUserListProps): JSX.Element => {
     currentNavItem,
     setHistoryPush,
     getUser,
-    resetUserData,
     sites,
     deleteUser,
     removeUsersBulk,
@@ -77,13 +76,14 @@ const UserList = (props: IUserListProps): JSX.Element => {
     setHoverCheck,
   } = useBulkSelection(usersIds);
 
+  const handleGetUsers = async () => {
+    const query = searchQuery ? (filterQuery ? `&query=${searchQuery}` : `?query=${searchQuery}`) : "";
+    const currentFilterQuerySite =
+      isSiteView && filterQuery ? `${filterQuery}&site=${currentSiteInfo.id}` : filterQuery;
+    await getUsers({ filterQuery: currentFilterQuerySite, query }, currentSiteInfo?.id);
+  };
+
   useEffect(() => {
-    const handleGetUsers = async () => {
-      const query = searchQuery ? (filterQuery ? `&query=${searchQuery}` : `?query=${searchQuery}`) : "";
-      const currentFilterQuerySite =
-        isSiteView && filterQuery ? `${filterQuery}&site=${currentSiteInfo.id}` : filterQuery;
-      await getUsers({ filterQuery: currentFilterQuerySite, query }, currentSiteInfo?.id);
-    };
     handleGetUsers();
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [filterQuery, searchQuery]);
@@ -175,7 +175,6 @@ const UserList = (props: IUserListProps): JSX.Element => {
 
   const handleClick = (id: number | null) => async () => {
     if (id) {
-      resetUserData();
       await getUser(id);
       setHistoryPush(`${BASE_URL}/edit`);
     }
@@ -269,6 +268,7 @@ const UserList = (props: IUserListProps): JSX.Element => {
                       roles={roles}
                       toggleDeleteToast={handleToggleToast}
                       hoverCheck={checkState.hoverCheck}
+                      getUsers={handleGetUsers}
                     />
                   );
                 })
@@ -313,7 +313,6 @@ const mapStateToProps = (state: IRootState) => ({
 const mapDispatchToProps = {
   getUsers: usersActions.getUsers,
   getUser: usersActions.getUser,
-  resetUserData: usersActions.resetUserData,
   setHistoryPush: appActions.setHistoryPush,
   deleteUser: usersActions.deleteUser,
   removeUsersBulk: sitesActions.removeUsersBulk,
@@ -324,7 +323,6 @@ const mapDispatchToProps = {
 interface IDispatchProps {
   getUsers(params: any, siteID?: number | null): Promise<void>;
   getUser(id: number): Promise<void>;
-  resetUserData(): void;
   setHistoryPush(route: string): void;
   deleteUser(id: number[]): Promise<boolean>;
   removeUsersBulk(siteId: number, users: number[]): void;

package/src/routes/multisite.tsx

@@ -15,6 +15,7 @@ import FormList from "../modules/Forms/FormList";
 import FormEditor from "../modules/Forms/FormEditor";
 import FormCategoriesList from "../modules/Forms/FormCategoriesList";
 import MediaGallery from "../modules/MediaGallery";
+import ActivityLog from "../modules/ActivityLog";
 
 export default [
   {
@@ -214,4 +215,12 @@ export default [
     hideNav: true,
     permission: ["global.forms.createForms", "global.forms.editForms"],
   },
+  {
+    path: "/log",
+    component: ActivityLog,
+    name: "Log",
+    showInNav: true,
+    icon: "log",
+    permission: "global.accessToActivityLog",
+  },
 ];

package/src/themes/theme.json

@@ -2,7 +2,8 @@
   "id": "cms-theme",
   "radii": {
     "xs": "2px",
-    "s": "4px"
+    "s": "4px",
+    "m": "8px"
   },
   "spacing": {
     "xxs": "4px",

package/src/types/forms.tsx

@@ -17,6 +17,7 @@ export type FormContent = {
   originalLanguage: number;
   editorID: number;
   formInUse: { page: number[] } | null;
+  deleted: boolean;
 };
 
 export type FormLanguage = { id: number; site: number | null; language: number };

package/src/types/index.tsx

@@ -14,6 +14,7 @@ import { IAnalyticsState } from "@ax/containers/Analytics/reducer";
 import { IIntegrationsState } from "@ax/containers/Integrations/reducer";
 import { IFileDriveState } from "@ax/containers/FileDrive/reducer";
 import { IFormsState } from "@ax/containers/Forms/reducer";
+import { IActivityLogState } from "@ax/containers/ActivityLog/reducer";
 
 import {
   GetFormsParams,
@@ -40,6 +41,8 @@ import {
   IImageFolder,
 } from "./files";
 
+import { ILogItemsByDay, ILogItemsByUser, ILogContent } from "./logs";
+
 export interface IBreadcrumbItem {
   editorID: number;
   component: string;
@@ -123,6 +126,7 @@ export interface IAPIPage {
   originalLanguage: number;
   language: number;
   publicationScheduled: string | null;
+  schemaVersionTimestamp: string;
 }
 
 export interface IPage extends IAPIPage {
@@ -253,6 +257,7 @@ export interface IRootState {
   integrations: IIntegrationsState;
   fileDrive: IFileDriveState;
   forms: IFormsState;
+  activityLog: IActivityLogState;
 }
 
 export interface IStyledProps {
@@ -549,6 +554,7 @@ export interface IStructuredDataContent {
   fromPage: boolean;
   dataPacks: string[];
   publicationScheduled: string | null;
+  schemaVersionTimestamp: string;
 }
 
 export interface IStructuredDataCategory {
@@ -1137,3 +1143,5 @@ export type {
   IImage,
   IImageFolder,
 };
+
+export type { ILogItemsByDay, ILogItemsByUser, ILogContent };

package/src/types/logs.tsx

@@ -0,0 +1,12 @@
+import { LogActivityGroupedDayDTO, LogActivityGroupedUserDTO, PaginationResponse } from "@griddo/api-types";
+
+export type ILogItemsByUser = Omit<PaginationResponse<LogActivityGroupedUserDTO<LogActivityGroupedUserDTO[]>>, "page">;
+
+export type ILogItemsByDay = Omit<PaginationResponse<LogActivityGroupedDayDTO>, "page">;
+
+export type ILogContent = {
+  id: number;
+  title: string | undefined;
+  contentType: string | undefined;
+  type: string;
+};