From fca250a2ed2994a5cc9909cd2c2dac1e32f97a1b Mon Sep 17 00:00:00 2001 From: HalyconJAC Date: Fri, 9 Apr 2021 08:47:23 +0100 Subject: [PATCH 01/29] Bug Fix - wrong version of jac-kit being used --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7c25a5b60..ec531e8cf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "admin", - "version": "0.59.0", + "version": "0.59.4", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -1618,7 +1618,7 @@ "dev": true }, "@jac-uk/jac-kit": { - "version": "0.0.25", + "version": "0.0.34", "resolved": "https://npm.pkg.github.com/download/@jac-uk/jac-kit/0.0.34/fe845de79339f49afde019a4295bcc04359afde27ddc0655e07e29fcf923c9cb", "integrity": "sha512-SezeQwvkp6pJTjm64zQ1LyKs4jKUhy5YYvu+ObCbG6ibxI2tYFvbTJ6IQXw51uQ6LsUloSBYzTdGip8pj+Dg+Q==" }, @@ -3080,7 +3080,7 @@ } }, "vue-loader-v16": { - "version": "npm:vue-loader@16.1.2", + "version": "16.1.2", "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.1.2.tgz", "integrity": "sha512-8QTxh+Fd+HB6fiL52iEVLKqE9N1JSlMXLR92Ijm6g8PZrwIxckgpqjPDWRP5TWxdiPaHR+alUWsnu1ShQOwt+Q==", "dev": true, diff --git a/package.json b/package.json index 9adecc7dc..2f7d93f7c 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ "dependencies": { "@ckeditor/ckeditor5-build-classic": "^16.0.0", "@ckeditor/ckeditor5-vue": "^1.0.3", - "@jac-uk/jac-kit": "0.0.25", + "@jac-uk/jac-kit": "0.0.34", "@ministryofjustice/frontend": "0.0.17-alpha", "@sentry/browser": "^5.30.0", "@sentry/integrations": "^5.30.0", From 8ec1cabc202643186a9441c9d684b8e815e04a55 Mon Sep 17 00:00:00 2001 From: HalyconJAC Date: Fri, 9 Apr 2021 08:47:43 +0100 Subject: [PATCH 02/29] resolve some npm warnings that appear during compilation --- src/views/Exercises/Show/Reports/Agency.vue | 1 - src/views/Exercises/Show/Reports/ReasonableAdjustments.vue | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/Exercises/Show/Reports/Agency.vue b/src/views/Exercises/Show/Reports/Agency.vue index ea2be806a..ce55cd7ec 100644 --- a/src/views/Exercises/Show/Reports/Agency.vue +++ b/src/views/Exercises/Show/Reports/Agency.vue @@ -450,7 +450,6 @@ - diff --git a/src/views/Exercises/Show/Reports/ReasonableAdjustments.vue b/src/views/Exercises/Show/Reports/ReasonableAdjustments.vue index 9baff219e..d082ca1b5 100644 --- a/src/views/Exercises/Show/Reports/ReasonableAdjustments.vue +++ b/src/views/Exercises/Show/Reports/ReasonableAdjustments.vue @@ -37,7 +37,8 @@
+ class="govuk-grid-row" + >
From ffa1bbde1616e224c8cce49f4f26e26040c0d1e1 Mon Sep 17 00:00:00 2001 From: HalyconJAC Date: Fri, 9 Apr 2021 14:54:48 +0100 Subject: [PATCH 03/29] Bug Fix - view QT - if there are no applications the page would not load Now the page loads and displays a warning message on-screen --- .../Tasks/QualifyingTests/QualifyingTest/View.vue | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/views/Exercises/Tasks/QualifyingTests/QualifyingTest/View.vue b/src/views/Exercises/Tasks/QualifyingTests/QualifyingTest/View.vue index 5863aeb8e..a940a1f1b 100644 --- a/src/views/Exercises/Tasks/QualifyingTests/QualifyingTest/View.vue +++ b/src/views/Exercises/Tasks/QualifyingTests/QualifyingTest/View.vue @@ -154,6 +154,7 @@
+
+ +