Skip to content

Conversation

@kevwhitt-hee
Copy link
Contributor

@kevwhitt-hee kevwhitt-hee commented Dec 20, 2024

JIRA link

TD-5153

Description

Describe what has changed and how that will affect the app. If relevant, add references to the resources you used. Use this as your opportunity to highlight anything odd and give people context around particular decisions.

Screenshots

image


Developer checks

(Leave tasks unticked if they haven't been appropriate for your ticket.)

I have:

  • Run the formatter and made sure there are no IDE errors (see info on Text Editor settings to avoid whitespace changes)
  • Written tests for the changes (accessibility tests, unit tests for controller, data services, services, view models, etc)
  • Manually tested my work with and without JavaScript
  • Tested any Views or partials created or changed with Wave Chrome plugin and addressed any valid accessibility issues
  • Updated/added documentation in Confluence and/or GitHub Readme. List of documentation links added/changed:
  • Updated my Jira ticket with information about other parts of the system that were touched as part of the MR and have to be sanity tested to ensure nothing’s broken
  • Scanned over my pull request in GitHub and addressed any warnings from the GitHub Build and Test checks.

dependabot bot and others added 30 commits September 5, 2024 10:28
Bumps [webpack](https://github.com/webpack/webpack) from 5.90.3 to 5.94.0.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](webpack/webpack@v5.90.3...v5.94.0)

---
updated-dependencies:
- dependency-name: webpack
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [micromatch](https://github.com/micromatch/micromatch) from 4.0.5 to 4.0.8.
- [Release notes](https://github.com/micromatch/micromatch/releases)
- [Changelog](https://github.com/micromatch/micromatch/blob/master/CHANGELOG.md)
- [Commits](micromatch/micromatch@4.0.5...4.0.8)

---
updated-dependencies:
- dependency-name: micromatch
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [braces](https://github.com/micromatch/braces) from 3.0.2 to 3.0.3.
- [Changelog](https://github.com/micromatch/braces/blob/master/CHANGELOG.md)
- [Commits](micromatch/braces@3.0.2...3.0.3)

---
updated-dependencies:
- dependency-name: braces
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [Microsoft.Data.SqlClient](https://github.com/dotnet/sqlclient) from 5.1.2 to 5.1.3.
- [Release notes](https://github.com/dotnet/sqlclient/releases)
- [Changelog](https://github.com/dotnet/SqlClient/blob/main/CHANGELOG.md)
- [Commits](dotnet/SqlClient@v5.1.2...v5.1.3)

---
updated-dependencies:
- dependency-name: Microsoft.Data.SqlClient
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [dompurify](https://github.com/cure53/DOMPurify) from 2.4.7 to 2.5.4.
- [Release notes](https://github.com/cure53/DOMPurify/releases)
- [Commits](cure53/DOMPurify@2.4.7...2.5.4)

---
updated-dependencies:
- dependency-name: dompurify
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
commit 4eb3383
Merge: e97a907 f0b75ff
Author: kevwhitt-hee <kevin.whittaker@hee.nhs.uk>
Date:   Fri Nov 22 16:25:55 2024 +0000

    Merge pull request #2970 from TechnologyEnhancedLearning/Develop/Fixes/TD-5058-FixAddSimilarCompetency

    TD-5058 Fix add similar competency 500 error

commit f0b75ff
Author: kevwhitt-hee <kevin.whittaker@hee.nhs.uk>
Date:   Fri Nov 22 16:23:37 2024 +0000

    TD-5058 Fixes setting of flag IDs property when no flags are selected
…irmation view to supervisors with a matching category
Bumps [eslint-plugin-import](https://github.com/import-js/eslint-plugin-import) from 2.29.1 to 2.31.0.
- [Release notes](https://github.com/import-js/eslint-plugin-import/releases)
- [Changelog](https://github.com/import-js/eslint-plugin-import/blob/main/CHANGELOG.md)
- [Commits](import-js/eslint-plugin-import@v2.29.1...v2.31.0)

---
updated-dependencies:
- dependency-name: eslint-plugin-import
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [NUnit3TestAdapter](https://github.com/nunit/nunit3-vs-adapter) from 4.5.0 to 4.6.0.
- [Release notes](https://github.com/nunit/nunit3-vs-adapter/releases)
- [Commits](nunit/nunit3-vs-adapter@V4.5.0...V4.6.0)

---
updated-dependencies:
- dependency-name: NUnit3TestAdapter
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…2989)

Bumps [core-js](https://github.com/zloirock/core-js/tree/HEAD/packages/core-js) from 3.36.0 to 3.39.0.
- [Release notes](https://github.com/zloirock/core-js/releases)
- [Changelog](https://github.com/zloirock/core-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/zloirock/core-js/commits/v3.39.0/packages/core-js)

---
updated-dependencies:
- dependency-name: core-js
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [eslint-plugin-jasmine](https://github.com/tlvince/eslint-plugin-jasmine) from 4.1.3 to 4.2.2.
- [Release notes](https://github.com/tlvince/eslint-plugin-jasmine/releases)
- [Commits](tlvince/eslint-plugin-jasmine@v4.1.3...v4.2.2)

---
updated-dependencies:
- dependency-name: eslint-plugin-jasmine
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
)

Bumps [rimraf](https://github.com/isaacs/rimraf) from 5.0.5 to 5.0.10.
- [Changelog](https://github.com/isaacs/rimraf/blob/main/CHANGELOG.md)
- [Commits](isaacs/rimraf@v5.0.5...v5.0.10)

---
updated-dependencies:
- dependency-name: rimraf
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
#2987)

Bumps [babel-loader](https://github.com/babel/babel-loader) from 9.1.3 to 9.2.1.
- [Release notes](https://github.com/babel/babel-loader/releases)
- [Changelog](https://github.com/babel/babel-loader/blob/main/CHANGELOG.md)
- [Commits](babel/babel-loader@v9.1.3...v9.2.1)

---
updated-dependencies:
- dependency-name: babel-loader
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [xunit](https://github.com/xunit/xunit) from 2.6.2 to 2.9.2.
- [Commits](xunit/xunit@v2-2.6.2...v2-2.9.2)

---
updated-dependencies:
- dependency-name: xunit
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [Dapper](https://github.com/DapperLib/Dapper) from 2.1.24 to 2.1.35.
- [Release notes](https://github.com/DapperLib/Dapper/releases)
- [Commits](DapperLib/Dapper@2.1.24...2.1.35)

---
updated-dependencies:
- dependency-name: Dapper
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [Selenium.Support](https://github.com/SeleniumHQ/selenium) and [Selenium.WebDriver](https://github.com/SeleniumHQ/selenium). These dependencies needed to be updated together.

Updates `Selenium.Support` from 4.16.2 to 4.27.0
- [Release notes](https://github.com/SeleniumHQ/selenium/releases)
- [Commits](https://github.com/SeleniumHQ/selenium/commits/selenium-4.27.0)

Updates `Selenium.WebDriver` from 4.16.2 to 4.27.0
- [Release notes](https://github.com/SeleniumHQ/selenium/releases)
- [Commits](https://github.com/SeleniumHQ/selenium/commits/selenium-4.27.0)

---
updated-dependencies:
- dependency-name: Selenium.Support
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: Selenium.WebDriver
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [Microsoft.Data.SqlClient](https://github.com/dotnet/sqlclient) from 5.1.5 to 5.2.2.
- [Release notes](https://github.com/dotnet/sqlclient/releases)
- [Changelog](https://github.com/dotnet/SqlClient/blob/main/CHANGELOG.md)
- [Commits](dotnet/SqlClient@v5.1.5...v5.2.2)

---
updated-dependencies:
- dependency-name: Microsoft.Data.SqlClient
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…m_and_yarn/DigitalLearningSolutions.Web/webpack-5.94.0
…m_and_yarn/DigitalLearningSolutions.Web/micromatch-4.0.8
…m_and_yarn/DigitalLearningSolutions.Web/braces-3.0.3
…uget/Automatic_version_update_dependabot/multi-bd4e373d75

Bump Selenium.Support and Selenium.WebDriver
…uget/DigitalLearningSolutions.Data.Tests/Microsoft.Data.SqlClient-5.1.3

Bump Microsoft.Data.SqlClient from 5.1.2 to 5.1.3 in /DigitalLearningSolutions.Data.Tests
…m_and_yarn/DigitalLearningSolutions.Web/dompurify-2.5.4
Bumps [HtmlAgilityPack](https://github.com/zzzprojects/html-agility-pack) from 1.11.54 to 1.11.71.
- [Release notes](https://github.com/zzzprojects/html-agility-pack/releases)
- [Commits](zzzprojects/html-agility-pack@v1.11.54...v1.11.71)

---
updated-dependencies:
- dependency-name: HtmlAgilityPack
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
dependabot bot and others added 28 commits November 29, 2024 16:34
#3001)

Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 5.25.0 to 5.62.0.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v5.62.0/packages/eslint-plugin)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/eslint-plugin"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [regenerator-runtime](https://github.com/facebook/regenerator) from 0.13.9 to 0.14.1.
- [Release notes](https://github.com/facebook/regenerator/releases)
- [Commits](https://github.com/facebook/regenerator/compare/regenerator-runtime@0.13.9...regenerator-runtime@0.14.1)

---
updated-dependencies:
- dependency-name: regenerator-runtime
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…ures/TD-4973-LimitthelistofsupervisorsintheRequestproficiencyconfirmationviewtosupervisorswithamatchingcategories

TD-4973 Limit the list of supervisors in the Request proficiency confirmation view to supervisors with a matching category
…ures/TD-4889-WhenasupervisorpromotesalearnertotheNominatedsupervisorrole,assignthemtothesamecategoryasthesupervisors

TD-4889 Resolving internal server error when nominating delegate to supervisor
…uget/Automatic_version_update_dependabot/Microsoft.AspNetCore.Mvc.Testing-7.0.0

Bump Microsoft.AspNetCore.Mvc.Testing from 6.0.25 to 7.0.0
…rsion_update_dependabot

Automatic version update dependabot to dev branch
…ntID to update CandidateAssessmentSupervisors
…TD-4787-Assessor-role-instead-Educator-manager

TD-4787- Changed role from Educator/Manager to Assessor for nominated supervisors
…TD-5095-Enrol-on-activity-error

TD-5095-Tracking system enrol on activity - Enrolling Adult critical care self-assessment resulting in error
…/Features/TD-4884-Reviewpageisstillaccessibleforthisadmintoconfirmtheresults
…ures/TD-4884-Reviewpageisstillaccessibleforthisadmintoconfirmtheresults

TD-4884 Prevent supervisors from confirm self assessments in a category that doesn't match their own
…ures/TD-5026-Limittheselfassessmentactivitieslistedinthemanagedelegateviewtothecategoryassociatedwiththeadmin

TD-5026 Limit the self assessment activities listed in the manage delegate view to the category associated with the admin
@kevwhitt-hee kevwhitt-hee merged commit 6ff7840 into DLS-Release-v1.2.0 Dec 20, 2024
3 checks passed
@kevwhitt-hee kevwhitt-hee deleted the Develop/Features/TD-5153-BulkUploadCompetenciesPage branch December 20, 2024 16:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants