From 9fc2151eadd48055c49bea32248896dbfc1781c4 Mon Sep 17 00:00:00 2001
From: Pedro Amorim <pedro.amorim@ptfs-europe.com>
Date: Wed, 9 Aug 2023 11:05:50 +0000
Subject: [PATCH] Bug 34587: Remove begin_date and end_date as
 usage_data_providers properties/columns

(cherry picked from commit 9339eed9358301f7bf17934e2e13fc17205d9cd0)

Signed-off-by: Jessica Zairo <jzairo@bywatersolutions.com>
Signed-off-by: Michaela Sieber <michaela.sieber@kit.edu>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
---
 Koha/Schema/Result/ErmUsageDataProvider.pm    |  24 +-
 .../definitions/erm_usage_data_provider.yaml  |  12 -
 .../paths/erm_usage_data_providers.yaml       |  10 -
 .../erm_usage_statistics_tables.pl            |   2 -
 installer/data/mysql/kohastructure.sql        |   2 -
 .../UsageStatisticsDataProviderDetails.vue    |  12 -
 .../UsageStatisticsDataProvidersFormAdd.vue   |  23 -
 .../ERM/UsageStatisticsDataProvidersShow.vue  |  17 +
 .../integration/ERM/DataProviders_spec.ts     | 758 ++++++++++--------
 t/cypress/support/e2e.js                      |   2 -
 10 files changed, 462 insertions(+), 400 deletions(-)

diff --git a/Koha/Schema/Result/ErmUsageDataProvider.pm b/Koha/Schema/Result/ErmUsageDataProvider.pm
index de4ec8877b..e2f5635661 100644
--- a/Koha/Schema/Result/ErmUsageDataProvider.pm
+++ b/Koha/Schema/Result/ErmUsageDataProvider.pm
@@ -94,22 +94,6 @@ service_url of the harvester
 
 report_release of the harvester
 
-=head2 begin_date
-
-  data_type: 'date'
-  datetime_undef_if_invalid: 1
-  is_nullable: 1
-
-start date of the harvester
-
-=head2 end_date
-
-  data_type: 'date'
-  datetime_undef_if_invalid: 1
-  is_nullable: 1
-
-end date of the harvester
-
 =head2 customer_id
 
   data_type: 'varchar'
