ccs-digitalmarketplace-frameworks 1.8.21 → 1.8.23

package/.github/dependabot.yml

@@ -6,8 +6,6 @@ updates:
     interval: weekly
     time: "03:00"
   open-pull-requests-limit: 10
-  allow:
-  - dependency-type: production
 - package-ecosystem: "github-actions"
   directory: "/"
   schedule:

package/.github/workflows/publish_package.yml

@@ -12,7 +12,7 @@ jobs:
 
     - uses: actions/checkout@v4
     # Setup .npmrc file to publish to npm
-    - uses: actions/setup-node@v3
+    - uses: actions/setup-node@v4
       with:
         node-version: '${{ steps.nvm.outputs.NVMRC }}'
         registry-url: 'https://registry.npmjs.org'

package/.github/workflows/test.yml

@@ -37,10 +37,8 @@ jobs:
       matrix:
         python-version: [3.9]
         script:
-          - scripts/generate-assessment-schema.py g-cloud-12
-          - scripts/generate-assessment-schema.py digital-outcomes-and-specialists-5
-          - scripts/generate-search-config.py g-cloud-12 services --output-path=/tmp
-          - scripts/generate-search-config.py digital-outcomes-and-specialists-5 briefs --output-path=/tmp
+          - scripts/generate-assessment-schema.py g-cloud-14
+          - scripts/generate-search-config.py g-cloud-14 services --output-path=/tmp
           - scripts/generate-validation-schemas.py --output-path=/tmp
 
     steps:

package/frameworks/g-cloud-14/manifests/display_service.yml

@@ -271,11 +271,7 @@
 
 - name: Social Value
   questions:
-    - multiqfightingClimateChange
-    - multiqcovid19Recovery
-    - multiqtacklingEconomicInequality
-    - multiqequalOpportunity
-    - multiqwellbeing
+    - multiqSocialValue
 
 - name: Pricing
   questions:

package/frameworks/g-cloud-14/manifests/edit_service_as_admin.yml

@@ -226,11 +226,7 @@
 
   editable: True
   questions:
-    - multiqfightingClimateChange
-    - multiqcovid19Recovery
-    - multiqtacklingEconomicInequality
-    - multiqequalOpportunity
-    - multiqwellbeing
+    - multiqSocialValue
 
 - name: Pricing
   editable: True

package/frameworks/g-cloud-14/manifests/edit_submission.yml

@@ -251,21 +251,10 @@
     - multiqEnergyEfficiency
 
 - name: Social Value
-  summary_page_description: >
-    Please provide further information about how your G-Cloud service provision will deliver against <b> at least one or more of the following 
-              <a href="https://assets.publishing.service.gov.uk/government/uploads/system/uploads/attachment_data/file/921437/PPN-06_20-Taking-Account-of-Social-Value-in-the-Award-of-Central-Government-Contracts.pdf" target="_blank" rel="noopener noreferrer">Social Value themes outlined in PPN 06/20</a></b>.
-    </br>
-    </br>
-    It is expected that public sector buyers will request clarifications on Social Value and/or the information you provide as part of the G-Cloud buying process.
-
   editable: False
   edit_questions: True
   questions:
-    - multiqfightingClimateChange
-    - multiqcovid19Recovery
-    - multiqtacklingEconomicInequality
-    - multiqequalOpportunity
-    - multiqwellbeing
+    - multiqSocialValue
 
 - name: Pricing
   editable: False

package/frameworks/g-cloud-14/metadata/copy_services.yml

@@ -1,12 +1,7 @@
 questions_to_exclude:
-- staffSecurityClearanceChecks
-- serviceDefinitionDocumentURL
-- termsAndConditionsDocumentURL
-- pricingDocumentURL
-- sfiaRateDocumentURL
-- dataStorageAndProcessing
-- dataStorageAndProcessingLocations
-- dataStorageAndProcessingUserControl
-- browsersAccess
-- browsersSupported
+  - fightingClimateChange
+  - covid19Recovery
+  - tacklingEconomicInequality
+  - equalOpportunity
+  - wellbeing
 source_framework: g-cloud-13

