From 7110eecb7d308eb6f74c5fcd64a4fd913e8fb4e4 Mon Sep 17 00:00:00 2001 From: Calvin Lee Date: Wed, 22 Nov 2023 23:34:45 +0000 Subject: [PATCH] feat: [code-1135]: add launch icon (#821) --- web/src/icons/Launch.svg | 1 + web/src/pages/Home/Home.tsx | 2 +- .../pages/PullRequest/PullRequestMetaLine.tsx | 2 +- web/src/pages/PullRequests/PullRequests.tsx | 4 +- .../FeatureMap/FeatureMap.tsx | 13 +++++- .../FeatureMap/featureRoadmap.json | 46 ++++++++++++++----- .../RepositoriesListing.module.scss | 10 +++- .../RepositoriesListing.module.scss.d.ts | 2 + .../RepositoriesListing.tsx | 2 +- web/src/utils/Utils.ts | 1 + 10 files changed, 64 insertions(+), 19 deletions(-) create mode 100644 web/src/icons/Launch.svg diff --git a/web/src/icons/Launch.svg b/web/src/icons/Launch.svg new file mode 100644 index 000000000..a6b2be958 --- /dev/null +++ b/web/src/icons/Launch.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/web/src/pages/Home/Home.tsx b/web/src/pages/Home/Home.tsx index 136ca0f0d..69eaaca28 100644 --- a/web/src/pages/Home/Home.tsx +++ b/web/src/pages/Home/Home.tsx @@ -71,7 +71,7 @@ export default function Home() { {getString('homepage.welcomeText', { - currentUser: currentUser?.display_name + currentUser: currentUser?.display_name || currentUser?.email || '' })} {author?.display_name}, + user: {author?.display_name || author?.email || ''}, commits: {stats?.commits}, commitsCount: stats?.commits, target: ( diff --git a/web/src/pages/PullRequests/PullRequests.tsx b/web/src/pages/PullRequests/PullRequests.tsx index 3b5019a02..8647c55ab 100644 --- a/web/src/pages/PullRequests/PullRequests.tsx +++ b/web/src/pages/PullRequests/PullRequests.tsx @@ -167,7 +167,9 @@ export default function PullRequests() { /> ), - user: {row.original.author?.display_name} + user: ( + {row.original.author?.display_name || row.original.author?.email || ''} + ) }} /> diff --git a/web/src/pages/RepositoriesListing/FeatureMap/FeatureMap.tsx b/web/src/pages/RepositoriesListing/FeatureMap/FeatureMap.tsx index 6bd93e98a..3d0601b74 100644 --- a/web/src/pages/RepositoriesListing/FeatureMap/FeatureMap.tsx +++ b/web/src/pages/RepositoriesListing/FeatureMap/FeatureMap.tsx @@ -17,12 +17,14 @@ import React from 'react' import cx from 'classnames' import { Icon } from '@harnessio/icons' -import { Container, Layout, Text } from '@harnessio/uicore' +import { Container, Layout, Text, Link } from '@harnessio/uicore' import { Color } from '@harnessio/design-system' import { ThreadSection } from 'components/ThreadSection/ThreadSection' import { FeatureType, type FeatureData } from 'utils/Utils' import { useStrings } from 'framework/strings' import features from './featureRoadmap.json' +import Launch from '../../../icons/Launch.svg' + import css from '../RepositoriesListing.module.scss' const FeatureMap = () => { @@ -55,7 +57,14 @@ const FeatureMap = () => { { - {feature.title} + + {feature.title} + + + + + + {feature.content} diff --git a/web/src/pages/RepositoriesListing/FeatureMap/featureRoadmap.json b/web/src/pages/RepositoriesListing/FeatureMap/featureRoadmap.json index 847baadf2..5bea348bd 100644 --- a/web/src/pages/RepositoriesListing/FeatureMap/featureRoadmap.json +++ b/web/src/pages/RepositoriesListing/FeatureMap/featureRoadmap.json @@ -1,20 +1,42 @@ [ + { + "type": "comingSoon", + "typeText": "coming soon", + "color": "purple", + "title": "Notifications", + "content": "Email notifications for pull request changes", + "link": "https://ideas.harness.io/admin/roadmap/gitness-roadmap/p/email-notifications" + }, + { + "type": "comingSoon", + "typeText": "coming soon", + "color": "purple", + "title": "Code search", + "content": "Keyword search of source code across repositories", + "link": "https://ideas.harness.io/admin/roadmap/gitness-roadmap/p/search-across-repositories" + }, + { + "type": "comingSoon", + "typeText": "coming soon", + "color": "purple", + "title": "Image support in Pull Requests", + "content": "Support to upload images in pull request descriptions", + "link": "https://ideas.harness.io/admin/roadmap/gitness-roadmap/p/image-support-in-pr-description" + }, { "type": "released", "typeText": "released", - "title": "Semantic Search", - "content": "Semantic search feature is released." + "color": "green", + "title": "Code Owners", + "content": "Configure codeowners files to assign ownership to areas of the codebase, and automatically add as reviewers for pull requests with changes to those files", + "link": "https://ideas.harness.io/admin/roadmap/gitness-roadmap/p/code-owners" }, { - "type": "comingSoon", - "typeText": "coming soon", - "title": "Code search", - "content": "Code search feature is coming soon in December." - }, - { - "type": "comingSoon", - "typeText": "coming soon", - "title": "Linked repositories", - "content": "Linked repositories feature is coming soon in December." + "type": "released", + "typeText": "released", + "color": "green", + "title": "Branch Rules", + "content": "Define branch rules to enforce process and prevent unwanted changes on protected branches", + "link": "https://ideas.harness.io/admin/roadmap/gitness-roadmap/p/branch-rules-merge-checks" } ] diff --git a/web/src/pages/RepositoriesListing/RepositoriesListing.module.scss b/web/src/pages/RepositoriesListing/RepositoriesListing.module.scss index 4f14c3597..a2bfe534c 100644 --- a/web/src/pages/RepositoriesListing/RepositoriesListing.module.scss +++ b/web/src/pages/RepositoriesListing/RepositoriesListing.module.scss @@ -151,9 +151,10 @@ padding-left: 2px !important; } .featureTitle { - font-size: 14px !important; + font-size: 13px !important; font-weight: 600 !important; padding-bottom: var(--spacing-small) !important; + display: flex !important; } .featureContent { font-size: 10px !important; @@ -192,3 +193,10 @@ } } } +.repoListingContainer { + width: calc(100% - 285px) !important; +} + +.launchIcon { + padding-bottom: 1px !important; +} diff --git a/web/src/pages/RepositoriesListing/RepositoriesListing.module.scss.d.ts b/web/src/pages/RepositoriesListing/RepositoriesListing.module.scss.d.ts index 8e3d49cd3..989a1e711 100644 --- a/web/src/pages/RepositoriesListing/RepositoriesListing.module.scss.d.ts +++ b/web/src/pages/RepositoriesListing/RepositoriesListing.module.scss.d.ts @@ -24,6 +24,7 @@ export declare const featureText: string export declare const featureTitle: string export declare const iconContainer: string export declare const input: string +export declare const launchIcon: string export declare const layout: string export declare const main: string export declare const name: string @@ -32,6 +33,7 @@ export declare const noDesc: string export declare const pinned: string export declare const progressBar: string export declare const releasedContainer: string +export declare const repoListingContainer: string export declare const repoName: string export declare const repoScope: string export declare const row: string diff --git a/web/src/pages/RepositoriesListing/RepositoriesListing.tsx b/web/src/pages/RepositoriesListing/RepositoriesListing.tsx index e0b8e5efe..68f631167 100644 --- a/web/src/pages/RepositoriesListing/RepositoriesListing.tsx +++ b/web/src/pages/RepositoriesListing/RepositoriesListing.tsx @@ -211,7 +211,7 @@ export default function RepositoriesListing() { - + {NewRepoButton} diff --git a/web/src/utils/Utils.ts b/web/src/utils/Utils.ts index cf3c8baf9..b4035d897 100644 --- a/web/src/utils/Utils.ts +++ b/web/src/utils/Utils.ts @@ -122,6 +122,7 @@ export interface FeatureData { type: string title: string content: string + link: string } export interface SourceCodeEditorProps {