@@ -179,10 +163,6 @@ __PACKAGE__->add_columns(
   { data_type => "varchar", is_nullable => 1, size => 80 },
   "report_release",
   { data_type => "varchar", is_nullable => 1, size => 80 },
-  "begin_date",
-  { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 },
-  "end_date",
-  { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 },
   "customer_id",
   { data_type => "varchar", is_nullable => 1, size => 50 },
   "requestor_id",
@@ -331,8 +311,8 @@ __PACKAGE__->has_many(
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07049 @ 2023-07-26 14:35:34
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:AVt5SSRe/g6EmvBtASWHPA
+# Created by DBIx::Class::Schema::Loader v0.07049 @ 2023-08-09 11:00:27
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:B99vhhVjbyR/7VoGHcrnFA
 
 # __PACKAGE__->add_columns(
 #     '+active' => { is_boolean => 1 }
diff --git a/api/v1/swagger/definitions/erm_usage_data_provider.yaml b/api/v1/swagger/definitions/erm_usage_data_provider.yaml
index 238cfa6521..f1c11bd3b0 100644
--- a/api/v1/swagger/definitions/erm_usage_data_provider.yaml
+++ b/api/v1/swagger/definitions/erm_usage_data_provider.yaml
@@ -43,18 +43,6 @@ properties:
     type: 
     - string
     - "null"
-  begin_date:
-    type:
-      - string
-      - "null"
-    format: date
-    description: Start of the harvester
-  end_date:
-    type:
-      - string
-      - "null"
-    format: date
-    description: End of the harvester
   customer_id:
     description: customer_id of the harvester
     type:
diff --git a/api/v1/swagger/paths/erm_usage_data_providers.yaml b/api/v1/swagger/paths/erm_usage_data_providers.yaml
index 779b335c5d..7c5aa88e1d 100644
--- a/api/v1/swagger/paths/erm_usage_data_providers.yaml
+++ b/api/v1/swagger/paths/erm_usage_data_providers.yaml
@@ -54,16 +54,6 @@
         name: report_release
         required: false
         type: string
-      - description: Case insensitive search on usage_data_provider begin_date
-        in: query
-        name: begin_date
-        required: false
-        type: string
-      - description: Case insensitive search on usage_data_provider end_date
-        in: query
-        name: end_date
-        required: false
-        type: string
       - description: Case insensitive search on usage_data_provider customer_id
         in: query
         name: customer_id
diff --git a/installer/data/mysql/atomicupdate/erm_usage_statistics_tables.pl b/installer/data/mysql/atomicupdate/erm_usage_statistics_tables.pl
index 325931ed63..0f955eb6d0 100644
--- a/installer/data/mysql/atomicupdate/erm_usage_statistics_tables.pl
+++ b/installer/data/mysql/atomicupdate/erm_usage_statistics_tables.pl
@@ -20,8 +20,6 @@ return {
                 `service_type` varchar(80) DEFAULT NULL COMMENT 'service_type of the harvester',
                 `service_url` varchar(80) DEFAULT NULL COMMENT 'service_url of the harvester',
                 `report_release` varchar(80) DEFAULT NULL COMMENT 'report_release of the harvester',
-                `begin_date` date DEFAULT NULL COMMENT 'start date of the harvester',
-                `end_date` date DEFAULT NULL COMMENT 'end date of the harvester',
                 `customer_id` varchar(50) DEFAULT NULL COMMENT 'sushi customer id',
                 `requestor_id` varchar(50) DEFAULT NULL COMMENT 'sushi requestor id',
                 `api_key` varchar(80) DEFAULT NULL COMMENT 'sushi api key',
diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
index d834bd8408..08f2f623ae 100644
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -3140,8 +3140,6 @@ CREATE TABLE `erm_usage_data_providers` (
   `service_type` varchar(80) DEFAULT NULL COMMENT 'service_type of the harvester',
   `service_url` varchar(80) DEFAULT NULL COMMENT 'service_url of the harvester',
   `report_release` varchar(80) DEFAULT NULL COMMENT 'report_release of the harvester',
-  `begin_date` date DEFAULT NULL COMMENT 'start date of the harvester',
-  `end_date` date DEFAULT NULL COMMENT 'end date of the harvester',
   `customer_id` varchar(50) DEFAULT NULL COMMENT 'sushi customer id',
   `requestor_id` varchar(50) DEFAULT NULL COMMENT 'sushi requestor id',
   `api_key` varchar(80) DEFAULT NULL COMMENT 'sushi api key',
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/UsageStatisticsDataProviderDetails.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/UsageStatisticsDataProviderDetails.vue
index 50ce56cbc5..3b9b4eee47 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/UsageStatisticsDataProviderDetails.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/UsageStatisticsDataProviderDetails.vue
@@ -26,18 +26,6 @@
                     {{ usage_data_provider.service_type }}
                 </span>
             </li>
-            <li>
-                <label>{{ $__("Harvest Start") }}:</label>
-                <span id="usage_data_provider_begin_date">
-                    {{ usage_data_provider.begin_date }}
-                </span>
-            </li>
-            <li>
-                <label>{{ $__("Harvest End") }}:</label>
-                <span id="usage_data_provider_end_date">
-                    {{ usage_data_provider.end_date }}
-                </span>
-            </li>
             <li>
                 <label>{{ $__("Report types") }}:</label>
                 <span id="report_type">
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/UsageStatisticsDataProvidersFormAdd.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/UsageStatisticsDataProvidersFormAdd.vue
index 827724b752..7a12acb00c 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/UsageStatisticsDataProvidersFormAdd.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/UsageStatisticsDataProvidersFormAdd.vue
@@ -80,27 +80,6 @@
                                 v-model="usage_data_provider.service_type"
                             />
                         </li>
-                        <li>
-                            <label for="usage_data_provider_begin_date"
-                                >{{ $__("Harvest start date") }}:
-                            </label>
-                            <flat-pickr
-                                id="usage_data_provider_begin_date"
-                                v-model="usage_data_provider.begin_date"
-                                :config="fp_config"
-                                data-date_to="usage_data_provider_end_date"
-                            />
-                        </li>
-                        <li>
-                            <label for="usage_data_provider_end_date"
-                                >{{ $__("Harvest end date") }}:
-                            </label>
-                            <flat-pickr
-                                id="usage_data_provider_end_date"
-                                v-model="usage_data_provider.end_date"
-                                :config="fp_config"
-                            />
-                        </li>
                         <li>
                             <label
                                 class="required"
@@ -269,8 +248,6 @@ export default {
                 service_type: "",
                 service_url: "",
                 report_release: "",
-                begin_date: null,
-                end_date: null,
                 customer_id: "",
                 requestor_id: "",
                 api_key: "",
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/UsageStatisticsDataProvidersShow.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/UsageStatisticsDataProvidersShow.vue
index b096d0b650..1a5f599f4e 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/UsageStatisticsDataProvidersShow.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/UsageStatisticsDataProvidersShow.vue
@@ -143,6 +143,23 @@ export default {
     },
     data() {
         return {
+            usage_data_provider: {
+                erm_usage_data_provider_id: null,
+                name: "",
+                description: "",
+                active: 1,
+                method: "",
+                aggregator: "",
+                service_type: "",
+                service_url: "",
+                report_release: "",
+                customer_id: "",
+                requestor_id: "",
+                api_key: "",
+                requestor_name: "",
+                requestor_email: "",
+                report_types: [],
+            },
             initialized: false,
             tab_content: "detail",
             available_data_types: [
diff --git a/t/cypress/integration/ERM/DataProviders_spec.ts b/t/cypress/integration/ERM/DataProviders_spec.ts
index 5dfa26e9bc..d3b0fac344 100644
--- a/t/cypress/integration/ERM/DataProviders_spec.ts
+++ b/t/cypress/integration/ERM/DataProviders_spec.ts
@@ -1,50 +1,52 @@
-import { mount } from "@cypress/vue"
-import { data } from "cypress/types/jquery"
+import { mount } from "@cypress/vue";
+import { data } from "cypress/types/jquery";
 
-const dayjs = require("dayjs") 
+const dayjs = require("dayjs");
 
 const dates = {
     today_iso: dayjs().format("YYYY-MM-DD"),
     today_us: dayjs().format("MM/DD/YYYY"),
     tomorrow_iso: dayjs().add(1, "day").format("YYYY-MM-DD"),
     tomorrow_us: dayjs().add(1, "day").format("MM/DD/YYYY"),
-}
+};
 
 describe("Data provider CRUD operations", () => {
     beforeEach(() => {
-        cy.login()
-        cy.title().should("eq", "Koha staff interface")
+        cy.login();
+        cy.title().should("eq", "Koha staff interface");
         cy.intercept(
             "GET",
             "/cgi-bin/koha/svc/config/systempreferences/?pref=ERMModule",
             '{"value":"1"}'
-        )
+        );
         cy.intercept(
             "GET",
             "/cgi-bin/koha/svc/config/systempreferences/?pref=ERMProviders",
             '{"value":"local"}'
-        )
-    })
+        );
+    });
 
     it("Should list providers", () => {
         // GET usage_data_providers returns 500
         cy.intercept("GET", "/api/v1/erm/usage_data_providers*", {
             statusCode: 500,
             error: "Something went wrong",
-        })
-        cy.visit("/cgi-bin/koha/erm/erm.pl")
-        cy.get("#navmenulist").contains("Data providers").click()
+        });
+        cy.visit("/cgi-bin/koha/erm/erm.pl");
+        cy.get("#navmenulist").contains("Data providers").click();
         cy.get("main div[class='dialog alert']").contains(
             /Something went wrong/
-        )
+        );
 
         // GET usage_data_providers returns empty list
-        cy.intercept("GET", "/api/v1/erm/usage_data_providers*", [])
-        cy.visit("/cgi-bin/koha/erm/eusage/usage_data_providers")
-        cy.get("#usage_data_providers_list").contains("There are no usage data providers defined")
+        cy.intercept("GET", "/api/v1/erm/usage_data_providers*", []);
+        cy.visit("/cgi-bin/koha/erm/eusage/usage_data_providers");
+        cy.get("#usage_data_providers_list").contains(
+            "There are no usage data providers defined"
+        );
 
-        const dataProvider = cy.get_usage_data_provider()
-        const dataProviders = [dataProvider]
+        const dataProvider = cy.get_usage_data_provider();
+        const dataProviders = [dataProvider];
 
         cy.intercept("GET", "/api/v1/erm/usage_data_providers*", {
             statusCode: 200,
@@ -53,94 +55,99 @@ describe("Data provider CRUD operations", () => {
                 "X-Base-Total-Count": "1",
                 "X-Total-Count": "1",
             },
-        })
-        cy.visit("/cgi-bin/koha/erm/eusage/usage_data_providers")
-        cy.get("#usage_data_providers_list").contains("Showing 1 to 1 of 1 entries")
-    })
+        });
+        cy.visit("/cgi-bin/koha/erm/eusage/usage_data_providers");
+        cy.get("#usage_data_providers_list").contains(
+            "Showing 1 to 1 of 1 entries"
+        );
+    });
 
     it("Should add provider", () => {
-        cy.visit("/cgi-bin/koha/erm/eusage/usage_data_providers")
-        cy.contains("New data provider").click()
-        cy.get("#data_providers_add h2").contains("New usage data provider")
+        cy.visit("/cgi-bin/koha/erm/eusage/usage_data_providers");
+        cy.contains("New data provider").click();
+        cy.get("#data_providers_add h2").contains("New usage data provider");
 
-        const dataProvider = cy.get_usage_data_provider()
+        const dataProvider = cy.get_usage_data_provider();
 
-        cy.get("#data_providers_add").contains("Submit").click()
+        cy.get("#data_providers_add").contains("Submit").click();
         cy.get("input:invalid,textarea:invalid,select:invalid").should(
             "have.length",
             6
-        )
-        
+        );
+
         // Fill in text inputs
-        cy.get("#usage_data_provider_name").type(dataProvider.name)
-        cy.get("#usage_data_provider_description").type(dataProvider.description)
-        cy.get("#usage_data_provider_service_type").type(dataProvider.service_type)
-        cy.get("#usage_data_provider_service_url").type(dataProvider.service_url)
-        cy.get("#usage_data_provider_report_release").type(dataProvider.report_release)
-        cy.get("#usage_data_provider_customer_id").type(dataProvider.customer_id)
-        cy.get("#usage_data_provider_requestor_id").type(dataProvider.requestor_id)
-        cy.get("#usage_data_provider_api_key").type(dataProvider.api_key)
-        cy.get("#usage_data_provider_requestor_name").type(dataProvider.requestor_name)
-        cy.get("#usage_data_provider_requestor_email").type(dataProvider.requestor_email)
-
-        cy.get("#data_providers_add").contains("Submit").click()
+        cy.get("#usage_data_provider_name").type(dataProvider.name);
+        cy.get("#usage_data_provider_description").type(
+            dataProvider.description
+        );
+        cy.get("#usage_data_provider_service_type").type(
+            dataProvider.service_type
+        );
+        cy.get("#usage_data_provider_service_url").type(
+            dataProvider.service_url
+        );
+        cy.get("#usage_data_provider_report_release").type(
+            dataProvider.report_release
+        );
+        cy.get("#usage_data_provider_customer_id").type(
+            dataProvider.customer_id
+        );
+        cy.get("#usage_data_provider_requestor_id").type(
+            dataProvider.requestor_id
+        );
+        cy.get("#usage_data_provider_api_key").type(dataProvider.api_key);
+        cy.get("#usage_data_provider_requestor_name").type(
+            dataProvider.requestor_name
+        );
+        cy.get("#usage_data_provider_requestor_email").type(
+            dataProvider.requestor_email
+        );
+
+        cy.get("#data_providers_add").contains("Submit").click();
         cy.get("input:invalid,textarea:invalid,select:invalid").should(
             "have.length",
             1
-        )
+        );
 
         // Fill in status and report types
         cy.get("#harvester_status .vs__search").type(
             dataProvider.active + "{enter}",
             { force: true }
-        )
+        );
         cy.get("#report_type .vs__search").type(
             dataProvider.report_types.slice(0, -1) + "{enter}",
             { force: true }
-        )
-
-        // Fill in start and end dates
-        cy.get("#usage_data_provider_begin_date+input").click()
-        cy.get(".flatpickr-calendar")
-            .eq(1)
-            .find("span.today")
-            .click({ force: true })
-        cy.get("#usage_data_provider_end_date+input").click()
-        cy.get(".flatpickr-calendar")
-            .eq(1)
-            .find("span.today")
-            .next("span")
-            .click({ force: true })
+        );
 
         // Submit the form, get 500
         cy.intercept("POST", "/api/v1/erm/usage_data_providers", {
             statusCode: 500,
             error: "Something went wrong",
-        })
-        cy.get("#data_providers_add").contains("Submit").click()
+        });
+        cy.get("#data_providers_add").contains("Submit").click();
         cy.get("main div[class='dialog alert']").contains(
             "Something went wrong: Error: Internal Server Error"
-        )
+        );
 
         // Submit the form, success!
         cy.intercept("POST", "/api/v1/erm/usage_data_providers", {
             statusCode: 201,
             body: dataProvider,
-        })
-        cy.get("#data_providers_add").contains("Submit").click()
+        });
+        cy.get("#data_providers_add").contains("Submit").click();
         cy.get("main div[class='dialog message']").contains(
             "Data provider created"
-        )
+        );
 
         cy.intercept("GET", "/api/v1/erm/usage_data_providers*", {
             statusCode: 200,
             body: [dataProvider],
-        })
-    })
+        });
+    });
 
     it("Should edit provider", () => {
-        const dataProvider = cy.get_usage_data_provider()
-        const dataProviders = [dataProvider]
+        const dataProvider = cy.get_usage_data_provider();
+        const dataProviders = [dataProvider];
 
         cy.intercept("GET", "/api/v1/erm/usage_data_providers*", {
             statusCode: 200,
@@ -149,54 +156,88 @@ describe("Data provider CRUD operations", () => {
                 "X-Base-Total-Count": "1",
                 "X-Total-Count": "1",
             },
-        })
-        cy.intercept("GET", "/api/v1/erm/usage_data_providers/*", dataProvider).as(
-            "get-data-provider"
-        )
-        cy.visit("/cgi-bin/koha/erm/eusage/usage_data_providers")
-        cy.get("#usage_data_providers_list table tbody tr:first").contains("Edit").click()
-        cy.wait("@get-data-provider")
-        cy.wait(500) // Cypress is too fast! Vue hasn't populated the form yet!
-        cy.get("#data_providers_add h2").contains("Edit usage data provider")
+        });
+        cy.intercept(
+            "GET",
+            "/api/v1/erm/usage_data_providers/*",
+            dataProvider
+        ).as("get-data-provider");
+        cy.visit("/cgi-bin/koha/erm/eusage/usage_data_providers");
+        cy.get("#usage_data_providers_list table tbody tr:first")
+            .contains("Edit")
+            .click();
+        cy.wait("@get-data-provider");
+        cy.wait(500); // Cypress is too fast! Vue hasn't populated the form yet!
+        cy.get("#data_providers_add h2").contains("Edit usage data provider");
 
         // Form has been correctly filled in
-        cy.get("#usage_data_provider_name").should("have.value", dataProvider.name)
-        cy.get("#usage_data_provider_description").should("have.value", dataProvider.description)
-        cy.get("#usage_data_provider_service_type").should("have.value", dataProvider.service_type)
-        cy.get("#usage_data_provider_service_url").should("have.value", dataProvider.service_url)
-        cy.get("#usage_data_provider_report_release").should("have.value", dataProvider.report_release)
-        cy.get("#usage_data_provider_customer_id").should("have.value", dataProvider.customer_id)
-        cy.get("#usage_data_provider_requestor_id").should("have.value", dataProvider.requestor_id)
-        cy.get("#usage_data_provider_api_key").should("have.value", dataProvider.api_key)
-        cy.get("#usage_data_provider_requestor_name").should("have.value", dataProvider.requestor_name)
-        cy.get("#usage_data_provider_requestor_email").should("have.value", dataProvider.requestor_email)
-
-        cy.get("#harvester_status .vs__selected").contains("Active")
-        cy.get("#report_type .vs__selected").contains("TR_J1")
-        cy.get("#usage_data_provider_begin_date").invoke("val").should("eq", dates["today_iso"])
-        cy.get("#usage_data_provider_end_date").invoke("val").should("eq", dates["tomorrow_iso"])
+        cy.get("#usage_data_provider_name").should(
+            "have.value",
+            dataProvider.name
+        );
+        cy.get("#usage_data_provider_description").should(
+            "have.value",
+            dataProvider.description
+        );
+        cy.get("#usage_data_provider_service_type").should(
+            "have.value",
+            dataProvider.service_type
+        );
+        cy.get("#usage_data_provider_service_url").should(
+            "have.value",
+            dataProvider.service_url
+        );
+        cy.get("#usage_data_provider_report_release").should(
+            "have.value",
+            dataProvider.report_release
+        );
+        cy.get("#usage_data_provider_customer_id").should(
+            "have.value",
+            dataProvider.customer_id
+        );
+        cy.get("#usage_data_provider_requestor_id").should(
+            "have.value",
+            dataProvider.requestor_id
+        );
+        cy.get("#usage_data_provider_api_key").should(
+            "have.value",
+            dataProvider.api_key
+        );
+        cy.get("#usage_data_provider_requestor_name").should(
+            "have.value",
+            dataProvider.requestor_name
+        );
+        cy.get("#usage_data_provider_requestor_email").should(
+            "have.value",
+            dataProvider.requestor_email
+        );
+
+        cy.get("#harvester_status .vs__selected").contains("Active");
+        cy.get("#report_type .vs__selected").contains("TR_J1");
 
         // Submit the form, get 500
         cy.intercept("PUT", "/api/v1/erm/usage_data_providers/*", {
             statusCode: 500,
             error: "Something went wrong",
-        })
-        cy.get("#data_providers_add").contains("Submit").click()
+        });
+        cy.get("#data_providers_add").contains("Submit").click();
         cy.get("main div[class='dialog alert']").contains(
             "Something went wrong: Error: Internal Server Error"
-        )
+        );
         // Submit the form, success!
         cy.intercept("PUT", "/api/v1/erm/usage_data_providers/*", {
             statusCode: 200,
             body: dataProvider,
-        })
-        cy.get("#data_providers_add").contains("Submit").click()
-        cy.get("main div[class='dialog message']").contains("Data provider updated")
-    })
+        });
+        cy.get("#data_providers_add").contains("Submit").click();
+        cy.get("main div[class='dialog message']").contains(
+            "Data provider updated"
+        );
+    });
 
     it("Should show provider", () => {
-        const dataProvider = cy.get_usage_data_provider()
-        const dataProviders = [dataProvider]
+        const dataProvider = cy.get_usage_data_provider();
+        const dataProviders = [dataProvider];
 
         cy.intercept("GET", "/api/v1/erm/usage_data_providers*", {
             statusCode: 200,
@@ -205,28 +246,35 @@ describe("Data provider CRUD operations", () => {
                 "X-Base-Total-Count": "1",
                 "X-Total-Count": "1",
             },
-        })
-        cy.intercept("GET", "/api/v1/erm/usage_data_providers/*", dataProvider).as(
-            "get-data-provider"
-        )
-        cy.visit("/cgi-bin/koha/erm/eusage/usage_data_providers")
+        });
+        cy.intercept(
+            "GET",
+            "/api/v1/erm/usage_data_providers/*",
+            dataProvider
+        ).as("get-data-provider");
+        cy.visit("/cgi-bin/koha/erm/eusage/usage_data_providers");
         let name_link = cy.get(
             "#usage_data_providers_list table tbody tr:first td:first a"
-        )
+        );
         name_link.should(
             "have.text",
-            dataProvider.name + " (#" + dataProvider.erm_usage_data_provider_id + ")"
-        )
-        name_link.click()
-        cy.wait("@get-data-provider")
-        cy.wait(500) // Cypress is too fast! Vue hasn't populated the form yet!
-        cy.get("#usage_data_providers_show h2").contains("Data provider #" + dataProvider.erm_usage_data_provider_id)
-    })
+            dataProvider.name +
+                " (#" +
+                dataProvider.erm_usage_data_provider_id +
+                ")"
+        );
+        name_link.click();
+        cy.wait("@get-data-provider");
+        cy.wait(500); // Cypress is too fast! Vue hasn't populated the form yet!
+        cy.get("#usage_data_providers_show h2").contains(
+            "Data provider #" + dataProvider.erm_usage_data_provider_id
+        );
+    });
 
     it("Should delete provider", () => {
-        const dataProvider = cy.get_usage_data_provider()
-        const dataProviders = [dataProvider]
-        
+        const dataProvider = cy.get_usage_data_provider();
+        const dataProviders = [dataProvider];
+
         // Click the 'Delete' button from the list
         cy.intercept("GET", "/api/v1/erm/usage_data_providers*", {
             statusCode: 200,
@@ -235,40 +283,48 @@ describe("Data provider CRUD operations", () => {
                 "X-Base-Total-Count": "1",
                 "X-Total-Count": "1",
             },
-        })
-        cy.intercept("GET", "/api/v1/erm/usage_data_providers/*", dataProvider).as(
-            "get-data-provider"
-        )
-        cy.visit("/cgi-bin/koha/erm/eusage/usage_data_providers")
-    
-        cy.get("#usage_data_providers_list table tbody tr:first").contains("Delete").click()
-        cy.get(".dialog.alert.confirmation h1").contains("remove this data provider")
-        cy.contains(dataProvider.name)
-    
+        });
+        cy.intercept(
+            "GET",
+            "/api/v1/erm/usage_data_providers/*",
+            dataProvider
+        ).as("get-data-provider");
+        cy.visit("/cgi-bin/koha/erm/eusage/usage_data_providers");
+
+        cy.get("#usage_data_providers_list table tbody tr:first")
+            .contains("Delete")
+            .click();
+        cy.get(".dialog.alert.confirmation h1").contains(
+            "remove this data provider"
+        );
+        cy.contains(dataProvider.name);
+
         // Accept the confirmation dialog, get 500
         cy.intercept("DELETE", "/api/v1/erm/usage_data_providers/*", {
             statusCode: 500,
             error: "Something went wrong",
-        })
-        cy.contains("Yes, delete").click()
+        });
+        cy.contains("Yes, delete").click();
         cy.get("main div[class='dialog alert']").contains(
             "Something went wrong: Error: Internal Server Error"
-        )
-    
+        );
+
         // Accept the confirmation dialog, success!
         cy.intercept("DELETE", "/api/v1/erm/usage_data_providers/*", {
             statusCode: 204,
             body: null,
-        })
+        });
         cy.get("#usage_data_providers_list table tbody tr:first")
             .contains("Delete")
