Skip to content

Commit 95eca42

Browse files
yasellyasell
committed
Merge branch 'main' into design-review-fixes-v1
2 parents b9fe9e5 + fe77bbf commit 95eca42

File tree

231 files changed

+20865
-18968
lines changed

Some content is hidden

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

231 files changed

+20865
-18968
lines changed

‎.github/workflows/build-and-deploy-storybook.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ jobs:
1818
ref: ${{ github.event.pull_request.head.sha }}
1919
- uses: pnpm/action-setup@v4
2020
- run: pnpm deps
21+
- run: pnpm build
2122
- run: pnpm lint
2223

2324
Prettier:

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

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
import { FC, PropsWithChildren } from 'react'
2+
import { Route } from 'react-router-dom'
3+
4+
import { ProjectSettingsPage } from '@harnessio/ui/views'
5+
6+
import RootViewWrapper from './root-view-wrapper'
7+
8+
const Layout = () => {
9+
return (
10+
<div className="bg-background-1 sticky top-[55px] z-40">
11+
<ProjectSettingsPage />
12+
</div>
13+
)
14+
}
15+
16+
export const ProjectSettingsWrapper: FC<PropsWithChildren<unknown>> = ({ children }) => {
17+
return (
18+
<>
19+
<RootViewWrapper asChild>
20+
<Route
21+
path="*"
22+
element={
23+
<>
24+
<Layout />
25+
{children}
26+
</>
27+
}
28+
/>
29+
</RootViewWrapper>
30+
</>
31+
)
32+
}

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

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
import { FC, PropsWithChildren, useCallback } from 'react'
2+
import { Route } from 'react-router-dom'
3+
4+
import { pullRequestStore } from '@subjects/views/pull-request-conversation/pull-request-store'
5+
import { useTranslationsStore } from '@utils/viewUtils'
6+
7+
import { PullRequestLayout } from '@harnessio/ui/views'
8+
9+
import RootViewWrapper from './root-view-wrapper'
10+
11+
const PullRequestLayoutWrapper: FC<PropsWithChildren<unknown>> = ({ children }) => {
12+
const usePullRequestStore = useCallback(
13+
() => ({
14+
...pullRequestStore
15+
}),
16+
[]
17+
)
18+
return (
19+
<RootViewWrapper asChild>
20+
<Route
21+
path="*"
22+
element={
23+
<PullRequestLayout
24+
useTranslationStore={useTranslationsStore}
25+
usePullRequestStore={usePullRequestStore}
26+
spaceId={''}
27+
repoId={''}
28+
updateTitle={() => {
29+
return Promise.resolve()
30+
}}
31+
/>
32+
}
33+
>
34+
<Route path="*" element={children} />
35+
</Route>
36+
</RootViewWrapper>
37+
)
38+
}
39+
40+
export default PullRequestLayoutWrapper

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

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

34
import { useTranslationsStore } from '@utils/viewUtils'
45

5-
import { SandboxLayout, SettingsSidebar } from '@harnessio/ui/views'
6+
import { RepoSettingsLayout } from '@harnessio/ui/views'
67

78
export const RepoSettingsViewWrapper: FC<PropsWithChildren> = ({ children }) => {
8-
const { t } = useTranslationsStore()
9-
109
return (
11-
<SandboxLayout.Main fullWidth>
12-
<SandboxLayout.Columns columnWidths="auto 1fr">
13-
<SandboxLayout.Column>
14-
<SettingsSidebar t={t} />
15-
</SandboxLayout.Column>
16-
<SandboxLayout.Column>{children}</SandboxLayout.Column>
17-
</SandboxLayout.Columns>
18-
</SandboxLayout.Main>
10+
<Routes>
11+
<Route path="*" element={<RepoSettingsLayout useTranslationStore={useTranslationsStore} />}>
12+
<Route path="*" element={children} />
13+
</Route>
14+
</Routes>
1915
)
2016
}

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

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,34 @@ import { Navigate, Route, Routes } from 'react-router-dom'
66

