@concretecms/bedrock 1.3.1 → 1.3.4

package/assets/cms/components/RunningProcessList.vue

@@ -31,6 +31,7 @@
 </template>
 
 <script>
+/* global CCM_DISPATCHER_FILENAME, CCM_SERVER_EVENTS_URL, CCM_SECURITY_TOKEN */
 /* eslint-disable no-new */
 /* eslint eqeqeq: 0 */
 import Icon from './Icon'
@@ -117,36 +118,45 @@ export default {
             }
         })
 
-        ConcreteEvent.subscribe('ConcreteServerEventProcessOutput', function(e, data) {
-            if (data.processId) {
-                my.processes.forEach(function (thisProcess) {
-                    if (thisProcess.id === data.processId) {
-                        thisProcess.details.push(data.message)
-                    }
-                })
-            }
-        })
-        ConcreteEvent.subscribe('ConcreteServerEventBatchUpdated', function(e, data) {
-            var total = data.batch.totalJobs
-            var progress = total - data.batch.pendingJobs
-            var percent = Math.round(progress / total * 100)
-
-            my.processes.forEach(function (thisProcess) {
-                if (thisProcess.batch && thisProcess.batch.id == data.batch.id) {
-                    thisProcess.progress = percent
-                    thisProcess.batch = data.batch
-                }
+        if (typeof (CCM_SERVER_EVENTS_URL) !== 'undefined') {
+            const eventSourceUrl = new URL(CCM_SERVER_EVENTS_URL)
+            eventSourceUrl.searchParams.append('topic', '{+siteUrl}/concrete/events/processes/{+eventName}')
+            const eventSource = new EventSource(eventSourceUrl, {
+                withCredentials: true
             })
-        })
-        ConcreteEvent.subscribe('ConcreteServerEventCloseProcess', function(e, data) {
-            my.processes.forEach(function (thisProcess) {
-                if (thisProcess.id == data.process.id) {
-                    thisProcess.dateCompleted = data.process.dateCompleted
-                    thisProcess.dateCompletedString = data.process.dateCompletedString
-                    my.completeProcess(thisProcess)
+
+            eventSource.onmessage = event => {
+                var data = JSON.parse(event.data)
+                if (Object.prototype.hasOwnProperty.call(data, 'batch')) {
+                    // Batch Updated
+                    var total = data.batch.totalJobs
+                    var progress = total - data.batch.pendingJobs
+                    var percent = Math.round(progress / total * 100)
+
+                    my.processes.forEach(function (thisProcess) {
+                        if (thisProcess.batch && thisProcess.batch.id == data.batch.id) {
+                            thisProcess.progress = percent
+                            thisProcess.batch = data.batch
+                        }
+                    })
+                } else if (Object.prototype.hasOwnProperty.call(data, 'exitCode')) {
+                    // Close process
+                    my.processes.forEach(function (thisProcess) {
+                        if (thisProcess.id == data.process.id) {
+                            thisProcess.dateCompleted = data.process.dateCompleted
+                            thisProcess.dateCompletedString = data.process.dateCompletedString
+                            my.completeProcess(thisProcess)
+                        }
+                    })
+                } else if (Object.prototype.hasOwnProperty.call(data, 'processId')) {
+                    my.processes.forEach(function (thisProcess) {
+                        if (thisProcess.id === data.processId) {
+                            thisProcess.details.push(data.message)
+                        }
+                    })
                 }
-            })
-        })
+            }
+        }
     },
     watch: {
         processes: {

package/assets/cms/js/base.js

@@ -13,9 +13,6 @@ import 'ajax-bootstrap-select'
 import './modifiable-ajax-bootstrap-select'
 import 'dropzone/dist/dropzone'
 
-// Server events
-import './server-events'
-
 // jQuery UI components
 import 'jquery-ui/ui/widgets/button'
 import 'jquery-ui/ui/widgets/dialog'

package/assets/cms/js/edit-mode/area.js

@@ -386,8 +386,8 @@
             }
 
             if (!my.getElem().parent().is('#ccm-stack-container')) {
-                var template = _(ccmi18n.emptyArea).template()
-                elem.text(template({ area_handle: my.getElem().data('area-display-name') }))
+                var template = _('<span>' + ccmi18n.emptyArea + '</span>').template()
+                elem.html(template({ area_handle: my.getElem().data('area-display-name') }))
             }
             my.getDragAreas().push(drag_area)
             return drag_area

package/assets/cms/scss/_base.scss

@@ -93,6 +93,7 @@
 @import './permission-grid';
 @import './tooltips';
 @import 'spectrum-colorpicker2/dist/spectrum';
+@import './color-picker';
 @import './icons';
 @import './date-time';
 @import './dropdown';

package/assets/cms/scss/_color-picker.scss

@@ -0,0 +1,28 @@
+div.ccm-ui {
+  .ccm-widget-colorpicker {
+    border: 1px solid $input-border-color;
+    height: unset;
+    padding: 5px;
+    width: unset;
+
+    .sp-preview {
+      border: 1px solid $input-border-color;
+      border-radius: 2px;
+      height: 30px;
+      margin-right: 15px;
+      width: 35px;
+    }
+
+    .sp-dd {
+      color: $input-color;
+      font-size: 12px;
+      line-height: 2.6rem;
+      right: 2px;
+    }
+
+    &.sp-replacer:hover,
+    &.sp-replacer.sp-active {
+      border-color: $input-focus-border-color;
+    }
+  }
+}

package/assets/cms/scss/_inline-toolbar.scss

@@ -127,30 +127,6 @@
       position: relative;
     }
 
-    .sp-dd {
-      display: none;
-    }
-
-    .sp-replacer {
-      border: 1px solid #444;
-      border-radius: 4px;
-      height: 28px;
-      margin-left: 10px;
-      padding: 0;
-      width: 28px;
-
-      .sp-preview {
-        border: 0;
-        height: 28px;
-        width: 28px;
-
-        .sp-preview-inner {
-          height: 28px;
-          width: 28px;
-        }
-      }
-    }
-
     h3 {
       font-size: $font-size-base;
       font-weight: bold;

package/assets/cms/scss/_login-page.scss

@@ -13,12 +13,6 @@
     padding: 40px 0;
   }
 
-  .external-auth-option {
-    margin-left: auto;
-    margin-right: auto;
-    max-width: 360px;
-  }
-
   h2.login-page-title {
     color: #fff;
     font-size: $modal-title-font-size;

package/assets/cms/scss/_page-areas.scss

@@ -129,12 +129,13 @@ div.ccm-area.ccm-menu-item-hover {
 }
 
 div.ccm-area-footer {
-  //bottom: -35px;
+  bottom: 0;
   left: 0;
   max-width: 100%;
   opacity: 0;
   padding-left: 20px;
   position: absolute;
+  transform: translateY(100%);
   transition: opacity 0.5 s cubic-bezier(0.19, 1, 0.22, 1);
   white-space: nowrap;
   //padding-top: 15px;
@@ -148,7 +149,6 @@ div.ccm-area-footer {
     color: #666;
     display: inline-block;
     font-size: $font-size-base !important;
-    height: 35px;
     max-width: 100%;
     padding: 8px 15px;
 
@@ -409,9 +409,12 @@ div.ccm-area-drag-area {
   outline-color: rgb(170, 255, 170);
   outline-style: solid;
   outline-width: 0;
-  text-indent: -10000em;
   transition: outline-width 0.5s cubic-bezier(0.19, 1, 0.22, 1), outline-color 0.5s cubic-bezier(0.19, 1, 0.22, 1);
 
+  span {
+    display: none;
+  }
+
   &.ccm-area-drag-area-contender {
     background-color: rgba(221, 255, 221, 0.5);
     outline: solid 5px rgba(221, 255, 221, 0.7) !important;
@@ -445,9 +448,12 @@ html.ccm-block-dragging {
 div.ccm-area[data-total-blocks='0'] {
   div.ccm-area-drag-area {
     color: #bbb;
+    display: block;
     padding: 24px;
     text-align: center !important; /* https://github.com/concrete5/concrete5/issues/10249 */
-    text-indent: 0;
+    span {
+      display: inline-block;
+    }
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@concretecms/bedrock",
-  "version": "1.3.1",
+  "version": "1.3.4",
   "description": "The asset framework and dependencies for Concrete CMS.",
   "scripts": {
     "lint": "standardx \"**/*.{js,vue}\" && stylelint assets/**/*.{scss,vue}",

package/assets/cms/js/server-events.js

@@ -1,17 +0,0 @@
-/* eslint-disable no-new, no-unused-vars, camelcase, eqeqeq */
-
-class ConcreteServerEvents {
-    static listen(url, topicUrl) {
-        const eventSourceUrl = new URL(url)
-        eventSourceUrl.searchParams.append('topic', topicUrl + '/{+anything}')
-        const eventSource = new EventSource(eventSourceUrl)
-        eventSource.onmessage = event => {
-            // Will be called every time an update is published by the server
-            var data = JSON.parse(event.data)
-            var eventName = 'ConcreteServerEvent' + data.event
-            ConcreteEvent.publish(eventName, data.data)
-        }
-    }
-}
-
-global.ConcreteServerEvents = ConcreteServerEvents