Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
7f3361f
feature: Implemented the new KS4 chart interaction across both ks4hea…
vipinsamreddy Jun 3, 2026
6f39524
fixed some css issues
vipinsamreddy Jun 4, 2026
e71086a
fix css
vipinsamreddy Jun 4, 2026
838c570
fix button size
vipinsamreddy Jun 5, 2026
a02132b
fix button and charts
vipinsamreddy Jun 5, 2026
1f7a95c
fix charts label
vipinsamreddy Jun 5, 2026
0ba4b35
add component
vipinsamreddy Jun 5, 2026
9567c4a
fix charts
vipinsamreddy Jun 5, 2026
8fb35ec
fixd the charts label position
vipinsamreddy Jun 5, 2026
1e8c5a5
button fix
vipinsamreddy Jun 5, 2026
30b18ff
removed the unwanted class
vipinsamreddy Jun 5, 2026
7654760
fix toggle button
vipinsamreddy Jun 5, 2026
cc5ad20
custom axe chart
vipinsamreddy Jun 9, 2026
1925259
updated the chart.js
vipinsamreddy Jun 9, 2026
dcecd4f
fix labels
vipinsamreddy Jun 9, 2026
76dcb55
fix tabs
vipinsamreddy Jun 9, 2026
65a17ca
fix squash design
vipinsamreddy Jun 12, 2026
c6cd0b9
fix charts
vipinsamreddy Jun 12, 2026
11a56f8
fix hover state
vipinsamreddy Jun 12, 2026
f990cc4
fixed the div issue
vipinsamreddy Jun 15, 2026
7ec692e
fixed the label issue
vipinsamreddy Jun 15, 2026
2846cd3
fix the issue related to labels
vipinsamreddy Jun 15, 2026
23d5e58
hover font change to 14px
vipinsamreddy Jun 15, 2026
8eae345
fix hover state
vipinsamreddy Jun 16, 2026
618d587
fix font size
vipinsamreddy Jun 16, 2026
a67100c
fix data switcher
vipinsamreddy Jun 16, 2026
d6cf7de
fixed the new button
vipinsamreddy Jun 17, 2026
aeb1345
fix build
vipinsamreddy Jun 17, 2026
7c5f639
fixed deployment
vipinsamreddy Jun 17, 2026
7dabf63
fix the bold text
vipinsamreddy Jun 17, 2026
29dbf89
add custom css for chart js tool tip
vipinsamreddy Jun 17, 2026
aefed36
fix db reset button
vipinsamreddy Jun 17, 2026
4798dff
fix the tool
vipinsamreddy Jun 17, 2026
2d562e9
tool kit width
vipinsamreddy Jun 17, 2026
05c8d46
fix tests
vipinsamreddy Jun 18, 2026
f6e9b06
merge dev branch
vipinsamreddy Jun 18, 2026
614fa88
fix hover scroll
vipinsamreddy Jun 18, 2026
140c24a
fix test
vipinsamreddy Jun 18, 2026
76ac864
Merge branch 'main' into feature/new-button-design
vipinsamreddy Jun 19, 2026
737c104
changed the name and removed ks4
vipinsamreddy Jun 19, 2026
580ed01
Merge branch 'feature/new-button-design' of https://github.com/DFE-Di…
vipinsamreddy Jun 19, 2026
9157853
change to true for db reset
vipinsamreddy Jun 19, 2026
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
67 changes: 47 additions & 20 deletions .github/workflows/build-and-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,18 @@ jobs:
KONDUIT_APP_NAME: ${{ secrets.KONDUIT_APP_NAME }}

steps:
- name: Checkout
uses: actions/checkout@v4

- name: Resolve review DB config
id: review_db_config
shell: bash
run: |
set -euo pipefail
config_reset_review_db="$(ruby -e "require 'yaml'; config = YAML.load_file('terraform/application/config/review.yml') || {}; value = config.fetch('reset_review_db', true); normalized = case value when true then true when false then false else value.to_s.strip.downcase == 'true' end; puts(normalized ? 'true' : 'false')")"
echo "config_reset_review_db=${config_reset_review_db}" >> "$GITHUB_OUTPUT"
echo "effective_reset_review_db=${config_reset_review_db}" >> "$GITHUB_OUTPUT"

- name: Deploy App to Review
id: deploy_review
uses: DFE-Digital/github-actions/deploy-to-aks@master
Expand All @@ -245,26 +257,26 @@ jobs:
# REVIEW APP DATABASE DEPLOYMENT (PR)
# ---------------------------
- name: Checkout (needed for workspace consistency)
if: ${{ github.event_name != 'workflow_dispatch' || (inputs.environment == 'review' && inputs.refresh-review-db) }}
if: ${{ steps.review_db_config.outputs.effective_reset_review_db == 'true' }}
uses: actions/checkout@v4