-            .click()
-        cy.get(".dialog.alert.confirmation h1").contains("remove this data provider")
-        cy.contains("Yes, delete").click()
+            .click();
+        cy.get(".dialog.alert.confirmation h1").contains(
+            "remove this data provider"
+        );
+        cy.contains("Yes, delete").click();
         cy.get("main div[class='dialog message']")
             .contains("Data provider")
-            .contains("deleted")
-    
+            .contains("deleted");
+
         // Delete from show
         // Click the "name" link from the list
         cy.intercept("GET", "/api/v1/erm/usage_data_providers*", {
@@ -278,51 +334,60 @@ describe("Data provider CRUD operations", () => {
                 "X-Base-Total-Count": "1",
                 "X-Total-Count": "1",
             },
-        })
-        cy.intercept("GET", "/api/v1/erm/usage_data_providers/*", dataProvider).as(
-            "get-data-provider"
-        )
-        cy.visit("/cgi-bin/koha/erm/eusage/usage_data_providers")
+        });
+        cy.intercept(
+            "GET",
+            "/api/v1/erm/usage_data_providers/*",
+            dataProvider
+        ).as("get-data-provider");
+        cy.visit("/cgi-bin/koha/erm/eusage/usage_data_providers");
         let name_link = cy.get(
             "#usage_data_providers_list table tbody tr:first td:first a"
-        )
+        );
         name_link.should(
             "have.text",
-            dataProvider.name + " (#" + dataProvider.erm_usage_data_provider_id + ")"
-        )
-        name_link.click()
-        cy.wait("@get-data-provider")
-        cy.wait(500)
-        cy.get("#usage_data_providers_show h2").contains("Data provider #" + dataProvider.erm_usage_data_provider_id)
-    
-        cy.get("#usage_data_providers_show .action_links .fa-trash").click()
-        cy.get(".dialog.alert.confirmation h1").contains("remove this data provider")
-        cy.contains("Yes, delete").click()
-    
+            dataProvider.name +
+                " (#" +
+                dataProvider.erm_usage_data_provider_id +
+                ")"
+        );
+        name_link.click();
+        cy.wait("@get-data-provider");
+        cy.wait(500);
+        cy.get("#usage_data_providers_show h2").contains(
+            "Data provider #" + dataProvider.erm_usage_data_provider_id
+        );
+
+        cy.get("#usage_data_providers_show .action_links .fa-trash").click();
+        cy.get(".dialog.alert.confirmation h1").contains(
+            "remove this data provider"
+        );
+        cy.contains("Yes, delete").click();
+
         //Make sure we return to list after deleting from show
