@griddo/ax 10.2.11 → 10.2.13

package/src/modules/GlobalSettings/Robots/Item/RobotsPanel/index.tsx

@@ -28,25 +28,27 @@ const RobotsPanel = (props: IProps): JSX.Element => {
 
   return (
     <FloatingPanel title={title} toggleModal={toggleModal} isOpen={isOpen}>
-      <S.Item>
-        <S.ItemHeader>You are editing</S.ItemHeader>
-        <S.ItemContent>{item.fullUrl}</S.ItemContent>
-      </S.Item>
-      <FieldsBehavior
-        fieldType="TextArea"
-        onChange={setValue}
-        value={value}
-        title="Robots.txt"
-        placeholder={placeholder}
-      />
-      <Button buttonStyle="text" type="button" icon="refresh" disabled={!value} onClick={resetItem}>
-        Reset to default
-      </Button>
-      <S.Footer>
-        <Button className="button" type="button" onClick={editButton.action}>
-          {editButton.label}
+      <S.Wrapper>
+        <S.Item>
+          <S.ItemHeader>You are editing</S.ItemHeader>
+          <S.ItemContent>{item.fullUrl}</S.ItemContent>
+        </S.Item>
+        <FieldsBehavior
+          fieldType="TextArea"
+          onChange={setValue}
+          value={value}
+          title="Robots.txt"
+          placeholder={placeholder}
+        />
+        <Button buttonStyle="text" type="button" icon="refresh" disabled={!value} onClick={resetItem}>
+          Reset to default
         </Button>
-      </S.Footer>
+        <S.Footer>
+          <Button className="button" type="button" onClick={editButton.action}>
+            {editButton.label}
+          </Button>
+        </S.Footer>
+      </S.Wrapper>
     </FloatingPanel>
   );
 };

package/src/modules/GlobalSettings/Robots/Item/RobotsPanel/style.tsx

@@ -1,5 +1,10 @@
 import styled from "styled-components";
 
+const Wrapper = styled.div`
+  padding: ${(p) => p.theme.spacing.m};
+  height: 100%;
+`;
+
 const Item = styled.div`
   background-color: ${(p) => p.theme.color.uiBarBackground};
   padding: ${(p) => p.theme.spacing.s};
@@ -27,4 +32,4 @@ const Footer = styled.div`
   right: ${(p) => p.theme.spacing.m};
 `;
 
-export { Item, ItemHeader, ItemContent, Footer };
+export { Wrapper, Item, ItemHeader, ItemContent, Footer };

package/src/modules/Navigation/Menus/List/Table/ConfigPanel/index.tsx

@@ -31,12 +31,14 @@ const ConfigPanel = (props: IProps): JSX.Element => {
 
   return (
     <FloatingPanel title="Subsection Config" toggleModal={toggleModal} isOpen={isOpen}>
-      <Form form={form} setForm={setForm} />
-      <S.Footer>
-        <Button className="button" type="button" onClick={editButton.action}>
-          {editButton.label}
-        </Button>
-      </S.Footer>
+      <S.Wrapper>
+        <Form form={form} setForm={setForm} />
+        <S.Footer>
+          <Button className="button" type="button" onClick={editButton.action}>
+            {editButton.label}
+          </Button>
+        </S.Footer>
+      </S.Wrapper>
     </FloatingPanel>
   );
 };

package/src/modules/Navigation/Menus/List/Table/ConfigPanel/style.tsx

@@ -1,9 +1,14 @@
 import styled from "styled-components";
 
+const Wrapper = styled.div`
+  padding: ${(p) => p.theme.spacing.m};
+  height: 100%;
+`;
+
 const Footer = styled.div`
   position: absolute;
   bottom: ${(p) => p.theme.spacing.m};
   right: ${(p) => p.theme.spacing.m};
 `;
 
-export { Footer };
+export { Wrapper, Footer };

package/src/modules/Navigation/Menus/List/Table/SidePanel/index.tsx

@@ -68,19 +68,21 @@ const SidePanel = (props: IProps): JSX.Element => {
       closeOnOutsideClick={!isGalleryOpened}
       handlePanel={toggleSecondaryPanel}
     >
-      <S.FormWrapper>
-        <Form toggleSecondaryPanel={toggleSecondaryPanel} setIsGalleryOpened={setIsOpenedGallery} />
-      </S.FormWrapper>
-      <S.Footer>
-        <Button
-          className="button"
-          type="button"
-          onClick={edit ? editButton.action : addButton.action}
-          disabled={edit ? editButton.disabled : addButton.disabled}
-        >
-          {edit ? editButton.label : addButton.label}
-        </Button>
-      </S.Footer>
+      <S.Wrapper>
+        <S.FormWrapper>
+          <Form toggleSecondaryPanel={toggleSecondaryPanel} setIsGalleryOpened={setIsOpenedGallery} />
+        </S.FormWrapper>
+        <S.Footer>
+          <Button
+            className="button"
+            type="button"
+            onClick={edit ? editButton.action : addButton.action}
+            disabled={edit ? editButton.disabled : addButton.disabled}
+          >
+            {edit ? editButton.label : addButton.label}
+          </Button>
+        </S.Footer>
+      </S.Wrapper>
     </FloatingPanel>
   );
 };

package/src/modules/Navigation/Menus/List/Table/SidePanel/style.tsx

@@ -1,6 +1,11 @@
 import styled from "styled-components";
 
-export const Footer = styled.div`
+const Wrapper = styled.div`
+  padding: ${(p) => p.theme.spacing.m};
+  height: 100%;
+`;
+
+const Footer = styled.div`
   position: absolute;
   bottom: 0;
   width: 100%;
@@ -15,9 +20,11 @@ export const Footer = styled.div`
   }
 `;
 
-export const FormWrapper = styled.div`
+const FormWrapper = styled.div`
   height: calc(100% - ${(p) => p.theme.spacing.s} - 73px);
   overflow: auto;
   margin: -${(p) => p.theme.spacing.m};
   padding: ${(p) => p.theme.spacing.m};
 `;
