Attachment 173789 Details for Bug 37577 – Bug 37577: (QA follow-up) Tidy

[patch] Bug 37577: (QA follow-up) Tidy

Bug-37577-QA-follow-up-Tidy.patch (text/plain), 9.17 KB, created by Nick Clemens (kidclamp) on 2024-10-31 12:20:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nick Clemens (kidclamp)

Created: 2024-10-31 12:20:40 UTC

Size: 9.17 KB

patch

obsolete

>From 6cdf09fe9c4931fd05986a3b4563d60c55259fd4 Mon Sep 17 00:00:00 2001
>From: Nick Clemens <nick@bywatersolutions.com>
>Date: Thu, 31 Oct 2024 12:19:30 +0000
>Subject: [PATCH] Bug 37577: (QA follow-up) Tidy
>
>Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
>---
> Koha/REST/V1/ERM/EHoldings/Packages/Local.pm  | 10 ++--
> .../ERM/EHoldingsLocalPackagesList.vue        |  2 +-
> .../integration/AdditionalFields_spec.ts      | 55 +++++++++++++------
> 3 files changed, 44 insertions(+), 23 deletions(-)
>
>diff --git a/Koha/REST/V1/ERM/EHoldings/Packages/Local.pm b/Koha/REST/V1/ERM/EHoldings/Packages/Local.pm
>index 2985477421e..0fb1d984eab 100644
>--- a/Koha/REST/V1/ERM/EHoldings/Packages/Local.pm
>+++ b/Koha/REST/V1/ERM/EHoldings/Packages/Local.pm
>@@ -87,14 +87,15 @@ sub add {
> 
>                 my $body = $c->req->json;
> 
>-                my $package_agreements = delete $body->{package_agreements} // [];
>+                my $package_agreements  = delete $body->{package_agreements}  // [];
>                 my $extended_attributes = delete $body->{extended_attributes} // [];
>                 delete $body->{external_id} unless $body->{external_id};
> 
>                 my $package = Koha::ERM::EHoldings::Package->new_from_api($body)->store;
>                 $package->package_agreements($package_agreements);
> 
>-                my @extended_attributes = map { {'id' => $_->{field_id}, 'value' => $_->{value}} } @{$extended_attributes};
>+                my @extended_attributes =
>+                    map { { 'id' => $_->{field_id}, 'value' => $_->{value} } } @{$extended_attributes};
>                 $package->extended_attributes( \@extended_attributes );
> 
>                 $c->res->headers->location($c->req->url->to_string . '/' . $package->package_id);
>@@ -163,7 +164,7 @@ sub update {
> 
>                 my $body = $c->req->json;
> 
>-                my $package_agreements = delete $body->{package_agreements} // [];
>+                my $package_agreements  = delete $body->{package_agreements}  // [];
>                 my $extended_attributes = delete $body->{extended_attributes} // [];
>                 delete $body->{external_id} unless $body->{external_id};
> 
>@@ -173,7 +174,8 @@ sub update {
>                 # ie. It's coming from EBSCO and we don't have local data linked to it
>                 $package->package_agreements($package_agreements);
> 
>-                my @extended_attributes = map { {'id' => $_->{field_id}, 'value' => $_->{value}} } @{$extended_attributes};
>+                my @extended_attributes =
>+                    map { { 'id' => $_->{field_id}, 'value' => $_->{value} } } @{$extended_attributes};
>                 $package->extended_attributes( \@extended_attributes );
> 
>                 $c->res->headers->location($c->req->url->to_string . '/' . $package->package_id);
>diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesList.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesList.vue
>index 279755d20a4..51e2f87f81d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesList.vue
>+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesList.vue
>@@ -134,7 +134,7 @@ export default {
>                 error => {}
>             )
>         },
>-	    async getSearchableAdditionalFields() {
>+        async getSearchableAdditionalFields() {
>             const client = APIClient.additional_fields
>             await client.additional_fields.getAll("package").then(
>                 searchable_additional_fields => {
>diff --git a/t/cypress/integration/AdditionalFields_spec.ts b/t/cypress/integration/AdditionalFields_spec.ts
>index c2486ad7c49..8d8907fae1b 100644
>--- a/t/cypress/integration/AdditionalFields_spec.ts
>+++ b/t/cypress/integration/AdditionalFields_spec.ts
>@@ -269,7 +269,7 @@ function get_no_additional_fields_package() {
>         vendor: [cy.get_vendors_to_relate()[0]],
>         extended_attributes: [],
>         _strings: {
>-            "additional_field_values": []
>+            additional_field_values: [],
>         },
>     };
> }
>@@ -1274,7 +1274,8 @@ describe("Additional Fields operations", () => {
>     it("Additional Fields display - Table (eHoldings packages)", () => {
>         let eholdings_package = get_package();
>         let eholdings_packages = [eholdings_package];
>-        let eholdings_package_additional_fields = get_packages_additional_fields();
>+        let eholdings_package_additional_fields =
>+            get_packages_additional_fields();
>         let av_cats = get_av_cats();
> 
>         cy.intercept("GET", "/api/v1/extended_attribute_types*", {
>@@ -1290,7 +1291,11 @@ describe("Additional Fields operations", () => {
>                 "X-Total-Count": "1",
>             },
>         });
>-        cy.intercept("GET", "/api/v1/erm/eholdings/local/packages/*", eholdings_package);
>+        cy.intercept(
>+            "GET",
>+            "/api/v1/erm/eholdings/local/packages/*",
>+            eholdings_package
>+        );
>         cy.visit("/cgi-bin/koha/erm/eholdings/local/packages");
>         cy.get("#packages_list").contains("Showing 1 to 1 of 1 entries");
> 
>@@ -1318,7 +1323,8 @@ describe("Additional Fields operations", () => {
>         let eholdings_package = get_package();
>         let eholdings_packages = [eholdings_package];
>         let vendors = cy.get_vendors_to_relate();
>-        let eholdings_package_additional_fields = get_packages_additional_fields();
>+        let eholdings_package_additional_fields =
>+            get_packages_additional_fields();
>         let av_cats = get_av_cats();
> 
>         // Click the 'Edit' button from the list
>@@ -1330,9 +1336,11 @@ describe("Additional Fields operations", () => {
>                 "X-Total-Count": "1",
>             },
>         });
>-        cy.intercept("GET", "/api/v1/erm/eholdings/local/packages/*", empty_eholdings_package).as(
>-            "get-empty-eholdings-package"
>-        );
>+        cy.intercept(
>+            "GET",
>+            "/api/v1/erm/eholdings/local/packages/*",
>+            empty_eholdings_package
>+        ).as("get-empty-eholdings-package");
> 
>         //Intercept vendors request
>         cy.intercept("GET", "/api/v1/acquisitions/vendors*", {
>@@ -1368,9 +1376,11 @@ describe("Additional Fields operations", () => {
>             }
>         ).as("avcategories");
> 
>-        cy.intercept("GET", "/api/v1/erm/eholdings/local/packages/*", eholdings_package).as(
>-            "get-eholdings-package"
>-        );
>+        cy.intercept(
>+            "GET",
>+            "/api/v1/erm/eholdings/local/packages/*",
>+            eholdings_package
>+        ).as("get-eholdings-package");
> 
>         // There are additional fields, fieldset should exist
>         cy.visit("/cgi-bin/koha/erm/eholdings/local/packages");
>@@ -1437,7 +1447,8 @@ describe("Additional Fields operations", () => {
> 
>     it("Additional Fields entry - Add (eHoldings packages)", () => {
>         let vendors = cy.get_vendors_to_relate();
>-        let eholdings_package_additional_fields = get_packages_additional_fields();
>+        let eholdings_package_additional_fields =
>+            get_packages_additional_fields();
>         let av_cats = get_av_cats();
> 
>         //Intercept vendors request
>@@ -1551,7 +1562,8 @@ describe("Additional Fields operations", () => {
>         let eholdings_package = get_package();
>         let eholdings_packages = [eholdings_package];
>         let vendors = cy.get_vendors_to_relate();
>-        let eholdings_package_additional_fields = get_packages_additional_fields();
>+        let eholdings_package_additional_fields =
>+            get_packages_additional_fields();
>         let av_cats = get_av_cats();
> 
>         // Click the 'Edit' button from the list
>@@ -1563,9 +1575,11 @@ describe("Additional Fields operations", () => {
>                 "X-Total-Count": "1",
>             },
>         });
>-        cy.intercept("GET", "/api/v1/erm/eholdings/local/packages/*", eholdings_package).as(
>-            "get-eholdings-package"
>-        );
>+        cy.intercept(
>+            "GET",
>+            "/api/v1/erm/eholdings/local/packages/*",
>+            eholdings_package
>+        ).as("get-eholdings-package");
> 
>         //Intercept vendors request
>         cy.intercept("GET", "/api/v1/acquisitions/vendors*", {
>@@ -1615,14 +1629,20 @@ describe("Additional Fields operations", () => {
>         )
>             .parent()
>             .children("input")
>-            .should("have.value", eholdings_package.extended_attributes[2].value);
>+            .should(
>+                "have.value",
>+                eholdings_package.extended_attributes[2].value
>+            );
> 
>         cy.get(
>             "#packages_add form #additional_fields label[for='additional_field_3']"
>         )
>             .parent()
>             .children("input")
>-            .should("have.value", eholdings_package.extended_attributes[3].value);
>+            .should(
>+                "have.value",
>+                eholdings_package.extended_attributes[3].value
>+            );
> 
>         cy.get("#additional_fields #additional_field_4 .vs__selected").contains(
>             get_description_from_av_value(
>@@ -1659,5 +1679,4 @@ describe("Additional Fields operations", () => {
>             "#packages_add form #additional_fields label[for='additional_field_3']"
>         ).should("have.length", 2);
>     });
>-
> });
>-- 
>2.39.5

Actions: View | Diff | Splinter Review

Attachments on bug 37577: 171398 | 172693 | 173779 | 173784 | 173788 | 173789