fix: [code-1991]: hide ssh and add optional chaining to filter functi…

…on (#2100)
harness · Jun 12, 2024 · 45acf04 · 45acf04
1 parent f0e12fa
commit 45acf04
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 10 deletions.
diff --git a/web/src/components/CloneButtonTooltip/CloneButtonTooltip.tsx b/web/src/components/CloneButtonTooltip/CloneButtonTooltip.tsx
@@ -56,7 +56,7 @@ export function CloneButtonTooltip({ httpsURL, sshURL }: CloneButtonTooltipProps
  <Container padding={{ top: 'small' }}>
  {
  // TODO: replace with data from config api
- sshURL && <Text font={{ variation: FontVariation.BODY2_SEMI }}>HTTP</Text>
+ sshURL && <Text font={{ variation: FontVariation.BODY2_SEMI }}>{getString('http')}</Text>
  }
  <Layout.Horizontal className={css.layout}>
  <Text className={css.url}>{httpsURL}</Text>
@@ -68,7 +68,7 @@ export function CloneButtonTooltip({ httpsURL, sshURL }: CloneButtonTooltipProps
  // TODO: replace with data from config api
  sshURL && (
  <Container padding={{ top: 'small' }}>
- <Text font={{ variation: FontVariation.BODY2_SEMI }}>SSH</Text>
+ <Text font={{ variation: FontVariation.BODY2_SEMI }}>{getString('ssh')}</Text>
  <Layout.Horizontal className={css.layout}>
  <Text className={css.url}>{sshURL}</Text>
 

diff --git a/web/src/framework/strings/stringTypes.ts b/web/src/framework/strings/stringTypes.ts
@@ -478,6 +478,7 @@ export interface StringsMap {
  'homepage.selectSpaceContent': string
  'homepage.selectSpaceTitle': string
  'homepage.welcomeText': string
+ http: string
  'imageUpload.readyToUpload': string
  'imageUpload.text': string
  'imageUpload.title': string
@@ -966,6 +967,7 @@ export interface StringsMap {
  spaceUpdate: string
  spaces: string
  squashMerge: string
+ ssh: string
  sslVerificationLabel: string
  startSearching: string
  status: string

diff --git a/web/src/i18n/strings.en.yaml b/web/src/i18n/strings.en.yaml
@@ -1179,3 +1179,5 @@ confirmStrat: 'Confirm {{strat}}'
 waiting: Waiting
 changesRequestedBy: CHANGES REQUESTED BY
 mergeBranchTitle: Merge branch {{branchName}} of {{repoPath}} (#{{prNum}})
+http: HTTP
+ssh: SSH
diff --git a/web/src/pages/PullRequest/Conversation/Conversation.tsx b/web/src/pages/PullRequest/Conversation/Conversation.tsx
@@ -148,22 +148,22 @@ export const Conversation: React.FC<ConversationProps> = ({
 
  switch (activityFilter.value) {
  case PRCommentFilterType.ALL_COMMENTS:
- return blocks.filter(_activities => !isSystemComment(_activities))
+ return blocks?.filter(_activities => !isSystemComment(_activities))
 
  case PRCommentFilterType.RESOLVED_COMMENTS:
- return blocks.filter(
+ return blocks?.filter(
  _activities => _activities[0].payload?.resolved && (isCodeComment(_activities) || isComment(_activities))
  )
 
  case PRCommentFilterType.UNRESOLVED_COMMENTS:
- return blocks.filter(
+ return blocks?.filter(
  _activities => !_activities[0].payload?.resolved && (isComment(_activities) || isCodeComment(_activities))
  )
 
  case PRCommentFilterType.MY_COMMENTS: {
- const allCommentBlock = blocks.filter(_activities => !isSystemComment(_activities))
- const userCommentsOnly = allCommentBlock.filter(_activities => {
- const userCommentReply = _activities.filter(
+ const allCommentBlock = blocks?.filter(_activities => !isSystemComment(_activities))
+ const userCommentsOnly = allCommentBlock?.filter(_activities => {
+ const userCommentReply = _activities?.filter(
  authorIsUser => currentUser?.uid && authorIsUser.payload?.author?.uid === currentUser?.uid
  )
  return userCommentReply.length !== 0

diff --git a/web/src/pages/Repository/EmptyRepositoryInfo.tsx b/web/src/pages/Repository/EmptyRepositoryInfo.tsx
@@ -98,7 +98,7 @@ export const EmptyRepositoryInfo: React.FC<Pick<GitInfoProps, 'repoMetadata'>> =
  <Container padding={{ bottom: 'medium' }} width={400} margin={{ right: 'small' }}>
  {
  // TODO: replace with data from config api
- repoMetadata.git_ssh_url && <Text>HTTP</Text>
+ repoMetadata.git_ssh_url && <Text>{getString('http')}</Text>
  }
  <Layout.Horizontal className={css.layout}>
  <Text className={css.url}>{repoMetadata.git_url}</Text>
@@ -114,7 +114,7 @@ export const EmptyRepositoryInfo: React.FC<Pick<GitInfoProps, 'repoMetadata'>> =
  // TODO: replace with data from config api
  repoMetadata.git_ssh_url && (
  <>
- <Text>SSH</Text>
+ <Text>{getString('ssh')}</Text>
  <Layout.Horizontal className={css.layout}>
  <Text className={css.url}>{repoMetadata.git_ssh_url}</Text>
  <FlexExpander />