+
+export { Wrapper, Footer, FormWrapper }

package/src/modules/PublicPreview/index.tsx

@@ -59,7 +59,7 @@ const PublicPreview = () => {
         footer={state && state.footerContent}
         languageID={state && state.language}
         pageLanguages={state && state.pageLanguages}
-        renderer="editor"
+        renderer="preview"
       />
     </S.Wrapper>
   );

package/src/modules/Redirects/RedirectPanel/index.tsx

@@ -60,37 +60,39 @@ const RedirectPanel = (props: IProps): JSX.Element => {
       isOpenedSecond={isOpenedSecond}
       handlePanel={toggleSecondaryPanel}
     >
-      <FieldsBehavior
-        title="Old URL"
-        name="oldUrl"
-        fieldType="TextField"
-        value={formValues.from}
-        onChange={handleOldUrl}
-        autoComplete="redirect-old"
-        helptext="Type the complete old page url you want to redirect."
-      />
-      <FieldsBehavior
-        title="New URL"
-        name="newUrl"
-        fieldType="UrlField"
-        value={formValues.to}
-        onChange={handleNewUrl}
-        handlePanel={toggleSecondaryPanel}
-        inFloatingPanel={true}
-        autoComplete="redirect-new"
-        helptext="Select an internal page or paste an external url."
-      />
-      <S.Footer>
-        {redirect ? (
-          <Button className="button" type="button" onClick={editButton.action} disabled={editButton.disabled}>
-            {editButton.label}
-          </Button>
-        ) : (
-          <Button className="button" type="button" onClick={addButton.action} disabled={addButton.disabled}>
-            {addButton.label}
-          </Button>
-        )}
-      </S.Footer>
+      <S.Wrapper>
+        <FieldsBehavior
+          title="Old URL"
+          name="oldUrl"
+          fieldType="TextField"
+          value={formValues.from}
+          onChange={handleOldUrl}
+          autoComplete="redirect-old"
+          helptext="Type the complete old page url you want to redirect."
+        />
+        <FieldsBehavior
+          title="New URL"
+          name="newUrl"
+          fieldType="UrlField"
+          value={formValues.to}
+          onChange={handleNewUrl}
+          handlePanel={toggleSecondaryPanel}
+          inFloatingPanel={true}
+          autoComplete="redirect-new"
+          helptext="Select an internal page or paste an external url."
+        />
+        <S.Footer>
+          {redirect ? (
+            <Button className="button" type="button" onClick={editButton.action} disabled={editButton.disabled}>
+              {editButton.label}
+            </Button>
+          ) : (
+            <Button className="button" type="button" onClick={addButton.action} disabled={addButton.disabled}>
+              {addButton.label}
+            </Button>
+          )}
+        </S.Footer>
+      </S.Wrapper>
     </FloatingPanel>
   );
 };

package/src/modules/Redirects/RedirectPanel/style.tsx

@@ -1,5 +1,10 @@
 import styled from "styled-components";
 
