Merge branch 'develop' into main

Author: SydneyUni-Jim

.nvmrc

@@ -1 +1 @@
-10.24.0
+lts/fermium

cloudapp/src/app/alma-configuration/alma-configuration-service.ts

@@ -0,0 +1,62 @@
+import { Injectable } from '@angular/core'
+import { CloudAppRestService } from '@exlibris/exl-cloudapp-angular-lib'
+import LRU from 'lru-cache'
+
+
+export interface Location {
+  code: string
+  name: string
+}
+
+
+/*
+
+  ### A note on the caches in AlmaConfigurationService
+
+  The caches store promises and not the results. This ensures we only make one request to the Alma API.
+  The first call creates a promise and sets up the request. Subsequent calls get the same promise.
+  When the request set up in the first call resolves, the promise resolves for all the callers.
+  Any subsequent calls return the same promise, which is already resolved.
+
+*/
+
+
+@Injectable({
+  providedIn: 'root',
+})
+export class AlmaConfigurationService {
+
+  private _locationCache = new LRU<string, Promise<Location>>(100)
+  private _locationsForLibraryCache = new LRU<string, Promise<Location[]>>(5)
+
+
+  constructor(
+    private restService: CloudAppRestService,
+  ) { }
+
+
+  location(libraryCode: string, locationCode: string): Promise<Location | undefined> {
+    let cacheKey = `${ libraryCode }‡${ locationCode }`
+    let locationPromise = this._locationCache.get(cacheKey)
+    if (!locationPromise) {
+      let locationsForLibraryPromise = this.locationsForLibrary(libraryCode)
+      locationPromise = locationsForLibraryPromise.then(locations =>
+        locations.find(l => l.code == locationCode)
+      )
+      this._locationCache.set(cacheKey, locationPromise)
+    }
+    return locationPromise
+  }
+
+
+  locationsForLibrary(libraryCode: string): Promise<Location[]> {
+    let locationsForLibraryPromise = this._locationsForLibraryCache.get(libraryCode)
+    if (!locationsForLibraryPromise) {
+      let respPromise = this.restService.call(`/almaws/v1/conf/libraries/${libraryCode}/locations`).toPromise()
+      locationsForLibraryPromise = respPromise.then(resp => resp.location)
+      this._locationsForLibraryCache.set(libraryCode, locationsForLibraryPromise)
+    }
+    return locationsForLibraryPromise
+  }
+
+}

cloudapp/src/app/app-module-services.service.ts

@@ -0,0 +1,36 @@
+import { Injectable } from '@angular/core'
+import { AppService } from './app.service'
+import { PrintSlipReportWindowService } from './print-slip-report/window.service'
+import { RequestedResourcesService } from './requested-resources'
+
+
+
+export const WINDOW_KEY = 'appModuleServicesService'
+
+
+@Injectable({
+  providedIn: 'root'
+})
+export class AppModuleServicesService {
+
+  static getFromWindow(wnd): AppModuleServicesService {
+    let s = wnd[WINDOW_KEY]
+    if (!s) {
+      throw Error(`No ${ WINDOW_KEY } defined on window`)
+    }
+    return s
+  }
+
+
+  constructor(
+    public readonly appService: AppService,
+    public readonly printSlipReportWindowService: PrintSlipReportWindowService,
+    public readonly requestedResourcesService: RequestedResourcesService,
+  ) { }
+
+
+  setInWindow(wnd) {
+    Object.defineProperty(wnd, WINDOW_KEY, { enumerable: true, value: this })
+  }
+
+}

cloudapp/src/app/app-routing.module.ts

@@ -1,20 +1,31 @@
 import { NgModule } from '@angular/core'
 import { RouterModule, Routes } from '@angular/router'
-import { ConfigComponent } from './config/config.component'
 import { MainComponent } from './main/main.component'
-import { PrintSlipReportComponent } from './print-slip-report/print-slip-report.component'
 
 
 
 const routes: Routes = [
-  { path: '', component: MainComponent },
-  { path: 'config', component: ConfigComponent },
-  { path: 'print-slip-report', component: PrintSlipReportComponent }
+  {
+    path: '',
+    component: MainComponent
+  },
+  {
+    path: 'config',
+    loadChildren: () => import('./config/config.module').then(m => m.PrintSlipReportConfigModule),
+  },
+  {
+    path: 'download-excel-slip-report',
+    loadChildren: () =>  import('./download-excel-slip-report/download-excel-slip-report.module').then(m => m.DownloadExcelSlipReportModule)
+  },
+  {
+    path: 'print-slip-report',
+    loadChildren: () => import('./print-slip-report/print-slip-report.module').then(m => m.PrintSlipReportModule)
+  },
 ]
 
 
 @NgModule({
-  imports: [RouterModule.forRoot(routes, { useHash: true })],
-  exports: [RouterModule],
+  imports: [ RouterModule.forRoot(routes, { useHash: true }) ],
+  exports: [ RouterModule ],
 })
 export class AppRoutingModule { }

