@concretecms/bedrock 1.3.1 → 1.3.2

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@concretecms/bedrock",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "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