Skip to content

Commit 2f9bb0e

Browse files
3em3em
authored
refactor: project settings page (harness#1066)
1 parent fc6dbdd commit 2f9bb0e

File tree

75 files changed

+511
-602
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+511
-602
lines changed

‎apps/design-system/src/pages/view-preview/commit-details-diff-view-wrapper.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { FC, useCallback } from 'react'
33
import { commitDetailsStore } from '@subjects/views/commit-details/commit-details-store'
44
import { repoFilesStore } from '@subjects/views/repo-files/components/repo-files-store'
55
import { renderEntries } from '@utils/fileViewUtils'
6-
import { noop, useTranslationsStore } from '@utils/viewUtils'
6+
import { noop, useTranslationStore } from '@utils/viewUtils'
77

88
import { FileExplorer } from '@harnessio/ui/components'
99
import { CommitDiff, CommitSidebar, ICommitDetailsStore } from '@harnessio/ui/views'
@@ -14,15 +14,15 @@ export const CommitDetailsDiffViewWrapper: FC = () => {
1414
return (
1515
<>
1616
<CommitSidebar
17-
useTranslationStore={useTranslationsStore}
17+
useTranslationStore={useTranslationStore}
1818
navigateToFile={() => {}}
1919
filesList={repoFilesStore.filesList}
2020
>
2121
<FileExplorer.Root onValueChange={noop} value={[]}>
2222
{renderEntries(repoFilesStore.filesTreeData, '')}
2323
</FileExplorer.Root>
2424
</CommitSidebar>
25-
<CommitDiff useCommitDetailsStore={useCommitDetailsStore} useTranslationStore={useTranslationsStore} />
25+
<CommitDiff useCommitDetailsStore={useCommitDetailsStore} useTranslationStore={useTranslationStore} />
2626
</>
2727
)
2828
}

‎apps/design-system/src/pages/view-preview/profile-settings-view-wrapper.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import { FC, HTMLAttributes, PropsWithChildren } from 'react'
22
import { Route, Routes } from 'react-router-dom'
33

4-
import { useTranslationsStore } from '@utils/viewUtils'
4+
import { useTranslationStore } from '@utils/viewUtils'
55

66
import { ProfileSettingsLayout } from '@harnessio/ui/views'
77

88
export const ProfileSettingsViewWrapper: FC<PropsWithChildren<HTMLAttributes<HTMLElement>>> = ({ children }) => {
99
return (
1010
<Routes>
11-
<Route path="*" element={<ProfileSettingsLayout useTranslationStore={useTranslationsStore} />}>
11+
<Route path="*" element={<ProfileSettingsLayout useTranslationStore={useTranslationStore} />}>
1212
<Route path="*" element={children} />
1313
</Route>
1414
</Routes>

‎apps/design-system/src/pages/view-preview/project-settings-wrapper.tsx‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
import { FC, HTMLAttributes, PropsWithChildren } from 'react'
22
import { Route } from 'react-router-dom'
33

4+
import { useTranslationStore } from '@utils/viewUtils'
5+
46
import { ProjectSettingsPage } from '@harnessio/ui/views'
57

68
import RootViewWrapper from './root-view-wrapper'
79

810
const Layout = () => {
911
return (
1012
<div className="bg-background-1 sticky top-[55px] z-40">
11-
<ProjectSettingsPage />
13+
<ProjectSettingsPage useTranslationStore={useTranslationStore} />
1214
</div>
1315
)
1416
}

‎apps/design-system/src/pages/view-preview/pull-request-layout-wrapper.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { FC, PropsWithChildren, useCallback } from 'react'
22
import { Route } from 'react-router-dom'
33

44
import { pullRequestStore } from '@subjects/views/pull-request-conversation/pull-request-store'
5-
import { useTranslationsStore } from '@utils/viewUtils'
5+
import { useTranslationStore } from '@utils/viewUtils'
66

77
import { PullRequestLayout } from '@harnessio/ui/views'
88

@@ -21,7 +21,7 @@ const PullRequestLayoutWrapper: FC<PropsWithChildren<React.HTMLAttributes<HTMLEl
2121
path="*"
2222
element={
2323
<PullRequestLayout
24-
useTranslationStore={useTranslationsStore}
24+
useTranslationStore={useTranslationStore}
2525
usePullRequestStore={usePullRequestStore}
2626
spaceId={''}
2727
repoId={''}

‎apps/design-system/src/pages/view-preview/repo-files-view-wrapper.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { FC, PropsWithChildren, useCallback } from 'react'
22

33
import { repoFilesStore } from '@subjects/views/repo-files/components/repo-files-store'
44
import { renderEntries } from '@utils/fileViewUtils'
5-
import { noop, useTranslationsStore } from '@utils/viewUtils'
5+
import { noop, useTranslationStore } from '@utils/viewUtils'
66

77
import { FileExplorer } from '@harnessio/ui/components'
88
import { BranchSelectorTab, IBranchSelectorStore, RepoSidebar as RepoSidebarView } from '@harnessio/ui/views'
@@ -34,7 +34,7 @@ export const RepoFilesViewWrapper: FC<PropsWithChildren<React.HTMLAttributes<HTM
3434
<RepoSidebarView
3535
selectBranchOrTag={noop}
3636
useRepoBranchesStore={useRepoBranchesStore}
37-
useTranslationStore={useTranslationsStore}
37+
useTranslationStore={useTranslationStore}
3838
navigateToNewFile={noop}
3939
navigateToFile={noop}
4040
filesList={repoFilesStore.filesList}

‎apps/design-system/src/pages/view-preview/repo-settings-view-wrapper.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import { FC, PropsWithChildren } from 'react'
22
import { Route, Routes } from 'react-router-dom'
33

4-
import { useTranslationsStore } from '@utils/viewUtils'
4+
import { useTranslationStore } from '@utils/viewUtils'
55

66
import { RepoSettingsLayout } from '@harnessio/ui/views'
77

88
export const RepoSettingsViewWrapper: FC<PropsWithChildren<React.HTMLAttributes<HTMLElement>>> = ({ children }) => {
99
return (
1010
<Routes>
11-
<Route path="*" element={<RepoSettingsLayout useTranslationStore={useTranslationsStore} />}>
11+
<Route path="*" element={<RepoSettingsLayout useTranslationStore={useTranslationStore} />}>
1212
<Route path="*" element={children} />
1313
</Route>
1414
</Routes>

‎apps/design-system/src/pages/view-preview/repo-view-wrapper.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { FC, PropsWithChildren } from 'react'
22
import { Route } from 'react-router-dom'
33

4-
import { useTranslationsStore } from '@utils/viewUtils'
4+
import { useTranslationStore } from '@utils/viewUtils'
55

66
import { RepoSubheader } from '@harnessio/ui/components'
77

@@ -14,7 +14,7 @@ const RepoViewWrapper: FC<PropsWithChildren<React.HTMLAttributes<HTMLElement>>>
1414
element={
1515
<>
1616
<div className="layer-high bg-background-1 sticky top-[55px]">
17-
<RepoSubheader useTranslationStore={useTranslationsStore} />
17+
<RepoSubheader useTranslationStore={useTranslationStore} />
1818
</div>
1919
{children}
2020
</>

‎apps/design-system/src/pages/view-preview/root-view-wrapper.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { FC, PropsWithChildren, useCallback, useState } from 'react'
22
import { Outlet, Route, Routes } from 'react-router-dom'
33

4-
import { noop, useThemeStore, useTranslationsStore } from '@utils/viewUtils'
4+
import { noop, useThemeStore, useTranslationStore } from '@utils/viewUtils'
55

66
import { Breadcrumb, MoreSubmenu, Navbar, NavbarItemType, SettingsMenu, Topbar } from '@harnessio/ui/components'
77
import { SandboxLayout } from '@harnessio/ui/views'
@@ -50,7 +50,7 @@ const RootViewWrapper: FC<PropsWithChildren<{ asChild?: boolean }>> = ({ childre
5050
handleChangePinnedMenuItem={setPinned}
5151
handleRemoveRecentMenuItem={noop}
5252
useThemeStore={useThemeStore}
53-
useTranslationStore={useTranslationsStore}
53+
useTranslationStore={useTranslationStore}
5454
/>
5555
<MoreSubmenu showMoreMenu={showMoreMenu} handleMoreMenu={onToggleMoreMenu} items={moreMenu} />
5656
<SettingsMenu

‎apps/design-system/src/pages/view-preview/view-preview.tsx‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import PipelineGraphMinimalWrapper from '@subjects/views/pipeline-graph/pipeline
1616
import PipelineListWrapper from '@subjects/views/pipeline-list/pipeline-list'
1717
import { ProfileSettingsView } from '@subjects/views/profile-settings'
1818
import { ProfileSettingsKeysView } from '@subjects/views/profile-settings-keys'
19+
import { ProjectSettingsView } from '@subjects/views/project-settings/project-settings'
1920
import PullRequestCompareWrapper from '@subjects/views/pull-request-compare/pull-request-compare'
2021
import PullRequestChangesWrapper from '@subjects/views/pull-request-conversation/pull-request-changes-wrapper'
2122
import PullRequestCommits from '@subjects/views/pull-request-conversation/pull-request-commits'
@@ -39,7 +40,7 @@ import { RepoWebhooksList } from '@subjects/views/repo-webhooks-list/repo-webhoo
3940
import { SignInView } from '@subjects/views/signin'
4041
import { SignUpView } from '@subjects/views/signup'
4142
import { SpaceSettingsMembers } from '@subjects/views/space-settings-members/space-settings-members'
42-
import { useTranslationsStore } from '@utils/viewUtils'
43+
import { useTranslationStore } from '@utils/viewUtils'
4344

4445
import { ChatEmptyPreviewWrapper, ChatPreviewWrapper } from '@harnessio/ui/components'
4546
import { NotFoundPage } from '@harnessio/ui/views'
@@ -225,7 +226,7 @@ export const viewPreviews: Record<string, ReactNode> = {
225226
'rule-not-found': (
226227
<RepoViewWrapper>
227228
<RepoSettingsViewWrapper>
228-
<NotFoundPage useTranslationStore={useTranslationsStore} pageTypeText="rules" />
229+
<NotFoundPage useTranslationStore={useTranslationStore} pageTypeText="rules" />
229230
</RepoSettingsViewWrapper>
230231
</RepoViewWrapper>
231232
),
@@ -246,6 +247,11 @@ export const viewPreviews: Record<string, ReactNode> = {
246247
<SpaceSettingsMembers />
247248
</ProjectSettingsWrapper>
248249
),
250+
'project-settings': (
251+
<ProjectSettingsWrapper>
252+
<ProjectSettingsView />
253+
</ProjectSettingsWrapper>
254+
),
249255
'profile-settings': (
250256
<RootViewWrapper>
251257
<ProfileSettingsViewWrapper>

‎apps/design-system/src/subjects/views/commit-details/commit-details-store.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -812,7 +812,7 @@ export const commitDetailsStore: ICommitDetailsStore = {
812812
newNumber: 3
813813
},
814814
{
815-
content: " import { noop, useThemeStore, useTranslationsStore } from '@utils/viewUtils'",
815+
content: " import { noop, useThemeStore, useTranslationStore } from '@utils/viewUtils'",
816816
type: 'context',
817817
oldNumber: 4,
818818
newNumber: 4
@@ -1095,7 +1095,7 @@ export const commitDetailsStore: ICommitDetailsStore = {
10951095
fileId:
10961096
'apps/design-system/src/pages/view-preview/root-view-wrapper.tsx::::apps/design-system/src/pages/view-preview/root-view-wrapper.tsx',
10971097
filePath: 'apps/design-system/src/pages/view-preview/root-view-wrapper.tsx',
1098-
raw: 'diff --git a/apps/design-system/src/pages/view-preview/root-view-wrapper.tsx b/apps/design-system/src/pages/view-preview/root-view-wrapper.tsx\nindex 31551abd93ce31e564e2304d83638dca29b302f2..57549ac177fdd0b5197f562edb3983a2f0197a1f 100644\n--- a/apps/design-system/src/pages/view-preview/root-view-wrapper.tsx\n+++ b/apps/design-system/src/pages/view-preview/root-view-wrapper.tsx\n@@ -3,16 +3,7 @@ import { Outlet, Route, Routes } from \'react-router-dom\'\n \n import { noop, useThemeStore, useTranslationsStore } from \'@utils/viewUtils\'\n \n-import {\n- Breadcrumb,\n- BreadcrumbItem,\n- BreadcrumbLink,\n- BreadcrumbList,\n- BreadcrumbSeparator,\n- Navbar,\n- NavbarItemType,\n- Topbar\n-} from \'@harnessio/ui/components\'\n+import { Breadcrumb, Navbar, NavbarItemType, Topbar } from \'@harnessio/ui/components\'\n import { SandboxLayout } from \'@harnessio/ui/views\'\n \n const RootViewWrapper: FC<PropsWithChildren<{ asChild?: boolean }>> = ({ children, asChild = false }) => {\n@@ -62,19 +53,19 @@ const RootViewWrapper: FC<PropsWithChildren<{ asChild?: boolean }>> = ({ childre\n <div className="bg-background-1 sticky top-0 z-40">\n <Topbar.Root>\n <Topbar.Left>\n- <Breadcrumb className="select-none">\n- <BreadcrumbList>\n- <BreadcrumbItem>\n- <BreadcrumbLink href="#">Lorem</BreadcrumbLink>\n- </BreadcrumbItem>\n- <BreadcrumbSeparator />\n- <BreadcrumbItem>\n- <BreadcrumbLink href="#">Ipsum</BreadcrumbLink>\n- </BreadcrumbItem>\n- <BreadcrumbSeparator />\n- <BreadcrumbItem>Dolor</BreadcrumbItem>\n- </BreadcrumbList>\n- </Breadcrumb>\n+ <Breadcrumb.Root className="select-none">\n+ <Breadcrumb.List>\n+ <Breadcrumb.Item>\n+ <Breadcrumb.Link href="#">Lorem</Breadcrumb.Link>\n+ </Breadcrumb.Item>\n+ <Breadcrumb.Separator />\n+ <Breadcrumb.Item>\n+ <Breadcrumb.Link href="#">Ipsum</Breadcrumb.Link>\n+ </Breadcrumb.Item>\n+ <Breadcrumb.Separator />\n+ <Breadcrumb.Item>Dolor</Breadcrumb.Item>\n+ </Breadcrumb.List>\n+ </Breadcrumb.Root>\n </Topbar.Left>\n </Topbar.Root>\n </div>\n'
1098+
raw: 'diff --git a/apps/design-system/src/pages/view-preview/root-view-wrapper.tsx b/apps/design-system/src/pages/view-preview/root-view-wrapper.tsx\nindex 31551abd93ce31e564e2304d83638dca29b302f2..57549ac177fdd0b5197f562edb3983a2f0197a1f 100644\n--- a/apps/design-system/src/pages/view-preview/root-view-wrapper.tsx\n+++ b/apps/design-system/src/pages/view-preview/root-view-wrapper.tsx\n@@ -3,16 +3,7 @@ import { Outlet, Route, Routes } from \'react-router-dom\'\n \n import { noop, useThemeStore, useTranslationStore } from \'@utils/viewUtils\'\n \n-import {\n- Breadcrumb,\n- BreadcrumbItem,\n- BreadcrumbLink,\n- BreadcrumbList,\n- BreadcrumbSeparator,\n- Navbar,\n- NavbarItemType,\n- Topbar\n-} from \'@harnessio/ui/components\'\n+import { Breadcrumb, Navbar, NavbarItemType, Topbar } from \'@harnessio/ui/components\'\n import { SandboxLayout } from \'@harnessio/ui/views\'\n \n const RootViewWrapper: FC<PropsWithChildren<{ asChild?: boolean }>> = ({ children, asChild = false }) => {\n@@ -62,19 +53,19 @@ const RootViewWrapper: FC<PropsWithChildren<{ asChild?: boolean }>> = ({ childre\n <div className="bg-background-1 sticky top-0 z-40">\n <Topbar.Root>\n <Topbar.Left>\n- <Breadcrumb className="select-none">\n- <BreadcrumbList>\n- <BreadcrumbItem>\n- <BreadcrumbLink href="#">Lorem</BreadcrumbLink>\n- </BreadcrumbItem>\n- <BreadcrumbSeparator />\n- <BreadcrumbItem>\n- <BreadcrumbLink href="#">Ipsum</BreadcrumbLink>\n- </BreadcrumbItem>\n- <BreadcrumbSeparator />\n- <BreadcrumbItem>Dolor</BreadcrumbItem>\n- </BreadcrumbList>\n- </Breadcrumb>\n+ <Breadcrumb.Root className="select-none">\n+ <Breadcrumb.List>\n+ <Breadcrumb.Item>\n+ <Breadcrumb.Link href="#">Lorem</Breadcrumb.Link>\n+ </Breadcrumb.Item>\n+ <Breadcrumb.Separator />\n+ <Breadcrumb.Item>\n+ <Breadcrumb.Link href="#">Ipsum</Breadcrumb.Link>\n+ </Breadcrumb.Item>\n+ <Breadcrumb.Separator />\n+ <Breadcrumb.Item>Dolor</Breadcrumb.Item>\n+ </Breadcrumb.List>\n+ </Breadcrumb.Root>\n </Topbar.Left>\n </Topbar.Root>\n </div>\n'
10991099
},
11001100
{
11011101
blocks: [

0 commit comments

Comments
 (0)