Merge pull request #326 from SU-SWS/release-4.0.2

Release 4.0.2

.ddev/config.yaml

@@ -1,12 +1,14 @@
 name: sdss
-type: drupal9
+type: drupal10
 docroot: docroot
 php_version: "8.1"
 webserver_type: nginx-fpm
 router_http_port: "80"
 router_https_port: "443"
 xdebug_enabled: false
-additional_hostnames: []
+additional_hostnames:
+  - woods-water
+  - sustainability-accelerator
 additional_fqdns: []
 database:
     type: mariadb

.github/workflows/deploy_branch.yml

@@ -16,7 +16,7 @@ jobs:
       DRUPAL_DATABASE_PASSWORD: drupal
       DRUPAL_DATABASE_HOST: mysql
     container:
-      image: pookmish/drupal8ci:latest
+      image: pookmish/drupal8ci:8.1
     steps:
       - uses: actions/checkout@v3
       - name: Restore Cache
@@ -27,11 +27,11 @@ jobs:
             docroot/core
             docroot/libraries
             docroot/modules/contrib
-          key: 4.x-20230622-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
+          key: 4.x-20231130-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
           restore-keys: |
-            4.x-20230622-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
-            4.x-20230622-${{ hashFiles('composer.json') }}-
-            4.x-20230622-
+            4.x-20231130-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
+            4.x-20231130-${{ hashFiles('composer.json') }}-
+            4.x-20231130-
       - name: Install SSH key
         uses: shimataro/ssh-key-action@v2
         with:

.github/workflows/tests.yml

@@ -15,7 +15,7 @@ jobs:
       DRUPAL_DATABASE_PASSWORD: drupal
       DRUPAL_DATABASE_HOST: mysql
     container:
-      image: pookmish/drupal8ci:latest
+      image: pookmish/drupal8ci:8.1
     services:
       mysql:
         image: mysql:5.7
@@ -37,11 +37,11 @@ jobs:
             docroot/core
             docroot/libraries
             docroot/modules/contrib
-          key: 4.x-20231101-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
+          key: 4.x-20231130-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
           restore-keys: |
-            4.x-20231101-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
-            4.x-20231101-${{ hashFiles('composer.json') }}-
-            4.x-20231101-
+            4.x-20231130-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
+            4.x-20231130-${{ hashFiles('composer.json') }}-
+            4.x-20231130-
       - run: git config --system --add safe.directory '*'
       - name: Run Unit Tests
         # env:
@@ -65,7 +65,7 @@ jobs:
       DRUPAL_DATABASE_PASSWORD: drupal
       DRUPAL_DATABASE_HOST: mysql
     container:
-      image: pookmish/drupal8ci:latest
+      image: pookmish/drupal8ci:8.1
     services:
       mysql:
         image: mysql:5.7
@@ -120,7 +120,7 @@ jobs:
       DRUPAL_DATABASE_PASSWORD: drupal
       DRUPAL_DATABASE_HOST: mysql
     container:
-      image: pookmish/drupal8ci:latest
+      image: pookmish/drupal8ci:8.1
       options: '--network-alias drupal8ci'
     services:
       selenium:

.gitpod.yml

@@ -23,7 +23,7 @@ ports:
     visibility: public
   - port: 8002-9999
     onOpen: ignore
-image: pookmish/drupal8ci:gitpod
+image: pookmish/drupal8ci:gitpod8.1
 tasks:
   - name: Drupal Prep
     init: >

CHANGELOG.md

@@ -1,5 +1,22 @@
 # ACE SDSSGryphon
 
