strapi-plugin-navigation 2.0.5 → 2.0.8

package/README.md

@@ -41,6 +41,7 @@ Strapi Navigation Plugin provides a website navigation / menu builder feature fo
 - **Navigation Public API:** Simple and ready for use API endpoint for consuming the navigation structure you've created
 - **Visual builder:** Elegant and easy to use visual builder
 - **Any Content Type relation:** Navigation can by linked to any of your Content Types by default. Simply, you're controlling it and also limiting available content types by configuration props
+- **Different types of navigation items:** Create navigation with items linked to internal types, to external links or wrapper elements to keep structure clean 
 - **Multiple navigations:** Create as many Navigation containers as you want, setup them and use in the consumer application
 - **Customizable:** Possibility to customize the options like: available Content Types, Maximum level for "attach to menu", Additional fields (audience)
 - **[Audit log](https://github.com/VirtusLab/strapi-molecules/tree/master/packages/strapi-plugin-audit-log):** integration with Strapi Molecules Audit Log plugin that provides changes track record
@@ -81,7 +82,7 @@ Complete installation requirements are exact same as for Strapi itself and can b
 
 **Supported Strapi versions**:
 
-- Strapi v4.1.0 (recently tested)
+- Strapi v4.1.5 (recently tested)
 - Strapi v4.x
 
 > This plugin is designed for **Strapi v4** and is not working with v3.x. To get version for **Strapi v3** install version [v1.x](https://github.com/VirtusLab-Open-Source/strapi-plugin-navigation/tree/strapi-v3).

package/admin/src/components/CollapseButton/index.js

@@ -0,0 +1,31 @@
+import React from 'react';
+import styled from 'styled-components'
+import { Flex } from '@strapi/design-system/Flex';
+import { Typography } from '@strapi/design-system/Typography';
+import { Icon } from '@strapi/design-system/Icon';
+import { CarretUp, CarretDown } from '@strapi/icons';
+
+const Wrapper = styled.div`
+	border-radius: 50%;
+	background: #DCDCE4;
+	width: 25px;
+	height: 25px;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	margin-right: 8px;
+`;
+
+const CollapseButton = ({ toggle, collapsed, itemsCount }) => (
+	<Flex justifyContent='space-between' alignItems='center' onClick={toggle} cursor="pointer" style={{ marginRight: '16px' }}>
+		<Wrapper>
+			{ collapsed ?
+				<Icon as={CarretDown} width='7px' height='4px' /> :
+				<Icon as={CarretUp} width='7px' height='4px' />
+			}
+		</Wrapper>
+		<Typography variant="pi">{itemsCount} nested items</Typography>
+	</Flex >
+);
+
+export default CollapseButton;

package/admin/src/components/ConfirmationDialog/index.js

@@ -27,7 +27,7 @@ const ConfirmationDialog = ({
 }) => (
 	<Dialog onClose={onCancel} title={header || getMessage('components.confirmation.dialog.header', 'Confirmation')} isOpen={isVisible}>
 		<DialogBody icon={<ExclamationMarkCircle />}>
-			<Stack size={2}>
+			<Stack spacing={2}>
 				<Flex justifyContent="center">
 					<Typography id="dialog-confirm-description">{children || getMessage('components.confirmation.dialog.description')}</Typography>
 				</Flex>

package/admin/src/components/Item/ItemCardBadge/index.js

@@ -4,15 +4,15 @@ import { Badge } from '@strapi/design-system/Badge';
 const ItemCardBadge = styled(Badge)`
 		border: 1px solid ${({ theme, borderColor }) => theme.colors[borderColor]};
 
-		${ props => props.small && `
-			padding: ${props.theme.spaces[1]};
-			margin: 0px ${props.theme.spaces[3]};
+		${ ({small, theme}) => small && `
+			padding: ${theme.spaces[1]} ${theme.spaces[2]};
+			margin: 0px ${theme.spaces[3]};
 			vertical-align: middle;
 
 			cursor: default;
 
 			span {
-				font-size: .55rem;
+				font-size: .65rem;
 				line-height: 1;
 				vertical-align: middle;
 			}

package/admin/src/components/Item/ItemCardHeader/Wrapper.js

@@ -9,10 +9,6 @@ const CardItemTitle = styled(CardTitle)`
 	justify-content: space-between;
 	align-items: center;
 	
-	color: ${({ theme }) => theme.colors.neutral800};
-	font-size: ${({ theme }) => theme.fontSizes[2]};
-	font-weight: ${({ theme }) => theme.fontWeights.bold};
-
 	> div > * {
 			margin: 0px ${({ theme }) => theme.spaces[1]};
 	}

package/admin/src/components/Item/ItemCardHeader/index.js

@@ -1,4 +1,5 @@
 import React from 'react';
+import styled from 'styled-components';
 
 import { Flex } from '@strapi/design-system/Flex';
 import { IconButton } from '@strapi/design-system/IconButton';
@@ -10,20 +11,44 @@ import Wrapper from './Wrapper';
 import ItemCardBadge from '../ItemCardBadge';
 import { getMessage } from '../../../utils';
 
+const IconWrapper = styled.div`
+display: flex;
+align-items: center;
+justify-content: center;
+height: ${32 / 16}rem;
+width: ${32 / 16}rem;
+
+cursor: pointer;
+  padding: ${({ theme }) => theme.spaces[2]};
+  border-radius: ${({ theme }) => theme.borderRadius};
+  background: ${({ theme }) => theme.colors.neutral0};
+  border: 1px solid ${({ theme }) => theme.colors.neutral200};
+	
+svg {
+	> g,
+	path {
+		fill: ${({ theme }) => theme.colors.neutral500};
+	}
+}
+`
+
 const ItemCardHeader = ({ title, path, icon, removed, onItemRemove, onItemEdit, onItemRestore, dragRef }) => {
 	return (
 		<Wrapper>
 			<Flex alignItems="center">
-				<Icon as={icon} />
+				<IconWrapper ref={dragRef}>
+					<Icon as={Drag} />
+				</IconWrapper>
 				<Typography variant="omega" fontWeight="bold">
 					{title}
 				</Typography>
 				<Typography variant="omega" fontWeight="bold" textColor='neutral500'>
 					{path}
 				</Typography>
+				<Icon as={icon} />
 			</Flex>
 			<Flex alignItems="center" style={{ zIndex: 2 }}>
-				{removed && 
+				{removed &&
 					(<ItemCardBadge
 						borderColor={`danger200`}
 						backgroundColor={`danger100`}
@@ -36,10 +61,7 @@ const ItemCardHeader = ({ title, path, icon, removed, onItemRemove, onItemEdit,
 				<IconButton disabled={removed} onClick={onItemEdit} label="Edit" icon={<Pencil />} />
 				{removed ?
 					<IconButton onClick={onItemRestore} label="Restore" icon={<Refresh />} /> :
-					<>
-						<IconButton ref={dragRef} label="Drag" icon={<Drag />} />
-						<IconButton onClick={onItemRemove} label="Remove" icon={<Trash />} />
-					</>
+					<IconButton onClick={onItemRemove} label="Remove" icon={<Trash />} />
 				}
 			</Flex>
 		</Wrapper>

package/admin/src/components/Item/Wrapper.js

@@ -3,7 +3,7 @@ import styled from "styled-components";
 const Wrapper = styled.div`
 position: relative;
 margin-top: ${({theme}) => theme.spaces[2]};
-margin-left: ${({ theme, level }) => level && theme.spaces[8]}};
+margin-left: ${({ level }) => level && '54px'}};
 
 ${({ level, theme, isLast }) => level && `
 	&::before {

package/admin/src/components/Item/index.js

@@ -1,17 +1,15 @@
-import React, { useRef, useEffect } from 'react';
+import React, { useRef } from 'react';
 import PropTypes from 'prop-types';
 import { useDrag, useDrop } from 'react-dnd';
-import { getEmptyImage } from 'react-dnd-html5-backend';
-import { drop, isEmpty, isNumber } from 'lodash';
+import { isEmpty, isNumber } from 'lodash';
 
-import { Box } from '@strapi/design-system/Box';
 import { Card, CardBody } from '@strapi/design-system/Card';
 import { Divider } from '@strapi/design-system/Divider';
 import { Flex } from '@strapi/design-system/Flex';
 import { Link } from '@strapi/design-system/Link';
 import { TextButton } from '@strapi/design-system/TextButton';
 import { Typography } from '@strapi/design-system/Typography';
-import { ArrowRight, Link as LinkIcon, Earth, Plus } from '@strapi/icons';
+import { ArrowRight, Link as LinkIcon, Earth, Plus, Cog } from '@strapi/icons';
 
 import { navigationItemType } from '../../pages/View/utils/enums';
 import ItemCardHeader from './ItemCardHeader';
@@ -21,6 +19,7 @@ import { extractRelatedItemLabel } from '../../pages/View/utils/parsers';
 import ItemCardBadge from './ItemCardBadge';
 import { ItemCardRemovedOverlay } from './ItemCardRemovedOverlay';
 import { getMessage, ItemTypes } from '../../utils';
+import CollapseButton from '../CollapseButton';
 
 const Item = (props) => {
   const {
@@ -36,6 +35,7 @@ const Item = (props) => {
     onItemRestore,
     onItemEdit,
     onItemReOrder,
+    onItemToggleCollapse,
     error,
     displayChildren,
     config = {},
@@ -49,10 +49,12 @@ const Item = (props) => {
     removed,
     externalPath,
     menuAttached,
+    collapsed,
   } = item;
 
   const { contentTypes, contentTypesNameFields } = config;
   const isExternal = type === navigationItemType.EXTERNAL;
+  const isWrapper = type === navigationItemType.WRAPPER;
   const isPublished = relatedRef && relatedRef?.publishedAt;
   const isNextMenuAllowedLevel = isNumber(allowedLevels) ? level < (allowedLevels - 1) : true;
   const isMenuAllowedLevel = isNumber(allowedLevels) ? level < allowedLevels : true;
@@ -87,7 +89,16 @@ const Item = (props) => {
       const isAfter = hoverClientY > hoverMiddleY;
       const newOrder = isAfter ? item.order + 0.5 : item.order - 0.5;
 
+      if (dragIndex < dropIndex && hoverClientY < hoverMiddleY) {
+        return;
+      }
+      // Dragging upwards
+      if (dragIndex > dropIndex && hoverClientY > hoverMiddleY) {
+        return;
+      }
+
       onItemReOrder({ ...hoveringItem }, newOrder);
+      hoveringItem.order = newOrder;
     },
     collect: monitor => ({
       isOverCurrent: monitor.isOver({ shallow: true }),
@@ -97,7 +108,7 @@ const Item = (props) => {
   const [{ isDragging }, drag, dragPreview] = useDrag({
     type: `${ItemTypes.NAVIGATION_ITEM}_${levelPath}`,
     item: () => {
-      return { ...item };
+      return { ...item, relatedRef };
     },
     collect: monitor => ({
       isDragging: monitor.isDragging(),
@@ -119,7 +130,7 @@ const Item = (props) => {
             <ItemCardHeader
               title={title}
               path={isExternal ? externalPath : absolutePath}
-              icon={isExternal ? Earth : LinkIcon}
+              icon={isExternal ? Earth : isWrapper ? Cog : LinkIcon}
               onItemRemove={() => onItemRemove({
                 ...item,
                 relatedRef,
@@ -128,6 +139,7 @@ const Item = (props) => {
                 ...item,
                 isMenuAllowedLevel,
                 isParentAttachedToMenu,
+                relatedRef,
               }, levelPath, isParentAttachedToMenu)}
               onItemRestore={() => onItemRestore({
                 ...item,
@@ -138,49 +150,50 @@ const Item = (props) => {
             />
           </CardBody>
           <Divider />
-          {!isExternal && (<CardBody style={{ margin: '8px' }}>
-            <Flex style={{ width: '100%' }} direction="row" alignItems="center" justifyContent="space-between">
-              <TextButton
-                disabled={removed}
-                startIcon={<Plus />}
-                onClick={(e) => onItemLevelAdd(e, viewId, isNextMenuAllowedLevel, absolutePath, menuAttached)}
-              >
-                <Typography variant="pi" fontWeight="bold" textColor={removed ? "neutral600" : "primary600"}>
-                  {getMessage("components.navigationItem.action.newItem")}
-                </Typography>
-              </TextButton>
-              {relatedItemLabel && (<Box>
-                <ItemCardBadge
-                  borderColor={`${relatedBadgeColor}200`}
-                  backgroundColor={`${relatedBadgeColor}100`}
-                  textColor={`${relatedBadgeColor}600`}
-                  className="action"
-                  small
-                >
-                  {getMessage({
-                    id: `components.navigationItem.badge.${isPublished ? 'published' : 'draft'}`, props: {
-                      type: relatedTypeLabel
-                    }
-                  })}
-                </ItemCardBadge>
-                <Typography variant="pi" fontWeight="bold" textColor="neutral600">
-                  {relatedItemLabel}
-                  <Link
-                    to={`/content-manager/collectionType/${relatedRef?.__collectionUid}/${relatedRef?.id}`}
-                    endIcon={<ArrowRight />}>&nbsp;</Link>
-                </Typography>
-              </Box>)
-              }
-            </Flex>
-          </CardBody>)}
+          {!isExternal && (
+            <CardBody style={{ padding: '8px' }}>
+              <Flex style={{ width: '100%' }} direction="row" alignItems="center" justifyContent="space-between">
+                <Flex>
+                  {!isEmpty(item.items) && <CollapseButton toggle={() => onItemToggleCollapse({...item, relatedRef})} collapsed={collapsed} itemsCount={item.items.length}/>}
+                  <TextButton
+                    disabled={removed}
+                    startIcon={<Plus />}
+                    onClick={(e) => onItemLevelAdd(e, viewId, isNextMenuAllowedLevel, absolutePath, menuAttached)}
+                  >
+                    <Typography variant="pi" fontWeight="bold" textColor={removed ? "neutral600" : "primary600"}>
+                      {getMessage("components.navigationItem.action.newItem")}
+                    </Typography>
+                  </TextButton>
+                </Flex>
+                {relatedItemLabel && (
+                  <Flex justifyContent='center' alignItems='center'>
+                    <ItemCardBadge
+                      borderColor={`${relatedBadgeColor}200`}
+                      backgroundColor={`${relatedBadgeColor}100`}
+                      textColor={`${relatedBadgeColor}600`}
+                      className="action"
+                      small
+                    >
+                      {getMessage({id: `components.navigationItem.badge.${isPublished ? 'published' : 'draft'}`})}
+                    </ItemCardBadge>
+                    <Typography variant="omega" textColor='neutral600'>{relatedTypeLabel}&nbsp;/&nbsp;</Typography>
+                    <Typography variant="omega" textColor='neutral800'>{relatedItemLabel}</Typography>
+                      <Link
+                        to={`/content-manager/collectionType/${relatedRef?.__collectionUid}/${relatedRef?.id}`}
+                        endIcon={<ArrowRight />}>&nbsp;</Link>
+                  </Flex>)
+                }
+              </Flex>
+            </CardBody>)}
         </div>
       </Card>
-      {hasChildren && !removed && <List
+      {hasChildren && !removed && !collapsed && <List
         onItemLevelAdd={onItemLevelAdd}
         onItemRemove={onItemRemove}
         onItemEdit={onItemEdit}
         onItemRestore={onItemRestore}
         onItemReOrder={onItemReOrder}
+        onItemToggleCollapse={onItemToggleCollapse}
         error={error}
         allowedLevels={allowedLevels}
         isParentAttachedToMenu={menuAttached}
@@ -204,7 +217,8 @@ Item.propTypes = {
     path: PropTypes.string,
     externalPath: PropTypes.string,
     related: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
-    menuAttached: PropTypes.bool
+    menuAttached: PropTypes.bool,
+    collapsed: PropTypes.bool,
   }).isRequired,
   relatedRef: PropTypes.object,
   level: PropTypes.number,
@@ -214,6 +228,7 @@ Item.propTypes = {
   onItemLevelAdd: PropTypes.func.isRequired,
   onItemRemove: PropTypes.func.isRequired,
   onItemReOrder: PropTypes.func.isRequired,
+  onItemToggleCollapse: PropTypes.func.isRequired,
   config: PropTypes.shape({
     contentTypes: PropTypes.array.isRequired,
     contentTypesNameFields: PropTypes.object.isRequired,

package/admin/src/components/NavigationItemList/Wrapper.js

@@ -11,7 +11,7 @@ const Wrapper = styled.div`
 
       position: absolute;
       top: -${theme.spaces[2]};
-      left: ${theme.spaces[4]};
+      left: 30px;
       
       border: 0px solid transparent;
       border-left: 4px solid ${theme.colors.neutral300};

package/admin/src/components/NavigationItemList/index.js

@@ -16,6 +16,7 @@ const List = ({
   onItemRemove,
   onItemRestore,
   onItemReOrder,
+  onItemToggleCollapse,
   displayFlat,
   contentTypes,
   contentTypesNameFields,
@@ -38,6 +39,7 @@ const List = ({
           onItemRemove={onItemRemove}
           onItemEdit={onItemEdit}
           onItemReOrder={onItemReOrder}
+          onItemToggleCollapse={onItemToggleCollapse}
           error={error}
           displayChildren={displayFlat}
           config={{
@@ -60,6 +62,7 @@ List.propTypes = {
   onItemRestore: PropTypes.func.isRequired,
   onItemRestore: PropTypes.func.isRequired,
   onItemReOrder: PropTypes.func.isRequired,
+  onItemToggleCollapse: PropTypes.func.isRequired,
   contentTypes: PropTypes.array.isRequired,
   contentTypesNameFields: PropTypes.object.isRequired
 };

package/admin/src/pages/SettingsPage/index.js

@@ -49,13 +49,14 @@ const SettingsPage = () => {
 		padding: 6,
 	};
   
-  const preparePayload = ({ selectedContentTypes, nameFields, audienceFieldChecked, allowedLevels }) => ({
+  const preparePayload = ({ selectedContentTypes, nameFields, audienceFieldChecked, allowedLevels, populate }) => ({
     contentTypes: selectedContentTypes,
     contentTypesNameFields: nameFields,
+    contentTypesPopulate: populate,
     additionalFields: audienceFieldChecked ? [navigationItemAdditionalFields.AUDIENCE] : [],
     allowedLevels: allowedLevels,
     gql: {
-      navigationItemRelated: selectedContentTypes.map(uid => allContentTypes.find(ct => ct.uid === uid).info.displayName)
+      navigationItemRelated: selectedContentTypes.map(uid => allContentTypes.find(ct => ct.uid === uid).info.displayName.replace(/\s+/g, ''))
     }
   });
 
@@ -110,8 +111,9 @@ const SettingsPage = () => {
   const allContentTypes = !isLoading && Object.values(allContentTypesData).filter(item => item.uid.includes('api::'));
   const selectedContentTypes = navigationConfigData?.contentTypes.map(item => item.uid);
   const audienceFieldChecked = navigationConfigData?.additionalFields.includes(navigationItemAdditionalFields.AUDIENCE);
-  const allowedLevels = navigationConfigData?.allowedLevels;
-  const nameFields = navigationConfigData?.contentTypesNameFields
+  const allowedLevels = navigationConfigData?.allowedLevels || 2;
+  const nameFields = navigationConfigData?.contentTypesNameFields || {}
+  const populate = navigationConfigData?.contentTypesPopulate || {}
 
   return (
     <>
@@ -125,6 +127,7 @@ const SettingsPage = () => {
             audienceFieldChecked,
             allowedLevels,
             nameFields,
+            populate,
           }}
           onSubmit={onSave}
         >
@@ -142,7 +145,7 @@ const SettingsPage = () => {
                 }
               />
               <ContentLayout>
-                <Stack size={7}>
+                <Stack spacing={7}>
                   {isRestartRequired && (
                     <RestartAlert
                       closeLabel={getMessage('pages.settings.actions.restart.alert.cancel')}
@@ -152,7 +155,7 @@ const SettingsPage = () => {
                       {getMessage('pages.settings.actions.restart.alert.description')}
                     </RestartAlert>)}
                   <Box {...boxDefaultProps} >
-                    <Stack size={4}>
+                    <Stack spacing={4}>
                       <Typography variant="delta" as="h2">
                         {getMessage('pages.settings.general.title')}
                       </Typography>
@@ -183,6 +186,7 @@ const SettingsPage = () => {
                               {orderBy(values.selectedContentTypes).map(uid => {
                                 const { attributes, info: { displayName } } = allContentTypes.find(item => item.uid == uid);
                                 const stringAttributes = Object.keys(attributes).filter(_ => attributes[_].type === 'string');
+                                const relationAttributes = Object.keys(attributes).filter(_ => attributes[_].type === 'relation');
                                 const key = `collectionSettings-${uid}`;
                                 return (<Accordion
                                   expanded={contentTypeExpanded === key}
@@ -193,24 +197,40 @@ const SettingsPage = () => {
                                   <AccordionToggle title={displayName} togglePosition="left" />
                                   <AccordionContent>
                                     <Box padding={6}>
-                                      <Stack size={4}>
+                                      <Stack spacing={4}>
                                         <Select
                                           name={`collectionSettings-${uid}-entryLabel`}
                                           label={getMessage('pages.settings.form.nameField.label')}
-                                          hint={getMessage('pages.settings.form.nameField.hint')}
+                                          hint={getMessage(`pages.settings.form.populate.${isEmpty(stringAttributes) ? 'empty' : 'hint'}`)}
                                           placeholder={getMessage('pages.settings.form.nameField.placeholder')}
                                           onClear={() => null}
                                           value={values.nameFields[uid] || []}
                                           onChange={(value) => setFieldValue('nameFields', prepareNameFieldFor(uid, values.nameFields, value))}
                                           multi
                                           withTags
-                                          disabled={isRestartRequired}
+                                          disabled={isRestartRequired || isEmpty(stringAttributes)}
                                         >
                                           {stringAttributes.map(key =>
                                             (<Option key={uid + key} value={key}>{capitalize(key.split('_').join(' '))}</Option>))}
+                                        </Select>                                    
+                                        <Select
+                                          name={`collectionSettings-${uid}-populate`}
+                                          label={getMessage('pages.settings.form.populate.label')}
+                                          hint={getMessage(`pages.settings.form.populate.${isEmpty(relationAttributes) ? 'empty' : 'hint'}`)}
+                                          placeholder={getMessage('pages.settings.form.populate.placeholder')}
+                                          onClear={() => null}
+                                          value={values.populate[uid] || []}
+                                          onChange={(value) => setFieldValue('populate', prepareNameFieldFor(uid, values.populate, value))}
+                                          multi
+                                          withTags
+                                          disabled={isRestartRequired || isEmpty(relationAttributes)}
+                                        >
+                                          {relationAttributes.map(key =>
+                                            (<Option key={uid + key} value={key}>{capitalize(key.split('_').join(' '))}</Option>))}
                                         </Select>
                                       </Stack>
                                     </Box>
+
                                   </AccordionContent>
                                 </Accordion>);
                               })}
@@ -220,22 +240,22 @@ const SettingsPage = () => {
                     </Stack>
                   </Box>
                   <Box {...boxDefaultProps} >
-                    <Stack size={4}>
+                    <Stack spacing={4}>
                       <Typography variant="delta" as="h2">
                         {getMessage('pages.settings.additional.title')}
                       </Typography>
                       <Grid gap={4}>
                         <GridItem col={3} s={6} xs={12}>
-                            <NumberInput
-                              name="allowedLevels"
-                              label={getMessage('pages.settings.form.allowedLevels.label')}
-                              placeholder={getMessage('pages.settings.form.allowedLevels.placeholder')}
-                              hint={getMessage('pages.settings.form.allowedLevels.hint')}
-                              onValueChange={(value) => setFieldValue('allowedLevels', value, false)}
-                              value={values.allowedLevels}
-                              disabled={isRestartRequired}
-                            />
-                          </GridItem>
+                          <NumberInput
+                            name="allowedLevels"
+                            label={getMessage('pages.settings.form.allowedLevels.label')}
+                            placeholder={getMessage('pages.settings.form.allowedLevels.placeholder')}
+                            hint={getMessage('pages.settings.form.allowedLevels.hint')}
+                            onValueChange={(value) => setFieldValue('allowedLevels', value, false)}
+                            value={values.allowedLevels}
+                            disabled={isRestartRequired}
+                          />
+                        </GridItem>
                         <GridItem col={6} s={12} xs={12}>
                           <ToggleInput
                             name="audienceFieldChecked"
@@ -252,7 +272,7 @@ const SettingsPage = () => {
                     </Stack>
                   </Box>
                   <Box {...boxDefaultProps} >
-                    <Stack size={4}>
+                    <Stack spacing={4}>
                       <Typography variant="delta" as="h2">
                         {getMessage('pages.settings.restoring.title')}
                       </Typography>
@@ -292,4 +312,4 @@ const SettingsPage = () => {
 }
 
 
-export default SettingsPage;
+export default SettingsPage;

package/admin/src/pages/View/components/NavigationHeader/index.js

@@ -22,7 +22,7 @@ const NavigationHeader = ({
   return (
     <HeaderLayout
       primaryAction={
-        <Stack horizontal size={2}>
+        <Stack horizontal spacing={2}>
           <Box width="10vw">
             <Select
               type="select"