cloudapp/src/app/app.component.ts

@@ -1,5 +1,5 @@
 import { Component } from '@angular/core'
-import { AppService } from './app.service'
+import { InitService } from '@exlibris/exl-cloudapp-angular-lib'
 
 
 
@@ -9,6 +9,9 @@ import { AppService } from './app.service'
 })
 export class AppComponent {
 
-  constructor(private appService: AppService) { }
+  // noinspection JSUnusedLocalSymbols
+  constructor(
+    private initService: InitService
+  ) { }
 
 }

cloudapp/src/app/app.module.ts

@@ -8,24 +8,15 @@ import { MaterialModule, getTranslateModule, AlertModule } from '@exlibris/exl-c
 
 import { AppComponent } from './app.component';
 import { AppRoutingModule } from './app-routing.module';
-import { CircDeskCodeDefaultsComponent } from './config/circ-desk-code-defaults.component'
-import { ColumnOptionComponent } from './column-options/column-option.component';
-import { ColumnOptionsListComponent } from './column-options/column-options-list.component';
-import { ConfigComponent } from './config/config.component';
+import { ColumnOptionsModule } from './column-options'
 import { MainComponent } from './main/main.component';
-import { PrintSlipReportComponent } from './print-slip-report/print-slip-report.component';
 
 
 
 @NgModule({
   declarations: [
     AppComponent,
-    CircDeskCodeDefaultsComponent,
-    ColumnOptionComponent,
-    ColumnOptionsListComponent,
-    ConfigComponent,
     MainComponent,
-    PrintSlipReportComponent,
   ],
   imports: [
     MaterialModule,
@@ -37,6 +28,7 @@ import { PrintSlipReportComponent } from './print-slip-report/print-slip-report.
     FormsModule,
     ReactiveFormsModule,
     getTranslateModule(),
+    ColumnOptionsModule,
   ],
   providers: [
     { provide: MAT_FORM_FIELD_DEFAULT_OPTIONS, useValue: { appearance: 'standard' } },

cloudapp/src/app/app.service.ts

@@ -1,15 +1,190 @@
 import { Injectable } from '@angular/core'
-import { InitService } from '@exlibris/exl-cloudapp-angular-lib'
+import { CloudAppEventsService, CloudAppStoreService, InitData } from '@exlibris/exl-cloudapp-angular-lib'
+import * as _ from 'lodash'
+import { last } from 'rxjs/operators'
+import { COLUMNS_DEFINITIONS } from './requested-resources/column-definitions'  // Direct to avoid circular dependency
+import { ColumnOption } from './column-options'
+import { ConfigService } from './config/config.service'
+import { SlipReportError } from './slip-report'
 
 
 
+const FALLBACK_DEFAULT_CIRC_DESK_CODE = 'DEFAULT_CIRC_DESK'
+const STORAGE_KEY = 'last-used-options'
+
+
 @Injectable({
   providedIn: 'root',
 })
 export class AppService {
 
+  initData?: InitData
+  private _libraryCode?: string
+  private _circDeskCode?: string
+  columnOptions: ColumnOption[] | undefined = undefined
+  lastSlipReportError: SlipReportError | undefined = undefined
+
+
   constructor(
-    private initService: InitService
-  ) {}
+    private configService: ConfigService,
+    private eventsService: CloudAppEventsService,
+    private storeService: CloudAppStoreService,
+  ) {
+    this.eventsService.getInitData().subscribe(initData => { this.initData = initData })
+  }
+
+
+  get circDeskCode(): string {
+    return this._circDeskCode ?? FALLBACK_DEFAULT_CIRC_DESK_CODE
+  }
+
+
+  set circDeskCode(c) {
+    this._circDeskCode = c.trim()
+  }
+
+
+  get columnOptionsAreCustomised(): boolean {
+    let selected = this.columnOptions.filter(_ => _.include)
+    let selectedByDefault = this.defaultColumnOptions.filter(_ => _.include)
+    let r = (
+      selected.length !== selectedByDefault.length
+      || ! _.every(
+        _.zip(selected, selectedByDefault),
+        ([a, b]) => {
+          let r2 = (
+            a.code === b.code
+            && a.hiddenInApp === b.hiddenInApp
+            && a.limit === b.limit
+          )
+          console.log('columnOptionsAreCustomised inner result', r2)
+          return r2
+        }
+      )
+    )
+    console.log('columnOptionsAreCustomised result', r)
+    return r
+  }
+
+
+  get defaultCircDeskCode(): string {
+    let libConfig = this.configService.config?.libraryConfigs?.filter(x => x.libraryCode == this.libraryCode)
+    return libConfig?.[0]?.defaultCircDeskCode ?? FALLBACK_DEFAULT_CIRC_DESK_CODE
+  }
+
+
+  get defaultColumnOptions(): ColumnOption[] {
+    let missingColumnDefinitions = new Map(COLUMNS_DEFINITIONS)   // Copy because we are going to mutate it
+    return [
+      // Start with the columns in the order they are from the app configuration,
+      ...(
+        (this.configService.config?.columnDefaults ?? [])
+        // ... minus any that aren't defined anymore
+        .filter(c => missingColumnDefinitions.has(c.code))
+        .map(c => {
+          let name = missingColumnDefinitions.get(c.code).name
+          missingColumnDefinitions.delete(c.code)
+          return { include: false, limit: 0, hiddenInApp: false, ...c, name }
+        })
+      ),
+      // Add any columns not in the app configuration, in the order they appear in the column definitions
+      ...(
+        Array.from(missingColumnDefinitions.values())
+             .map(c => ({ code: c.code, name: c.name, include: false, limit: 0, hiddenInApp: false }))
+      )
+    ]
+  }
+
+
+  get includedColumnOptions() {
+    return this.columnOptions.filter(c => c.include)
+  }
+
+
+  get libraryCode(): string {
+    return this._libraryCode
+  }
+
+
+  set libraryCode(c) {
+    this._libraryCode = c.trim()
+  }
+
+
+  popLastSlipReportError(): SlipReportError | undefined {
+    let e = this.lastSlipReportError
+    this.lastSlipReportError = undefined
+    return e
+  }
+
+
+  async resetColumnsToDefaults() {
+    await this.configService.load()
+    this.columnOptions = this.defaultColumnOptions
+  }
+
+
+  async loadLastUsed() {
+    await this.configService.load()
+    let lastUsedOptions = await this.storeService.get(STORAGE_KEY).toPromise()
+
+    this.libraryCode = (
+      this.initData?.user?.currentlyAtLibCode
+        ? this.initData.user.currentlyAtLibCode
+        : (lastUsedOptions?.libraryCode ?? '')
+    )
+
+    this.circDeskCode = lastUsedOptions?.circDeskCode ?? this.defaultCircDeskCode
+
+    if (!lastUsedOptions?.columnOptions?.length) {
+      // If there are no last used options saved, reset them
+      return await this.resetColumnsToDefaults()
+    }
+
+    if (lastUsedOptions?.columnOptions) {
+      let missingColumnDefinitions = new Map(COLUMNS_DEFINITIONS)   // Copy because we are going to mutate it
+      this.columnOptions = [
+        // Start with the columns in the order they are from the last used options,
+        ...(
+          (lastUsedOptions?.columnOptions ?? [])
+          // ... minus any that aren't defined anymore
+          .filter(c => missingColumnDefinitions.has(c.code))
+          .map(c => {
+            let name = missingColumnDefinitions.get(c.code).name
+            missingColumnDefinitions.delete(c.code)
+            return { include: false, limit: 0, hiddenInApp: false, ...c, name }
+          })
+        ),
+        // Add any columns not in the app configuration, in the order they appear in the column definitions
+        ...(
+          Array.from(missingColumnDefinitions.values())
+               .map(c => ({ code: c.code, name: c.name, include: false, limit: 0, hiddenInApp: false }))
+        )
+      ]
+    } else {
+      this.columnOptions = this.defaultColumnOptions
+    }
+  }
+
+
+  async saveLastUsed() {
+    let lastUsedOptions =  {
+      libraryCode: this.libraryCode,
+      circDeskCode: this.circDeskCode,
+      columnOptions: (
+        this.columnOptionsAreCustomised
+        ? this.columnOptions.map(c => ({
+            code: c.code, include: c.include, limit: c.limit, hiddenInApp: c.hiddenInApp
+          }))
+        : undefined
+      )
+    }
+    if (lastUsedOptions.columnOptions) {
+      console.log('Saving customised column options')
+    } else {
+      console.log('Saving default column options')
+    }
+    return this.storeService.set(STORAGE_KEY, lastUsedOptions).toPromise()
+  }
 
 }