Skip to content

Commit

Permalink
Merge branch 'main' into 12974-text-key-not-updated-for-options-when-…
Browse files Browse the repository at this point in the history
…edited-from-text-editor
  • Loading branch information
Jondyr committed Sep 10, 2024
2 parents 7c939c6 + 4f0e93e commit b6ed687
Show file tree
Hide file tree
Showing 19 changed files with 916 additions and 620 deletions.
2 changes: 1 addition & 1 deletion development/azure-devops-mock/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"version": "1.0.0",
"author": "The Altinn Studio Team",
"dependencies": {
"axios": "1.7.6",
"axios": "1.7.7",
"cors": "2.8.5",
"express": "4.19.2",
"morgan": "1.10.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { Alert, Heading, Link, Paragraph, Spinner } from '@digdir/designsystemet
import { Trans, useTranslation } from 'react-i18next';
import type { KubernetesDeployment } from 'app-shared/types/api/KubernetesDeployment';
import { DateUtils } from '@studio/pure-functions';
import { ExternalLinkIcon } from '@studio/icons';

export interface DeploymentEnvironmentStatusProps {
lastPublishedDate?: string;
Expand Down Expand Up @@ -88,19 +89,18 @@ export const DeploymentEnvironmentStatus = ({
version: kubernetesDeployment.version,
}}
components={{
a: <Link href={urlToApp}> </Link>,
a: (
<Link href={urlToApp} rel='noopener noreferrer' target='_blank'>
{' '}
</Link>
),
ext: <ExternalLinkIcon title={t('app_deployment.status.open_app_in_new_window')} />,
}}
/>
}
footer={
lastPublishedDate && (
<Trans
i18nKey={'app_deployment.last_published'}
values={{
lastPublishedDate: formatDateTime(lastPublishedDate),
}}
/>
)
lastPublishedDate &&
t('app_deployment.last_published', { lastPublishedDate: formatDateTime(lastPublishedDate) })
}
/>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { Alert, Heading, Paragraph, Spinner, Link } from '@digdir/designsystemet
import { DateUtils } from '@studio/pure-functions';
import { publishPath } from 'app-shared/api/paths';
import type { KubernetesDeployment } from 'app-shared/types/api/KubernetesDeployment';
import { ExternalLinkIcon } from '@studio/icons';

export type DeploymentStatusProps = {
kubernetesDeployment?: KubernetesDeployment;
Expand Down Expand Up @@ -114,7 +115,12 @@ export const DeploymentStatus = ({
version: kubernetesDeployment.version,
}}
components={{
a: <Link href={urlToApp}> </Link>,
a: (
<Link href={urlToApp} rel='noopener noreferrer' target='_blank'>
{' '}
</Link>
),
ext: <ExternalLinkIcon title={t('app_deployment.status.open_app_in_new_window')} />,
}}
/>
}
Expand Down
4 changes: 2 additions & 2 deletions frontend/app-development/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"@studio/hooks": "workspace:^",
"@studio/icons": "workspace:^",
"@studio/pure-functions": "workspace:^",
"axios": "1.7.6",
"axios": "1.7.7",
"classnames": "2.5.1",
"i18next": "23.14.0",
"react": "18.3.1",
Expand All @@ -25,7 +25,7 @@
"jest": "29.7.0",
"typescript": "5.5.4",
"webpack": "5.94.0",
"webpack-dev-server": "5.0.4"
"webpack-dev-server": "5.1.0"
},
"license": "3-Clause BSD",
"private": true,
Expand Down
2 changes: 1 addition & 1 deletion frontend/app-preview/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"jest": "29.7.0",
"typescript": "5.5.4",
"webpack": "5.94.0",
"webpack-dev-server": "5.0.4"
"webpack-dev-server": "5.1.0"
},
"license": "3-Clause BSD",
"private": true,
Expand Down
2 changes: 1 addition & 1 deletion frontend/dashboard/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"jest": "29.7.0",
"typescript": "5.5.4",
"webpack": "5.94.0",
"webpack-dev-server": "5.0.4"
"webpack-dev-server": "5.1.0"
},
"license": "3-Clause BSD",
"private": true,
Expand Down
3 changes: 2 additions & 1 deletion frontend/language/src/nb.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,8 @@
"app_deployment.releases_loading": "Laster inn tilgjengelige versjoner av appen...",
"app_deployment.status.inProgress": "Appen oppdateres i miljøet...",
"app_deployment.status.none": "Appen er ikke publisert i miljøet.",
"app_deployment.status.succeeded": "Appen <a>versjon {{version}}</a> er tilgjengelig i miljøet.",
"app_deployment.status.open_app_in_new_window": "Lenken åpner appen i en ny fane",
"app_deployment.status.succeeded": "Appen <a>versjon {{version}}<ext></ext></a> er tilgjengelig i miljøet.",
"app_deployment.status.unavailable": "Kan ikke se statusen for appen for øyeblikket.",
"app_deployment.table.available_version_col": "Dato",
"app_deployment.table.build_log": "Byggloggen",
Expand Down
2 changes: 1 addition & 1 deletion frontend/libs/studio-components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"uuid": "10.0.0"
},
"devDependencies": {
"@chromatic-com/storybook": "1.8.0",
"@chromatic-com/storybook": "1.9.0",
"@storybook/addon-essentials": "^8.0.4",
"@storybook/addon-interactions": "^8.0.4",
"@storybook/addon-links": "^8.0.4",
Expand Down
2 changes: 1 addition & 1 deletion frontend/packages/schema-editor/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"jest": "29.7.0"
},
"peerDependencies": {
"axios": "1.7.6",
"axios": "1.7.7",
"classnames": "2.5.1",
"react": "18.3.1",
"react-dom": "18.3.1"
Expand Down
2 changes: 1 addition & 1 deletion frontend/packages/shared/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"version": "0.1.0",
"author": "Altinn",
"dependencies": {
"@mui/material": "6.0.1",
"@mui/material": "6.0.2",
"classnames": "2.5.1",
"qs": "6.13.0",
"react": "18.3.1",
Expand Down
2 changes: 1 addition & 1 deletion frontend/packages/ux-editor-v3/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"version": "1.0.1",
"author": "Altinn",
"dependencies": {
"@mui/material": "6.0.1",
"@mui/material": "6.0.2",
"@reduxjs/toolkit": "1.9.7",
"@studio/icons": "workspace:^",
"classnames": "2.5.1",
Expand Down
2 changes: 1 addition & 1 deletion frontend/packages/ux-editor/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"version": "1.0.1",
"author": "Altinn",
"dependencies": {
"@mui/material": "6.0.1",
"@mui/material": "6.0.2",
"@studio/icons": "workspace:^",
"classnames": "2.5.1",
"react": "18.3.1",
Expand Down
2 changes: 1 addition & 1 deletion frontend/resourceadm/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"jest": "29.7.0",
"typescript": "5.5.4",
"webpack": "5.94.0",
"webpack-dev-server": "5.0.4"
"webpack-dev-server": "5.1.0"
},
"license": "3-Clause BSD",
"private": true,
Expand Down
6 changes: 3 additions & 3 deletions frontend/scripts/package.json
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{
"name": "altinn-studio-internal-stats",
"dependencies": {
"axios": "1.7.6"
"axios": "1.7.7"
},
"devDependencies": {
"@typescript-eslint/eslint-plugin": "7.18.0",
"@typescript-eslint/parser": "7.18.0",
"eslint": "8.57.0",
"eslint-plugin-import": "2.29.1",
"eslint-plugin-import": "2.30.0",
"glob": "11.0.0",
"husky": "9.1.5",
"jsonpointer": "5.0.1",
"lint-staged": "15.2.9",
"lint-staged": "15.2.10",
"prettier": "^3.0.3",
"ts-node": "^10.9.1",
"tsconfig-paths": "^4.2.0",
Expand Down
Loading

0 comments on commit b6ed687

Please sign in to comment.