+4.0.2
+--------------------------------------------------------------------------------
+_Release Date: 2023-11-30_
+
+3e73be0 SDSS-1089: Added JS to redirect to current page when clicking saml_login links (#325)
+409459e SDSS-1106: Ignore SDSS Subtheme settings (#324)
+483e153 SDSS-1127: Use php8.1 docker images for automation (#323)
+fc77bcf SDSS-1084 | SDSS-1085: Increase bottom margin on Callout and Editorial Sidebar (#316)
+7bd3a53 SDSS-1079: Updated stanford_earth_r25 module to 8.1.10 (#321)
+abbc14a SDSS-1103 | SDSS-1063: Provision waters-wood and sustainability-accelerator (#320)
+dc354c9 SDSS-987: Updated publications styles (#248)
+dda4335 SDSS-1086: Updated margins on images in wysiwyg (#314)
+b9eb51a Update .gitpod.yml (#319)
+e17defe Merge pull request #311 from SU-SWS/backtodev-4.0.2
+387ea1c backtodev-4.0.2
+
+
 4.0.1
 --------------------------------------------------------------------------------
 _Release Date: 2023-11-16_

blt/blt.yml

@@ -66,11 +66,13 @@ multisites:
   - storagex
   - strategic_energy_alliance
   - sustainability
+  - sustainability_accelerator
   - understand_energy_course
   - understandenergy
   - water
   - witw
   - woods
+  - woods_water
 tests:
   reports:
     localDir: '${repo.root}/artifacts'

composer.json

@@ -53,12 +53,12 @@
             "type": "package",
             "package": {
                 "name": "stanford-earth/stanford_earth_r25",
-                "version": "8.1.8",
+                "version": "8.1.10",
                 "type": "drupal-custom-module-rooms-site",
                 "source": {
                     "type": "git",
                     "url": "https://github.com/stanford-earth/stanford_earth_r25",
-                    "reference": "8.1.8"
+                    "reference": "8.1.10"
                 }
             }
         }

docroot/profiles/sdss/sdss_profile/config/sync/config_ignore.settings.yml

@@ -3,14 +3,15 @@ _core:
 mode: simple
 ignored_config_entities:
   - 'block.block.*'
+  - 'core.extension:module.earth_news_importer'
   - 'core.extension:theme'
   - 'google_tag.container.*'
+  - 'migrate_plus.migration.earth_news_importer*'
+  - migrate_plus.migration_group.earth_news_importer
   - 'next.next_entity_type_config.*'
   - 'next.next_site.*'
-  - migrate_plus.migration_group.earth_news_importer
-  - 'migrate_plus.migration.earth_news_importer*'
-  - 'core.extension:module.earth_news_importer'
   - 'samlauth.authentication:map_users_roles'
+  - sdss_subtheme.settings
   - 'system.action.user_add_role_action.custm_*'
   - 'system.action.user_remove_role_action.custm_*'
   - 'system.theme:default'

docroot/profiles/sdss/sdss_profile/config/sync/core.entity_view_display.node.stanford_publication.default.yml

@@ -39,7 +39,7 @@ third_party_settings:
           context_mapping: {  }
           extra_classes: ''
           centered: centered-container
-          columns: default
+          columns: flex-10-of-12
         components:
           4df7625d-a934-4076-a6ff-d70bf5aa9f2e:
             uuid: 4df7625d-a934-4076-a6ff-d70bf5aa9f2e
@@ -79,17 +79,17 @@ third_party_settings:
             additional: {  }
         third_party_settings: {  }
       -
-        layout_id: jumpstart_ui_two_column
+        layout_id: jumpstart_ui_one_column
         layout_settings:
           label: ''
           context_mapping: {  }
-          extra_classes: ''
+          extra_classes: sdss-publication-content
           centered: centered-container
-          orientation: left
+          columns: flex-10-of-12
         components:
           42ec0a5c-ba15-4be4-9d66-9fecee9a3912:
             uuid: 42ec0a5c-ba15-4be4-9d66-9fecee9a3912
-            region: left
+            region: main
             configuration:
               id: 'field_block:node:stanford_publication:su_publication_components'
               label: Components
@@ -106,7 +106,7 @@ third_party_settings:
                 third_party_settings:
                   field_formatter_class:
                     class: ''
-            weight: 3
+            weight: 0
             additional: {  }
           10a9b9f7-3532-480f-9500-a73f98dc906a:
             uuid: 10a9b9f7-3532-480f-9500-a73f98dc906a
@@ -127,7 +127,7 @@ third_party_settings:
                 third_party_settings:
                   field_formatter_class:
                     class: ''
-            weight: 0
+            weight: 1
             additional: {  }
           8e0b99d1-3634-419b-b3f7-0660aa3a7537:
             uuid: 8e0b99d1-3634-419b-b3f7-0660aa3a7537
@@ -153,31 +153,18 @@ third_party_settings:
                 third_party_settings:
                   field_formatter_class:
                     class: ''
-            weight: 1
+            weight: 2
             additional: {  }
         third_party_settings: {  }
       -
         layout_id: jumpstart_ui_one_column
         layout_settings:
           label: ''
           context_mapping: {  }
-          extra_classes: ''
+          extra_classes: sdss-publication--types
           centered: centered-container
-          columns: flex-12-of-12
+          columns: flex-10-of-12
         components:
-          797a272b-885d-4772-a161-853409dca684:
-            uuid: 797a272b-885d-4772-a161-853409dca684
-            region: main
-            configuration:
-              id: 'views_block:stanford_publications-related'
-              label: 'More Publications'
-              label_display: visible
-              provider: views
-              context_mapping: {  }
-              views_label: 'More Publications'
-              items_per_page: none
-            weight: 1
-            additional: {  }
           7bc27225-3b16-491d-b443-c266687f6db8:
             uuid: 7bc27225-3b16-491d-b443-c266687f6db8
             region: main
@@ -202,6 +189,29 @@ third_party_settings:
             weight: 0
             additional: {  }
         third_party_settings: {  }
+      -
+        layout_id: jumpstart_ui_one_column
+        layout_settings:
+          label: ''
+          context_mapping: {  }
+          extra_classes: ''
+          centered: centered-container
+          columns: flex-12-of-12
+        components:
+          797a272b-885d-4772-a161-853409dca684:
+            uuid: 797a272b-885d-4772-a161-853409dca684
+            region: main
+            configuration:
+              id: 'views_block:stanford_publications-related'
+              label: 'More Publications'
+              label_display: visible
+              provider: views
+              context_mapping: {  }
+              views_label: 'More Publications'
+              items_per_page: none
+            weight: 1
+            additional: {  }
+        third_party_settings: {  }
   layout_library:
     enable: false
   layout_builder_restrictions:

docroot/profiles/sdss/sdss_profile/sdss_profile.info.yml

@@ -1,6 +1,6 @@
 name: 'Stanford Doerr School of Sustainability Profile'
 description: 'Jumpstart Website Profile for Stanford Doerr School of Sustainability'
-version: 4.0.1
+version: 4.0.2
 type: profile
 project: Stanford
 core_version_requirement: ^9 || ^10

docroot/profiles/sdss/sdss_profile/themes/sdss_subtheme/js/scripts.js

@@ -2,8 +2,14 @@
   'use strict';
   Drupal.behaviors.sdss_subtheme = {
     attach: function (context, settings) {
+
       // Add search link button to navigation.
       $('#block-sdss-subtheme-main-navigation').after('<a href="/search" id="sdss-button--search-link" class="su-site-search__submit"><span class="visually-hidden">Search</span></a>');
+
+      // Add current path as a drupal redirect desitnation to saml_login links.
+      // Will redirect the user to the current page after logging in.
+      $('a[href="/saml_login"').attr("href", "/saml/login?destination=" + window.location.pathname);
+
     }
   };
 

docroot/profiles/sdss/sdss_profile/themes/sdss_subtheme/sdss_subtheme.info.yml

@@ -2,7 +2,7 @@ name: Stanford SDSS subtheme
 type: theme
 description: 'Stanford SDSS subtheme'
 package: Stanford
-version: 4.0.1
+version: 4.0.2
 core_version_requirement: ^9 || ^10
 base theme: stanford_basic
 libraries:

docroot/profiles/sdss/sdss_profile/themes/sdss_subtheme/src/scss/components/index.scss

@@ -35,6 +35,7 @@
 @import 'newsroom/index.scss';
 @import 'node/index.scss';
 @import 'people/index.scss';
+@import 'publications/index.scss';
 @import 'row-backgrounds/index.scss';
 @import 'secondary-navigation/index.scss';
 @import 'search/index.scss';

docroot/profiles/sdss/sdss_profile/themes/sdss_subtheme/src/scss/components/newsroom/_callout.scss

@@ -2,6 +2,7 @@
 
 .callout {
   @include responsive-spacing('padding', 3 4 3 4);
+  @include responsive-spacing('margin-bottom', 1);
 
   display: flex;
 

docroot/profiles/sdss/sdss_profile/themes/sdss_subtheme/src/scss/components/newsroom/_sidebar.scss

@@ -3,6 +3,8 @@
 //padding set up based on layout.
 .layout--layout-paragraphs-one-column {
   .sidebar {
+    @include responsive-spacing('margin-bottom', 1);
+
     @include grid-media-max('lg') {
       max-width: 100%;
     }
@@ -14,7 +16,7 @@
 
     &.bg_color_option_1,
     &.bg_color_default  {
-      @include modular-spacing('padding', 4);
+      @include responsive-spacing('padding', 4);
     }
   }
 }
@@ -43,7 +45,7 @@
   }
 
   .su-sidebar-title {
-    @include modular-spacing('padding-bottom', 1);
+    @include responsive-spacing('padding-bottom', 1);
   }
 
   // This option is blue