- name: Install Azure CLI
if: ${{ github.event_name != 'workflow_dispatch' || (inputs.environment == 'review' && inputs.refresh-review-db) }}
if: ${{ steps.review_db_config.outputs.effective_reset_review_db == 'true' }}
shell: bash
run: |
set -euo pipefail
curl -sL https://aka.ms/InstallAzureCLIDeb | sudo bash

- name: Azure login (OIDC)
if: ${{ github.event_name != 'workflow_dispatch' || (inputs.environment == 'review' && inputs.refresh-review-db) }}
if: ${{ steps.review_db_config.outputs.effective_reset_review_db == 'true' }}
uses: azure/login@v2
with:
client-id: ${{ secrets.AZURE_CLIENT_ID }}
tenant-id: ${{ secrets.AZURE_TENANT_ID }}
subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}

- name: Install kubectl (pinned)
if: ${{ github.event_name != 'workflow_dispatch' || (inputs.environment == 'review' && inputs.refresh-review-db) }}
if: ${{ steps.review_db_config.outputs.effective_reset_review_db == 'true' }}
shell: bash
run: |
set -euo pipefail
Expand All @@ -274,7 +286,7 @@ jobs:
kubectl version --client=true

- name: Install kubelogin (pinned)
if: ${{ github.event_name != 'workflow_dispatch' || (inputs.environment == 'review' && inputs.refresh-review-db) }}
if: ${{ steps.review_db_config.outputs.effective_reset_review_db == 'true' }}
shell: bash
run: |
set -euo pipefail
Expand All @@ -285,7 +297,7 @@ jobs:
kubelogin --version

- name: Configure AKS credentials
if: ${{ github.event_name != 'workflow_dispatch' || (inputs.environment == 'review' && inputs.refresh-review-db) }}
if: ${{ steps.review_db_config.outputs.effective_reset_review_db == 'true' }}
shell: bash
run: |
set -euo pipefail
Expand All @@ -295,7 +307,7 @@ jobs:
kubelogin convert-kubeconfig -l azurecli

- name: Download konduit.sh
if: ${{ github.event_name != 'workflow_dispatch' || (inputs.environment == 'review' && inputs.refresh-review-db) }}
if: ${{ steps.review_db_config.outputs.effective_reset_review_db == 'true' }}
shell: bash
run: |
set -euo pipefail
Expand All @@ -305,7 +317,7 @@ jobs:
ls -la "$GITHUB_WORKSPACE/konduit.sh"

- name: Download seed backup from Blob
if: ${{ github.event_name != 'workflow_dispatch' || (inputs.environment == 'review' && inputs.refresh-review-db) }}
if: ${{ steps.review_db_config.outputs.effective_reset_review_db == 'true' }}
shell: pwsh
env:
AZURE_STORAGE_CONNECTION_STRING: ${{ secrets.AZURE_STORAGE_CONNECTION_STRING }}
Expand Down Expand Up @@ -367,7 +379,7 @@ jobs:
} -Label "download $env:BACKUP_BLOB_TEST"
}
- name: Reset PR review DB
if: ${{ github.event_name != 'workflow_dispatch' || (inputs.environment == 'review' && inputs.refresh-review-db) }}
if: ${{ steps.review_db_config.outputs.effective_reset_review_db == 'true' }}
shell: bash
env:
AKS_NAMESPACE: ${{ secrets.AKS_REVIEW_NAMESPACE }}
Expand Down Expand Up @@ -413,7 +425,7 @@ jobs:
"${APP_NAME}" -- psql

- name: Restore backup into PR review DB
if: ${{ github.event_name != 'workflow_dispatch' || (inputs.environment == 'review' && inputs.refresh-review-db) }}
if: ${{ steps.review_db_config.outputs.effective_reset_review_db == 'true' }}
shell: bash
env:
AKS_NAMESPACE: ${{ secrets.AKS_REVIEW_NAMESPACE }}
Expand Down Expand Up @@ -492,6 +504,21 @@ jobs:
- name: Checkout
uses: actions/checkout@v4

- name: Resolve review DB config
id: review_db_config
if: ${{ inputs.environment == 'review' }}
shell: bash
run: |
set -euo pipefail
config_reset_review_db="$(ruby -e "require 'yaml'; config = YAML.load_file('terraform/application/config/review.yml') || {}; value = config.fetch('reset_review_db', true); normalized = case value when true then true when false then false else value.to_s.strip.downcase == 'true' end; puts(normalized ? 'true' : 'false')")"
if [ "${config_reset_review_db}" = "true" ] && [ "${{ inputs.refresh-review-db }}" = "true" ]; then
effective_reset_review_db="true"
else
effective_reset_review_db="false"
fi
echo "config_reset_review_db=${config_reset_review_db}" >> "$GITHUB_OUTPUT"
echo "effective_reset_review_db=${effective_reset_review_db}" >> "$GITHUB_OUTPUT"

