Add Service Level field to blank request form

Fixes PR-2056.

CHANGELOG.md

@@ -32,6 +32,7 @@
 * Make robust against old version of mod-rs (e.g. 2.15.5) that do not return lists of copyright types. Fixes PR-1841.
 * Support per-service config item `allowAnyDate` to disable date validation in forms. Update docs, add tests. Fixes PR-2059.
 * Support per-service config item `alwaysShowForm` to specify that the full form always should be displayed once for confirmation even when the submitted OpenURL has complete basic metadata. Update docs. Fixes PR-2059.
+* Add Service Level field to blank request form. Fixes PR-2056.
 
 ## [1.6.0](https://github.com/openlibraryenvironment/listener-openurl/tree/v1.6.0) (2024-03-04)
 

config/templates/form1.html

@@ -36,6 +36,17 @@ <h2>Request type</h2>
                 </div>
               </div>
 
+              <div class="key-value-pair">
+                <div class="key">Service level</div>
+                <div class="value">
+                  <select class="select" id="input-serviceLevel" name="svc.level">
+                    {{#each serviceLevels}}
+                      <option value="{{this.code}}" {{this.selected}}>{{this.name}}</option>
+                    {{/each}}
+                  </select>
+                </div>
+              </div>
+
               {{#unless digitalOnly}}
               <div id="div-pickupLocation" class="key-value-pair">
                 <label class="key" for="input-pickupLocation">Pick up location</label>

src/OkapiSession.js

@@ -32,6 +32,11 @@ class OkapiSession {
   }
 
   async _getDataFromReShare(path, caption) {
+    if (this.logger.values?.withoutOkapi) {
+      // Running as part of a test: do nothing
+      return {};
+    }
+
     const res = await this.okapiFetch('GET', path);
     if (res.status !== 200) throw new HTTPError(res, `cannot fetch default ${caption} for '${this.label}'`);
     const json = await res.json();
@@ -54,11 +59,20 @@ class OkapiSession {
       });
   }
 
+  async _getRefDataValues(desc, caption) {
+    const path = `/rs/refdata?filters=desc%3D%3D${desc}&sort=desc%3Basc&max=100`;
+    const json = await this._getDataFromReShare(path, caption);
+    return json[0]?.values.map(r => ({ id: r.id, code: r.value, name: r.label }));
+  }
+
   async getCopyrightTypes() {
-    const path = '/rs/refdata?filters=desc%3D%3DcopyrightType&sort=desc%3Basc&max=100';
-    const json = await this._getDataFromReShare(path, 'copyright types');
-    this.copyrightTypes = json[0]?.values
-      .map(r => ({ id: r.id, code: r.value, name: r.label }));
+    // XXX could no-op if this.copyrightTypes is already defined
+    this.copyrightTypes = await this._getRefDataValues('copyrightType', 'copyright types');
+  }
+
+  async getServiceLevels() {
+    // XXX could no-op if this.serviceLevels is already defined
+    this.serviceLevels = await this._getRefDataValues('ServiceLevels', 'service levels');
   }
 
   async getDefaultCopyrightType() {

src/OpenURLServer.js

@@ -141,6 +141,10 @@ function makeFormData(ctx, query, service, valuesNotShownInForm, firstTry, npl)
       name: x.charAt(0).toUpperCase() + x.slice(1),
       checked: x === query.svc_id || (!query.svc_id && i === 0) ? 'checked' : '',
     })),
+    serviceLevels: (service.serviceLevels || []).map(x => ({
+      ...x,
+      selected: x.code === query['svc.level'] ? 'selected' : '',
+    })),
     pubDateValidation: ctx.state?.svcCfg?.allowAnyDate ? '' : 'pattern="[0-9]*" ',
   });
 
@@ -179,7 +183,7 @@ async function maybeRenderForm(ctx, next) {
     formName = 'form1';
     formFields.push('rft.title', 'rft.au', 'rft.date', 'rft.pub', 'rft.place', 'rft.edition', 'rft.isbn', 'rft.oclc',
       'rft.authorOfComponent', 'rft.copyrightType', 'rft.genre', 'rft.issn', 'rft.jtitle', 'rft.pagesRequested',
-      'rft.sponsoringBody', 'rft.subtitle', 'rft.titleOfComponent', 'rft.issue', 'svc_id');
+      'rft.sponsoringBody', 'rft.subtitle', 'rft.titleOfComponent', 'rft.issue', 'svc_id', 'svc.level');
   }
 
   ctx.cfg.log('flow', 'Rendering form', formName);
@@ -192,6 +196,8 @@ async function maybeRenderForm(ctx, next) {
     ]);
   }
 
+  await service.getServiceLevels();
+
   const originalQuery = co.getQuery();
   const query = {};
   Object.keys(originalQuery).forEach(key => {
@@ -322,7 +328,9 @@ class OpenURLServer {
 
     const serviceConfigs = cfg.getValues().services || [];
     Object.keys(serviceConfigs).forEach(label => {
-      this.services[label] = new OkapiSession(cfg, label, serviceConfigs[label]);
+      const values = { ...serviceConfigs[label] };
+      if (cfg.values.withoutOkapi) values.withoutOkapi = true;
+      this.services[label] = new OkapiSession(cfg, label, values);
     });
 
     // Default service

src/ReshareRequest.js

@@ -116,6 +116,7 @@ function translateCOtoRR(co) {
 
   // These are non-standard fields in OpenURL 1.0
   rr.serviceType = _.get(a, 'svc.id'); // No example of this in Z39.88
+  rr.serviceLevel = _.get(m, 'svc.level');
   rr.isRequester = true;
   const copyrightType = _.get(m, 'rft.copyrightType');
   if (copyrightType) rr.copyrightType = { value: copyrightType };

test/05-OpenURLServer.js

@@ -10,9 +10,9 @@ chai.use(chaiHttp);
 const app = (new OpenURLServer(new Config({
   // loggingCategories: 'error,start,okapi,co,rr,admindata,metadata,flow',
   loggingCategories: '',
+  withoutOkapi: true,
   services: {
     'US-EAST': {
-      withoutOkapi: true,
       reqIdToLower: true,
       reqIdRegex: 'abc-(.*)',
       reqIdReplacement: '$1-b',