Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: enabled undeploy for users by removing feature flag #14640

Merged
merged 2 commits into from
Feb 12, 2025
Merged

feat: enabled undeploy for users by removing feature flag #14640

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e7967b6
feat: enabled undeploy to be enabled for users
framitdavid Feb 12, 2025
f6eb862
lint and removed class-name that did not exist
framitdavid Feb 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 0 additions & 32 deletions ...tend/app-development/features/appPublish/components/DeploymentEnvironmentLogList.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,38 +68,6 @@ describe('DeploymentEnvironmentLogList', () => {
expect(screen.getByText(pipelineDeployment.createdBy)).toBeInTheDocument();
});

it('renders title when environment is production', async () => {
render({
pipelineDeploymentList: [pipelineDeployment],
envName: 'production',
isProduction: true,
});

expect(
screen.getByText(
textMock('app_deployment.table.deployed_version_history', {
envTitle: textMock('general.production_environment_alt').toLowerCase(),
}),
),
).toBeInTheDocument();
});

it('renders title when environment is not production', async () => {
render({
pipelineDeploymentList: [pipelineDeployment],
envName: 'tt02',
isProduction: false,
});

expect(
screen.getByText(
textMock('app_deployment.table.deployed_version_history', {
envTitle: `${textMock('general.test_environment_alt').toLowerCase()} TT02`,
}),
),
).toBeInTheDocument();
});

