Use SaveAndCancelButtons in SettingsObjectNewFieldStep1 (#2088)
* Use SaveAndCancelButtons in SettingsObjectNewFieldStep1 * refactor to introduce SettingsHeaderContainer
This commit is contained in:
@ -0,0 +1,9 @@
|
|||||||
|
import styled from '@emotion/styled';
|
||||||
|
|
||||||
|
const StyledSettingsHeaderContainer = styled.div`
|
||||||
|
align-items: center;
|
||||||
|
display: flex;
|
||||||
|
justify-content: space-between;
|
||||||
|
`;
|
||||||
|
|
||||||
|
export { StyledSettingsHeaderContainer as SettingsHeaderContainer };
|
||||||
@ -1,7 +1,7 @@
|
|||||||
import { useNavigate } from 'react-router-dom';
|
import { useNavigate } from 'react-router-dom';
|
||||||
import styled from '@emotion/styled';
|
|
||||||
|
|
||||||
import { SaveAndCancelButtons } from '@/settings/components/SaveAndCancelButtons/SaveAndCancelButtons';
|
import { SaveAndCancelButtons } from '@/settings/components/SaveAndCancelButtons/SaveAndCancelButtons';
|
||||||
|
import { SettingsHeaderContainer } from '@/settings/components/SettingsHeaderContainer';
|
||||||
import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
|
import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
|
||||||
import { SettingsNewObjectType } from '@/settings/data-model/new-object/components/SettingsNewObjectType';
|
import { SettingsNewObjectType } from '@/settings/data-model/new-object/components/SettingsNewObjectType';
|
||||||
import { IconSettings } from '@/ui/display/icon';
|
import { IconSettings } from '@/ui/display/icon';
|
||||||
@ -10,19 +10,12 @@ import { SubMenuTopBarContainer } from '@/ui/layout/page/SubMenuTopBarContainer'
|
|||||||
import { Section } from '@/ui/layout/section/components/Section';
|
import { Section } from '@/ui/layout/section/components/Section';
|
||||||
import { Breadcrumb } from '@/ui/navigation/bread-crumb/components/Breadcrumb';
|
import { Breadcrumb } from '@/ui/navigation/bread-crumb/components/Breadcrumb';
|
||||||
|
|
||||||
const StyledContainer = styled.div`
|
|
||||||
align-items: center;
|
|
||||||
display: flex;
|
|
||||||
flex-direction: row;
|
|
||||||
justify-content: space-between;
|
|
||||||
`;
|
|
||||||
|
|
||||||
export const SettingsNewObject = () => {
|
export const SettingsNewObject = () => {
|
||||||
const navigate = useNavigate();
|
const navigate = useNavigate();
|
||||||
return (
|
return (
|
||||||
<SubMenuTopBarContainer Icon={IconSettings} title="Settings">
|
<SubMenuTopBarContainer Icon={IconSettings} title="Settings">
|
||||||
<SettingsPageContainer>
|
<SettingsPageContainer>
|
||||||
<StyledContainer>
|
<SettingsHeaderContainer>
|
||||||
<Breadcrumb
|
<Breadcrumb
|
||||||
links={[
|
links={[
|
||||||
{ children: 'Objects', href: '/settings/objects' },
|
{ children: 'Objects', href: '/settings/objects' },
|
||||||
@ -36,7 +29,7 @@ export const SettingsNewObject = () => {
|
|||||||
}}
|
}}
|
||||||
onSave={() => {}}
|
onSave={() => {}}
|
||||||
/>
|
/>
|
||||||
</StyledContainer>
|
</SettingsHeaderContainer>
|
||||||
<Section>
|
<Section>
|
||||||
<H2Title
|
<H2Title
|
||||||
title="Object Type"
|
title="Object Type"
|
||||||
|
|||||||
@ -2,6 +2,8 @@ import { useEffect } from 'react';
|
|||||||
import { useNavigate, useParams } from 'react-router-dom';
|
import { useNavigate, useParams } from 'react-router-dom';
|
||||||
import styled from '@emotion/styled';
|
import styled from '@emotion/styled';
|
||||||
|
|
||||||
|
import { SaveAndCancelButtons } from '@/settings/components/SaveAndCancelButtons/SaveAndCancelButtons';
|
||||||
|
import { SettingsHeaderContainer } from '@/settings/components/SettingsHeaderContainer';
|
||||||
import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
|
import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
|
||||||
import {
|
import {
|
||||||
activeFieldItems,
|
activeFieldItems,
|
||||||
@ -47,16 +49,25 @@ export const SettingsObjectNewFieldStep1 = () => {
|
|||||||
return (
|
return (
|
||||||
<SubMenuTopBarContainer Icon={IconSettings} title="Settings">
|
<SubMenuTopBarContainer Icon={IconSettings} title="Settings">
|
||||||
<SettingsPageContainer>
|
<SettingsPageContainer>
|
||||||
<Breadcrumb
|
<SettingsHeaderContainer>
|
||||||
links={[
|
<Breadcrumb
|
||||||
{ children: 'Objects', href: '/settings/objects' },
|
links={[
|
||||||
{
|
{ children: 'Objects', href: '/settings/objects' },
|
||||||
children: activeObject?.name ?? '',
|
{
|
||||||
href: `/settings/objects/${pluralObjectName}`,
|
children: activeObject?.name ?? '',
|
||||||
},
|
href: `/settings/objects/${pluralObjectName}`,
|
||||||
{ children: 'New Field' },
|
},
|
||||||
]}
|
{ children: 'New Field' },
|
||||||
/>
|
]}
|
||||||
|
/>
|
||||||
|
<SaveAndCancelButtons
|
||||||
|
isSaveDisabled
|
||||||
|
onCancel={() => {
|
||||||
|
navigate(`/settings/objects/${pluralObjectName}`);
|
||||||
|
}}
|
||||||
|
onSave={() => {}}
|
||||||
|
/>
|
||||||
|
</SettingsHeaderContainer>
|
||||||
<StyledSection>
|
<StyledSection>
|
||||||
<H2Title
|
<H2Title
|
||||||
title="Check disabled fields"
|
title="Check disabled fields"
|
||||||
|
|||||||
@ -2,6 +2,7 @@ import { useNavigate } from 'react-router-dom';
|
|||||||
import { useTheme } from '@emotion/react';
|
import { useTheme } from '@emotion/react';
|
||||||
import styled from '@emotion/styled';
|
import styled from '@emotion/styled';
|
||||||
|
|
||||||
|
import { SettingsHeaderContainer } from '@/settings/components/SettingsHeaderContainer';
|
||||||
import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
|
import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
|
||||||
import {
|
import {
|
||||||
activeObjectItems,
|
activeObjectItems,
|
||||||
@ -52,12 +53,6 @@ const StyledIconDotsVertical = styled(IconDotsVertical)`
|
|||||||
color: ${({ theme }) => theme.font.color.tertiary};
|
color: ${({ theme }) => theme.font.color.tertiary};
|
||||||
`;
|
`;
|
||||||
|
|
||||||
const StyledHeader = styled.div`
|
|
||||||
align-items: center;
|
|
||||||
display: flex;
|
|
||||||
justify-content: space-between;
|
|
||||||
`;
|
|
||||||
|
|
||||||
const StyledH1Title = styled(H1Title)`
|
const StyledH1Title = styled(H1Title)`
|
||||||
margin-bottom: 0;
|
margin-bottom: 0;
|
||||||
`;
|
`;
|
||||||
@ -69,7 +64,7 @@ export const SettingsObjects = () => {
|
|||||||
return (
|
return (
|
||||||
<SubMenuTopBarContainer Icon={IconSettings} title="Settings">
|
<SubMenuTopBarContainer Icon={IconSettings} title="Settings">
|
||||||
<SettingsPageContainer>
|
<SettingsPageContainer>
|
||||||
<StyledHeader>
|
<SettingsHeaderContainer>
|
||||||
<StyledH1Title title="Objects" />
|
<StyledH1Title title="Objects" />
|
||||||
<Button
|
<Button
|
||||||
Icon={IconPlus}
|
Icon={IconPlus}
|
||||||
@ -80,7 +75,7 @@ export const SettingsObjects = () => {
|
|||||||
navigate('/settings/objects/new');
|
navigate('/settings/objects/new');
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
</StyledHeader>
|
</SettingsHeaderContainer>
|
||||||
<Section>
|
<Section>
|
||||||
<H2Title title="Existing objects" />
|
<H2Title title="Existing objects" />
|
||||||
<Table>
|
<Table>
|
||||||
|
|||||||
Reference in New Issue
Block a user