-        cy.get("#usage_data_providers_list table tbody tr:first")
-    })
-})
+        cy.get("#usage_data_providers_list table tbody tr:first");
+    });
+});
 
 describe("Data providers summary", () => {
     beforeEach(() => {
-        cy.login()
-        cy.title().should("eq", "Koha staff interface")
+        cy.login();
+        cy.title().should("eq", "Koha staff interface");
         cy.intercept(
             "GET",
             "/cgi-bin/koha/svc/config/systempreferences/?pref=ERMModule",
             '{"value":"1"}'
-        )
+        );
         cy.intercept(
             "GET",
             "/cgi-bin/koha/svc/config/systempreferences/?pref=ERMProviders",
             '{"value":"local"}'
-        )
-    })
+        );
+    });
 
     it("Should navigate to the summary page and back to providers list", () => {
-        const dataProvider = cy.get_usage_data_provider()
-        const dataProviders = [dataProvider]
+        const dataProvider = cy.get_usage_data_provider();
+        const dataProviders = [dataProvider];
 
         cy.intercept("GET", "/api/v1/erm/usage_data_providers*", {
             statusCode: 200,
@@ -331,20 +396,23 @@ describe("Data providers summary", () => {
                 "X-Base-Total-Count": "1",
                 "X-Total-Count": "1",
             },
-        })
-        cy.visit("/cgi-bin/koha/erm/eusage/usage_data_providers")
-
-        cy.contains("Data providers summary").click()
-        cy.get("#usage_data_providers_summary").contains("Showing 1 to 1 of 1 entries")
+        });
+        cy.visit("/cgi-bin/koha/erm/eusage/usage_data_providers");
 
-        cy.contains("Data providers list").click()
-        cy.get("#usage_data_providers_list").contains("Showing 1 to 1 of 1 entries")
+        cy.contains("Data providers summary").click();
+        cy.get("#usage_data_providers_summary").contains(
+            "Showing 1 to 1 of 1 entries"
+        );
 
-    })
+        cy.contains("Data providers list").click();
+        cy.get("#usage_data_providers_list").contains(
+            "Showing 1 to 1 of 1 entries"
+        );
+    });
 
     it("Should correctly display dates", () => {
-        const dataProvider = cy.get_usage_data_provider()
-        const dataProviders = [dataProvider]
+        const dataProvider = cy.get_usage_data_provider();
+        const dataProviders = [dataProvider];
 
         cy.intercept("GET", "/api/v1/erm/usage_data_providers*", {
             statusCode: 200,
@@ -353,54 +421,56 @@ describe("Data providers summary", () => {
                 "X-Base-Total-Count": "1",
                 "X-Total-Count": "1",
             },
-        })
-        cy.visit("/cgi-bin/koha/erm/eusage/usage_data_providers")
+        });
+        cy.visit("/cgi-bin/koha/erm/eusage/usage_data_providers");
 
-        cy.contains("Data providers summary").click()
+        cy.contains("Data providers summary").click();
 
         // Check provider name
-        cy.get("#usage_data_providers_summary table tbody tr:first td:first").should(
-            "have.text",
-            dataProvider.name
-        )
+        cy.get(
+            "#usage_data_providers_summary table tbody tr:first td:first"
+        ).should("have.text", dataProvider.name);
 
         // Check start and end dates
-        const startDate = dataProvider.counter_files[0].date_uploaded.substr(0,10)
-        const endDate = dataProvider.counter_files[1].date_uploaded.substr(0,10)
-
-        cy.get("#usage_data_providers_summary table tbody tr:first td:nth-child(2)").should(
-            "have.text",
-            startDate
-        )
-        cy.get("#usage_data_providers_summary table tbody tr:first td:nth-child(3)").should(
-            "have.text",
-            endDate
-        )
+        const startDate = dataProvider.counter_files[0].date_uploaded.substr(
+            0,
+            10
+        );
+        const endDate = dataProvider.counter_files[1].date_uploaded.substr(
+            0,
+            10
+        );
+
+        cy.get(
+            "#usage_data_providers_summary table tbody tr:first td:nth-child(2)"
+        ).should("have.text", startDate);
+        cy.get(
+            "#usage_data_providers_summary table tbody tr:first td:nth-child(3)"
+        ).should("have.text", endDate);
         // Check "Not run" harvests
-        cy.get("#usage_data_providers_summary table tbody tr:first td:nth-child(4)").should(
-            "have.text",
-            "Not run"
-        )
-    })
-})
+        cy.get(
+            "#usage_data_providers_summary table tbody tr:first td:nth-child(4)"
+        ).should("have.text", "Not run");
+    });
+});
 
 describe("Data provider tab options", () => {
     beforeEach(() => {
-        cy.login()
-        cy.title().should("eq", "Koha staff interface")
+        cy.login();
+        cy.title().should("eq", "Koha staff interface");
         cy.intercept(
             "GET",
             "/cgi-bin/koha/svc/config/systempreferences/?pref=ERMModule",
             '{"value":"1"}'
-        )
+        );
         cy.intercept(
             "GET",
             "/cgi-bin/koha/svc/config/systempreferences/?pref=ERMProviders",
             '{"value":"local"}'
-        )
+        );
 
-        const dataProvider = cy.get_usage_data_provider()
-        const dataProviders = [dataProvider]
+        const dataProvider = cy.get_usage_data_provider();
+        const dataProviders = [dataProvider];
 
         cy.intercept("GET", "/api/v1/erm/usage_data_providers*", {
             statusCode: 200,
@@ -409,48 +479,91 @@ describe("Data provider tab options", () => {
                 "X-Base-Total-Count": "1",
                 "X-Total-Count": "1",
             },
-        })
-        cy.intercept("GET", "/api/v1/erm/usage_data_providers/*", dataProvider).as(
-            "get-data-provider"
-        )
-        cy.visit("/cgi-bin/koha/erm/eusage/usage_data_providers")
+        });
+        cy.intercept(
+            "GET",
+            "/api/v1/erm/usage_data_providers/*",
+            dataProvider
+        ).as("get-data-provider");
+        cy.visit("/cgi-bin/koha/erm/eusage/usage_data_providers");
         let name_link = cy.get(
             "#usage_data_providers_list table tbody tr:first td:first a"
-        )
+        );
         name_link.should(
             "have.text",
-            dataProvider.name + " (#" + dataProvider.erm_usage_data_provider_id + ")"
-        )
-        name_link.click()
-        cy.wait("@get-data-provider")
-        cy.wait(500)
-    })
+            dataProvider.name +
+                " (#" +
+                dataProvider.erm_usage_data_provider_id +
+                ")"
+        );
+        name_link.click();
+        cy.wait("@get-data-provider");
+        cy.wait(500);
+    });
 
     it("Should display provider details", () => {
-        const dataProvider = cy.get_usage_data_provider()
-        const dataProviders = [dataProvider]
+        const dataProvider = cy.get_usage_data_provider();
+        const dataProviders = [dataProvider];
 
-        cy.get("#usage_data_providers_show > div.tab-content > div > legend:nth-child(1)").should(
-            "have.text",
-            "Data provider"
-        )
+        cy.get(
+            "#usage_data_providers_show > div.tab-content > div > legend:nth-child(1)"
+        ).should("have.text", "Data provider");
 
         //Page should be populated correctly
-        cy.get("#usage_data_provider_name").should("have.text", dataProvider.name)
-        cy.get("#usage_data_provider_description").should("have.text", dataProvider.description)
-        cy.get("#usage_data_provider_service_type").should("have.text", dataProvider.service_type)
-        cy.get("#usage_data_provider_service_url").should("have.text", dataProvider.service_url)
-        cy.get("#usage_data_provider_report_release").should("have.text", dataProvider.report_release)
-        cy.get("#usage_data_provider_customer_id").should("have.text", dataProvider.customer_id)
-        cy.get("#usage_data_provider_requestor_id").should("have.text", dataProvider.requestor_id)
-        cy.get("#usage_data_provider_api_key").should("have.text", dataProvider.api_key)
-        cy.get("#usage_data_provider_requestor_name").should("have.text", dataProvider.requestor_name)
-        cy.get("#usage_data_provider_requestor_email").should("have.text", dataProvider.requestor_email)
-        cy.get("#harvester_status").should("have.text", dataProvider.active ? "Active" : "Inactive")
-        cy.get("#report_type").should("have.text", dataProvider.report_types)
-        cy.get("#usage_data_provider_begin_date").should("have.text", dataProvider.begin_date)
-        cy.get("#usage_data_provider_end_date").should("have.text", dataProvider.end_date)
-    })
+        cy.get("#usage_data_provider_name").should(
+            "have.text",
+            dataProvider.name
+        );
+        cy.get("#usage_data_provider_description").should(
+            "have.text",
+            dataProvider.description
+        );
+        cy.get("#usage_data_provider_service_type").should(
+            "have.text",
+            dataProvider.service_type
+        );
+        cy.get("#usage_data_provider_service_url").should(
+            "have.text",
+            dataProvider.service_url
+        );
+        cy.get("#usage_data_provider_report_release").should(
+            "have.text",
+            dataProvider.report_release
+        );
+        cy.get("#usage_data_provider_customer_id").should(
+            "have.text",
+            dataProvider.customer_id
+        );
+        cy.get("#usage_data_provider_requestor_id").should(
+            "have.text",
+            dataProvider.requestor_id
+        );
+        cy.get("#usage_data_provider_api_key").should(
+            "have.text",
+            dataProvider.api_key
+        );
+        cy.get("#usage_data_provider_requestor_name").should(
+            "have.text",
+            dataProvider.requestor_name
+        );
+        cy.get("#usage_data_provider_requestor_email").should(
+            "have.text",
+            dataProvider.requestor_email
+        );
+        cy.get("#harvester_status").should(
+            "have.text",
+            dataProvider.active ? "Active" : "Inactive"
+        );
+        cy.get("#report_type").should("have.text", dataProvider.report_types);
+        cy.get("#usage_data_provider_begin_date").should(
+            "have.text",
+            dataProvider.begin_date
+        );
+        cy.get("#usage_data_provider_end_date").should(
+            "have.text",
+            dataProvider.end_date
+        );
+    });
 
     it("Should display titles", () => {
         cy.intercept("GET", "/api/v1/erm/usage_titles*", {
@@ -460,17 +573,18 @@ describe("Data provider tab options", () => {
                 "X-Base-Total-Count": "0",
                 "X-Total-Count": "0",
             },
-        })
+        });
 
-        cy.get("#usage_data_providerstabs").contains("Titles").click()
+        cy.get("#usage_data_providerstabs").contains("Titles").click();
         cy.get("main div[class='dialog message']").should(
-            "have.text", "No title data has been harvested for this provider"
-        )
+            "have.text",
+            "No title data has been harvested for this provider"
+        );
+
+        cy.get("#usage_data_providerstabs").contains("Detail").click();
 