+const Wrapper = styled.div`
+  padding: ${(p) => p.theme.spacing.m};
+  height: 100%;
+`;
+
 const Footer = styled.div`
   position: absolute;
   bottom: ${(p) => p.theme.spacing.m};
@@ -10,4 +15,4 @@ const ModalContent = styled.div`
   padding: ${(p) => p.theme.spacing.m};
 `;
 
-export { Footer, ModalContent };
+export { Wrapper, Footer, ModalContent };

package/src/modules/Redirects/index.tsx

@@ -257,7 +257,6 @@ const Redirects = (props: IProps): JSX.Element => {
   const secondaryImportModalAction = { title: "Cancel", onClick: toggleCheckImportModal };
 
   const searchFilters = [
-    { value: "filterby", label: "Filter by" },
     { value: "from", label: "Old URL" },
     { value: "to", label: "New URL" },
   ];

package/src/modules/Settings/Integrations/IntegrationForm/VariablePanel/index.tsx

@@ -54,75 +54,77 @@ function VariablePanel(props: IProps): JSX.Element {
   return (
     <FloatingPanel title={title} toggleModal={toggleModal} isOpen={isOpen}>
       <S.Wrapper>
-        <S.NoteWrapper>
-          <NoteField value={{ title: "", text: "Make sure you include the variable key in the code." }} />
-        </S.NoteWrapper>
-        <FieldsBehavior
-          title="Is this variable language-dependent?"
-          name="isMultilanguage"
-          fieldType="RadioGroup"
-          value={!!state.multilanguage?.length}
-          options={variableOptions}
-          onChange={handleIsMultilanguage}
-        />
-        <FieldsBehavior
-          title="Variable Name"
-          name="variableName"
-          fieldType="TextField"
-          placeholder="Type a variable name"
-          mandatory
-          value={state.variableName}
-          onChange={handleNameChange}
-        />
-        <FieldsBehavior
-          title="Variable Key"
-          name="variableKey"
-          fieldType="TextField"
-          placeholder="Type a variable {key}"
-          mandatory
-          value={state.variableKey}
-          onChange={handleKeyChange}
-          helptext="Define a Key to this variable"
-        />
-        {!state.multilanguage?.length && (
+        <S.ContentWrapper>
+          <S.NoteWrapper>
+            <NoteField value={{ title: "", text: "Make sure you include the variable key in the code." }} />
+          </S.NoteWrapper>
           <FieldsBehavior
-            title="Default Value"
-            name="defaulValue"
-            fieldType="TextArea"
-            placeholder="Type a default value"
-            value={state.defaultValue}
-            onChange={handleValueChange}
-            helptext="You can define a default value to this variable"
+            title="Is this variable language-dependent?"
+            name="isMultilanguage"
+            fieldType="RadioGroup"
+            value={!!state.multilanguage?.length}
+            options={variableOptions}
+            onChange={handleIsMultilanguage}
           />
-        )}
-        {state.multilanguage?.map((field: IVariableLang, index: number) => {
-          const language = langs.find((lang: ILanguage) => lang.id === field.languageId);
-
-          const handleLangChange = (value: string) => {
-            const langs = state.multilanguage ? [...state.multilanguage] : [];
-            langs[index].value = value;
-            setState({ ...state, multilanguage: langs });
-          };
-
-          return (
+          <FieldsBehavior
+            title="Variable Name"
+            name="variableName"
+            fieldType="TextField"
+            placeholder="Type a variable name"
+            mandatory
+            value={state.variableName}
+            onChange={handleNameChange}
+          />
+          <FieldsBehavior
+            title="Variable Key"
+            name="variableKey"
+            fieldType="TextField"
+            placeholder="Type a variable {key}"
+            mandatory
+            value={state.variableKey}
+            onChange={handleKeyChange}
+            helptext="Define a Key to this variable"
+          />
+          {!state.multilanguage?.length && (
             <FieldsBehavior
-              title={`Default ${language?.language} Value`}
+              title="Default Value"
               name="defaulValue"
               fieldType="TextArea"
               placeholder="Type a default value"
-              value={field.value}
-              onChange={handleLangChange}
-              helptext={`You can define a ${language?.language} default value to this variable`}
-              key={field.languageId}
+              value={state.defaultValue}
+              onChange={handleValueChange}
+              helptext="You can define a default value to this variable"
             />
-          );
-        })}
+          )}
+          {state.multilanguage?.map((field: IVariableLang, index: number) => {
+            const language = langs.find((lang: ILanguage) => lang.id === field.languageId);
+
+            const handleLangChange = (value: string) => {
+              const langs = state.multilanguage ? [...state.multilanguage] : [];
+              langs[index].value = value;
+              setState({ ...state, multilanguage: langs });
+            };
+
+            return (
+              <FieldsBehavior
+                title={`Default ${language?.language} Value`}
+                name="defaulValue"
+                fieldType="TextArea"
+                placeholder="Type a default value"
+                value={field.value}
+                onChange={handleLangChange}
+                helptext={`You can define a ${language?.language} default value to this variable`}
+                key={field.languageId}
+              />
+            );
+          })}
+        </S.ContentWrapper>
+        <S.ActionWrapper>
+          <Button type="button" onClick={handleButtonClick}>
+            {title}
+          </Button>
+        </S.ActionWrapper>
       </S.Wrapper>
-      <S.ActionWrapper>
-        <Button type="button" onClick={handleButtonClick}>
-          {title}
-        </Button>
-      </S.ActionWrapper>
     </FloatingPanel>
   );
 }

package/src/modules/Settings/Integrations/IntegrationForm/VariablePanel/style.tsx

@@ -1,6 +1,11 @@
 import styled from "styled-components";
 
 const Wrapper = styled.div`