package/frameworks/g-cloud-14/questions/declaration/contractsFinderContactDetailsHaveWebAddress.yml

@@ -0,0 +1,12 @@
+name: Do you have a web address?
+question: Do you have a web address?
+type: boolean
+
+followup:
+  contractsFinderContactDetailsWebAddress:
+    - true
+
+validations:
+  -
+    name: answer_required
+    message: You must select an option

package/frameworks/g-cloud-14/questions/declaration/contractsFinderContactDetailsWebAddress.yml

@@ -2,6 +2,7 @@ name: Web address
 question: |
   <span class="govuk-label">Web address</span>
 type: text
+hidden: true
 
 validations:
   - name: answer_required

package/frameworks/g-cloud-14/questions/declaration/multiqContractsFinderContactDetails.yml

@@ -5,4 +5,5 @@ question: |
 type: multiquestion
 questions:
   - contractsFinderContactDetailsEmail
+  - contractsFinderContactDetailsHaveWebAddress
   - contractsFinderContactDetailsWebAddress

package/frameworks/g-cloud-14/questions/services/covid19Recovery.yml

@@ -1,5 +1,5 @@
 name: Covid-19 recovery
-question: ""
+question: Covid-19 recovery
 
 depends:
   - "on": lot
@@ -10,11 +10,12 @@ depends:
 
 type: textbox_large
 max_length_in_words: 300
+hidden: true
 
 validations:
   - name: answer_required
-    message: Please complete at least one of the following Social Value fields.
+    message: You need to answer this question because you selected ‘Covid-19 recovery’ as a Social Value
   - name: under_300_words
-    message: Description must be 300 words or fewer.
+    message: Your answer must be no more than 300 words
   - name: under_character_limit
-    message: Description must be 3000 characters or fewer.
+    message: Description must be 3000 characters or fewer

package/frameworks/g-cloud-14/questions/services/equalOpportunity.yml

@@ -1,5 +1,5 @@
 name: Equal opportunity
-question: ""
+question: Equal opportunity
 
 depends:
   - "on": lot
@@ -10,11 +10,12 @@ depends:
 
 type: textbox_large
 max_length_in_words: 300
+hidden: true
 
 validations:
   - name: answer_required
-    message: Please complete at least one of the following Social Value fields.
+    message: You need to answer this question because you selected ‘Equal opportunity’ as a Social Value
   - name: under_300_words
-    message: Description must be 300 words or fewer.
+    message: Your answer must be no more than 300 words
   - name: under_character_limit
-    message: Description must be 3000 characters or fewer.
+    message: Description must be 3000 characters or fewer

package/frameworks/g-cloud-14/questions/services/fightingClimateChange.yml

@@ -1,5 +1,5 @@
 name: Fighting climate change
-question:  ""
+question: Fighting climate change
 
 depends:
   - "on": lot
@@ -10,11 +10,12 @@ depends:
 
 type: textbox_large
 max_length_in_words: 300
+hidden: true
 
 validations:
   - name: answer_required
-    message: Please complete at least one of the following Social Value fields.
+    message: You need to answer this question because you selected ‘Fighting climate change’ as a Social Value.
   - name: under_300_words
-    message: Description must be 300 words or fewer.
+    message: Your answer must be no more than 300 words
   - name: under_character_limit
-    message: Description must be 3000 characters or fewer.
+    message: Description must be 3000 characters or fewer

package/frameworks/g-cloud-14/questions/services/multiqSocialValue.yml

@@ -1,5 +1,5 @@
-name: Social value
-question: Social value
+name: Social Value
+question: ""
 
 depends:
   - "on": lot
@@ -10,8 +10,9 @@ depends:
 
 type: multiquestion
 questions:
-  - multiqfightingClimateChange
-  - multiqcovid19Recovery
-  - multiqtacklingEconomicInequality
-  - multiqequalOpportunity
-  - multiqwellbeing
+  - socialValue
+  - fightingClimateChange
+  - covid19Recovery
+  - tacklingEconomicInequality
+  - equalOpportunity
+  - wellbeing

