@griddo/ax 11.10.16 → 11.10.17-rc.1

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

@@ -1,68 +1,68 @@
-import React, { useCallback, useEffect, useLayoutEffect, useRef, useState } from "react";
+import type React from "react";
+import { useCallback, useEffect, useLayoutEffect, useRef, useState } from "react";
 import { connect } from "react-redux";
 import { useHistory, useLocation } from "react-router-dom";
 
 import {
-	IRootState,
-	IStructuredData,
-	IStructuredDataContent,
-	IGetStructuredDataParams,
+	EmptyState,
+	ErrorToast,
+	FilterTagsBar,
+	MainWrapper,
+	Modal,
+	Notification,
+	SearchTagsBar,
+	TableList,
+	Toast,
+} from "@ax/components";
+import { analyticsActions } from "@ax/containers/Analytics";
+import { appActions } from "@ax/containers/App";
+import { pageEditorActions } from "@ax/containers/PageEditor";
+import {
+	type ISetCurrentPageIDAction,
+	type ISetCurrentPageNameAction,
+	type ISetCurrentPageStatusAction,
+	pageStatus,
+} from "@ax/containers/PageEditor/interfaces";
+import { sitesActions } from "@ax/containers/Sites";
+import { structuredDataActions } from "@ax/containers/StructuredData";
+import { getMaxColumns, updateColumns } from "@ax/helpers";
+import { useBulkSelection, useCategoryColors, useModal, usePermission, useToast, useWindowSize } from "@ax/hooks";
+import type {
+	ICheck,
+	IColumn,
 	IDataPack,
 	IEmptyStateProps,
-	ILanguage,
-	IStructuredDataFilter,
-	IStructuredDataValue,
+	IExportDataParams,
 	IGetGlobalPagesParams,
+	IGetStructuredDataParams,
+	ILanguage,
 	IPage,
-	ICheck,
-	IColumn,
 	IQueryValue,
+	IRootState,
 	ISchemaField,
-	IExportDataParams,
+	IStructuredData,
+	IStructuredDataContent,
+	IStructuredDataFilter,
+	IStructuredDataValue,
 } from "@ax/types";
-import {
-	ISetCurrentPageIDAction,
-	ISetCurrentPageStatusAction,
-	ISetCurrentPageNameAction,
-	pageStatus,
-} from "@ax/containers/PageEditor/interfaces";
-import { useBulkSelection, useModal, useToast, useCategoryColors, usePermission, useWindowSize } from "@ax/hooks";
-import { appActions } from "@ax/containers/App";
-import { structuredDataActions } from "@ax/containers/StructuredData";
-import { sitesActions } from "@ax/containers/Sites";
-import { pageEditorActions } from "@ax/containers/PageEditor";
-import { analyticsActions } from "@ax/containers/Analytics";
-import {
-	MainWrapper,
-	TableList,
-	ErrorToast,
-	Toast,
-	Notification,
-	EmptyState,
-	Modal,
-	SearchTagsBar,
-	FilterTagsBar,
-} from "@ax/components";
-import { getMaxColumns, updateColumns } from "@ax/helpers";
 
-import StructuredDataItem from "./StructuredDataItem";
+import { DeleteModal } from "./atoms";
 import BulkHeader from "./BulkHeader";
 import ContentFilters from "./ContentFilters";
+import GlobalPageItem from "./GlobalPageItem";
+import { useFilterQuery, useSortedListStatus } from "./hooks";
 import OptionTable from "./OptionTable";
+import StructuredDataItem from "./StructuredDataItem";
+import * as S from "./style";
 import {
-	getSelectedValue,
-	getSortedListStatus,
-	getOptionFilters,
-	getOptionValues,
 	filterByStatus,
 	getAllLangPagesIds,
 	getColumns,
+	getOptionFilters,
+	getOptionValues,
+	getSelectedValue,
+	getSortedListStatus,
 } from "./utils";