- name: Deploy app to ${{ matrix.environment }}
id: deploy_app
uses: DFE-Digital/github-actions/deploy-to-aks@master
Expand Down Expand Up @@ -646,26 +673,26 @@ jobs:
kubectl -n "${namespace}" rollout status deployment/get-school-improvement-insights-maintenance --timeout=180s

- name: Checkout (needed for workspace consistency)
if: ${{ inputs.environment == 'review' && inputs.refresh-review-db }}
if: ${{ inputs.environment == 'review' && steps.review_db_config.outputs.effective_reset_review_db == 'true' }}
uses: actions/checkout@v4

- name: Install Azure CLI
if: ${{ inputs.environment == 'review' && inputs.refresh-review-db }}
if: ${{ inputs.environment == 'review' && steps.review_db_config.outputs.effective_reset_review_db == 'true' }}
shell: bash
run: |
set -euo pipefail
curl -sL https://aka.ms/InstallAzureCLIDeb | sudo bash

- name: Azure login (OIDC)
if: ${{ inputs.environment == 'review' && inputs.refresh-review-db }}
if: ${{ inputs.environment == 'review' && steps.review_db_config.outputs.effective_reset_review_db == 'true' }}
uses: azure/login@v2
with:
client-id: ${{ secrets.AZURE_CLIENT_ID }}
tenant-id: ${{ secrets.AZURE_TENANT_ID }}
subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}

- name: Install kubectl (pinned)
if: ${{ inputs.environment == 'review' && inputs.refresh-review-db }}
if: ${{ inputs.environment == 'review' && steps.review_db_config.outputs.effective_reset_review_db == 'true' }}
shell: bash
run: |
set -euo pipefail
Expand All @@ -675,7 +702,7 @@ jobs:
kubectl version --client=true

- name: Install kubelogin (pinned)
if: ${{ inputs.environment == 'review' && inputs.refresh-review-db }}
if: ${{ inputs.environment == 'review' && steps.review_db_config.outputs.effective_reset_review_db == 'true' }}
shell: bash
run: |
set -euo pipefail
Expand All @@ -686,7 +713,7 @@ jobs:
kubelogin --version

- name: Configure AKS credentials
if: ${{ inputs.environment == 'review' && inputs.refresh-review-db }}
if: ${{ inputs.environment == 'review' && steps.review_db_config.outputs.effective_reset_review_db == 'true' }}
shell: bash
run: |
set -euo pipefail
Expand All @@ -696,7 +723,7 @@ jobs:
kubelogin convert-kubeconfig -l azurecli

- name: Download konduit.sh
if: ${{ inputs.environment == 'review' && inputs.refresh-review-db }}
if: ${{ inputs.environment == 'review' && steps.review_db_config.outputs.effective_reset_review_db == 'true' }}
shell: bash
run: |
set -euo pipefail
Expand All @@ -706,7 +733,7 @@ jobs:
ls -la "$GITHUB_WORKSPACE/konduit.sh"

- name: Download seed backup from Blob
if: ${{ inputs.environment == 'review' && inputs.refresh-review-db }}
if: ${{ inputs.environment == 'review' && steps.review_db_config.outputs.effective_reset_review_db == 'true' }}
shell: bash
env:
AZURE_STORAGE_CONNECTION_STRING: ${{ secrets.AZURE_STORAGE_CONNECTION_STRING }}
Expand All @@ -726,7 +753,7 @@ jobs:
ls -lh "${BACKUP_FILE}"

- name: Reset PR review DB
if: ${{ inputs.environment == 'review' && inputs.refresh-review-db }}
if: ${{ inputs.environment == 'review' && steps.review_db_config.outputs.effective_reset_review_db == 'true' }}
shell: bash
env:
AKS_NAMESPACE: ${{ secrets.AKS_REVIEW_NAMESPACE }}
Expand Down Expand Up @@ -772,7 +799,7 @@ jobs:
"${APP_NAME}" -- psql

- name: Restore backup into PR review DB
if: ${{ inputs.environment == 'review' && inputs.refresh-review-db }}
if: ${{ inputs.environment == 'review' && steps.review_db_config.outputs.effective_reset_review_db == 'true' }}
shell: bash
env:
AKS_NAMESPACE: ${{ secrets.AKS_REVIEW_NAMESPACE }}
Expand Down
Loading
Loading