package/frameworks/g-cloud-14/questions/services/socialValue.yml

@@ -0,0 +1,50 @@
+name: Social Value
+question: |
+  You must provide further information about how your G-Cloud service provision will deliver against at least one or more of the following <a class="govuk-link" href="https://assets.publishing.service.gov.uk/government/uploads/system/uploads/attachment_data/file/921437/PPN-06_20-Taking-Account-of-Social-Value-in-the-Award-of-Central-Government-Contracts.pdf" target="_blank">Social Value themes outlined in PPN 06/20 (opens in new tab)</a>:
+
+  <ul class="govuk-list govuk-list--bullet govuk-!-margin-top-2 govuk-!-margin-bottom-2">
+    <li>Fighting climate change</li>
+    <li>Covid-19 recovery</li>
+    <li>Tackling economic inequality</li>
+    <li>Equal opportunity</li>
+    <li>Wellbeing</li>
+  </ul>
+
+question_advice: |
+  It is expected that public sector buyers will request clarifications on Social Value and/or the information you provide as part of the G-Cloud buying process.
+
+depends:
+  - "on": lot
+    being:
+      - cloud-hosting
+      - cloud-software
+      - cloud-support
+
+followup:
+  fightingClimateChange:
+    - fighting_climate_change
+  covid19Recovery:
+    - covid_19_recovery
+  tacklingEconomicInequality:
+    - tackling_economic_inequality
+  equalOpportunity:
+    - equal_opportunity
+  wellbeing:
+    - wellbeing
+
+type: checkboxes
+options:
+  - label: Fighting climate change
+    value: fighting_climate_change
+  - label: Covid-19 recovery
+    value: covid_19_recovery
+  - label: Tackling economic inequality
+    value: tackling_economic_inequality
+  - label: Equal opportunity
+    value: equal_opportunity
+  - label: Wellbeing
+    value: wellbeing
+
+validations:
+  - name: answer_required
+    message: You must select at least one Social Value option

package/frameworks/g-cloud-14/questions/services/tacklingEconomicInequality.yml

@@ -1,5 +1,5 @@
 name: Tackling economic inequality
-question: ""
+question: Tackling economic inequality
 
 depends:
   - "on": lot
@@ -10,11 +10,12 @@ depends:
 
 type: textbox_large
 max_length_in_words: 300
+hidden: true
 
 validations:
   - name: answer_required
-    message: Please complete at least one of the following Social Value fields.
+    message: You need to answer this question because you selected ‘Tackling economic inequality’ as a Social Value
   - name: under_300_words
-    message: Description must be 300 words or fewer.
+    message: Your answer must be no more than 300 words
   - name: under_character_limit
-    message: Description must be 3000 characters or fewer.
+    message: Description must be 3000 characters or fewer

package/frameworks/g-cloud-14/questions/services/wellbeing.yml

@@ -1,5 +1,5 @@
 name: Wellbeing
-question: ""
+question: Wellbeing
 
 depends:
   - "on": lot
@@ -8,15 +8,14 @@ depends:
       - cloud-software
       - cloud-support
 
-
-
 type: textbox_large
 max_length_in_words: 300
+hidden: true
 
 validations:
   - name: answer_required
-    message: Please complete at least one of the following Social Value fields.
+    message: You need to answer this question because you selected ‘Wellbeing’ as a Social Value
   - name: under_300_words
-    message: Description must be 300 words or fewer.
+    message: Your answer must be no more than 300 words
   - name: under_character_limit
-    message: Description must be 3000 characters or fewer.
+    message: Description must be 3000 characters or fewer

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ccs-digitalmarketplace-frameworks",
-  "version": "1.8.21",
+  "version": "1.8.23",
   "description": "Data files for Digital Marketplace’s procurement frameworks",
   "repository": "git@github.com:Crown-Commercial-Service/ccs-digitalmarketplace-frameworks",
   "author": "enquiries@digitalmarketplace.service.gov.uk"