Enable preview button on data node type (#4000)

GetDKAN · Aug 22, 2023 · f0e4418 · f0e4418
1 parent cb7fdee
commit f0e4418
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 12 deletions.
diff --git a/cypress/integration/07_admin_dataset_json_form.spec.js b/cypress/integration/07_admin_dataset_json_form.spec.js
@@ -45,8 +45,9 @@ context('Admin dataset json form', () => {
           .click({ force: true });
         cy.get('input[aria-controls="select2-edit-field-json-metadata-0-value-keyword-keyword-0-results"]').type('open data{enter}')
         // End filling up keyword.
+        cy.wait(2000)
         cy.get('#edit-actions').within(() => {
-          cy.get('#edit-preview').should('not.exist')
+          cy.get('#edit-preview').should('exist')
         })
         cy.get('#edit-submit').click({ force:true })
         cy.get('.button').contains('Yes').click({ force:true });
@@ -73,9 +74,6 @@ context('Admin dataset json form', () => {
         cy.get('#edit-field-json-metadata-0-value-distribution-distribution-0-distribution-title').type('DKANTEST distribution title text', { force:true })
         cy.get('#edit-field-json-metadata-0-value-distribution-distribution-0-distribution-description').type('DKANTEST distribution description text', { force:true })
         cy.get('#edit-field-json-metadata-0-value-distribution-distribution-0-distribution-format-select').select('csv', { force:true })
-        cy.get('#edit-actions').within(() => {
-          cy.get('#edit-preview').should('not.exist')
-        })
         cy.get('#edit-submit').click({ force:true })
         cy.get('.button').contains('Yes').click({ force:true });
         cy.get('.messages--status').should('contain','has been updated')
@@ -87,7 +85,7 @@ context('Admin dataset json form', () => {
         cy.get('#edit-submit--2').click({ force:true })
         cy.get('.button').contains('Yes').click({ force:true });
         cy.get('input[value="Delete"]').click({ force:true })
-        cy.get('.messages').should('contain','Deleted 1 content item.')
+        cy.get('.messages__content').should('contain','Deleted 1 content item.')
     })
 
 })
diff --git a/modules/metastore/config/install/node.type.data.yml b/modules/metastore/config/install/node.type.data.yml
@@ -10,5 +10,5 @@ type: data
 description: ''
 help: ''
 new_revision: true
-preview_mode: 0
+preview_mode: 1
 display_submitted: true
diff --git a/modules/metastore/metastore.install b/modules/metastore/metastore.install
@@ -106,3 +106,11 @@ function metastore_update_8006() {
   $index_settings->set('processor_settings.dkan_dataset_filter_unpublished', []);
   $index_settings->save();
 }
+
+/**
+ * Restore the preveiw button on data form.
+ */
+function metastore_update_8007() {
+  $config = \Drupal::service('config.factory')->getEditable('node.type.data');
+  $config->set('preview_mode', 1)->save();
+}
diff --git a/modules/metastore/templates/node--data.html.twig b/modules/metastore/templates/node--data.html.twig
@@ -107,6 +107,14 @@
         {% if page %}
         <p>Last updated: {{ dataset.modified|date("m/d/Y") }}</p>
         {{ dataset.description | drupal_escape }}
+        {% if dataset.distributions|length > 0 %}
+            <h2>Downloads</h2>
+            <ul>
+            {% for distribution in dataset.distributions %}
+                <li><a href="{{distribution.downloadURL}}">{{distribution.title}} ({{distribution.format}})</a></li>
+            {% endfor %}
+            </ul>
+        {% endif %}
         {% if dataset.themes|length > 1 %}
             <h2>Themes</h2>
         {% elseif dataset.themes|length == 1 %}
@@ -118,12 +126,6 @@
                 <li>{{ theme }}</li>
             {% endfor %}</ul>
         {% endif %}
-        <h2>Downloads</h2>
-        <ul>
-        {% for distribution in dataset.distributions %}
-            <li><a href="{{distribution.downloadURL}}">{{distribution.title}} ({{distribution.format}})</a></li>
-        {% endfor %}
-        </ul>
         {% if dataset.keywords|length > 1 %}
             <h2>Keywords</h2>
         {% elseif dataset.keywords|length == 1 %}