Merge branch 'WS2-sprint-72' and fix dependency issue

ASUWebPlatforms · Oct 22, 2024 · 10b68ed · 10b68ed
2 parents 60b82a8 + 713173f
commit 10b68ed
Show file tree

Hide file tree

Showing 11 changed files with 60 additions and 22 deletions.
diff --git a/.github/workflows/mono-package-split.yml b/.github/workflows/mono-package-split.yml
@@ -1,13 +1,13 @@
 name: 'Split ASU Packages'
 
 # Run action only on code deployments with a tag that matches the regex.
-# This will make it so that this only runs when we create a release.
+# This will make it so that this only runs when we create a release
 on:
   push:
     branches:
-      - main
-    tags:
-      - 'v[0-9]+.[0-9]+.[0-9]+'
+      - WS2-1623
+#    tags:
+#      - 'v[0-9]+.[0-9]+.[0-9]+'
   # Allow us to manually trigger the workflow
   workflow_dispatch:
 

diff --git a/web/modules/asu_modules/asu_brand/asu_brand.info.yml b/web/modules/asu_modules/asu_brand/asu_brand.info.yml
@@ -5,5 +5,6 @@ core_version_requirement: ^10
 package: ASU
 configure: asu_brand.asu_brand_settings
 dependencies:
-  - asu_react_integration:asu_react_integration
-  - asu_react_core:asu_react_core
+  - asuwebplatforms:asu_react_integration
+  - asuwebplatforms:asu_react_core
+  - asuwebplatforms:asu_user
diff --git a/web/modules/asu_modules/asu_brand/composer.json b/web/modules/asu_modules/asu_brand/composer.json
@@ -5,6 +5,7 @@
     "license": "MIT",
     "require": {
         "asuwebplatforms/asu_react_core": "^2.14",
-        "asuwebplatforms/asu_react_integration": "^2.14"
+        "asuwebplatforms/asu_react_integration": "^2.14",
+        "asuwebplatforms/asu_user": "^2.14"
     }
 }
diff --git a/web/modules/asu_modules/asu_user/composer.json b/web/modules/asu_modules/asu_user/composer.json
@@ -4,6 +4,7 @@
     "type": "drupal-module",
     "license": "MIT",
     "require": {
-        "asuwebplatforms/asu_config_utility": "^2.14"
+        "asuwebplatforms/asu_config_utility": "^2.14",
+        "drupal/cas": "2.3.2"
     }
 }
diff --git a/web/modules/webspark/webspark_ckeditor_plugins/js/build/websparkPlugin.js b/web/modules/webspark/webspark_ckeditor_plugins/js/build/websparkPlugin.js
diff --git a/...keditor5_plugins/websparkPlugin/src/tablecellwsproperties/tablecellwspropertiesediting.js b/...keditor5_plugins/websparkPlugin/src/tablecellwsproperties/tablecellwspropertiesediting.js
@@ -62,7 +62,8 @@ function markerConversion(conversion) {
     converterPriority: "high",
   });
 