+  padding: ${(p) => p.theme.spacing.m};
+  height: 100%;
+`;
+
+const ContentWrapper = styled.div`
   overflow-y: scroll;
   border-bottom: 1px solid ${(p) => p.theme.color.uiLine};
   position: absolute;
@@ -25,4 +30,4 @@ const NoteWrapper = styled.div`
   margin-bottom: ${(p) => p.theme.spacing.m};
 `;
 
-export { Wrapper, ActionWrapper, NoteWrapper };
+export { Wrapper, ContentWrapper, ActionWrapper, NoteWrapper };

package/src/modules/Settings/Integrations/IntegrationForm/index.tsx

@@ -270,9 +270,11 @@ const IntegrationForm = (props: IProps) => {
           </S.SettingContent>
         </S.SettingsWrapper>
         <FloatingPanel title="Select pages" toggleModal={toggleModal} isOpen={isOpen}>
-          {isOpen && (
-            <PageFinder onClick={handleSetPage} isOpen={isOpen} multiple={true} hideSites={true} pages={pageIDs} />
-          )}
+          <S.ContentWrapper>
+            {isOpen && (
+              <PageFinder onClick={handleSetPage} isOpen={isOpen} multiple={true} hideSites={true} pages={pageIDs} />
+            )}
+          </S.ContentWrapper>
         </FloatingPanel>
         {isVariableOpen && (
           <VariablePanel

package/src/modules/Settings/Integrations/IntegrationForm/style.tsx

@@ -63,6 +63,11 @@ const PageElement = styled.div`
   white-space: nowrap;
 `;
 
+const ContentWrapper = styled.div`
+  padding: ${(p) => p.theme.spacing.m};
+  height: 100%;
+`;
+
 export {
   Wrapper,
   Heading,
@@ -74,4 +79,5 @@ export {
   PagesWrapper,
   ButtonWrapper,
   PageElement,
+  ContentWrapper,
 };

package/src/modules/Settings/Languages/LanguagePanel/index.tsx

@@ -42,18 +42,20 @@ const LanguagePanel = (props: IProps): JSX.Element => {
 
   return (
     <FloatingPanel title={title} toggleModal={toggleModal} isOpen={isOpen}>
-      <Form item={item} />
-      <S.Footer>
-        {item ? (
-          <Button className="button" type="button" onClick={editButton.action} disabled={editButton.disabled}>
-            {editButton.label}
-          </Button>
-        ) : (
-          <Button className="button" type="button" onClick={addButton.action} disabled={addButton.disabled}>
-            {addButton.label}
-          </Button>
-        )}
-      </S.Footer>
+      <S.Wrapper>
+        <Form item={item} />
+        <S.Footer>
+          {item ? (
+            <Button className="button" type="button" onClick={editButton.action} disabled={editButton.disabled}>
+              {editButton.label}
+            </Button>
+          ) : (
+            <Button className="button" type="button" onClick={addButton.action} disabled={addButton.disabled}>
+              {addButton.label}
+            </Button>
+          )}
+        </S.Footer>
+      </S.Wrapper>
     </FloatingPanel>
   );
 };

package/src/modules/Settings/Languages/LanguagePanel/style.tsx

@@ -1,7 +1,14 @@
 import styled from "styled-components";
 
-export const Footer = styled.div`
+const Wrapper = styled.div`
+  padding: ${(p) => p.theme.spacing.m};
+  height: 100%;
+`;
+
+const Footer = styled.div`
   position: absolute;
   bottom: ${(p) => p.theme.spacing.m};
   right: ${(p) => p.theme.spacing.m};
 `;
+
+export { Wrapper, Footer };

package/src/types/index.tsx

@@ -331,7 +331,7 @@ export interface IGetGlobalPagesParams {
 }
 
 export interface IGetStructuredDataParams {
-  dataID: string | null;
+  dataID?: string | null;
   page: number;
   itemsPerPage: number;
   pagination: boolean;