77
import { RepoSettingsViewWrapper } from '@/pages/view-preview/repo-settings-view-wrapper'
88
import ExecutionListWrapper from '@subjects/views/execution-list/execution-list'
9+
import { ProjectLabelsList } from '@subjects/views/labels/project-labels-list'
10+
import { RepoLabelsList } from '@subjects/views/labels/repo-labels-list'
911
import PipelineListWrapper from '@subjects/views/pipeline-list/pipeline-list'
1012
import PullRequestCompareWrapper from '@subjects/views/pull-request-compare/pull-request-compare'
13+
import PullRequestChanges from '@subjects/views/pull-request-conversation/pull-request-changes'
14+
import PullRequestCommits from '@subjects/views/pull-request-conversation/pull-request-commits'
15+
import PullRequestConversation from '@subjects/views/pull-request-conversation/pull-request-conversation'
1116
import PullRequestListWrapper from '@subjects/views/pull-request-list/pull-request-list'
1217
import { RepoCommitsView } from '@subjects/views/repo-commits'
18+
import { RepoCreateRule } from '@subjects/views/repo-create-rule'
1319
import { RepoFilesEditView } from '@subjects/views/repo-files/repo-files-edit-view'
1420
import { RepoFilesJsonView } from '@subjects/views/repo-files/repo-files-json-view'
1521
import { RepoFilesList } from '@subjects/views/repo-files/repo-files-list'
1622
import { RepoFilesMarkdownView } from '@subjects/views/repo-files/repo-files-markdown-view'
23+
import { RepoGeneralSettings } from '@subjects/views/repo-general-settings/repo-general-settings'
1724
import RepoListWrapper from '@subjects/views/repo-list/repo-list'
1825
import RepoSummaryViewWrapper from '@subjects/views/repo-summary/repo-summary'
1926
import { RepoWebhooksCreate } from '@subjects/views/repo-webhooks-create/repo-webhooks-list'
2027
import { RepoWebhooksList } from '@subjects/views/repo-webhooks-list/repo-webhooks-list'
28+
import { SpaceSettingsMembers } from '@subjects/views/space-settings-members/space-settings-members'
29+
import { useTranslationsStore } from '@utils/viewUtils'
30+
31+
import { NotFoundPage } from '@harnessio/ui/views'
2132

2233
import { CommitDetailsDiffViewWrapper } from './commit-details-diff-view-wrapper'
2334
import CommitDetailsViewWrapper from './commit-details-view-wrapper'
35+
import { ProjectSettingsWrapper } from './project-settings-wrapper'
36+
import PullRequestLayoutWrapper from './pull-request-layout-wrapper'
2437
import { RepoFilesViewWrapper } from './repo-files-view-wrapper'
2538
import RepoViewWrapper from './repo-view-wrapper'
2639
import RootViewWrapper from './root-view-wrapper'
@@ -47,6 +60,21 @@ export const viewPreviews: Record<string, ReactNode> = {
4760
<PullRequestCompareWrapper />
4861
</RepoViewWrapper>
4962
),
63+
'pull-request-conversation': (
64+
<PullRequestLayoutWrapper>
65+
<PullRequestConversation />
66+
</PullRequestLayoutWrapper>
67+
),
68+
'pull-request-commits': (
69+
<PullRequestLayoutWrapper>
70+
<PullRequestCommits />
71+
</PullRequestLayoutWrapper>
72+
),
73+
'pull-request-changes': (
74+
<PullRequestLayoutWrapper>
75+
<PullRequestChanges />
76+
</PullRequestLayoutWrapper>
77+
),
5078
'repo-files-list': (
5179
<RepoViewWrapper>
5280
<RepoFilesViewWrapper>
@@ -110,6 +138,44 @@ export const viewPreviews: Record<string, ReactNode> = {
110138
<RepoWebhooksCreate />
111139
</RepoSettingsViewWrapper>
112140
</RepoViewWrapper>
141+
),
142+
'general-settings': (
143+
<RepoViewWrapper>
144+
<RepoSettingsViewWrapper>
145+
<RepoGeneralSettings />
146+
</RepoSettingsViewWrapper>
147+
</RepoViewWrapper>
148+
),
149+
'create-rule': (
150+
<RepoViewWrapper>
151+
<RepoSettingsViewWrapper>
152+
<RepoCreateRule />
153+
</RepoSettingsViewWrapper>
154+
</RepoViewWrapper>
155+
),
156+
'rule-not-found': (
157+
<RepoViewWrapper>
158+
<RepoSettingsViewWrapper>
159+
<NotFoundPage useTranslationStore={useTranslationsStore} pageTypeText="rules" />
160+
</RepoSettingsViewWrapper>
161+
</RepoViewWrapper>
162+
),
163+
'repo-labels-list': (
164+
<RepoViewWrapper>
165+
<RepoSettingsViewWrapper>
166+
<RepoLabelsList />
167+
</RepoSettingsViewWrapper>
168+
</RepoViewWrapper>
169+
),
170+
'space-settings-labels': (
171+
<ProjectSettingsWrapper>
172+
<ProjectLabelsList />
173+
</ProjectSettingsWrapper>
174+
),
175+
'space-settings-members': (
176+
<ProjectSettingsWrapper>
177+
<SpaceSettingsMembers />
178+
</ProjectSettingsWrapper>
113179
)
114180
}
115181

‎apps/design-system/src/subjects/views/pull-request-compare/repo-branch-store.ts renamed to ‎apps/design-system/src/subjects/stores/repo-branch-store.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { noop } from '@utils/viewUtils'
1+
import { noop } from '@utils/viewUtils.ts'
22

