Revert "Add 'hidden' state to dkan_publishing workflow (#3718)" (#3741)

This reverts commit 7c0fe29.
GetDKAN · Jan 21, 2022 · df9ed61 · df9ed61
1 parent 28723a6
commit df9ed61
Show file tree

Hide file tree

Showing 28 changed files with 370 additions and 810 deletions.
diff --git a/cypress/integration/01_metastore.spec.js b/cypress/integration/01_metastore.spec.js
diff --git a/cypress/integration/10_hidden_workflow_state.spec.js b/cypress/integration/10_hidden_workflow_state.spec.js
diff --git a/cypress/support/commands/drupal.js → cypress/support/commands.js b/cypress/support/commands/drupal.js → cypress/support/commands.js
@@ -1,5 +1,7 @@
-// login as a given drupal user
-Cypress.Commands.add('drupalLogin', (user, password) => {
+/**
+ * Drupal Collection
+ */
+Cypress.Commands.add("drupalLogin", (user, password) => {
     return cy.request({
         method: 'POST',
         url: '/user/login',
@@ -12,13 +14,11 @@ Cypress.Commands.add('drupalLogin', (user, password) => {
     });
 });
 
-// logout of drupal
 Cypress.Commands.add('drupalLogout', () => {
     return cy.request('/user/logout');
 });
 
-// Run the supplied drush command
-Cypress.Commands.add('drupalDrushCommand', (command) => {
+Cypress.Commands.add("drupalDrushCommand", (command) => {
     var cmd = Cypress.env('drupalDrushCmdLine');
 
     if (cmd == null) {

diff --git a/cypress/support/helpers/dkan.js b/cypress/support/helpers/dkan.js
diff --git a/cypress/support/index.js b/cypress/support/index.js
@@ -14,7 +14,7 @@
 // ***********************************************************
 
 // Import commands.js using ES2015 syntax:
-import './commands/drupal'
+import './commands'
 
 // Alternatively you can use CommonJS syntax:
 // require('./commands')
diff --git a/modules/datastore/src/Service/ResourcePurger.php b/modules/datastore/src/Service/ResourcePurger.php
@@ -334,7 +334,7 @@ private function getRevisionData(string $vid) : array {
   private function getResources(NodeInterface $dataset) : array {
     $resources = [];
     $metadata = json_decode($dataset->get('field_json_metadata')->getString());
-    $distributions = $metadata->{'%Ref:distribution'} ?? [];
+    $distributions = $metadata->{'%Ref:distribution'};
 
     foreach ($distributions as $distribution) {
       // Retrieve and validate the resource for this distribution before adding

diff --git a/modules/datastore/tests/src/Unit/Controller/MockStorage.php b/modules/datastore/tests/src/Unit/Controller/MockStorage.php
@@ -18,7 +18,11 @@ public function retrieveByHash($hash, $schemaId) {
     return [];
   }
 
-  public function retrieve(string $uuid, bool $published = FALSE) : ?string {
+  public function retrievePublished(string $uuid) : ?string {
+    throw new MissingObjectException("Error retrieving published dataset: distribution {$uuid} not found.");
+  }
+
+  public function retrieve(string $uuid) : ?string {
     throw new MissingObjectException("Error retrieving published dataset: distribution {$uuid} not found.");
   }