diff --git a/web/src/cde-gitness/components/DetailsCard/DetailsCard.tsx b/web/src/cde-gitness/components/DetailsCard/DetailsCard.tsx index 76e54e9ec..d7ff37e43 100644 --- a/web/src/cde-gitness/components/DetailsCard/DetailsCard.tsx +++ b/web/src/cde-gitness/components/DetailsCard/DetailsCard.tsx @@ -76,7 +76,7 @@ export const DetailsCard = ({ data }: { data: TypesGitspaceConfig | null; loadin - {getString('cde.lastUsed')} + {getString('cde.lastActivated')} {instance?.last_used ? ( ) : ( diff --git a/web/src/cde-gitness/components/GitnessRepoImportForm/GitnessRepoImportForm.tsx b/web/src/cde-gitness/components/GitnessRepoImportForm/GitnessRepoImportForm.tsx index df206cb2e..1f6132459 100644 --- a/web/src/cde-gitness/components/GitnessRepoImportForm/GitnessRepoImportForm.tsx +++ b/web/src/cde-gitness/components/GitnessRepoImportForm/GitnessRepoImportForm.tsx @@ -164,6 +164,7 @@ export const GitnessRepoImportForm = () => { return { ...prvValues, code_repo_url: repo.git_url, + branch: repo.default_branch, identifier: repoParams?.[repoParams.length - 1], name: repo.path } diff --git a/web/src/cde-gitness/components/GitspaceListing/ListGitspaces.tsx b/web/src/cde-gitness/components/GitspaceListing/ListGitspaces.tsx index 7e65c7abe..673504f10 100644 --- a/web/src/cde-gitness/components/GitspaceListing/ListGitspaces.tsx +++ b/web/src/cde-gitness/components/GitspaceListing/ListGitspaces.tsx @@ -42,7 +42,6 @@ import { } from 'iconoir-react' import { Intent, Menu, MenuItem, PopoverInteractionKind, Position } from '@blueprintjs/core' import { useHistory } from 'react-router-dom' -import { isNil } from 'lodash-es' import { useMutate } from 'restful-react' import type { IconName } from '@harnessio/icons' import { UseStringsReturn, useStrings } from 'framework/strings' @@ -160,9 +159,8 @@ export const RenderGitspaceName: Renderer> = ({ r } export const RenderRepository: Renderer> = ({ row }) => { - const { getString } = useStrings() const details = row.original - const { name, branch, code_repo_url, code_repo_type, instance } = details || {} + const { name, branch, code_repo_url, code_repo_type } = details || {} return ( @@ -192,11 +190,6 @@ export const RenderRepository: Renderer> = ({ row {branch} - {(isNil(instance?.tracked_changes) || instance?.tracked_changes === '') && ( - - {getString('cde.noChange')} - - )} ) } @@ -387,6 +380,7 @@ const ActionMenu = ({ void} text={ diff --git a/web/src/cde-gitness/pages/GitspaceDetails/GitspaceDetails.module.scss b/web/src/cde-gitness/pages/GitspaceDetails/GitspaceDetails.module.scss index 5462786bd..e6cc94e57 100644 --- a/web/src/cde-gitness/pages/GitspaceDetails/GitspaceDetails.module.scss +++ b/web/src/cde-gitness/pages/GitspaceDetails/GitspaceDetails.module.scss @@ -22,6 +22,7 @@ margin-top: var(--spacing-xxlarge) !important; width: 100% !important; + [data-testid='logsCard-panel'], [data-testid='eventsCard-panel'] { padding: 0px !important; } diff --git a/web/src/cde-gitness/pages/GitspaceDetails/GitspaceDetails.tsx b/web/src/cde-gitness/pages/GitspaceDetails/GitspaceDetails.tsx index 47ac6c15a..6e5d50893 100644 --- a/web/src/cde-gitness/pages/GitspaceDetails/GitspaceDetails.tsx +++ b/web/src/cde-gitness/pages/GitspaceDetails/GitspaceDetails.tsx @@ -98,7 +98,7 @@ export const GitspaceDetails = () => { useEffect(() => { const filteredEvent = eventData?.filter( item => - item.event === 'agent_gitspace_creation_start' && + (item.event === 'agent_gitspace_creation_start' || item.event === 'agent_gitspace_deletion_start') && defaultTo(item?.timestamp, 0) >= defaultTo(data?.instance?.updated, 0) ) if (disabledActionButtons && filteredEvent?.length && !isStreamingLogs) { diff --git a/web/src/i18n/strings.en.yaml b/web/src/i18n/strings.en.yaml index c35d2f366..2954375c7 100644 --- a/web/src/i18n/strings.en.yaml +++ b/web/src/i18n/strings.en.yaml @@ -1159,7 +1159,7 @@ cde: startingGitspace: Starting Gitspace stopingGitspace: Stopping Gitspace sessionDuration: Last Started - lastActivated: LAST ACTIVATED + lastActivated: Last Activated deleteGitspaceTitle: Delete Gitspace '{{name}}' deleteGitspaceText: 'This action cannot be undone. Are you sure you want to proceed to delete?' deleteSuccess: Gitspace deleted succesfully @@ -1185,7 +1185,7 @@ cde: repoNotFound: 'Create a repo {{repo}} in Gitness' gitspaceCreateSuccess: Gitspace created successfully gitspaceCreateFailed: Gitspace creation failed - subtext: Start Coding, no setup required. Dedicated cloud development environments with your favorite editor + subtext: Start Coding, no setup required. Dedicated cloud development environments with your favorite editor. importWarning: Currently we support only third party public repositories. In order to use a private git repository, please import the repository into Gitness.