-        cy.get("#usage_data_providerstabs").contains("Detail").click()
-        
-        const title = cy.get_usage_title()
-        const titles = [title]
+        const title = cy.get_usage_title();
+        const titles = [title];
         cy.intercept("GET", "/api/v1/erm/usage_titles*", {
             statusCode: 200,
             body: titles,
@@ -478,22 +592,20 @@ describe("Data provider tab options", () => {
                 "X-Base-Total-Count": "1",
                 "X-Total-Count": "1",
             },
-        })
-        
-        cy.get("#usage_data_providerstabs").contains("Titles").click()
-        cy.get("#titles_list").contains("Showing 1 to 1 of 1 entries")
-    })
+        });
+
+        cy.get("#usage_data_providerstabs").contains("Titles").click();
+        cy.get("#titles_list").contains("Showing 1 to 1 of 1 entries");
+    });
 
     it("Should allow manual file upload", () => {
-        cy.get("#usage_data_providerstabs").contains("Manual upload").click()
-        cy.get("#files h2").should("have.text", "Manual upload:")
+        cy.get("#usage_data_providerstabs").contains("Manual upload").click();
+        cy.get("#files h2").should("have.text", "Manual upload:");
 
-        cy.get("#import_file").click()
-        cy.get("#import_file").selectFile(
-            "t/cypress/fixtures/file.json"
-        )
-        cy.get("#files .file_information span").contains("file.json")
-    })
+        cy.get("#import_file").click();
+        cy.get("#import_file").selectFile("t/cypress/fixtures/file.json");
+        cy.get("#files .file_information span").contains("file.json");
+    });
 
     it("Should display import logs", () => {
         cy.intercept("GET", "/api/v1/erm/counter_files*", {
@@ -503,16 +615,17 @@ describe("Data provider tab options", () => {
                 "X-Base-Total-Count": "0",
                 "X-Total-Count": "0",
             },
-        })
-        cy.get("#usage_data_providerstabs").contains("Import logs").click()
+        });
+        cy.get("#usage_data_providerstabs").contains("Import logs").click();
         cy.get("main div[class='dialog message']").should(
-            "have.text", "There are no import logs defined"
-        )
+            "have.text",
+            "There are no import logs defined"
+        );
 
