Merge pull request #94 from City-of-Helsinki/dev

Dev to main

.platform/schema

@@ -1 +1 @@
-15
+16

conf/cmi/field.field.paragraph.event_list.field_event_location.yml

@@ -6,13 +6,13 @@ dependencies:
     - field.storage.paragraph.field_event_location
     - paragraphs.paragraphs_type.event_list
 _core:
-  default_config_hash: 7Hs1O1Q80jl_WCj7YdTHGtJJGN_UIzP6FFe1h7EEZ8I
+  default_config_hash: 13KIFMm3tOwizoAK5jPdkaQMBM5Q0VVQGzRhZXowlPA
 id: paragraph.event_list.field_event_location
 field_name: field_event_location
 entity_type: paragraph
 bundle: event_list
 label: 'Event location'
-description: 'Show "event location" filter. Do not use at the same time with the "Remote events" filter. The API URL field should include all location IDs, otherwise this list will display all active locations.'
+description: 'Show "event location" filter. The API URL field should include all location IDs, otherwise this list will display all active locations.'
 required: false
 translatable: false
 default_value:

conf/cmi/field.field.paragraph.event_list.field_remote_events.yml

@@ -6,13 +6,13 @@ dependencies:
     - field.storage.paragraph.field_remote_events
     - paragraphs.paragraphs_type.event_list
 _core:
-  default_config_hash: MlPqj3UK1sh8Q_ocrr9beEo5ZuLzzeXXDn4QPV5EGbg
+  default_config_hash: wz7a1ma56v-vMw8QiUY3AxztYVoDF6xKj0aO_yA0d_4
 id: paragraph.event_list.field_remote_events
 field_name: field_remote_events
 entity_type: paragraph
 bundle: event_list
 label: 'Remote events'
-description: 'Show "list only remote events" filter. Do not use at the same time with the "Event location" filter.'
+description: 'Show "list only remote events" filter.'
 required: false
 translatable: false
 default_value:

conf/cmi/language/fi/field.field.paragraph.event_list.field_event_location.yml

@@ -1,5 +1,5 @@
 label: Tapahtumapaikka
-description: 'Näytä "tapahtumapaikka" -suodatin. Älä käytä yhtä aikaa "Etätapahtumat" -suodattimen kanssa. Tapahtumapaikat pitää valita tapahtumakalenterista ennen kuin kopioit linkin.'
+description: 'Näytä "tapahtumapaikka" -suodatin.Tapahtumapaikat pitää valita tapahtumakalenterista ennen kuin kopioit linkin.'
 settings:
   on_label: Kyllä
   off_label: Ei

conf/cmi/language/fi/field.field.paragraph.event_list.field_remote_events.yml

@@ -1,5 +1,5 @@
 label: Etätapahtumat
-description: 'Näytä "näytä vain etätapahtumat" -suodatin. Älä käytä yhtä aikaa "Tapahtumapaikka" -suodattimen kanssa.'
+description: 'Näytä "näytä vain etätapahtumat" -suodatin.'
 settings:
   on_label: Kyllä
   off_label: Ei

conf/cmi/oembed_providers.provider.icareus_suite.yml

@@ -3,7 +3,7 @@ langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: lAatlgWI8urSMlM-wvNsFE3cwVWq9Y7cA6WIH6q5o5Y
+  default_config_hash: cx73uI3KIlc_zavusNtbn2_vDJwmNJhxgorInBFhRAw
 id: icareus_suite
 label: 'Icareus Suite'
 provider_url: 'https://www.helsinkikanava.fi'
@@ -44,3 +44,11 @@ endpoints:
     formats:
       json: true
       xml: false
+  -
+    schemes:
+      - 'https://players.icareus.com/helsinkikanava/embed/vod/*'
+    url: 'https://suite.icareus.com/api/oembed'
+    discovery: false
+    formats:
+      json: true
+      xml: false

docker/openshift/Dockerfile

@@ -5,17 +5,15 @@ COPY / /var/www/html/
 WORKDIR /var/www/html
 RUN composer install --no-progress --profile --prefer-dist --no-interaction --no-dev --optimize-autoloader
 
-# Copy ALL deploy scripts
+# Copy custom entrypoints.
+# @see https://github.com/City-of-Helsinki/drupal-docker-images/tree/main/openshift/drupal
+RUN mkdir -p /crons /entrypoints /deploy
 COPY docker/openshift/entrypoints/ /entrypoints
