@griddo/ax 10.6.7 → 10.6.8

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@griddo/ax",
   "description": "Griddo Author Experience",
-  "version": "10.6.7",
+  "version": "10.6.8",
   "authors": [
     "Álvaro Sánchez' <alvaro.sanches@secuoyas.com>",
     "Carlos Torres <carlos.torres@secuoyas.com>",
@@ -233,5 +233,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7518a5fa486026aeeceee57d87fac1841e9e35a6"
+  "gitHead": "a622dc1b913fd26805bbbeea654314a0438630c5"
 }

package/src/components/MenuGroup/index.tsx

@@ -47,7 +47,7 @@ const MenuGroup = (props: IProps): JSX.Element => {
       <S.Dropdown isOpen={isOpen}>
         {filter.items &&
           filter.items.map((filter) => {
-            const { label, value, fromPage, firstTemplate, editable } = filter;
+            const { label, value, fromPage, firstTemplate, editable, isPrivate } = filter;
 
             const isSelected = value === current;
             const selectedClass = isSelected ? "selected" : "";
@@ -60,7 +60,14 @@ const MenuGroup = (props: IProps): JSX.Element => {
                 className={selectedClass}
               >
                 <NavLink to="#">
-                  <S.Link active={isSelected}>{label}</S.Link>
+                  <S.Link>
+                    <S.Text active={isSelected}>{label}</S.Text>
+                    {isPrivate && (
+                      <S.Icon>
+                        <Icon name="lock" size="16" />
+                      </S.Icon>
+                    )}
+                  </S.Link>
                 </NavLink>
               </MenuItem>
             );

package/src/components/MenuGroup/style.tsx

@@ -38,9 +38,19 @@ const Dropdown = styled.ul<{ isOpen: boolean }>`
   margin-bottom: ${(p) => p.theme.spacing.s};
 `;
 
-const Link = styled.div<{ active: boolean }>`
+const Link = styled.div`
+  display: flex;
+  align-items: center;
+`;
+
+const Icon = styled.div`
+  margin-left: ${(p) => p.theme.spacing.xs};
+  margin-right: ${(p) => p.theme.spacing.xs};
+`;
+
+const Text = styled.div<{ active: boolean }>`
   ${(p) => p.theme.textStyle.uiS};
   color: ${(p) => (p.active ? p.theme.color.textHighEmphasis : p.theme.color.textMediumEmphasis)};
 `;
 
-export { Item, NavLink, Title, Arrow, Dropdown, Link };
+export { Item, NavLink, Title, Arrow, Dropdown, Link, Icon, Text };

package/src/components/Notification/index.tsx

@@ -31,6 +31,12 @@ const Notification = (props: INotificationProps): JSX.Element => {
             <Icon name="warning" />
           </S.IconWrapper>
         );
+      case "private":
+        return (
+          <S.IconWrapper data-testid="private-icon">
+            <Icon name="lock" />
+          </S.IconWrapper>
+        );
     }
   };
 
@@ -85,7 +91,7 @@ const Notification = (props: INotificationProps): JSX.Element => {
 
 export interface INotificationProps {
   text: string;
-  type: "error" | "info" | "success" | "warning";
+  type: "error" | "info" | "success" | "warning" | "private";
   resetError?: () => void;
   btnText?: string;
   onClick?: () => void;

package/src/components/Notification/style.tsx

@@ -17,6 +17,9 @@ const Wrapper = styled.div<{ isVisible: boolean }>`
   &.warning {
     background-color: ${(p) => p.theme.colors.warning};
   }
+  &.private {
+    background-color: ${(p) => p.theme.colors.info};
+  }
 `;
 
 const NotificationWrapper = styled.div`
@@ -41,6 +44,7 @@ const Row = styled.div`
     height: ${(p) => p.theme.spacing.m};
     path {
       fill: ${(p) => p.theme.color.textHighEmphasisInverse};
+      fill-opacity: 1;
     }
   }
 `;

package/src/modules/Content/ContentFilters/utils.tsx

@@ -9,6 +9,7 @@ const getDynamicFilters = (values: IStructuredData[]): IDynamicFilter[] =>
     fromPage: value.fromPage,
     editable: value.editable ? value.editable : false,
     firstTemplate: value.schema.templates ? value.schema.templates[0] : null,
+    isPrivate: value.private !== undefined ? value.private : false,
   }));
 
 const getFilters = (dynamicValues: IStructuredData[]): IContentFilter[] => {

package/src/modules/Content/index.tsx

@@ -168,6 +168,7 @@ const Content = (props: IProps): JSX.Element => {
   const isStructuredData = filter !== "unique-pages" && !checkFromPage;
   const isGlobalPages = filter !== "unique-pages" && checkFromPage;
   const isDataEditable = !isStructuredData || (currentStructuredData && currentStructuredData.editable);
+  const isDataPrivate = currentStructuredData?.private || false;
   const isDataExportable = currentStructuredData?.exportable || false;
 
   const pagesIds = currentSitePages && currentSitePages.map((page: any) => page.id);
@@ -400,7 +401,7 @@ const Content = (props: IProps): JSX.Element => {
 
   const addNewData = () => {
     resetForm(true);
-    const path = `/sites/data/${currentStructuredData.id}/editor`;
+    const path = `/sites/data/${currentStructuredData?.id}/editor`;
     setHistoryPush(path, false);
   };
 
@@ -842,6 +843,8 @@ const Content = (props: IProps): JSX.Element => {
   const notEditableText =
     "Sorry, this content cannot be edited because it comes from an external source or belongs to a preconfigured system.";
 
+  const isPrivateText = "This content is private and will not be available for display in any distributor.";
+
   const filterLabels = {
     liveStatus: "Live",
     translated: "Translated",
@@ -877,6 +880,11 @@ const Content = (props: IProps): JSX.Element => {
               <Notification type="info" text={notEditableText} closeButton={false} />
             </S.NotificationWrapper>
           )}
+          {isDataPrivate && (
+            <S.NotificationWrapper>
+              <Notification type="private" text={isPrivateText} closeButton={false} />
+            </S.NotificationWrapper>
+          )}
           {templateInstanceError.error && (
             <Notification
               type="error"
@@ -1080,7 +1088,7 @@ interface IPagesProps {
   errors: IErrorItem[];
   siteLanguages: any[];
   structuredData: IStructuredData[];
-  currentStructuredData: any;
+  currentStructuredData: IStructuredData | null;
   currentDataContent: IStructuredDataContent[];
   isFromEditor: boolean;
   activatedDataPacks: IDataPack[];

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

@@ -7,8 +7,9 @@ const getDynamicFilters = (values: IStructuredData[]): IDynamicFilter[] =>
     label: value.title,
     value: value.id,
     fromPage: value.fromPage,
-    editable: value.editable ? value.editable : false,
+    editable: value.editable !== undefined ? value.editable : false,
     firstTemplate: null,
+    isPrivate: value.private !== undefined ? value.private : false,
   }));
 
 const getFilters = (dynamicValues: IStructuredData[]): IContentFilter[] => {

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

@@ -155,6 +155,7 @@ const StructuredDataList = (props: IProps): JSX.Element => {
   const isDataTranslatable = currentStructuredData && currentStructuredData.translate;
   const isAllPages = filter === "all-pages";
   const isStructuredDataFromPage = !!currentStructuredData?.fromPage || isAllPages;
+  const isPrivateData = currentStructuredData?.private || false;
   const isDataExportable = currentStructuredData?.exportable || false;
   const dataIds = isStructuredDataFromPage
     ? currentSitePages.map((page: IPage) => page.id)
@@ -526,6 +527,8 @@ const StructuredDataList = (props: IProps): JSX.Element => {
   const notEditableText =
     "Sorry, this content cannot be edited because it comes from an external source or belongs to a preconfigured system.";
 
+  const isPrivateText = "This content is private and will not be available for display in any distributor.";
+
   const languageProps = {
     globalLangs: isAllPages || isDataTranslatable ? globalLangs : null,
     lang: isAllPages || isDataTranslatable ? lang : null,
@@ -634,6 +637,11 @@ const StructuredDataList = (props: IProps): JSX.Element => {
               <Notification type="info" text={notEditableText} closeButton={false} />
             </S.NotificationWrapper>
           )}
+          {isPrivateData && (
+            <S.NotificationWrapper>
+              <Notification type="private" text={isPrivateText} closeButton={false} />
+            </S.NotificationWrapper>
+          )}
           <ErrorToast />
           {!!currentSiteErrorPages.length && <Notification type="error" text={errorPagesText} />}
           {notification && (

package/src/types/index.tsx

@@ -451,6 +451,7 @@ export interface IStructuredData {
   structuredData?: string;
   editable: boolean;
   dataPacks: string[];
+  private?: boolean;
   exportable?: boolean;
 }
 
@@ -1060,6 +1061,7 @@ export interface IDynamicFilter {
   fromPage: boolean;
   firstTemplate: string | null;
   editable?: boolean;
+  isPrivate?: boolean;
 }
 
 export interface IGriddoTheme {