3-
import { BranchSelectorTab } from '@harnessio/ui/views'
3+
import { BranchSelectorTab, IBranchSelectorStore } from '@harnessio/ui/views'
44

55
export const repoBranchListStore = {
66
selectedBranchTag: { name: 'main', sha: '1d0e5a9461b340ebb3d7e092a2d35ff6d0d5c952', default: true },
@@ -47,4 +47,4 @@ export const repoBranchListStore = {
4747
setDefaultBranch: noop,
4848
setPage: noop,
4949
setPaginationFromHeaders: noop
50-
}
50+
} as IBranchSelectorStore

‎apps/design-system/src/subjects/views/labels/project-labels-list.tsx

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
import { useState } from 'react'
2+
3+
import { noop, useTranslationsStore } from '@utils/viewUtils'
4+
5+
import { DeleteAlertDialog } from '@harnessio/ui/components'
6+
import { CreateLabelDialog, ProjectLabelsListView } from '@harnessio/ui/views'
7+
8+
import { RepoLabelsListStore } from './repo-labels-store'
9+
10+
export const ProjectLabelsList = () => {
11+
const [openCreateLabelDialog, setOpenCreateLabelDialog] = useState(false)
12+
const [openAlertDeleteDialog, setOpenAlertDeleteDialog] = useState(false)
13+
14+
return (
15+
<>
16+
<ProjectLabelsListView
17+
useLabelsStore={RepoLabelsListStore.useLabelsStore}
18+
useTranslationStore={useTranslationsStore}
19+
handleDeleteLabel={() => setOpenAlertDeleteDialog(true)}
20+
handleEditLabel={() => setOpenCreateLabelDialog(true)}
21+
openCreateLabelDialog={() => setOpenCreateLabelDialog(true)}
22+
searchQuery={null}
23+
setSearchQuery={noop}
24+
isLoadingSpaceLabels={false}
25+
/>
26+
<CreateLabelDialog
27+
open={openCreateLabelDialog}
28+
onClose={() => setOpenCreateLabelDialog(false)}
29+
onSubmit={noop}
30+
useTranslationStore={useTranslationsStore}
31+
isCreatingLabel={false}
32+
error={''}
33+
useLabelsStore={RepoLabelsListStore.useLabelsStore}
34+
/>
35+
<DeleteAlertDialog
36+
open={openAlertDeleteDialog}
37+
onClose={() => setOpenAlertDeleteDialog(false)}
38+
identifier={''}
39+
type="label"
40+
deleteFn={noop}
41+
isLoading={false}
42+
useTranslationStore={useTranslationsStore}
43+
/>
44+
</>
45+
)
46+
}

‎apps/design-system/src/subjects/views/labels/repo-labels-list.tsx

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
import { useState } from 'react'
2+
3+
import { noop, useTranslationsStore } from '@utils/viewUtils'
4+
5+
import { DeleteAlertDialog } from '@harnessio/ui/components'
6+
import { CreateLabelDialog, RepoLabelsListView } from '@harnessio/ui/views'
7+
8+
import { RepoLabelsListStore } from './repo-labels-store'
9+
10+
export const RepoLabelsList = () => {
11+
const [openCreateLabelDialog, setOpenCreateLabelDialog] = useState(false)
12+
const [openAlertDeleteDialog, setOpenAlertDeleteDialog] = useState(false)
13+
14+
return (
15+
<>
16+
<RepoLabelsListView
17+
useLabelsStore={RepoLabelsListStore.useLabelsStore}
18+
useTranslationStore={useTranslationsStore}
19+
handleDeleteLabel={() => setOpenAlertDeleteDialog(true)}
20+
handleEditLabel={() => setOpenCreateLabelDialog(true)}
21+
openCreateLabelDialog={() => setOpenCreateLabelDialog(true)}
22+
searchQuery={null}
23+
setSearchQuery={noop}
24+
isLoadingSpaceLabels={false}
25+
/>
26+
<CreateLabelDialog
27+
open={openCreateLabelDialog}
28+
onClose={() => setOpenCreateLabelDialog(false)}
29+
onSubmit={noop}
30+
useTranslationStore={useTranslationsStore}
31+
isCreatingLabel={false}
32+
error={''}
33+
useLabelsStore={RepoLabelsListStore.useLabelsStore}
34+
/>
35+
<DeleteAlertDialog
36+
open={openAlertDeleteDialog}
37+
onClose={() => setOpenAlertDeleteDialog(false)}
38+
identifier={''}
39+
type="label"
40+
deleteFn={noop}
41+
isLoading={false}
42+
useTranslationStore={useTranslationsStore}
43+
/>
44+
</>
45+
)
46+
}

0 commit comments

Comments
 (0)