Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions .changeset/portal-analytics_migrate-progress-indicator.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
"portal-analytics": patch
---

Replace the deprecated `@equinor/fusion-react-progress-indicator` dependency with EDS's
`Progress.Star` (`@equinor/eds-core-react`) in `EquinorLoader`. The loading text is now
rendered as a visible `Typography` caption alongside an `aria-label` on the spinner,
matching EDS's own accessible loading-indicator pattern.
2 changes: 1 addition & 1 deletion biome.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://biomejs.dev/schemas/2.5.6/schema.json",
"$schema": "https://biomejs.dev/schemas/2.5.8/schema.json",
"vcs": {
"enabled": true,
"clientKind": "git",
Expand Down
1 change: 0 additions & 1 deletion cookbooks/portal-analytics/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
"@equinor/fusion-query": "workspace:*",
"@equinor/fusion-react-context-selector": "^2.0.1",
"@equinor/fusion-react-date": "^1.0.0",
"@equinor/fusion-react-progress-indicator": "^0.3.0",
"@equinor/fusion-react-side-sheet": "^2.0.0",
"react": "^19.2.1",
"@equinor/fusion-framework-react-router": "workspace:*",
Expand Down
8 changes: 6 additions & 2 deletions cookbooks/portal-analytics/src/components/EquinorLoader.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
import type React from 'react';
import { StarProgress } from '@equinor/fusion-react-progress-indicator';
import { Progress, Typography } from '@equinor/eds-core-react';
import styled from 'styled-components';

const Styled = {
Wrapper: styled.div`
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
gap: 1rem;
width: 100vw;
height: 100vh;
overflow: hidden;
Expand All @@ -22,7 +24,9 @@ export const EquinorLoader = ({
}: React.PropsWithChildren<{ readonly text: string }>): JSX.Element => {
return (
<Styled.Wrapper>
<StarProgress text={text}>{children}</StarProgress>
<Progress.Star aria-label={text} />
<Typography aria-hidden="true">{text}</Typography>
{children}
</Styled.Wrapper>
);
};
Expand Down
39 changes: 1 addition & 38 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"yarn": "please-use-pnpm",
"pnpm": ">=10"
},
"packageManager": "pnpm@10.20.0",
"packageManager": "pnpm@11.22.0",
"scripts": {
"install": "pnpm -r exec genversion --es6 --semi src/version.ts",
"install:clean": "pnpm clean && pnpm install",
Expand Down Expand Up @@ -94,43 +94,6 @@
"vue-press"
]
},
"pnpm": {
"patchedDependencies": {
"vscode-jsonrpc@8.2.1": "patches/vscode-jsonrpc@8.2.1.patch"
},
"overrides": {
"form-data@>=4.0.0 <4.0.6": "4.0.6",
"immutable@>=5.0.0 <5.1.5": "5.1.5",
"markdown-it@>=13.0.0 <14.2.0": "14.2.0",
"linkify-it@<5.0.1": "5.0.1",
"js-yaml@>=3.0.0 <3.15.0": "3.15.0",
"js-yaml@>=4.0.0 <4.3.0": "4.3.0",
"qs@<=6.15.1": "6.15.2",
"undici@>=7.0.0 <7.29.0": "7.29.0",
"undici@>=8.0.0 <8.5.0": "8.5.0",
"ws@>=7.0.0 <7.5.11": "7.5.11",
"brace-expansion@>=2.0.0 <2.1.4": "2.1.4",
"brace-expansion@>=3.0.0 <=5.0.7": "5.0.8",
"dompurify@>=3.1.3 <=3.4.11": "3.4.12",
"follow-redirects@<=1.15.11": "1.16.0",
"handlebars@>=4.0.0 <=4.7.8": "4.7.9",
"langsmith@>=0.4.0 <0.6.0": "0.8.3",
"lodash@>=4.0.0 <=4.17.23": "4.18.1",
"lodash-es@>=4.0.0 <=4.17.23": "4.18.1",
"minimatch@>=5.0.0 <5.1.8": "5.1.8",
"minimatch@>=9.0.0 <9.0.7": "9.0.7",
"minimatch@<3.1.3": "3.1.5",
"path-to-regexp@>=8.0.0 <8.4.0": "8.4.0",
"serialize-javascript@<=7.0.4": "7.0.5",
"yaml@>=2.0.0 <2.8.3": "2.8.3",
"postcss@>=8.0.0 <=8.5.22": "8.5.23",
"valibot@<=1.4.1": "1.4.2",
"fast-uri@>=3.0.0 <=3.1.4": "3.1.5",
"@babel/core@<=7.29.0": "7.29.6",
"esbuild@>=0.27.3 <0.28.1": "0.28.1",
"zod": "4.4.3"
}
},
"dependencies": {
"@equinor/fusion-framework-cli": "workspace:*",
"@equinor/fusion-framework-cli-plugin-ai-index": "workspace:*",
Expand Down
Loading
Loading