-        cy.get("#usage_data_providerstabs").contains("Detail").click()
-        
-        const counter_file = cy.get_counter_file()
-        const counter_files = [counter_file]
+        cy.get("#usage_data_providerstabs").contains("Detail").click();
+
+        const counter_file = cy.get_counter_file();
+        const counter_files = [counter_file];
         cy.intercept("GET", "/api/v1/erm/counter_files*", {
             statusCode: 200,
             body: counter_files,
@@ -520,32 +633,32 @@ describe("Data provider tab options", () => {
                 "X-Base-Total-Count": "1",
                 "X-Total-Count": "1",
             },
-        })
-        
-        cy.get("#usage_data_providerstabs").contains("Import logs").click()
-        cy.get("#counter_logs_list").contains("Showing 1 to 1 of 1 entries")
-    })
-})
+        });
+
+        cy.get("#usage_data_providerstabs").contains("Import logs").click();
+        cy.get("#counter_logs_list").contains("Showing 1 to 1 of 1 entries");
+    });
+});
 
 describe("Data providers action buttons", () => {
     beforeEach(() => {
-        cy.login()
-        cy.title().should("eq", "Koha staff interface")
+        cy.login();
+        cy.title().should("eq", "Koha staff interface");
         cy.intercept(
             "GET",
             "/cgi-bin/koha/svc/config/systempreferences/?pref=ERMModule",
             '{"value":"1"}'
-        )
+        );
         cy.intercept(
             "GET",
             "/cgi-bin/koha/svc/config/systempreferences/?pref=ERMProviders",
             '{"value":"local"}'
-        )
-    })
+        );
+    });
 
     it("Should queue a harvest background job", () => {
-        const dataProvider = cy.get_usage_data_provider()
-        const dataProviders = [dataProvider]
+        const dataProvider = cy.get_usage_data_provider();
+        const dataProviders = [dataProvider];
 
         cy.intercept("GET", "/api/v1/erm/usage_data_providers*", {
             statusCode: 200,
@@ -554,34 +667,41 @@ describe("Data providers action buttons", () => {
                 "X-Base-Total-Count": "1",
                 "X-Total-Count": "1",
             },
-        })
-        cy.intercept("GET", "/api/v1/erm/usage_data_providers/*", dataProvider)
-        cy.visit("/cgi-bin/koha/erm/eusage/usage_data_providers")
+        });
+        cy.intercept("GET", "/api/v1/erm/usage_data_providers/*", dataProvider);
+        cy.visit("/cgi-bin/koha/erm/eusage/usage_data_providers");
 
-        cy.get("#usage_data_providers_list table tbody tr:first").contains("Run now").click()
-        cy.get(".modal_centered p").contains(dataProvider.name)
+        cy.get("#usage_data_providers_list table tbody tr:first")
+            .contains("Run now")
+            .click();
+        cy.get(".modal_centered p").contains(dataProvider.name);
 
         cy.intercept("GET", "/api/v1/erm/usage_data_providers/1/run*", {
             statusCode: 200,
-            body: { jobs: [
-                {
-                    report_type: 'TR_J1',
-                    job_id: 1
-                }
-            ]},
+            body: {
+                jobs: [
+                    {
+                        report_type: "TR_J1",
+                        job_id: 1,
+                    },
+                ],
+            },
             headers: {
                 "X-Base-Total-Count": "1",
                 "X-Total-Count": "1",
             },
-        })
-        cy.get('#accept_modal').click()
-        cy.get('#erm > div > div.main.container-fluid > div > div.col-sm-10.col-sm-push-2 > main > div.dialog.message > li')
-            .contains("Harvest background job for report type TR_J1 has started, click here to check its progress.")
-    })
+        });
+        cy.get("#accept_modal").click();
+        cy.get(
+            "#erm > div > div.main.container-fluid > div > div.col-sm-10.col-sm-push-2 > main > div.dialog.message > li"
+        ).contains(
+            "Harvest background job for report type TR_J1 has started, click here to check its progress."
+        );
+    });
 
     it("Should test a provider's SUSHI connection", () => {
-        const dataProvider = cy.get_usage_data_provider()
-        const dataProviders = [dataProvider]
+        const dataProvider = cy.get_usage_data_provider();
+        const dataProviders = [dataProvider];
 
         cy.intercept("GET", "/api/v1/erm/usage_data_providers*", {
             statusCode: 200,
@@ -590,23 +710,31 @@ describe("Data providers action buttons", () => {
                 "X-Base-Total-Count": "1",
                 "X-Total-Count": "1",
             },
-        })
-        cy.intercept("GET", "/api/v1/erm/usage_data_providers/*", dataProvider)
-        cy.visit("/cgi-bin/koha/erm/eusage/usage_data_providers")
-
-        
-        cy.intercept("GET", "/api/v1/erm/usage_data_providers/1/test_connection", {
-            statusCode: 200,
-            body: 1,
-            headers: {
-                "X-Base-Total-Count": "1",
-                "X-Total-Count": "1",
-            },
-        }).as("test-connection")
-        cy.get("#usage_data_providers_list table tbody tr:first").contains("Test").click()
-        cy.wait("@test-connection")
-        cy.get('#erm > div > div.main.container-fluid > div > div.col-sm-10.col-sm-push-2 > main > div.dialog.message')
-            .contains("Harvester connection was successful for usage data provider " + dataProvider.name)
-    })
-}) 
+        });
+        cy.intercept("GET", "/api/v1/erm/usage_data_providers/*", dataProvider);
+        cy.visit("/cgi-bin/koha/erm/eusage/usage_data_providers");
 