it('renders when deployment is in progress', () => {
render({
pipelineDeploymentList: [
Expand Down
164 changes: 71 additions & 93 deletions frontend/app-development/features/appPublish/components/DeploymentEnvironmentLogList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import classes from './DeploymentEnvironmentLogList.module.css';
import { Heading, Link, Table } from '@digdir/designsystemet-react';
import { Link, Table } from '@digdir/designsystemet-react';
import { DateUtils } from '@studio/pure-functions';
import { useTranslation } from 'react-i18next';
import classNames from 'classnames';
Expand Down Expand Up @@ -46,14 +46,7 @@ export const DeploymentEnvironmentLogList = ({
return <CheckmarkCircleFillIcon className={classnames} />;
case BuildResult.none:
default:
return (
<StudioSpinner
size='small'
spinnerTitle=''
showSpinnerTitle={false}
className={classes.loadingSpinner}
/>
);
return <StudioSpinner size='small' spinnerTitle='' showSpinnerTitle={false} />;
}
};

Expand All @@ -64,90 +57,75 @@ export const DeploymentEnvironmentLogList = ({
{t('app_deployment.table.deployed_version_history_empty', { envTitle })}
</div>
) : (
<div>
<Heading level={4} size='xxsmall' className={classes.heading}>
{t('app_deployment.table.deployed_version_history', { envTitle })}
</Heading>
<div className={classes.tableWrapper} id={`deploy-history-table-${envName}`}>
<Table size='small' stickyHeader className={classes.table}>
<Table.Head>
<Table.Row>
<Table.HeaderCell
className={classNames(classes.tableHeaderCell, classes.tableIconCell)}
/>
<Table.HeaderCell className={classes.tableHeaderCell}>
{t('app_deployment.table.status')}
</Table.HeaderCell>
<Table.HeaderCell className={classes.tableHeaderCell}>
{t('app_deployment.table.version_col')}
</Table.HeaderCell>
<Table.HeaderCell className={classes.tableHeaderCell}>
{t('app_deployment.table.available_version_col')}
</Table.HeaderCell>
<Table.HeaderCell className={classes.tableHeaderCell}>
{t('app_deployment.table.deployed_by_col')}
</Table.HeaderCell>
<Table.HeaderCell className={classes.tableHeaderCell}>
{t('app_deployment.table.build_log')}
</Table.HeaderCell>
</Table.Row>
</Table.Head>
<Table.Body>
{pipelineDeploymentList.map((deploy: PipelineDeployment) => {
const tableCellStatusClassName = classes[deploy.build.result];
return (
<Table.Row key={deploy.build.id} className={tableCellStatusClassName}>
<Table.Cell
className={classNames(
classes.tableCell,
classes.tableIconCell,
tableCellStatusClassName,
)}
>
{getIcon(deploy.build.result)}
</Table.Cell>
<Table.Cell
className={classNames(classes.tableCell, tableCellStatusClassName)}
>
{t(getStatusTextByDeploymentType(deploy))}
</Table.Cell>
<Table.Cell
className={classNames(classes.tableCell, tableCellStatusClassName)}
>
{deploy.tagName}
</Table.Cell>
<Table.Cell
className={classNames(classes.tableCell, tableCellStatusClassName)}
>
{deploy.build.finished && DateUtils.formatDateTime(deploy.build.finished)}
</Table.Cell>
<Table.Cell
className={classNames(classes.tableCell, tableCellStatusClassName)}
>
{deploy.createdBy}
</Table.Cell>
<Table.Cell
className={classNames(classes.tableCell, tableCellStatusClassName)}
>
{deploy.build.started &&
(DateUtils.isDateWithinDays(deploy.build.started, 30) ? (
<Link
href={getAzureDevopsBuildResultUrl(deploy.build.id)}
target='_newTab'
rel='noopener noreferrer'
>
{t('app_deployment.table.build_log_active_link')}
</Link>
) : (
t('app_deployment.table.build_log_expired_link')
))}
</Table.Cell>
</Table.Row>
);
})}
</Table.Body>
</Table>
</div>
<div className={classes.tableWrapper} id={`deploy-history-table-${envName}`}>
<Table size='small' stickyHeader className={classes.table}>
<Table.Head>
<Table.Row>
<Table.HeaderCell
className={classNames(classes.tableHeaderCell, classes.tableIconCell)}
/>
<Table.HeaderCell className={classes.tableHeaderCell}>
{t('app_deployment.table.status')}
</Table.HeaderCell>
<Table.HeaderCell className={classes.tableHeaderCell}>
{t('app_deployment.table.version_col')}
</Table.HeaderCell>
<Table.HeaderCell className={classes.tableHeaderCell}>
{t('app_deployment.table.available_version_col')}
</Table.HeaderCell>
<Table.HeaderCell className={classes.tableHeaderCell}>
{t('app_deployment.table.deployed_by_col')}
</Table.HeaderCell>
<Table.HeaderCell className={classes.tableHeaderCell}>
{t('app_deployment.table.build_log')}
</Table.HeaderCell>
</Table.Row>
</Table.Head>
<Table.Body>
{pipelineDeploymentList.map((deploy: PipelineDeployment) => {
const tableCellStatusClassName = classes[deploy.build.result];
return (
<Table.Row key={deploy.build.id} className={tableCellStatusClassName}>
<Table.Cell
className={classNames(
classes.tableCell,
classes.tableIconCell,
tableCellStatusClassName,
)}
>
{getIcon(deploy.build.result)}
</Table.Cell>
<Table.Cell className={classNames(classes.tableCell, tableCellStatusClassName)}>
{t(getStatusTextByDeploymentType(deploy))}
</Table.Cell>
<Table.Cell className={classNames(classes.tableCell, tableCellStatusClassName)}>
{deploy.tagName}
</Table.Cell>
<Table.Cell className={classNames(classes.tableCell, tableCellStatusClassName)}>
{deploy.build.finished && DateUtils.formatDateTime(deploy.build.finished)}
</Table.Cell>
<Table.Cell className={classNames(classes.tableCell, tableCellStatusClassName)}>
{deploy.createdBy}
</Table.Cell>
<Table.Cell className={classNames(classes.tableCell, tableCellStatusClassName)}>
{deploy.build.started &&
(DateUtils.isDateWithinDays(deploy.build.started, 30) ? (
<Link
href={getAzureDevopsBuildResultUrl(deploy.build.id)}
target='_newTab'
rel='noopener noreferrer'
>
{t('app_deployment.table.build_log_active_link')}
</Link>
) : (
t('app_deployment.table.build_log_expired_link')
))}
</Table.Cell>
</Table.Row>
);
})}
</Table.Body>
</Table>
</div>
)}
</div>
Expand Down
3 changes: 1 addition & 2 deletions frontend/app-development/features/appPublish/components/DeploymentEnvironmentStatus.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import type { KubernetesDeployment } from 'app-shared/types/api/KubernetesDeploy
import { DateUtils } from '@studio/pure-functions';
import { ExternalLinkIcon } from '@studio/icons';
import { DeployMoreOptionsMenu } from './DeployMoreOptionsMenu/DeployMoreOptionsMenu';
import { FeatureFlag, shouldDisplayFeature } from 'app-shared/utils/featureToggleUtils';

export interface DeploymentEnvironmentStatusProps {
lastPublishedDate?: string;
Expand Down Expand Up @@ -49,7 +48,7 @@ export const DeploymentEnvironmentStatus = ({
<Heading spacing level={2} size='xsmall'>
{envTitle}
</Heading>
{kubernetesDeployment?.version && shouldDisplayFeature(FeatureFlag.Undeploy) && (
{kubernetesDeployment?.version && (
<DeployMoreOptionsMenu linkToEnv={urlToApp} environment={envName} />
)}

Expand Down
1 change: 0 additions & 1 deletion frontend/language/src/nb.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,6 @@
"app_deployment.table.build_log_active_link": "Se loggen",
"app_deployment.table.build_log_expired_link": "Utløpt",
"app_deployment.table.deployed_by_col": "Publisert av",
"app_deployment.table.deployed_version_history": "Versjoner som er publisert til {{envTitle}}",
"app_deployment.table.deployed_version_history_empty": "Det er ingen publiseringshistorikk i {{envTitle}}",
"app_deployment.table.status": "Status",
"app_deployment.table.version_col": "Versjon",
Expand Down
1 change: 0 additions & 1 deletion frontend/packages/shared/src/utils/featureToggleUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ export enum FeatureFlag {
Maskinporten = 'maskinporten',
OptionListEditor = 'optionListEditor',
ShouldOverrideAppLibCheck = 'shouldOverrideAppLibCheck',
Undeploy = 'undeploy',
}

/*
Expand Down