Viewer element template rename and Cypress test fix for delete modal

relates to xibosignageltd/xibo-private#379
xibosignage · Aug 1, 2023 · 4c53462 · 4c53462
1 parent dbdf4cf
commit 4c53462
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 13 deletions.
diff --git a/cypress/e2e/layout_clock.cy.js b/cypress/e2e/layout_clock.cy.js
@@ -76,7 +76,6 @@ describe('Layout Designer', function() {
     // Delete
     cy.get('#layout-viewer .designer-region .widget-preview[data-type="widget_clock-analogue"]').parents('.designer-region').rightclick();
     cy.get('[data-title="Delete"]').click();
-    cy.get('.btn-bb-confirm').click();
     cy.get('#layout-viewer .designer-region .widget-preview[data-type="widget_clock-analogue"]').should('not.exist');
   });
 });
diff --git a/cypress/e2e/layout_dataset.cy.js b/cypress/e2e/layout_dataset.cy.js
@@ -103,7 +103,6 @@ describe('Layout Designer', function() {
 
     cy.get('#layout-viewer .designer-region .widget-preview[data-type="widget_dataset"]').parents('.designer-region').rightclick();
     cy.get('[data-title="Delete"]').click();
-    cy.get('.btn-bb-confirm').click();
     cy.get('#layout-viewer .designer-region .widget-preview[data-type="widget_dataset"]').should('not.exist');
   });
 });
diff --git a/cypress/e2e/layout_mastodon.cy.js b/cypress/e2e/layout_mastodon.cy.js
@@ -61,7 +61,6 @@ describe('Layout Designer', function() {
 
     cy.get('#layout-viewer .designer-region .widget-preview[data-type="widget_mastodon"]').parents('.designer-region').rightclick();
     cy.get('[data-title="Delete"]').click();
-    cy.get('.btn-bb-confirm').click();
     cy.get('#layout-viewer .designer-region .widget-preview[data-type="widget_mastodon"]').should('not.exist');
   });
 });
diff --git a/cypress/e2e/layout_rss_ticker.cy.js b/cypress/e2e/layout_rss_ticker.cy.js
@@ -70,7 +70,6 @@ describe('Layout Designer', function() {
 
     cy.get('#layout-viewer .designer-region .widget-preview[data-type="widget_rss-ticker"]').parents('.designer-region').rightclick();
     cy.get('[data-title="Delete"]').click();
-    cy.get('.btn-bb-confirm').click();
     cy.get('#layout-viewer .designer-region .widget-preview[data-type="widget_rss-ticker"]').should('not.exist');
   });
 });
diff --git a/ui/src/layout-editor/viewer.js b/ui/src/layout-editor/viewer.js
@@ -8,11 +8,11 @@ const viewerLayoutPreview = require('../templates/viewer-layout-preview.hbs');
 const viewerActionEditRegionTemplate =
   require('../templates/viewer-action-edit-region.hbs');
 const loadingTemplate = require('../templates/loading.hbs');
-const viewerObjectTemplate = require('../templates/viewer-object.hbs');
-const viewerObjectGroupTemplate =
-  require('../templates/viewer-object-group.hbs');
-const viewerObjectContentTemplate =
-  require('../templates/viewer-object-content.hbs');
+const viewerElementTemplate = require('../templates/viewer-element.hbs');
+const viewerElementGroupTemplate =
+  require('../templates/viewer-element-group.hbs');
+const viewerElementContentTemplate =
+  require('../templates/viewer-element-content.hbs');
 const drawThrottle = 60;
 
 /**
@@ -1216,7 +1216,7 @@ Viewer.prototype.renderElement = function(
   }
 
   // Render element container
-  const $newElement = $(viewerObjectTemplate({
+  const $newElement = $(viewerElementTemplate({
     element: element,
     dimensions: elementRenderDimensions,
   }));
@@ -1229,7 +1229,7 @@ Viewer.prototype.renderElement = function(
       $canvasRegionContainer.find(`#${element.groupId}`).length == 0
     ) {
       $canvasRegionContainer.append(
-        viewerObjectGroupTemplate({
+        viewerElementGroupTemplate({
           element: element,
           trans: viewerTrans,
         }),
@@ -1441,7 +1441,7 @@ Viewer.prototype.renderElementContent = function(
     }
 
     // Render element with template
-    $elementContainer.html($(viewerObjectContentTemplate({
+    $elementContainer.html($(viewerElementContentTemplate({
       element: element,
       template: template,
       scale: self.containerObjectDimensions.scale,

diff --git a/ui/src/templates/viewer-object-content.hbs → ui/src/templates/viewer-element-content.hbs b/ui/src/templates/viewer-object-content.hbs → ui/src/templates/viewer-element-content.hbs
diff --git a/ui/src/templates/viewer-object-group.hbs → ui/src/templates/viewer-element-group.hbs b/ui/src/templates/viewer-object-group.hbs → ui/src/templates/viewer-element-group.hbs
diff --git a/ui/src/templates/viewer-object.hbs → ui/src/templates/viewer-element.hbs b/ui/src/templates/viewer-object.hbs → ui/src/templates/viewer-element.hbs
diff --git a/ui/src/templates/viewer-widget.hbs b/ui/src/templates/viewer-widget.hbs
@@ -1,6 +1,6 @@
 <div id="{{id}}" data-type="widget" data-widget-region="{{regionId}}" data-widget-id="{{widgetId}}" class="designer-widget viewer-object-select {{containerStyle}} {{type}} droppable {{#if selected}}selected{{/if}} {{#if drawerWidget}}drawerWidget{{/if}}">
     <div class="widget-preview {{#if editable}}parent-editable{{/if}}"
-        data-parent="region" data-parent-id="{{parentId}}" data-type="{{elementType}}">
+        data-parent="region" data-parent-id="{{parentId}}" data-type="{{objectType}}">
         {{{res.html}}}
     </div>
 </div>