Bugzilla – Attachment 181797 Details for
Bug 38010
Migrate vendors to Vue
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 38010: (QA follow-up) Add a config endpoint for permissions
Bug-38010-QA-follow-up-Add-a-config-endpoint-for-p.patch (text/plain), 7.14 KB, created by
Jonathan Druart
on 2025-04-30 21:04:41 UTC
(
hide
)
Description:
Bug 38010: (QA follow-up) Add a config endpoint for permissions
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2025-04-30 21:04:41 UTC
Size:
7.14 KB
patch
obsolete
>From 37201625023eefc65ef7e00a4f2dbeebc32c740b Mon Sep 17 00:00:00 2001 >From: Matt Blenkinsop <matt.blenkinsop@openfifth.co.uk> >Date: Wed, 23 Apr 2025 12:53:41 +0100 >Subject: [PATCH] Bug 38010: (QA follow-up) Add a config endpoint for > permissions > >Signed-off-by: Michaela Sieber <michaela.sieber@kit.edu> >Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >--- > Koha/REST/V1/Acquisitions/Vendors.pm | 21 ++++++++++ > .../swagger/definitions/vendors_config.yaml | 7 ++++ > .../paths/acquisitions_vendors_config.yaml | 38 +++++++++++++++++++ > api/v1/swagger/swagger.yaml | 4 ++ > .../prog/js/fetch/acquisition-api-client.js | 9 +++++ > .../prog/js/vue/components/Vendors/Main.vue | 27 +++++++------ > 6 files changed, 95 insertions(+), 11 deletions(-) > create mode 100644 api/v1/swagger/definitions/vendors_config.yaml > create mode 100644 api/v1/swagger/paths/acquisitions_vendors_config.yaml > >diff --git a/Koha/REST/V1/Acquisitions/Vendors.pm b/Koha/REST/V1/Acquisitions/Vendors.pm >index 1ae2bde2c97..8b61de68797 100644 >--- a/Koha/REST/V1/Acquisitions/Vendors.pm >+++ b/Koha/REST/V1/Acquisitions/Vendors.pm >@@ -169,4 +169,25 @@ sub delete { > }; > } > >+=head3 config >+ >+Return the configuration options needed for the ERM Vue app >+ >+=cut >+ >+sub config { >+ my $c = shift->openapi->valid_input or return; >+ >+ my $patron = $c->stash('koha.user'); >+ my $userflags = C4::Auth::getuserflags( $patron->flags, $patron->id ); >+ my $permissions = Koha::Auth::Permissions->get_authz_from_flags( { flags => $userflags } ); >+ >+ return $c->render( >+ status => 200, >+ openapi => { >+ permissions => $permissions, >+ }, >+ ); >+} >+ > 1; >diff --git a/api/v1/swagger/definitions/vendors_config.yaml b/api/v1/swagger/definitions/vendors_config.yaml >new file mode 100644 >index 00000000000..f9e71160cd1 >--- /dev/null >+++ b/api/v1/swagger/definitions/vendors_config.yaml >@@ -0,0 +1,7 @@ >+--- >+type: object >+properties: >+ permissions: >+ type: object >+ description: List of permissions for the user >+additionalProperties: false >diff --git a/api/v1/swagger/paths/acquisitions_vendors_config.yaml b/api/v1/swagger/paths/acquisitions_vendors_config.yaml >new file mode 100644 >index 00000000000..4bc3e814ece >--- /dev/null >+++ b/api/v1/swagger/paths/acquisitions_vendors_config.yaml >@@ -0,0 +1,38 @@ >+--- >+/acquisitions/vendors/config: >+ get: >+ x-mojo-to: Acquisitions::Vendors#config >+ operationId: getVendorsconfig >+ description: This resource returns a list of options needed for the Vendors Vue app >+ summary: get the Vendors config >+ tags: >+ - vendors_config >+ produces: >+ - application/json >+ responses: >+ 200: >+ description: The Vendors config >+ schema: >+ $ref: "../swagger.yaml#/definitions/vendors_config" >+ 400: >+ description: Bad request >+ schema: >+ $ref: "../swagger.yaml#/definitions/error" >+ 403: >+ description: Access forbidden >+ schema: >+ $ref: "../swagger.yaml#/definitions/error" >+ 500: >+ description: | >+ Internal server error. Possible `error_code` attribute values: >+ >+ * `internal_server_error` >+ schema: >+ $ref: "../swagger.yaml#/definitions/error" >+ 503: >+ description: Under maintenance >+ schema: >+ $ref: "../swagger.yaml#/definitions/error" >+ x-koha-authorization: >+ permissions: >+ acquisition: 1 >diff --git a/api/v1/swagger/swagger.yaml b/api/v1/swagger/swagger.yaml >index e583215a8be..cbb6fa338f8 100644 >--- a/api/v1/swagger/swagger.yaml >+++ b/api/v1/swagger/swagger.yaml >@@ -188,6 +188,8 @@ definitions: > $ref: ./definitions/vendor.yaml > vendor_issue: > $ref: ./definitions/vendor_issue.yaml >+ vendors_config: >+ $ref: ./definitions/vendors_config.yaml > paths: > /acquisitions/baskets: > $ref: ./paths/acquisitions_baskets.yaml#/~1acquisitions~1baskets >@@ -207,6 +209,8 @@ paths: > $ref: "./paths/acquisitions_orders.yaml#/~1acquisitions~1orders~1{order_id}" > /acquisitions/vendors: > $ref: ./paths/acquisitions_vendors.yaml#/~1acquisitions~1vendors >+ /acquisitions/vendors/config: >+ $ref: ./paths/acquisitions_vendors_config.yaml#/~1acquisitions~1vendors~1config > "/acquisitions/vendors/{vendor_id}": > $ref: "./paths/acquisitions_vendors.yaml#/~1acquisitions~1vendors~1{vendor_id}" > "/acquisitions/vendors/{vendor_id}/issues": >diff --git a/koha-tmpl/intranet-tmpl/prog/js/fetch/acquisition-api-client.js b/koha-tmpl/intranet-tmpl/prog/js/fetch/acquisition-api-client.js >index 0316beb3b33..165d93948e2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/fetch/acquisition-api-client.js >+++ b/koha-tmpl/intranet-tmpl/prog/js/fetch/acquisition-api-client.js >@@ -5,6 +5,15 @@ export class AcquisitionAPIClient { > }); > } > >+ get config() { >+ return { >+ get: moduleEndpoint => >+ this.httpClient.get({ >+ endpoint: moduleEndpoint + "/config", >+ }), >+ }; >+ } >+ > get vendors() { > return { > get: id => >diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/Main.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/Main.vue >index 87d76eec324..17b7ceda9de 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/Main.vue >+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/Main.vue >@@ -32,6 +32,7 @@ import LeftMenu from "../LeftMenu.vue"; > import Dialog from "../Dialog.vue"; > import "vue-select/dist/vue-select.css"; > import { storeToRefs } from "pinia"; >+import { APIClient } from "../../fetch/api-client.js"; > > export default { > setup() { >@@ -61,18 +62,22 @@ export default { > > this.loadAuthorisedValues(this.authorisedValues, this.vendorStore).then( > () => { >- this.userPermissions = userPermissions; >- this.config.settings.edifact = edifact; >- this.config.settings.marcOrderAutomation = marcOrderAutomation; >- this.vendorStore.currencies = currencies; >- this.vendorStore.gstValues = gstValues.map(gv => { >- return { >- label: `${Number(gv.option * 100).format_price()}%`, >- value: gv.option, >- }; >+ const client = APIClient.acquisition; >+ client.config.get("vendors").then(config => { >+ this.userPermissions = config.permissions; >+ this.config.settings.edifact = edifact; >+ this.config.settings.marcOrderAutomation = >+ marcOrderAutomation; >+ this.vendorStore.currencies = currencies; >+ this.vendorStore.gstValues = gstValues.map(gv => { >+ return { >+ label: `${Number(gv.option * 100).format_price()}%`, >+ value: gv.option, >+ }; >+ }); >+ this.loaded(); >+ this.initialized = true; > }); >- this.loaded(); >- this.initialized = true; > } > ); > }, >-- >2.34.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 38010
:
174119
|
174120
|
174121
|
174122
|
174123
|
174124
|
174125
|
174126
|
174128
|
174129
|
174130
|
174131
|
174132
|
174133
|
174134
|
174135
|
174136
|
174137
|
174138
|
174139
|
174140
|
174141
|
174142
|
174143
|
174144
|
174145
|
174146
|
174147
|
174148
|
174151
|
174152
|
174153
|
174154
|
174155
|
174156
|
174157
|
174158
|
174159
|
174160
|
174161
|
174162
|
174163
|
174164
|
174165
|
174166
|
174167
|
174168
|
174169
|
174170
|
174171
|
174172
|
174173
|
174174
|
174175
|
174176
|
174177
|
174178
|
174179
|
174194
|
174196
|
174197
|
174198
|
174199
|
174200
|
174201
|
174202
|
174203
|
174204
|
174205
|
174206
|
174207
|
174208
|
174209
|
174210
|
174211
|
174212
|
174213
|
174214
|
174215
|
174216
|
174217
|
174218
|
174220
|
174221
|
174222
|
174223
|
174224
|
174225
|
174226
|
174248
|
174266
|
174267
|
174269
|
174270
|
174273
|
174327
|
174328
|
174329
|
174330
|
174331
|
174332
|
174333
|
174334
|
174335
|
174336
|
174337
|
174338
|
174339
|
174340
|
174341
|
174342
|
174343
|
174344
|
174345
|
174346
|
174347
|
174348
|
174349
|
174350
|
174351
|
174352
|
174353
|
174354
|
174355
|
174356
|
174357
|
174358
|
174359
|
174360
|
174603
|
175098
|
175099
|
175100
|
175101
|
175102
|
175103
|
175104
|
175105
|
175106
|
175107
|
175108
|
175109
|
175110
|
175111
|
175112
|
175113
|
175114
|
175115
|
175116
|
175117
|
175118
|
175119
|
175120
|
175121
|
175122
|
175123
|
175124
|
175125
|
175126
|
175127
|
175128
|
175129
|
175130
|
175131
|
175133
|
175134
|
175135
|
175136
|
175137
|
175167
|
175168
|
175170
|
175240
|
175241
|
175242
|
175243
|
175248
|
175249
|
175266
|
175791
|
175799
|
176547
|
178182
|
178183
|
178184
|
178185
|
178186
|
178187
|
178188
|
178189
|
178190
|
178191
|
178192
|
178193
|
178194
|
178195
|
178196
|
178197
|
178198
|
178199
|
178200
|
178201
|
178202
|
178203
|
178204
|
178205
|
178206
|
178207
|
178208
|
178209
|
178210
|
178211
|
178212
|
178213
|
178214
|
178215
|
178216
|
178217
|
178218
|
178219
|
178220
|
178221
|
178222
|
178223
|
178224
|
178225
|
178226
|
178227
|
178228
|
178229
|
178230
|
178231
|
178232
|
178233
|
178234
|
178235
|
178236
|
178237
|
178238
|
178239
|
178240
|
178241
|
178242
|
181579
|
181585
|
181727
|
181728
|
181729
|
181730
|
181731
|
181732
|
181733
|
181734
|
181735
|
181736
|
181737
|
181738
|
181739
|
181740
|
181741
|
181742
|
181743
|
181744
|
181745
|
181746
|
181747
|
181748
|
181749
|
181750
|
181751
|
181752
|
181753
|
181754
|
181755
|
181756
|
181757
|
181758
|
181759
|
181760
|
181761
|
181762
|
181763
|
181764
|
181765
|
181766
|
181767
|
181768
|
181769
|
181770
|
181771
|
181772
|
181773
|
181774
|
181775
|
181776
|
181777
|
181778
|
181779
|
181780
|
181781
|
181782
|
181783
|
181784
|
181785
|
181786
|
181787
|
181788
|
181789
|
181790
|
181791
|
181792
|
181793
|
181794
|
181795
|
181796
| 181797 |
181798
|
181799
|
181800
|
181801
|
181802
|
181803
|
181804
|
181805
|
181806
|
181807
|
181808
|
181809
|
181810
|
181811
|
181812
|
181813
|
181814
|
181815
|
181816
|
181817
|
181818
|
181819
|
181820
|
181821
|
181891
|
181898
|
181901
|
181963
|
181964
|
182053
|
182351
|
182438