-RUN chmod +x /entrypoints/*
+COPY docker/openshift/crons/ /crons
+COPY docker/openshift/deploy /deploy
+RUN chmod +x /entrypoints/* /deploy/* /crons/*
 
 COPY docker/openshift/init.sh /
 
-# Copy cron scripts
-RUN mkdir /crons
-COPY docker/openshift/crons/ /crons
-COPY docker/openshift/cron-entrypoint.sh /usr/local/bin/cron-entrypoint
-RUN chmod +x /crons/* /usr/local/bin/cron-entrypoint
-
 # Copy nginx overrides.
 COPY docker/openshift/custom.locations /etc/nginx/conf.d/custom.locations

docker/openshift/deploy/10-preflight.sh

@@ -0,0 +1,11 @@
+#!/bin/sh
+
+source /init.sh
+
+if [ -f "../docker/openshift/preflight/preflight.php" ]; then
+  echo "Running preflight checks ..."
+  if ! php ../docker/openshift/preflight/preflight.php; then
+    exit 1
+  fi
+fi
+

docker/openshift/deploy/20-deploy.sh

@@ -0,0 +1,27 @@
+#!/bin/sh
+
+# Skip deployment script if ENV var is true
+if [ "$SKIP_DEPLOY_SCRIPTS" = "true" ]; then
+    echo "SKIP_DEPLOY_SCRIPTS is true. Skipping the steps."
+    return
+fi
+
+source /init.sh
+
+echo "Starting deploy: $(date)"
+
+# Populate deploy ID so 20-deploy.sh is skipped.
+# @todo Remove this once 20-deploy.sh is removed.
+set_deploy_id $OPENSHIFT_BUILD_NAME
+
+drush state:set system.maintenance_mode 1 --input-format=integer
+# Run pre-deploy tasks.
+# @see https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/blob/main/documentation/deploy-hooks.md
+drush helfi:pre-deploy || true
+# Run maintenance tasks (config import, database updates etc)
+drush deploy
+# Run post-deploy tasks.
+# @see https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/blob/main/documentation/deploy-hooks.md
+drush helfi:post-deploy || true
+# Disable maintenance mode
+drush state:set system.maintenance_mode 0 --input-format=integer

docker/openshift/entrypoints/15-twig-compile.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+# Populate twig caches.
+if [ ! -d "/tmp/twig" ]; then
+  drush twig:compile || true
+fi

docker/openshift/entrypoints/20-deploy.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+# NOTE: This script is being phased out in favor of new deployment job pod.
 
 # Skip deployment script if ENV var is true
 if [ "$SKIP_DEPLOY_SCRIPTS" = "true" ]; then

public/themes/custom/hdbt_subtheme/.eslintignore

@@ -0,0 +1,3 @@
+node_modules/**/*
+webpack.config.js
+webpack.svgToSprite.js

public/themes/custom/hdbt_subtheme/.eslintrc.json

@@ -0,0 +1,76 @@
+{
+  "root": true,
+  "env": {
+    "browser": true,
+    "node": true,
+    "es6": true
+  },
+  "extends": [
+    "airbnb-base",
+    "prettier",
+    "plugin:import/recommended"
+  ],
+  "plugins": [
+    "jsdoc"
+  ],
+  "parserOptions": {
+    "ecmaVersion": 2022,
+    "sourceType": "module"
+  },
+  "globals": {
+    "Drupal": true,
+    "drupalSettings": true,
+    "drupalTranslations": true,
+    "jQuery": true,
+    "_": true,
+    "Cookies": true,
+    "Backbone": true,
+    "Modernizr": true,
+    "Popper": true,
+    "Shepherd": true,
+    "Sortable": true,
+    "once": true,
+    "CKEDITOR": true,
+    "tabbable": true
+  },
+  "rules": {
+    "arrow-spacing": ["warn", { "before": true, "after": true }],
+    "comma-spacing": ["warn", { "before": false, "after": true }],
+    "consistent-return": ["off"],
+    "import/no-extraneous-dependencies": ["error", {"devDependencies": true}],
+    "lines-between-class-members": ["error", "always", { "exceptAfterSingleLine": true }],
+    "max-nested-callbacks": ["warn", 5],
+    "no-plusplus": [
+      "warn",
+      {
+        "allowForLoopAfterthoughts": true
+      }
+    ],
+    "no-param-reassign": ["off"],
+    "no-prototype-builtins": ["off"],
+    "no-unused-vars": ["warn"],
+    "no-underscore-dangle": ["off"],
+    "no-whitespace-before-property": "warn",
+    "object-curly-spacing": ["error", "always"],
+    "operator-linebreak": [
+      "error",
+      "after",
+      { "overrides": { "?": "ignore", ":": "ignore" } }
+    ],
+    "prefer-arrow-callback":["off"],
+    "quotes": ["warn", "single"],
+    "semi": ["error", "always"],
+    "space-in-parens": ["warn", "never"],
+    "space-before-function-paren": ["error", "never"],
+    "valid-jsdoc": [
+      "warn",
+      {
+        "prefer": {
+          "returns": "return",
+          "property": "prop"
+        },
+        "requireReturn": false
+      }
+    ]
+  }
+}

public/themes/custom/hdbt_subtheme/.nvmrc

@@ -1 +1 @@
-20
+23