Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
cb25429
feat(telemetry): Add shared Application Insights client for Materials…
afeescps Jul 3, 2026
8f40a3f
Bugfix/pr pipeline trigger failure (#429)
dbarber-cps Jul 7, 2026
c1140f5
Fixing category list filter (#430)
girmacps Jul 7, 2026
b860caa
FCT2-20144-correct-label-spelling-capitilisation-2 (#431)
robmolloy-cps Jul 7, 2026
dac0f93
FCT2-15908-high-contrast-pdf-2 (#433)
robmolloy-cps Jul 8, 2026
2d6b9c1
added variables into build to support app insights logging (#435)
dbarber-cps Jul 8, 2026
dd455a9
feat(tracking): track user actions, roles and time in telemetry (#432)
afeescps Jul 9, 2026
f5c6cde
updating appinsights connection string (#437)
dbarber-cps Jul 10, 2026
84c34d9
fix filtr tests (#438)
abdul-cps Jul 10, 2026
6d73795
feat(relabelling): Re-label Search screen field names in Materials & …
afeescps Jul 10, 2026
b58d728
fix typo (#440)
girmacps Jul 10, 2026
e935594
FCT2-20521-ensure-that-category-labels-in-the-filters-section-can-be-…
robmolloy-cps Jul 13, 2026
2de72e8
[FCT2-20204] - fix(materials): align category filter labels with Revi…
afeescps Jul 13, 2026
1ec056a
fix(review-redact): rename Other documents to Other material for cons…
afeescps Jul 13, 2026
6f68e6a
FCT2-20540-improve-fe-linting-and-agree-with-fe-devs-2 (#445)
robmolloy-cps Jul 14, 2026
94f02e4
FCT2-16304-review-redact-tab-redaction-user-alerts-redaction-exceptio…
robmolloy-cps Jul 14, 2026
df3f9e8
FCT2-20523 fix error sceren on failed re fetch of doc list (#446)
benrome-cps Jul 15, 2026
b231743
display error msg for redacting large file (#448)
TahmeedAhmed-NTT-CPS Jul 15, 2026
eb84492
Merge branch 'main' into development
kramduny-cps Jul 15, 2026
eec5886
FCT2-16304-review-redact-tab-redaction-user-alerts-redaction-exceptio…
robmolloy-cps Jul 15, 2026
2b30441
FCT2-20395-cwa-make-supporting-notes-required-where-redaction-type-ot…
robmolloy-cps Jul 16, 2026
3078a94
FCT2-16304-review-redact-tab-redaction-user-alerts-redaction-exceptio…
robmolloy-cps Jul 16, 2026
9d91d1e
FCT2-16304-review-redact-tab-redaction-user-alerts-redaction-exceptio…
robmolloy-cps Jul 20, 2026
0cf9723
FCT2-16304-review-redact-tab-redaction-user-alerts-redaction-exceptio…
robmolloy-cps Jul 21, 2026
3427856
FCT2-20693 clickable search results and fix search (#457)
benrome-cps Jul 22, 2026
28c3dc1
FCT2-16686-review-redact-tab-redaction-user-alerts-redaction-exceptio…
robmolloy-cps Jul 23, 2026
b0748a9
FCT2-20797 / FCT2-20795 / FCT2-20631 JAWS fixes (#460)
benrome-cps Jul 23, 2026
562b923
fix copy for return to case button (#461)
benrome-cps Jul 23, 2026
9697573
feat(materials): support private beta usage reporting in App Insights…
afeescps Jul 24, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 2 additions & 1 deletion .prettierrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"singleQuote": true,
"trailingComma": "none",
"trailingComma": "all",
"printWidth": 100,
"objectWrap": "collapse",
"semi": true,
"useTabs": false,
Expand Down
62 changes: 31 additions & 31 deletions materials_devops_pipelines/Materials-PR.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ stages:
- stage: Wait_For_Running_PRs
displayName: Wait for running PRs
jobs:
- job:
- job: Query_Status
pool:
name: $(dev-build-agent)
steps:
Expand All @@ -61,7 +61,7 @@ stages:
name: $(dev-build-agent)
steps:
- checkout: self
fetchDepth: 0
fetchDepth: '0'

- task: PowerShell@2
inputs:
Expand Down Expand Up @@ -187,10 +187,10 @@ stages:
steps:

# Setup Node.js
- task: UseNode@1
- task: NodeTool@0
displayName: "Use Node.js"
inputs:
version: "$(nodeVersion)"
versionSpec: "$(nodeVersion)"

- task: Npm@1
inputs:
Expand Down Expand Up @@ -234,19 +234,19 @@ stages:

- script: |
npx playwright install
displayName: 'Install Playwright browsers'
condition: ne(variables['PLAYWRIGHT_CACHE_RESTORED'], 'true')
workingDirectory: '$(workingDir)'
env:
PLAYWRIGHT_BROWSERS_PATH: '$(Pipeline.Workspace)/.playwright'
displayName: 'Install Playwright browsers'
condition: ne(variables['PLAYWRIGHT_CACHE_RESTORED'], 'true')
workingDirectory: '$(workingDir)'
env:
PLAYWRIGHT_BROWSERS_PATH: '$(Pipeline.Workspace)/.playwright'

- script: |
npx playwright install-deps
displayName: 'Install Playwright OS dependencies'
condition: and(eq(variables['Agent.OS'], 'Linux'), ne(variables['PLAYWRIGHT_CACHE_RESTORED'], 'true'))
workingDirectory: '$(workingDir)'
env:
PLAYWRIGHT_BROWSERS_PATH: '$(Pipeline.Workspace)/.playwright'
- script: |
npx playwright install-deps
displayName: 'Install Playwright OS dependencies'
condition: and(eq(variables['Agent.OS'], 'Linux'), ne(variables['PLAYWRIGHT_CACHE_RESTORED'], 'true'))
workingDirectory: '$(workingDir)'
env:
PLAYWRIGHT_BROWSERS_PATH: '$(Pipeline.Workspace)/.playwright'

- script: |
npx playwright install msedge
Expand Down Expand Up @@ -279,19 +279,19 @@ stages:
VITE_GLOBAL_SCRIPT_URL: $(GLOBAL_SCRIPT_URL)
VITE_E2E: True

- task: PublishPipelineArtifact@1
displayName: 'Publish E2E Artifact'
inputs:
targetPath: '$(workingDir)/tests/playwright-report'
artifact: 'playwright-report'
publishLocation: 'pipeline'
condition: succeededOrFailed()
- task: PublishPipelineArtifact@1
displayName: 'Publish E2E Artifact'
inputs:
targetPath: '$(workingDir)/tests/playwright-report'
artifact: 'playwright-report'
publishLocation: 'pipeline'
condition: succeededOrFailed()

- task: PublishTestResults@2
displayName: 'Publish E2E Test Results (JUnit)'
inputs:
testResultsFormat: 'JUnit'
testResultsFiles: '$(workingDir)/tests/e2e-test-results.xml'
testRunTitle: 'E2E Tests'
publishRunAttachments: false
condition: always()
- task: PublishTestResults@2
displayName: 'Publish E2E Test Results (JUnit)'
inputs:
testResultsFormat: 'JUnit'
testResultsFiles: '$(workingDir)/tests/e2e-test-results.xml'
testRunTitle: 'E2E Tests'
publishRunAttachments: false
condition: always()
4 changes: 4 additions & 0 deletions materials_devops_pipelines/Materials-UI-Build-Dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ variables:
value: "materials_ui"
- group: materials-global
- group: materials-ui-spa-dev
- group: materials-kv-dev-terraform

pool:
name: $(dev-build-agent)
Expand Down Expand Up @@ -94,6 +95,9 @@ stages:
VITE_GLOBAL_SCRIPT_URL: $(GLOBAL_SCRIPT_URL)
VITE_REDACTION_LOG_URL: $(VITE_REDACTION_LOG_URL)
VITE_REDACTION_LOG_SCOPE: $(VITE_REDACTION_LOG_SCOPE)
VITE_APPLICATIONINSIGHTS_CONNECTION_STRING: $(innovation-development-app-insights-connection-string)
VITE_APPLICATIONINSIGHTS_SAMPLING_PERCENTAGE: $(APPLICATIONINSIGHTS_SAMPLING_PERCENTAGE)
VITE_APPLICATIONINSIGHTS_CLOUD_ROLE: $(APPLICATIONINSIGHTS_CLOUD_ROLE)

- task: replacetokens@5
displayName: "Set environment specific CSP in serve.json"
Expand Down
6 changes: 5 additions & 1 deletion materials_devops_pipelines/Materials-UI-Build-Prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ variables:
value: "materials_ui"
- group: materials-global
- group: materials-ui-spa-prod
- group: materials-kv-prod-terraform

pool:
name: $(prod-build-agent)
Expand Down Expand Up @@ -94,7 +95,10 @@ stages:
VITE_GLOBAL_SCRIPT_URL: $(GLOBAL_SCRIPT_URL)
VITE_REDACTION_LOG_URL: $(VITE_REDACTION_LOG_URL)
VITE_REDACTION_LOG_SCOPE: $(VITE_REDACTION_LOG_SCOPE)

VITE_APPLICATIONINSIGHTS_CONNECTION_STRING: $(innovation-prod-app-insights-connection-string)
VITE_APPLICATIONINSIGHTS_SAMPLING_PERCENTAGE: $(APPLICATIONINSIGHTS_SAMPLING_PERCENTAGE)
VITE_APPLICATIONINSIGHTS_CLOUD_ROLE: $(APPLICATIONINSIGHTS_CLOUD_ROLE)

- task: replacetokens@5
displayName: "Set environment specific CSP in serve.json"
inputs:
Expand Down
4 changes: 4 additions & 0 deletions materials_devops_pipelines/Materials-UI-Build-Staging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ variables:
value: "materials_ui"
- group: materials-global
- group: materials-ui-spa-stg
- group: materials-kv-stg-terraform

pool:
name: $(stg-build-agent)
Expand Down Expand Up @@ -94,6 +95,9 @@ stages:
VITE_GLOBAL_SCRIPT_URL: $(GLOBAL_SCRIPT_URL)
VITE_REDACTION_LOG_URL: $(VITE_REDACTION_LOG_URL)
VITE_REDACTION_LOG_SCOPE: $(VITE_REDACTION_LOG_SCOPE)
VITE_APPLICATIONINSIGHTS_CONNECTION_STRING: $(innovation-qa-app-insights-connection-string)
VITE_APPLICATIONINSIGHTS_SAMPLING_PERCENTAGE: $(APPLICATIONINSIGHTS_SAMPLING_PERCENTAGE)
VITE_APPLICATIONINSIGHTS_CLOUD_ROLE: $(APPLICATIONINSIGHTS_CLOUD_ROLE)

- task: replacetokens@5
displayName: "Set environment specific CSP in serve.json"
Expand Down
4 changes: 4 additions & 0 deletions materials_ui/.env.example
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ VITE_POLARIS_GATEWAY_SCOPE=
VITE_REDACTION_LOG_URL=
VITE_REDACTION_LOG_SCOPE=

VITE_APPLICATIONINSIGHTS_CONNECTION_STRING=
VITE_APPLICATIONINSIGHTS_SAMPLING_PERCENTAGE=
VITE_APPLICATIONINSIGHTS_CLOUD_ROLE=

VITE_GLOBAL_SCRIPT_URL=

VITE_DISABLE_FEATURE_FLAGS=
Expand Down
3 changes: 2 additions & 1 deletion materials_ui/.prettierrc
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"plugins": ["prettier-plugin-organize-imports"],
"singleQuote": true,
"trailingComma": "none",
"trailingComma": "all",
"printWidth": 100,
"objectWrap": "collapse",
"semi": true,
"useTabs": false,
Expand Down
17 changes: 5 additions & 12 deletions materials_ui/eslint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,13 @@ export default [
plugins: { 'react-hooks': reactHooks, 'react-refresh': reactRefresh },
rules: {
...reactHooks.configs.recommended.rules,
'react-refresh/only-export-components': [
'warn',
{ allowConstantExport: true }
],
'react-refresh/only-export-components': ['warn', { allowConstantExport: true }],
'react-hooks/exhaustive-deps': 'off',
'@typescript-eslint/no-unused-vars': [
'error',
{
argsIgnorePattern: '^_',
varsIgnorePattern: '^_',
caughtErrorsIgnorePattern: '^_'
}
{ argsIgnorePattern: '^_', varsIgnorePattern: '^_', caughtErrorsIgnorePattern: '^_' },
],
'@typescript-eslint/no-explicit-any': 'warn'
}
}
'@typescript-eslint/no-explicit-any': 'warn',
},
},
];
Loading
Loading