+        cy.intercept(
+            "GET",
+            "/api/v1/erm/usage_data_providers/1/test_connection",
+            {
+                statusCode: 200,
+                body: 1,
+                headers: {
+                    "X-Base-Total-Count": "1",
+                    "X-Total-Count": "1",
+                },
+            }
+        ).as("test-connection");
+        cy.get("#usage_data_providers_list table tbody tr:first")
+            .contains("Test")
+            .click();
+        cy.wait("@test-connection");
+        cy.get(
+            "#erm > div > div.main.container-fluid > div > div.col-sm-10.col-sm-push-2 > main > div.dialog.message"
+        ).contains(
+            "Harvester connection was successful for usage data provider " +
+                dataProvider.name
+        );
+    });
+});
diff --git a/t/cypress/support/e2e.js b/t/cypress/support/e2e.js
index f733af94cc..67c9911327 100644
--- a/t/cypress/support/e2e.js
+++ b/t/cypress/support/e2e.js
@@ -394,10 +394,8 @@ cy.get_multiple_providers = () => {
             "active": 1,
             "aggregator": "test_aggregator",
             "api_key": '12345',
-            "begin_date": dates['today_iso'],
             "customer_id": "12345",
             "description": "A data provider for cypress testing",
-            "end_date": dates['tomorrow_iso'],
             "erm_usage_data_provider_id": 1,
             "method": "test",
             "name": "Cypress test provider",
-- 
2.39.5