INTRANET-299 add message field to oclc alert display

unb-libraries · Jan 17, 2025 · 8e9dbc8 · 8e9dbc8
1 parent 8677f47
commit 8e9dbc8
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 6 deletions.
diff --git a/custom/modules/oclc_service_alert_status_client/js/models/OCLCStatusModel.js b/custom/modules/oclc_service_alert_status_client/js/models/OCLCStatusModel.js
@@ -15,29 +15,41 @@
      * @type {object}
      *
      * @prop status
+     * @prop message
      */
     defaults: {
       status: false,
+      message: '',
     },
     url: '',
-    message: '',
     alert: '',
+    options: '',
 
     getStatus: function() {
       return this.get('status');
     },
 
+    getMessage: function() {
+      return this.get('message');
+    },
+
     initialize: function(status, options) {
       this.set('status', status);
-      this.message = options.message;
+      this.set('message', options.message);
       this.url = options.url;
 
-      this.alert = $(OCLCStatusTemplate({message: this.message}));
+      this.alert = $(OCLCStatusTemplate({message: this.getMessage()}));
+      this.options = options;
       $('#discovery-search').append(this.alert);
 
       this.fetch({
-          success: function(model, response, options) {
+          success: function(model, response) {
             model.set('status', response.status);
+            model.set('message', this.options.message);
+            if (response.message) {
+                model.set('message', response.message);
+            }
+            $('#oclc-service-alert-message').html(this.getMessage());
             model.toggleView();
           }
       });
@@ -59,8 +71,13 @@
       model = this;
       setInterval(function() {
           model.fetch({
-              success: function(model, response, options) {
+              success: function(model, response) {
                   model.set('status', response.status);
+                  model.set('message', this.options.message);
+                  if (response.message) {
+                      model.set('message', response.message);
+                  }
+                  $('#oclc-service-alert-message').html(this.getMessage());
                   model.toggleView();
               }
           });

diff --git a/custom/modules/oclc_service_alert_status_client/js/templates/OCLCStatusTemplate.js b/custom/modules/oclc_service_alert_status_client/js/templates/OCLCStatusTemplate.js
@@ -1,3 +1,3 @@
 OCLCStatusTemplate = _.template(
-    '<div id="oclc-service-alert" class="col-12 my-0 collapse alert alert-warning"><i class="fa fa-lg fa-exclamation-triangle text-danger"></i> <strong><%= message %></strong> <a href="https://lib.unb.ca/help/status" class="btn btn-sm btn-dark">More Info<span class="sr-only"> about online resource issues</span></a></div>'
+    '<div id="oclc-service-alert" class="col-12 my-0 collapse alert alert-warning"><i class="fa fa-lg fa-exclamation-triangle text-danger"></i> <strong id="oclc-service-alert-message"><%= message %></strong> <a href="https://lib.unb.ca/help/status" class="btn btn-sm btn-dark">More Info<span class="sr-only"> about online resource issues</span></a></div>'
 );