Merge branch 'main' of https://git0.harness.io/l7B_kbSEQD2wjrM7PShm5w…

…/PROD/Harness_Commons/gitness
harness · Apr 23, 2024 · a12ab7d · a12ab7d
2 parents 02d918b + 28ba149
commit a12ab7d
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 27 deletions.
diff --git a/app/services/keywordsearch/local_index_searcher.go b/app/services/keywordsearch/local_index_searcher.go
@@ -16,7 +16,6 @@ package keywordsearch
 
 import (
  "context"
- "fmt"
 
  "github.com/harness/gitness/types"
 )
@@ -35,9 +34,9 @@ func (s *LocalIndexSearcher) Search(
  _ bool,
  _ int,
 ) (types.SearchResult, error) {
- return types.SearchResult{}, fmt.Errorf("not implemented")
+ return types.SearchResult{}, nil
 }
 
 func (s *LocalIndexSearcher) Index(_ context.Context, _ *types.Repository) error {
- return fmt.Errorf("not implemented")
+ return nil
 }
diff --git a/web/src/components/NewSpaceModalButton/NewSpaceModalButton.module.scss b/web/src/components/NewSpaceModalButton/NewSpaceModalButton.module.scss
@@ -149,7 +149,7 @@
  min-width: 158px;
  }
 
- .menuItem {
+ [class*='menuItem'] {
  max-width: fit-content;
  }
  }

diff --git a/web/src/components/UserManagementFlows/UserManagementFlows.module.scss b/web/src/components/UserManagementFlows/UserManagementFlows.module.scss
@@ -19,7 +19,7 @@
 
  :global {
  .bp3-form-group,
- .TextInput--main {
+ [class*='TextInput--main'] {
  width: 364px;
  }
  }

diff --git a/web/src/pages/PullRequest/Checks/ChecksMenu.tsx b/web/src/pages/PullRequest/Checks/ChecksMenu.tsx
@@ -138,7 +138,6 @@ export const ChecksMenu: React.FC<ChecksMenuProps> = ({
  useEffect(() => {
  const initialStates: ExpandedStates = {}
  const initialMap: ElapsedTimeStatusMap = {}
-
  Object.keys(groupedData).forEach(key => {
  const findStatus = () => {
  const statusPriority = ['running', 'pending', 'failure', 'error', 'success']
@@ -157,8 +156,8 @@ export const ChecksMenu: React.FC<ChecksMenuProps> = ({
  const { minCreated, maxUpdated } = dataArr.reduce(
  // eslint-disable-next-line @typescript-eslint/no-explicit-any
  (acc: any, item: TypesCheck) => ({
- minCreated: item.created && item.created < acc.minCreated ? item.created : acc.minCreated,
- maxUpdated: item.updated && item.updated > acc.maxUpdated ? item.updated : acc.maxUpdated
+ minCreated: item.started && item.started < acc.minCreated ? item.started : acc.minCreated,
+ maxUpdated: item.ended && item.ended > acc.maxUpdated ? item.ended : acc.maxUpdated
  }),
  { minCreated: Infinity, maxUpdated: -Infinity }
  )
@@ -230,22 +229,7 @@ export const ChecksMenu: React.FC<ChecksMenuProps> = ({
  {pipelineId}
  </Text>
  <FlexExpander />
- <Render when={statusTimeStates[pipelineId]?.time}>
- <Text
- color={Color.GREY_300}
- padding={{ right: 'small' }}
- font={{ variation: FontVariation.SMALL }}
- className={css.noShrink}>
- {statusTimeStates[pipelineId]?.status === 'running' ? (
- <ReactTimeago
- date={new Date(statusTimeStates[pipelineId]?.started || 0)}
- formatter={customFormatter}
- />
- ) : (
- statusTimeStates[pipelineId]?.time
- )}
- </Text>
- </Render>
+
  <NavArrowRight
  color={Utils.getRealCSSColor(Color.GREY_500)}
  className={cx(css.noShrink, css.chevron)}
@@ -355,7 +339,7 @@ const CheckMenuItem: React.FC<CheckMenuItemProps> = ({
 
  <Text color={Color.GREY_300} font={{ variation: FontVariation.SMALL }} className={css.noShrink}>
  {itemData?.ended && itemData?.started ? (
- timeDistance(itemData.updated, itemData.created)
+ timeDistance(itemData.started, itemData.ended)
  ) : (
  <ReactTimeago date={new Date(itemData?.started || 0)} formatter={customFormatter} />
  )}

diff --git a/web/src/pages/PullRequest/Checks/ChecksOverview.tsx b/web/src/pages/PullRequest/Checks/ChecksOverview.tsx
@@ -146,7 +146,7 @@ const CheckSection: React.FC<CheckSectionsProps & { isPipeline?: boolean }> = ({
  {getString(isPipeline ? 'pageTitle.pipelines' : 'checks')}
  </Text>
  <Container className={css.table}>
- {data.map(({ uid, status, summary, created, updated, ended }) => (
+ {data.map(({ uid, status, summary, created, ended, started }) => (
  <Container className={css.row} key={uid}>
  <Layout.Horizontal className={css.rowLayout}>
  <Container className={css.status}>
@@ -173,7 +173,7 @@ const CheckSection: React.FC<CheckSectionsProps & { isPipeline?: boolean }> = ({
  <Text className={css.time} font={{ variation: FontVariation.SMALL }}>
  {!ended
  ? created && <ReactTimeago date={created} formatter={customFormatter} />
- : timeDistance(updated, created)}
+ : timeDistance(ended, started)}
  </Text>
  </Layout.Horizontal>
  </Container>