-  conversion.for("downcast").elementToElement({
+  // For the editing view (with contenteditable)
+  conversion.for("editingDowncast").elementToElement({
     model: {
       name: "tableCell",
       attributes: ["cellType"],
@@ -73,7 +74,7 @@ function markerConversion(conversion) {
           return writer.createEditableElement(
             "th",
             {
-              contenteditable: "true",
+              contenteditable: "true",  // Allow editing in the editor
               class: "ck-editor__editable ck-editor__nested-editable",
               role: "textbox",
             },
@@ -83,7 +84,7 @@ function markerConversion(conversion) {
           return writer.createEditableElement(
             "td",
             {
-              contenteditable: "true",
+              contenteditable: "true",  // Allow editing in the editor
               class: "ck-editor__editable ck-editor__nested-editable",
               role: "textbox",
             },
@@ -94,7 +95,7 @@ function markerConversion(conversion) {
           return writer.createEditableElement(
             "th",
             {
-              contenteditable: "true",
+              contenteditable: "true",  // Allow editing in the editor
               class:
                 "ck-editor__editable ck-editor__nested-editable " +
                 modelElement.getAttribute("cellType"),
@@ -104,6 +105,29 @@ function markerConversion(conversion) {
           );
       }
     },
-    converterPriority: "high",
+    converterPriority: "high", // Ensure this converter has a high priority
+  });
+
+  // For the data view (without contenteditable)
+  conversion.for("dataDowncast").elementToElement({
+    model: {
+      name: "tableCell",
+      attributes: ["cellType"],
+    },
+    view: (modelElement, { writer }) => {
+      switch (modelElement.getAttribute("cellType")) {
+        case "th":
+          return writer.createContainerElement("th", {});  // No contenteditable attribute, just a basic table header element
+        case "td":
+          return writer.createContainerElement("td", {});  // No contenteditable attribute, just a basic table data element
+        case "indent":
+        case "normal":
+          return writer.createContainerElement("th", {
+            class: modelElement.getAttribute("cellType"),
+          });  // Apply the custom class, but no contenteditable attribute
+      }
+    },
+    converterPriority: "high", // Ensure this converter has a high priority
   });
+
 }
diff --git a/web/themes/webspark/renovation/package.json b/web/themes/webspark/renovation/package.json
@@ -21,7 +21,7 @@
         "sass-loader": "^12.1.0"
     },
     "dependencies": {
-        "@asu/unity-bootstrap-theme": "1.14.2",
+        "@asu/unity-bootstrap-theme": "1.15.1",
         "@popperjs/core": "^2.11.8"
     }
 }
diff --git a/web/themes/webspark/renovation/src/components/blockquote/blockquote.twig b/web/themes/webspark/renovation/src/components/blockquote/blockquote.twig
@@ -1,5 +1,5 @@
 <div class="uds-blockquote uds-content-align {{ accent_color }} {{ text_color }} {{ citation_style }}">
-  <svg title="Open quote" role="presentation" viewBox="0 0 302.87 245.82">
+  <svg role="presentation" viewBox="0 0 302.87 245.82">
     <path d="M113.61,245.82H0V164.56q0-49.34,8.69-77.83T40.84,35.58Q64.29,12.95,100.67,0l22.24,46.9q-34,11.33-48.72,31.54T58.63,132.21h55Zm180,0H180V164.56q0-49.74,8.7-78T221,35.58Q244.65,12.95,280.63,0l22.24,46.9q-34,11.33-48.72,31.54t-15.57,53.77h55Z"></path>
   </svg>
 

diff --git a/web/themes/webspark/renovation/src/components/cards/_card-image-and-content.scss b/web/themes/webspark/renovation/src/components/cards/_card-image-and-content.scss
@@ -24,4 +24,10 @@
       }
     }
   }
+
+  &-content-container-headline {
+    h2 {
+      font-size: 3rem;
+    }
+  }
 }
diff --git a/...ion/templates/field/field--block-content--field-heading--card-image-and-content.html.twig b/...ion/templates/field/field--block-content--field-heading--card-image-and-content.html.twig
@@ -1,3 +1,8 @@
 {% for item in items %}
-  {{ item.content }}
-{% endfor %}
+  <div{{ attributes.addClass(classes) }}>
+    {% include '@renovation/headings/heading.twig' with {
+      html_tag : 'h2',
+      heading: item.content['#context'].value,
+    } %}
+  </div>
+{% endfor %}
diff --git a/web/themes/webspark/renovation/yarn.lock b/web/themes/webspark/renovation/yarn.lock
@@ -10,10 +10,10 @@
     "@jridgewell/gen-mapping" "^0.1.0"
     "@jridgewell/trace-mapping" "^0.3.9"
 
-"@asu/unity-bootstrap-theme@1.14.2":
-  version "1.14.2"
-  resolved "https://npm.pkg.github.com/download/@asu/unity-bootstrap-theme/1.14.2/ade482be4962d2bae774b318a0e59983be3dd18b#ade482be4962d2bae774b318a0e59983be3dd18b"
-  integrity sha512-FZjslQ8dviKlJ9UiDlba/uuYFYurWPi/4SjUMIU9pb+Dinp/2Co9ZbPIX2H5uSwCpn4V83S0rLcPCIBIlsw7iw==
+"@asu/unity-bootstrap-theme@1.15.1":
+  version "1.15.1"
+  resolved "https://npm.pkg.github.com/download/@asu/unity-bootstrap-theme/1.15.1/f733b50680b1aded0105950ba3a99f4951356262#f733b50680b1aded0105950ba3a99f4951356262"
+  integrity sha512-IPLS4JmcRyJi381RcBBkMMF4FNyEx4Vm+TAnwyz7QnL21RICbfJOonJJECBxx4k0s10tvSJcXQ7F8gS5XI9lkQ==
 
 "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.22.10", "@babel/code-frame@^7.22.5":
   version "7.22.10"
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,4 +24,10 @@ @@
           }
         }
       }
+      &-content-container-headline {
+        h2 {
+          font-size: 3rem;
+        }
+      }
     }