ccs-digitalmarketplace-frameworks 9.4.0 → 9.6.0

package/frameworks/g-cloud-15/manifests/edit_live_additional_lot_questions.yml

@@ -0,0 +1,16 @@
+- name: "Condition of participation - Carbon reduction"
+  slug: carbon-reduction
+  editable: True
+  questions:
+    - muliqCarbonReduction
+
+- name: "Non-scored mandatory questions"
+  slug: non-scored-mandatory-questions
+  editable: True
+  questions:
+    - alsoBiddingLot2
+    - alsoBiddingLot3
+    - adhereToNCSCGuidance
+    - policiesAndControlsInPlace
+    - highLevelProcedureForContractualExit
+    - howYouEngageInChangeOfService

package/frameworks/g-cloud-15/manifests/edit_live_lot_pricing_questions.yml

@@ -0,0 +1,17 @@
+- name: Public Cloud - Formula for calculating price of your services
+  slug: public-cloud-pricing
+  editable: True
+  questions:
+    - multiqLivePublicCloudPricing
+
+- name: Private Cloud - Formula for calculating price of your services
+  slug: private-cloud-pricing
+  editable: True
+  questions:
+    - multiqLivePrivateCloudPricing
+
+- name: Price certainty
+  slug: price-certainty
+  editable: True
+  questions:
+    - priceCertainty

package/frameworks/g-cloud-15/manifests/edit_service.yml

@@ -24,6 +24,21 @@
     - multiqServiceFeaturesAndBenefitsHostingAndSoftware
     - multiqServiceFeaturesAndBenefitsSupport
 
+- name: Service scope
+  editable: True
+  questions:
+    - multiqServiceScopeLot1
+
+- name: Reselling
+  editable: True
+  questions:
+    - multiqResellingLot1
+
+- name: Pricing
+  editable: True
+  questions:
+    - multiqPricingLot1
+
 - name: Documents
   editable: True
   questions:

package/frameworks/g-cloud-15/manifests/services_search_filters.yml

@@ -77,6 +77,18 @@
   questions:
   - publicSectorNetworksTypes
 
+-
+  name: Cyber certifications
+  slug: cyber-certifications
+  filter_settings:
+    name: cyberCertifications
+    filter_type: radios
+    item_name:
+      singular: cyber certification filter
+      plural: cyber certification filters
+  questions:
+  - cyberCertifications
+
 -
   name: Data protection between buyer and supplier networks
   slug: data-protection-between-networks

package/frameworks/g-cloud-15/questions/lot-pricing-questions/multiqLivePrivateCloudPricing.yml

@@ -0,0 +1,18 @@
+name: Private Cloud - Formula for calculating price of your services
+question: Private Cloud - Formula for calculating price of your services
+
+type: multiquestion
+
+depends:
+  - "on": route
+    being:
+      - iaas-and-paas
+      - iaas-and-paas-above-official
+
+depends_on_follow_up:
+  whichCoreDeploymentModels:
+    - private-cloud
+
+questions:
+  - calculatingPricePrivateCloudCostAdditions
+  - calculatingPricePrivateCloudCostReductions

package/frameworks/g-cloud-15/questions/lot-pricing-questions/multiqLivePublicCloudPricing.yml

@@ -0,0 +1,19 @@
+name: Public Cloud - Formula for calculating price of your services
+question: Public Cloud - Formula for calculating price of your services
+
+type: multiquestion
+
+depends:
+  - "on": route
+    being:
+      - iaas-and-paas
+      - iaas-and-paas-above-official
+
+depends_on_follow_up:
+  whichCoreDeploymentModels:
+    - public-cloud
+
+questions:
+  - calculatingPricePublicCloudBaselinePricingWeblink
+  - calculatingPricePublicCloudCostAdditions
+  - calculatingPricePublicCloudCostReductions

package/frameworks/g-cloud-15/questions/services/certifications.yml

@@ -43,8 +43,13 @@ options:
     value: csa-star
   - label: PCI certification
     value: pci
+  # Cyber Essentials and Cyber Essentials Plus are filtered on from their own single-choice
+  # group (see cyberCertifications.yml), so they are not offered here (NDMP-2761). The
+  # derived_from rule stays: it keeps the NDMP-2699 hierarchy on this field for anything
+  # still filtering by `certifications`.
   - label: Cyber essentials
     value: cyber-essentials
+    filter_ignore: true
     derived_from:
       question: certifications
       any_of:
@@ -57,3 +62,4 @@ options:
           - cloud-support
   - label: Cyber Essentials Plus
     value: cyber-essentials-plus
+    filter_ignore: true

package/frameworks/g-cloud-15/questions/services/cyberCertifications.yml

@@ -0,0 +1,32 @@
+name: Cyber certifications
+question: (filter) cyber certifications
+
+# Filter-only question. Cyber Essentials and Cyber Essentials Plus are answered by suppliers
+# as part of `certifications`, but buyers must not be able to ask for both at once
+# (NDMP-2761), so they are filtered on from their own field as a single choice.
+#
+# The values are derived from the supplier's certifications at index time, keeping the
+# hierarchy NDMP-2699 introduced: Cyber Essentials Plus also answers Cyber Essentials, so
+# selecting the lower level still returns services holding the higher one.
+
+type: radios
+options:
+  - label: Cyber Essentials
+    value: cyber-essentials
+    derived_from:
+      question: certifications
+      any_of:
+        - cyber-essentials
+        - cyber-essentials-plus
+    depends:
+      - "on": lot
+        being:
+          - saas
+          - isaas
+          - cloud-support
+  - label: Cyber Essentials Plus
+    value: cyber-essentials-plus
+    derived_from:
+      question: certifications
+      any_of:
+        - cyber-essentials-plus

package/frameworks/g-cloud-15/questions/services/multiqPricingLot1.yml

@@ -0,0 +1,16 @@
+name: Pricing
+question: Pricing
+
+type: multiquestion
+
+depends:
+  - "on": lot
+    being:
+      - iaas-and-paas
+      - iaas-and-paas-above-official
+
+questions:
+  - educationPricing
+  - freeVersionTrialOption
+  - freeVersionDescription
+  - freeVersionLink

package/frameworks/g-cloud-15/questions/services/multiqResellingLot1.yml

@@ -0,0 +1,14 @@
+name: Supplier type
+question: Supplier type
+
+type: multiquestion
+
+depends:
+  - "on": lot
+    being:
+      - iaas-and-paas
+      - iaas-and-paas-above-official
+
+questions:
+  - resellingType
+  - resellingOrganisations

package/frameworks/g-cloud-15/questions/services/multiqServiceScopeLot1.yml

@@ -0,0 +1,15 @@
+name: Service scope
+question: Service scope
+
+type: multiquestion
+
+depends:
+  - "on": lot
+    being:
+      - iaas-and-paas
+      - iaas-and-paas-above-official
+
+questions:
+  - cloudDeploymentModelAmended
+  - serviceConstraintsHostingAndSoftware
+  - systemRequirements

package/frameworks/g-cloud-15/search_mappings/services.json

@@ -131,6 +131,10 @@
         "type": "keyword",
         "normalizer": "filter_normalizer"
       },
+      "dmfilter_cyberCertifications": {
+        "type": "keyword",
+        "normalizer": "filter_normalizer"
+      },
       "dmfilter_metricsHow": {
         "type": "keyword",
         "normalizer": "filter_normalizer"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ccs-digitalmarketplace-frameworks",
-  "version": "9.4.0",
+  "version": "9.6.0",
   "description": "Data files for Digital Marketplace’s procurement frameworks",
   "repository": {
     "type": "git",