-import { useSortedListStatus, useFilterQuery } from "./hooks";
-import { DeleteModal } from "./atoms";
-import GlobalPageItem from "./GlobalPageItem";
-
-import * as S from "./style";
 
 const StructuredDataList = (props: IProps): JSX.Element => {
 	const {
@@ -498,6 +498,7 @@ const StructuredDataList = (props: IProps): JSX.Element => {
 			maxColumns={maxColumns}
 			exportAction={exportContent}
 			setHoverCheck={setHoverCheck}
+			selectedItems={selectedItems}
 		/>
 	);
 

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

@@ -1,5 +1,7 @@
-import { config } from "components";
-import {
+import { pageStatus } from "@ax/containers/PageEditor/interfaces";
+import { arrayInsert } from "@ax/helpers";
+import type { IBulkSelectedItems } from "@ax/hooks";
+import type {
 	IColumn,
 	IPage,
 	IPageLanguage,
@@ -8,8 +10,8 @@ import {
 	IStructuredDataFilter,
 	IStructuredDataValue,
 } from "@ax/types";
-import { pageStatus } from "@ax/containers/PageEditor/interfaces";
-import { arrayInsert } from "@ax/helpers";
+
+import { config } from "components";
 
 const schemas = config.schemas.ui;
 const { templates } = schemas;
@@ -133,7 +135,7 @@ const getSortedListStatus = (orderPointer: string, isAscending: boolean) => {
 
 const getAllLangPagesIds = (
 	currentSitePages: IPage[],
-	selectedItems: Record<string, number[]>,
+	selectedItems: IBulkSelectedItems,
 	getAllVersions: boolean,
 ): number[] => {
 	let langsPagesIds: number[] = [];

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

@@ -1,11 +1,13 @@
-import styled from "styled-components";
 import { Header } from "@ax/components/TableList/style";
 
+import styled from "styled-components";
+
 const TableHeader = styled.div<{ isScrolling?: boolean }>`
   width: 100%;
   display: flex;
   flex-direction: row;
-  padding: ${(p) => p.theme.spacing.m};
+  align-items: center;
+  min-height: 40px;
   border-bottom: ${(p) => (p.isScrolling ? `1px solid ${p.theme.color.uiLine};` : "")};
 `;
 

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

@@ -1,7 +1,8 @@
-import React from "react";
 import { BulkSelectionOptions } from "@ax/components";
+import type { IBulkSelectedItems } from "@ax/hooks";
+import type { IQueryValue, IRole } from "@ax/types";
+
 import TableHeader from "./TableHeader";
-import { IQueryValue, IRole } from "@ax/types";
 
 const BulkHeader = (props: IBulkHeaderProps): JSX.Element => {
 	const {
@@ -19,6 +20,7 @@ const BulkHeader = (props: IBulkHeaderProps): JSX.Element => {
 		roles,
 		selectedRoles,
 		setHoverCheck,
+		selectedItems,
 	} = props;
 
 	const deactivatedSelectedRoles = roles.filter((role: IRole) => selectedRoles.includes(role.id) && !role.active);
@@ -39,6 +41,7 @@ const BulkHeader = (props: IBulkHeaderProps): JSX.Element => {
 			actions={[bulkAction]}
 			selectItems={selectItems}
 			totalItems={totalItems}
+			selectedItems={selectedItems}
 		/>
 	) : (
 		<TableHeader
@@ -70,6 +73,7 @@ export interface IBulkHeaderProps {
 	roles: IRole[];
 	selectedRoles: number[];
 	setHoverCheck: (state: boolean) => void;
+	selectedItems: IBulkSelectedItems;
 }
 
 export default BulkHeader;

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

@@ -1,19 +1,18 @@
-import React, { useEffect, useRef, useState } from "react";
+import { useEffect, useRef, useState } from "react";
 import { connect } from "react-redux";
 
-import { IRootState, IRole, IGetRoles, IActivateRole, ISite, IQueryValue } from "@ax/types";
-import { useBulkSelection, useToast } from "@ax/hooks";
+import { EmptyState, ErrorToast, MainWrapper, Nav, TableList, Toast } from "@ax/components";
 import { appActions } from "@ax/containers/App";
 import { usersActions } from "@ax/containers/Users";
-
-import { MainWrapper, TableList, ErrorToast, EmptyState, Nav, Toast } from "@ax/components";
+import { useBulkSelection, useToast } from "@ax/hooks";
+import type { IActivateRole, IGetRoles, IQueryValue, IRole, IRootState, ISite } from "@ax/types";
 
 import BulkHeader from "./BulkHeader";
-import RoleItem from "./RoleItem";
 import { useFilterQuery, useSortedListStatus } from "./hooks";
-import { getSortedListStatus } from "./utils";
+import RoleItem from "./RoleItem";
 import SideModal from "./SideModal";
 import * as S from "./style";
+import { getSortedListStatus } from "./utils";
 
 const Roles = (props: IRolesProps): JSX.Element => {
 	const { currentSiteInfo, roles, getRoles, navItems, currentNavItem, setHistoryPush, activateRoles } = props;
@@ -156,6 +155,7 @@ const Roles = (props: IRolesProps): JSX.Element => {
 			roles={roles}
 			selectedRoles={selectedItems.all}
 			setHoverCheck={setHoverCheck}
+			selectedItems={selectedItems}
 		/>
 	);
 

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

@@ -1,12 +1,14 @@
-import styled from "styled-components";
 import { Header } from "@ax/components/TableList/style";
 
+import styled from "styled-components";
+
 const TableHeader = styled.div<{ isScrolling?: boolean }>`
   width: 100%;
   display: flex;
   flex-direction: row;
-  padding: ${(p) => p.theme.spacing.m};
+  align-items: center;
   border-bottom: ${(p) => (p.isScrolling ? `1px solid ${p.theme.color.uiLine};` : "")};
+  min-height: 40px;
 `;
 
 const CheckHeader = styled(Header)`

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

@@ -1,7 +1,8 @@
-import React from "react";
 import { BulkSelectionOptions } from "@ax/components";
-import { IQueryValue, IRole } from "@ax/types";
+import type { IBulkSelectedItems } from "@ax/hooks";
 import { usePermission } from "@ax/hooks";
+import type { IQueryValue, IRole } from "@ax/types";
+
 import TableHeader from "./TableHeader";
 
 const BulkHeader = (props: IProps): JSX.Element => {
@@ -20,6 +21,7 @@ const BulkHeader = (props: IProps): JSX.Element => {
 		isSiteView = false,
 		roles,
 		setHoverCheck,
+		selectedItems,
 	} = props;
 
 	const isAllowedToRemoveUsers = usePermission("usersRoles.removeUsers");
@@ -40,6 +42,7 @@ const BulkHeader = (props: IProps): JSX.Element => {
 			actions={bulkActions}
 			selectItems={selectItems}
 			totalItems={totalItems}
+			selectedItems={selectedItems}
 		/>
 	) : (
 		<TableHeader
@@ -73,6 +76,7 @@ interface IProps {
 	filterItems: (filterPointer: string, filtersSelected: IQueryValue[]) => void;
 	roles: IRole[];
 	setHoverCheck: (state: boolean) => void;
+	selectedItems: IBulkSelectedItems;
 }
 
 export default BulkHeader;

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

@@ -1,30 +1,28 @@
-import React, { useEffect, useRef, useState } from "react";
+import { useEffect, useRef, useState } from "react";
 import { connect } from "react-redux";
 
-import { IRootState, IUser, ISite, IGetRoles, IRole, IGetSitesParams, IQueryValue } from "@ax/types";
-import { useBulkSelection, useModal, usePermission, useToast } from "@ax/hooks";
-import { appActions } from "@ax/containers/App";
-import { usersActions } from "@ax/containers/Users";
-import { sitesActions } from "@ax/containers/Sites";
-
 import {
-	MainWrapper,
-	TableList,
-	ErrorToast,
 	EmptyState,
+	ErrorToast,
+	FilterTagsBar,
+	MainWrapper,
 	Modal,
 	Nav,
-	Toast,
 	SearchTagsBar,
-	FilterTagsBar,
+	TableList,
+	Toast,
 } from "@ax/components";
+import { appActions } from "@ax/containers/App";
+import { sitesActions } from "@ax/containers/Sites";
+import { usersActions } from "@ax/containers/Users";
+import { useBulkSelection, useModal, usePermission, useToast } from "@ax/hooks";
+import type { IGetRoles, IGetSitesParams, IQueryValue, IRole, IRootState, ISite, IUser } from "@ax/types";
 
 import BulkHeader from "./BulkHeader";
-import UserItem from "./UserItem";
 import { useFilterQuery, useSortedListStatus } from "./hooks";
-import { getSortedListStatus } from "./utils";
-
 import * as S from "./style";
+import UserItem from "./UserItem";
+import { getSortedListStatus } from "./utils";
 
 const UserList = (props: IUserListProps): JSX.Element => {
 	const {
@@ -201,6 +199,7 @@ const UserList = (props: IUserListProps): JSX.Element => {
 			sortedListStatus={sortedListStatus}
 			roles={roles}
 			setHoverCheck={setHoverCheck}
+			selectedItems={selectedItems}
 		/>
 	);
 

package/src/schemas/pages/GlobalPage.tsx

@@ -151,6 +151,22 @@ export default {
 						},
 					],
 				},
+				{
+					title: "GEO (LLMS)",
+					type: "FieldGroup",
+					key: "geo",
+					collapsed: true,
+					fields: [
+						{
+							type: "UniqueCheck",
+							key: "isLlmsEnabled",
+							options: [
+								{ "title": "Include this page in LLMs.txt" }
+							],
+							description: "If enabled, this page will be listed in LLMs.txt for language models."
+						},
+					],
+				},
 				{
 					title: "Analytics Data Layer",
 					type: "FieldGroup",
@@ -206,5 +222,6 @@ export default {
 		socialTitle: "",
 		socialDescription: "",
 		socialImage: {},
+		isLlmsEnabled: true,
 	},
 };

package/src/schemas/pages/Page.tsx

@@ -217,6 +217,22 @@ export default {
 						},
 					],
 				},
+				{
+					title: "GEO (LLMS)",
+					type: "FieldGroup",
+					key: "geo",
+					collapsed: true,
+					fields: [
+						{
+							type: "UniqueCheck",
+							key: "isLlmsEnabled",
+							options: [
+								{ "title": "Include this page in LLMs.txt" }
+							],
+							description: "If enabled, this page will be listed in LLMs.txt for language models."
+						},
+					],
+				},
 				{
 					title: "Analytics Data Layer",
 					type: "FieldGroup",
@@ -280,5 +296,6 @@ export default {
 		customizeThemes: false,
 		headerTheme: null,
 		footerTheme: null,
+		isLlmsEnabled: true,
 	},
 };

package/tsconfig.paths.json

@@ -11,6 +11,7 @@
 			"@ax/guards": ["src/guards"],
 			"@ax/helpers": ["src/helpers"],
 			"@ax/hooks": ["src/hooks"],
+			"@ax/locales": ["src/locales"],
 			"@ax/modules": ["src/modules"],
 			"@ax/routes": ["src/routes"],
 			"@ax/routes/*": ["src/routes/*"],