Compare commits

...
Author SHA1 Message Date
Jovan Krunić a3f7fb0e84 refactor: remove library features
Closes #244
2026-09-09 11:10:34 +02:00
Rainer Killinger 1eaa70193d fix: update critical production dependencies 2026-08-26 15:16:05 +02:00
83 changed files with 32 additions and 4127 deletions
@@ -29,19 +29,6 @@ const menus = [
},
},
},
{
icon: 'local_library',
route: '/hebis-search',
title: 'library catalog',
translations: {
de: {
title: 'Bibliothekskatalog',
},
en: {
title: 'library catalog',
},
},
},
{
icon: 'inventory_2',
route: '/catalog',
@@ -137,20 +124,6 @@ const menus = [
},
},
},
{
authProvider: 'paia',
icon: 'badge',
route: '/library-account',
title: 'library account',
translations: {
de: {
title: 'Bibliothekskonto',
},
en: {
title: 'library account',
},
},
},
{
icon: 'settings',
route: '/settings',
-29
View File
@@ -32,25 +32,6 @@ const config = {
userinfo: 'https://cas.rz.uni-frankfurt.de/cas/oauth2.0/profile',
},
},
paia: {
client: {
clientId: '',
scopes: '',
url: 'https://hds.hebis.de/Shibboleth.sso/UBFFM?target=https://hds.hebis.de/ubffm/paia_login_stub.php',
},
endpoints: {
authorization:
'https://hds.hebis.de/Shibboleth.sso/UBFFM?target=https://hds.hebis.de/ubffm/paia_login_stub.php',
endSession: 'https://ubffm.hds.hebis.de/Shibboleth.sso/Logout',
mapping: {
id: '$.email',
name: '$.name',
role: '$.type',
},
token: 'https://hds.hebis.de/paia/auth/login',
userinfo: 'https://hds.hebis.de/paia/core',
},
},
},
app: {
...defaultApp,
@@ -60,16 +41,6 @@ const config = {
authProvider: 'default',
url: 'https://his-self-service.rz.uni-frankfurt.de',
},
daia: {
url: 'https://daia.hebis.de/DAIA2/UB_Frankfurt',
},
hebisProxy: {
url: 'https://proxy.ub.uni-frankfurt.de/login?qurl=',
},
paia: {
authProvider: 'paia',
url: 'https://hds.hebis.de/paia/core',
},
/** TODO: idCards: {
authProvider: 'default',
url: 'TODO',
-4
View File
@@ -33,7 +33,6 @@ import {CatalogModule} from './modules/catalog/catalog.module';
import {ConfigProvider} from './modules/config/config.provider';
import {DashboardModule} from './modules/dashboard/dashboard.module';
import {DataModule} from './modules/data/data.module';
import {HebisModule} from './modules/hebis/hebis.module';
import {MapModule} from './modules/map/map.module';
import {MenuModule} from './modules/menu/menu.module';
import {NewsModule} from './modules/news/news.module';
@@ -53,7 +52,6 @@ import {FeedbackModule} from './modules/feedback/feedback.module';
import {DebugDataCollectorService} from './modules/data/debug-data-collector.service';
import {AuthModule} from './modules/auth/auth.module';
import {BackgroundModule} from './modules/background/background.module';
import {LibraryModule} from './modules/library/library.module';
import {StorageProvider} from './modules/storage/storage.provider';
import {AssessmentsModule} from './modules/assessments/assessments.module';
import {ServiceHandlerInterceptor} from './_helpers/service-handler.interceptor';
@@ -154,10 +152,8 @@ export function createTranslateLoader(http: HttpClient) {
CommonModule,
DashboardModule,
DataModule,
HebisModule,
JobModule,
FavoritesModule,
LibraryModule,
ProfilePageModule,
FeedbackModule,
MapModule,
@@ -114,10 +114,6 @@ import {SkeletonListComponent} from './list/skeleton-list.component';
import {TreeListFragmentComponent} from './list/tree-list-fragment.component';
import {TreeListComponent} from './list/tree-list.component';
import {StAppsWebHttpClient} from './stapps-web-http-client.provider';
import {ArticleDetailContentComponent} from './types/article/article-detail-content.component';
import {ArticleListItemComponent} from './types/article/article-item.component';
import {BookDetailContentComponent} from './types/book/book-detail-content.component';
import {BookListItemComponent} from './types/book/book-list-item.component';
import {CatalogDetailContentComponent} from './types/catalog/catalog-detail-content.component';
import {CatalogListItemComponent} from './types/catalog/catalog-list-item.component';
import {DateSeriesDetailContentComponent} from './types/date-series/date-series-detail-content.component';
@@ -136,8 +132,6 @@ import {MessageDetailContentComponent} from './types/message/message-detail-cont
import {MessageListItemComponent} from './types/message/message-list-item.component';
import {OrganizationDetailContentComponent} from './types/organization/organization-detail-content.component';
import {OrganizationListItemComponent} from './types/organization/organization-list-item.component';
import {PeriodicalDetailContentComponent} from './types/periodical/periodical-detail-content.component';
import {PeriodicalListItemComponent} from './types/periodical/periodical-list-item.component';
import {PersonDetailContentComponent} from './types/person/person-detail-content.component';
import {PersonListItemComponent} from './types/person/person-list-item.component';
import {PlaceDetailContentComponent} from './types/place/place-detail-content.component';
@@ -216,12 +210,6 @@ import {IonIconDirective} from 'src/app/util/ion-icon/ion-icon.directive';
SimpleDataListComponent,
TitleCardComponent,
ExternalLinkComponent,
ArticleListItemComponent,
ArticleDetailContentComponent,
BookListItemComponent,
BookDetailContentComponent,
PeriodicalListItemComponent,
PeriodicalDetailContentComponent,
ShareButtonComponent,
],
exports: [
@@ -241,9 +229,6 @@ import {IonIconDirective} from 'src/app/util/ion-icon/ion-icon.directive';
FavoriteButtonComponent,
TreeListComponent,
ExternalLinkComponent,
ArticleDetailContentComponent,
BookDetailContentComponent,
PeriodicalDetailContentComponent,
TitleCardComponent,
],
imports: [
@@ -33,9 +33,6 @@
<ng-template #defaultContent>
<div class="content-switch">
@switch (item.type) {
@case ('article') {
<stapps-article-detail-content [item]="$any(item)"></stapps-article-detail-content>
}
@case ('catalog') {
<stapps-catalog-detail-content [item]="$any(item)"></stapps-catalog-detail-content>
}
@@ -14,7 +14,6 @@
*/
import {ComponentRef, Directive, Input, Type, ViewContainerRef} from '@angular/core';
import {SCThings, SCThingType} from '@openstapps/core';
import {BookListItemComponent} from '../types/book/book-list-item.component';
import {CatalogListItemComponent} from '../types/catalog/catalog-list-item.component';
import {DateSeriesListItemComponent} from '../types/date-series/date-series-list-item.component';
import {EventListItemComponent} from '../types/event/event-list-item.component';
@@ -25,9 +24,7 @@ import {PersonListItemComponent} from '../types/person/person-list-item.componen
import {PlaceListItemComponent} from '../types/place/place-list-item.component';
import {SemesterListItemComponent} from '../types/semester/semester-list-item.component';
import {VideoListItemComponent} from '../types/video/video-list-item.component';
import {PeriodicalListItemComponent} from '../types/periodical/periodical-list-item.component';
import {DataListItemHostDefaultComponent} from './data-list-item-host-default.component';
import {ArticleListItemComponent} from '../types/article/article-item.component';
import {DishListItemComponent} from '../types/dish/dish-list-item.component';
import {JobPostingListItemComponent} from '../types/job-posting/job-posting-list-item.component';
@@ -51,9 +48,6 @@ const DataListItemIndex: Partial<Record<SCThingType, Type<DataListItem>>> = {
[SCThingType.Room]: PlaceListItemComponent,
[SCThingType.Semester]: SemesterListItemComponent,
[SCThingType.Video]: VideoListItemComponent,
[SCThingType.Periodical]: PeriodicalListItemComponent,
[SCThingType.Book]: BookListItemComponent,
[SCThingType.Article]: ArticleListItemComponent,
[SCThingType.JobPosting]: JobPostingListItemComponent,
};
@@ -1,6 +1,5 @@
<stapps-search-page
[title]="'canteens.title' | translate"
[navigation]="[]"
[showDefaultData]="true"
[forcedFilter]="forcedFilter"
>
@@ -22,14 +22,7 @@ import {
ModalController,
} from '@ionic/angular/standalone';
import {Capacitor} from '@capacitor/core';
import {
SCFacet,
SCFeatureConfiguration,
SCSearchFilter,
SCSearchQuery,
SCSearchSort,
SCThings,
} from '@openstapps/core';
import {SCFacet, SCSearchFilter, SCSearchQuery, SCSearchSort, SCThings} from '@openstapps/core';
import {NGXLogger} from 'ngx-logger';
import {combineLatest, Subject} from 'rxjs';
import {debounceTime, distinctUntilChanged, startWith} from 'rxjs/operators';
@@ -67,14 +60,6 @@ export class SearchPageComponent implements OnInit {
*/
loading = false;
/**
* Navigation elements between search pages
*/
@Input() navigation: Array<{label: string; routerLink?: string[]}> = [
{label: 'search.type'},
{label: 'hebisSearch.type', routerLink: ['/hebis-search']},
];
/**
* Show default data (e.g. when there is user interaction)
*/
@@ -353,17 +338,6 @@ export class SearchPageComponent implements OnInit {
}
});
}
try {
// TODO: make this hack more generic
if (this.navigation[1]?.routerLink?.[0] === '/hebis-search') {
const features = this.configProvider.getValue('features') as SCFeatureConfiguration;
if (features.plugins?.['hebis-plugin']?.urlPath === undefined) {
this.navigation = [];
}
}
} catch (error) {
this.logger.error(error);
}
}
/**
@@ -43,26 +43,6 @@
</ion-menu-button>
}
</ion-toolbar>
@if (navigation.length > 0) {
<ion-toolbar color="primary" class="category-tab">
<ion-buttons class="ion-justify-content-between">
@for (target of navigation; track target) {
@if (target.routerLink) {
<ion-button
[routerLink]="target.routerLink"
queryParamsHandling="merge"
[routerAnimation]="routeAnimation"
fill="outline"
size="large"
>{{ target.label | translate }}
</ion-button>
} @else {
<ion-button class="button-active" size="large">{{ target.label | translate }}</ion-button>
}
}
</ion-buttons>
</ion-toolbar>
}
</ion-header>
<ion-content class="content">
@@ -1,24 +0,0 @@
/*
* Copyright (C) 2019 StApps
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
* Software Foundation, version 3.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along with
* this program. If not, see <https://www.gnu.org/licenses/>.
*/
import {Component, Input} from '@angular/core';
import {SCArticle} from '@openstapps/core';
@Component({
selector: 'stapps-article-detail-content',
templateUrl: 'article-detail-content.html',
})
export class ArticleDetailContentComponent {
@Input() item: SCArticle;
}
@@ -1,105 +0,0 @@
<!--
~ Copyright (C) 2022 StApps
~ This program is free software: you can redistribute it and/or modify it
~ under the terms of the GNU General Public License as published by the Free
~ Software Foundation, version 3.
~
~ This program is distributed in the hope that it will be useful, but WITHOUT
~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
~ more details.
~
~ You should have received a copy of the GNU General Public License along with
~ this program. If not, see <https://www.gnu.org/licenses/>.
-->
@if (item.sameAs) {
<ion-card>
<ion-card-header>{{ 'hebisSearch.detail.title' | translate | sentencecase }}</ion-card-header>
<ion-card-content>
<stapps-external-link
[text]="'name' | thingTranslate: item"
[link]="item.sameAs"
></stapps-external-link>
</ion-card-content>
</ion-card>
}
@if (!item.sameAs) {
<stapps-simple-card
[title]="'name' | propertyNameTranslate: item | sentencecase"
[content]="'name' | thingTranslate: item"
>
</stapps-simple-card>
}
@if (item.description) {
<stapps-simple-card
[title]="'hebisSearch.detail.description' | translate | sentencecase"
[content]="item.description"
></stapps-simple-card>
}
@if (item.sourceOrganization) {
<stapps-simple-card
[title]="'sourceOrganization' | propertyNameTranslate: item | sentencecase"
[content]="item.sourceOrganization"
></stapps-simple-card>
}
@if (item.authors && item.authors.length > 0) {
<ion-card>
<ion-card-header>{{ 'authors' | propertyNameTranslate: item | sentencecase }}</ion-card-header>
<ion-card-content>
@for (author of item.authors; track author) {
<ion-label>{{ 'name' | thingTranslate: author }}</ion-label>
}
</ion-card-content>
</ion-card>
}
@if (item.firstPublished && !item.lastPublished) {
<stapps-simple-card
[title]="'hebisSearch.detail.firstPublished' | translate | sentencecase"
[content]="item.firstPublished"
>
</stapps-simple-card>
}
@if (item.firstPublished && item.lastPublished) {
<stapps-simple-card
[title]="'hebisSearch.detail.firstPublished' | translate | sentencecase"
[content]="[item.firstPublished, item.lastPublished] | join: ' - '"
>
</stapps-simple-card>
}
@if (item.publications) {
<ion-card>
<ion-card-header>{{ 'publications' | propertyNameTranslate: item | sentencecase }}</ion-card-header>
<ion-card-content>
@for (publication of item.publications; track publication) {
<p>
{{ publication.locations | join: ', ' }}
{{ publication.locations && publication.publisher ? ':' : '' }} {{ publication.publisher }}
</p>
}
</ion-card-content>
</ion-card>
}
@if (item.reference) {
<stapps-simple-card
[title]="'reference' | propertyNameTranslate: item | sentencecase"
[content]="item.reference"
></stapps-simple-card>
}
@if (item.isPartOf) {
<stapps-simple-card
[title]="'isPartOf' | propertyNameTranslate: item | sentencecase"
[content]="item.isPartOf.name"
></stapps-simple-card>
}
@if (item.categories) {
<ion-card>
<ion-card-header>{{ 'categories' | propertyNameTranslate: item | sentencecase }}</ion-card-header>
<ion-card-content>
<ion-chip [color]="'primary'">
<ion-icon [name]="item.type | dataIcon"></ion-icon>
<ion-label>{{ 'categories' | thingTranslate: item }}</ion-label>
</ion-chip>
</ion-card-content>
</ion-card>
}
@@ -1,32 +0,0 @@
/*
* Copyright (C) 2019 StApps
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
* Software Foundation, version 3.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along with
* this program. If not, see <https://www.gnu.org/licenses/>.
*/
import {Component, Input} from '@angular/core';
import {SCArticle} from '@openstapps/core';
import {DataListItemComponent} from '../../list/data-list-item.component';
/**
* TODO
*/
@Component({
selector: 'stapps-article-item',
templateUrl: 'article-list-item.html',
styleUrl: 'article-list-item.scss',
})
export class ArticleListItemComponent extends DataListItemComponent {
/**
* TODO
*/
@Input() item: SCArticle;
}
@@ -1,32 +0,0 @@
<!--
~ Copyright (C) 2023 StApps
~ This program is free software: you can redistribute it and/or modify it
~ under the terms of the GNU General Public License as published by the Free
~ Software Foundation, version 3.
~
~ This program is distributed in the hope that it will be useful, but WITHOUT
~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
~ more details.
~
~ You should have received a copy of the GNU General Public License along with
~ this program. If not, see <https://www.gnu.org/licenses/>.
-->
<ion-label class="title">{{ 'name' | thingTranslate: item }}</ion-label>
<p class="title-sub">
@for (author of item.authors; track author) {
{{ 'name' | thingTranslate: author }}
}
@if (item.authors && item.authors && item.firstPublished) {
,&nbsp;
}
@if (item.firstPublished && !item.lastPublished) {
{{ item.firstPublished }}
} @else {
@if (item.firstPublished && item.lastPublished) {
{{ [item.firstPublished, item.lastPublished] | join: ' - ' }}
}
}
</p>
<ion-note> {{ 'categories' | thingTranslate: item }} </ion-note>
@@ -1,3 +0,0 @@
p.title-sub {
white-space: unset;
}
@@ -1,30 +0,0 @@
/*
* Copyright (C) 2019 StApps
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
* Software Foundation, version 3.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along with
* this program. If not, see <https://www.gnu.org/licenses/>.
*/
import {Component, Input} from '@angular/core';
import {SCBook} from '@openstapps/core';
/**
* TODO
*/
@Component({
selector: 'stapps-book-detail-content',
templateUrl: 'book-detail-content.html',
})
export class BookDetailContentComponent {
/**
* TODO
*/
@Input() item: SCBook;
}
@@ -1,104 +0,0 @@
<!--
~ Copyright (C) 2022 StApps
~ This program is free software: you can redistribute it and/or modify it
~ under the terms of the GNU General Public License as published by the Free
~ Software Foundation, version 3.
~
~ This program is distributed in the hope that it will be useful, but WITHOUT
~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
~ more details.
~
~ You should have received a copy of the GNU General Public License along with
~ this program. If not, see <https://www.gnu.org/licenses/>.
-->
@if (item.sameAs) {
<ion-card>
<ion-card-header>{{ 'hebisSearch.detail.title' | translate | sentencecase }}</ion-card-header>
<ion-card-content>
<stapps-external-link
[text]="'name' | thingTranslate: item"
[link]="item.sameAs"
></stapps-external-link>
</ion-card-content>
</ion-card>
}
@if (!item.sameAs) {
<stapps-simple-card
[title]="'name' | propertyNameTranslate: item | sentencecase"
[content]="'name' | thingTranslate: item"
>
</stapps-simple-card>
}
@if (item.edition) {
<stapps-simple-card
[title]="'edition' | propertyNameTranslate: item | sentencecase"
[content]="'edition' | thingTranslate: item"
>
</stapps-simple-card>
}
@if (item.description) {
<stapps-simple-card
[title]="'hebisSearch.detail.description' | translate | sentencecase"
[content]="item.description"
></stapps-simple-card>
}
@if (item.sourceOrganization) {
<stapps-simple-card
[title]="'sourceOrganization' | propertyNameTranslate: item | sentencecase"
[content]="item.sourceOrganization"
></stapps-simple-card>
}
@if (item.authors && item.authors.length > 0) {
<ion-card>
<ion-card-header>{{ 'authors' | propertyNameTranslate: item | sentencecase }}</ion-card-header>
<ion-card-content>
@for (author of item.authors; track author) {
<ion-label>{{ 'name' | thingTranslate: author }}</ion-label>
}
</ion-card-content>
</ion-card>
}
@if (item.ISBNs) {
<stapps-simple-card [title]="'ISBNs' | propertyNameTranslate: item | sentencecase" [content]="item.ISBNs">
</stapps-simple-card>
}
@if (item.firstPublished && !item.lastPublished) {
<stapps-simple-card
[title]="'hebisSearch.detail.firstPublished' | translate | sentencecase"
[content]="item.firstPublished"
>
</stapps-simple-card>
}
@if (item.firstPublished && item.lastPublished) {
<stapps-simple-card
[title]="'hebisSearch.detail.firstPublished' | translate | sentencecase"
[content]="[item.firstPublished, item.lastPublished] | join: ' - '"
>
</stapps-simple-card>
}
@if (item.publications) {
<ion-card>
<ion-card-header>{{ 'publications' | propertyNameTranslate: item | sentencecase }}</ion-card-header>
<ion-card-content>
@for (publication of item.publications; track publication) {
<p>
{{ publication.locations | join: ', ' }}
{{ publication.locations && publication.publisher ? ':' : '' }} {{ publication.publisher }}
</p>
}
</ion-card-content>
</ion-card>
}
@if (item.categories) {
<ion-card>
<ion-card-header>{{ 'categories' | propertyNameTranslate: item | sentencecase }}</ion-card-header>
<ion-card-content>
<ion-chip [color]="'primary'">
<ion-icon [name]="item.type | dataIcon"></ion-icon>
<ion-label>{{ 'categories' | thingTranslate: item }}</ion-label>
</ion-chip>
</ion-card-content>
</ion-card>
}
@@ -1,32 +0,0 @@
/*
* Copyright (C) 2019 StApps
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
* Software Foundation, version 3.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along with
* this program. If not, see <https://www.gnu.org/licenses/>.
*/
import {Component, Input} from '@angular/core';
import {SCBook} from '@openstapps/core';
import {DataListItemComponent} from '../../list/data-list-item.component';
/**
* TODO
*/
@Component({
selector: 'stapps-book-list-item',
templateUrl: 'book-list-item.html',
styleUrl: 'book-list-item.scss',
})
export class BookListItemComponent extends DataListItemComponent {
/**
* TODO
*/
@Input() item: SCBook;
}
@@ -1,32 +0,0 @@
<!--
~ Copyright (C) 2023 StApps
~ This program is free software: you can redistribute it and/or modify it
~ under the terms of the GNU General Public License as published by the Free
~ Software Foundation, version 3.
~
~ This program is distributed in the hope that it will be useful, but WITHOUT
~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
~ more details.
~
~ You should have received a copy of the GNU General Public License along with
~ this program. If not, see <https://www.gnu.org/licenses/>.
-->
<ion-label class="title">{{ 'name' | thingTranslate: item }}</ion-label>
<p class="title-sub">
@for (author of item.authors; track author) {
{{ 'name' | thingTranslate: author }}
}
@if (item.authors && item.authors && item.firstPublished) {
,&nbsp;
}
@if (item.firstPublished && !item.lastPublished) {
{{ item.firstPublished }}
} @else {
@if (item.firstPublished && item.lastPublished) {
{{ [item.firstPublished, item.lastPublished] | join: ' - ' }}
}
}
</p>
<ion-note> {{ 'categories' | thingTranslate: item }} </ion-note>
@@ -1,3 +0,0 @@
p.title-sub {
white-space: unset;
}
@@ -1,30 +0,0 @@
/*
* Copyright (C) 2019 StApps
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
* Software Foundation, version 3.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along with
* this program. If not, see <https://www.gnu.org/licenses/>.
*/
import {Component, Input} from '@angular/core';
import {SCPeriodical} from '@openstapps/core';
/**
* TODO
*/
@Component({
selector: 'stapps-periodical-detail-content',
templateUrl: 'periodical-detail-content.html',
})
export class PeriodicalDetailContentComponent {
/**
* TODO
*/
@Input() item: SCPeriodical;
}
@@ -1,100 +0,0 @@
<!--
~ Copyright (C) 2022 StApps
~ This program is free software: you can redistribute it and/or modify it
~ under the terms of the GNU General Public License as published by the Free
~ Software Foundation, version 3.
~
~ This program is distributed in the hope that it will be useful, but WITHOUT
~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
~ more details.
~
~ You should have received a copy of the GNU General Public License along with
~ this program. If not, see <https://www.gnu.org/licenses/>.
-->
@if (item.sameAs) {
<ion-card>
<ion-card-header>{{ 'hebisSearch.detail.title' | translate | sentencecase }}</ion-card-header>
<ion-card-content>
<stapps-external-link
[text]="'name' | thingTranslate: item"
[link]="item.sameAs"
></stapps-external-link>
</ion-card-content>
</ion-card>
}
@if (!item.sameAs) {
<stapps-simple-card
[title]="'name' | propertyNameTranslate: item | sentencecase"
[content]="'name' | thingTranslate: item"
>
</stapps-simple-card>
}
@if (item.description) {
<stapps-simple-card
[title]="'hebisSearch.detail.description' | translate | sentencecase"
[content]="item.description"
></stapps-simple-card>
}
@if (item.sourceOrganization) {
<stapps-simple-card
[title]="'sourceOrganization' | propertyNameTranslate: item | sentencecase"
[content]="item.sourceOrganization"
></stapps-simple-card>
}
@if (item.authors && item.authors.length > 0) {
<ion-card>
<ion-card-header>{{ 'authors' | propertyNameTranslate: item | sentencecase }}</ion-card-header>
<ion-card-content>
@for (author of item.authors; track author) {
<ion-label>{{ 'name' | thingTranslate: author }}</ion-label>
}
</ion-card-content>
</ion-card>
}
@if (item.firstPublished && !item.lastPublished) {
<stapps-simple-card
[title]="'hebisSearch.detail.firstPublished' | translate | sentencecase"
[content]="item.firstPublished + '-'"
>
</stapps-simple-card>
}
@if (item.firstPublished && item.lastPublished) {
<stapps-simple-card
[title]="'hebisSearch.detail.firstPublished' | translate | sentencecase"
[content]="[item.firstPublished, item.lastPublished] | join: ' - '"
>
</stapps-simple-card>
}
@if (item.publications) {
<ion-card>
<ion-card-header>{{ 'publications' | propertyNameTranslate: item | sentencecase }}</ion-card-header>
<ion-card-content>
@for (publication of item.publications; track publication) {
<p>
{{ publication.locations | join: ', ' }}
{{ publication.locations && publication.publisher ? ':' : '' }} {{ publication.publisher }}
</p>
}
</ion-card-content>
</ion-card>
}
@if (item.categories) {
<ion-card>
<ion-card-header>{{ 'categories' | propertyNameTranslate: item | sentencecase }}</ion-card-header>
<ion-card-content>
<ion-chip [color]="'primary'">
<ion-icon [name]="item.type | dataIcon"></ion-icon>
<ion-label>{{ 'categories' | thingTranslate: item }}</ion-label>
</ion-chip>
</ion-card-content>
</ion-card>
}
@if (item.ISSNs) {
<stapps-simple-card
[title]="'ISSNs' | propertyNameTranslate: item | sentencecase"
[content]="item.ISSNs | join: ', '"
>
</stapps-simple-card>
}
@@ -1,32 +0,0 @@
/*
* Copyright (C) 2019 StApps
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
* Software Foundation, version 3.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along with
* this program. If not, see <https://www.gnu.org/licenses/>.
*/
import {Component, Input} from '@angular/core';
import {SCPeriodical} from '@openstapps/core';
import {DataListItemComponent} from '../../list/data-list-item.component';
/**
* TODO
*/
@Component({
selector: 'stapps-periodical-list-item',
templateUrl: 'periodical-list-item.html',
styleUrl: 'periodical-list-item.scss',
})
export class PeriodicalListItemComponent extends DataListItemComponent {
/**
* TODO
*/
@Input() item: SCPeriodical;
}
@@ -1,32 +0,0 @@
<!--
~ Copyright (C) 2023 StApps
~ This program is free software: you can redistribute it and/or modify it
~ under the terms of the GNU General Public License as published by the Free
~ Software Foundation, version 3.
~
~ This program is distributed in the hope that it will be useful, but WITHOUT
~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
~ more details.
~
~ You should have received a copy of the GNU General Public License along with
~ this program. If not, see <https://www.gnu.org/licenses/>.
-->
<ion-label class="title">{{ 'name' | thingTranslate: item }}</ion-label>
<p class="title-sub">
@for (author of item.authors; track author) {
{{ 'name' | thingTranslate: author }}
}
@if (item.authors && item.authors && item.firstPublished) {
,&nbsp;
}
@if (item.firstPublished && !item.lastPublished) {
{{ item.firstPublished }}
} @else {
@if (item.firstPublished && item.lastPublished) {
{{ [item.firstPublished, item.lastPublished] | join: ' - ' }}
}
}
</p>
<ion-note> {{ 'categories' | thingTranslate: item }} </ion-note>
@@ -1,3 +0,0 @@
p.title-sub {
white-space: unset;
}
@@ -18,7 +18,6 @@ import {ActivatedRoute, Router} from '@angular/router';
import {NGXLogger} from 'ngx-logger';
import {debounceTime, distinctUntilChanged, startWith, take} from 'rxjs/operators';
import {combineLatest} from 'rxjs';
import {SCThingType} from '@openstapps/core';
import {FavoritesService} from './favorites.service';
import {DataRoutingService} from '../data/data-routing.service';
import {ContextMenuService} from '../menu/context/context-menu.service';
@@ -113,17 +112,7 @@ export class FavoritesPageComponent extends SearchPageComponent implements OnIni
.pipe(takeUntilDestroyed(this.destroy$))
.subscribe(item => {
if (this.itemRouting) {
if ([SCThingType.Book, SCThingType.Periodical, SCThingType.Article].includes(item.type)) {
void this.router.navigate(
[
'hebis-detail',
(item.origin && 'originalId' in item.origin && item.origin['originalId']) || '',
],
{state: {item}},
);
} else {
void this.router.navigate(['data-detail', item.uid], {state: {item}});
}
void this.router.navigate(['data-detail', item.uid], {state: {item}});
}
});
}
@@ -1,120 +0,0 @@
/*
* Copyright (C) 2022 StApps
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
* Software Foundation, version 3.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along with
* this program. If not, see <https://www.gnu.org/licenses/>.
*/
/* eslint-disable @typescript-eslint/no-non-null-assertion,@typescript-eslint/no-explicit-any */
import {CUSTOM_ELEMENTS_SCHEMA} from '@angular/core';
import {ComponentFixture, TestBed} from '@angular/core/testing';
import {ActivatedRoute, RouterModule} from '@angular/router';
import {TranslateLoader, TranslateModule, TranslateService} from '@ngx-translate/core';
import {sampleThingsMap} from '../../../_helpers/data/sample-things';
import {HebisRoutingModule} from '../hebis-routing.module';
import {HebisModule} from '../hebis.module';
import {DaiaAvailabilityComponent} from './daia-availability.component';
import {Observable, of} from 'rxjs';
import {StorageProvider} from '../../storage/storage.provider';
import {DaiaDataProvider} from '../daia-data.provider';
import {ConfigProvider} from '../../config/config.provider';
import {LoggerTestingModule} from 'ngx-logger/testing';
import {provideIonicAngular} from '@ionic/angular/standalone';
const translations: any = {data: {detail: {TITLE: 'Foo'}}};
class TranslateFakeLoader implements TranslateLoader {
getTranslation(_lang: string): Observable<any> {
return of(translations);
}
}
describe('DaiaAvailabilityComponent', () => {
let comp: DaiaAvailabilityComponent;
let fixture: ComponentFixture<DaiaAvailabilityComponent>;
let dataProvider: DaiaDataProvider;
const sampleThing = sampleThingsMap.book[0];
let translateService: TranslateService;
let configProviderMock: jasmine.SpyObj<ConfigProvider>;
// @Component({ selector: 'stapps-data-list-item', template: '' })
// class DataListItemComponent {
// @Input() item;
// }
const fakeActivatedRoute = {
snapshot: {
paramMap: {
get: () => {
return sampleThing.uid;
},
},
},
};
const storageProviderSpy = jasmine.createSpyObj('StorageProvider', ['init', 'get', 'has', 'put', 'search']);
beforeEach(() => {
configProviderMock = jasmine.createSpyObj('ConfigProvider', ['init', 'getValue', 'getAnyValue']);
TestBed.configureTestingModule({
imports: [
RouterModule.forRoot([]),
HebisRoutingModule,
HebisModule,
TranslateModule.forRoot({
loader: {provide: TranslateLoader, useClass: TranslateFakeLoader},
}),
LoggerTestingModule,
],
providers: [
provideIonicAngular(),
{
provide: ActivatedRoute,
useValue: fakeActivatedRoute,
},
{
provide: StorageProvider,
useValue: storageProviderSpy,
},
{
provide: ConfigProvider,
useValue: configProviderMock,
},
],
schemas: [CUSTOM_ELEMENTS_SCHEMA],
}).compileComponents();
});
beforeEach(async () => {
dataProvider = TestBed.inject(DaiaDataProvider);
const workingDAIAurl = 'https://daia.hebis.de/DAIA2/UB_Frankfurt';
dataProvider.daiaServiceUrl = workingDAIAurl;
translateService = TestBed.inject(TranslateService);
spyOn(dataProvider, 'getAvailability' as any).and.returnValue(Promise.resolve([]));
spyOn(DaiaAvailabilityComponent.prototype, 'getAvailability').and.callThrough();
fixture = await TestBed.createComponent(DaiaAvailabilityComponent);
comp = fixture.componentInstance;
translateService.use('foo');
fixture.detectChanges();
});
it('should create component', () => expect(comp).toBeDefined());
it('should get the availability of an item', () => {
comp.getAvailability(sampleThing.uid);
expect(DaiaAvailabilityComponent.prototype.getAvailability).toHaveBeenCalledWith(sampleThing.uid);
});
it('should get the availability of an item when the view is entered', () => {
comp.ngOnInit();
expect(DaiaAvailabilityComponent.prototype.getAvailability).toHaveBeenCalledWith(sampleThing.uid);
});
});
@@ -1,59 +0,0 @@
/*
* Copyright (C) 2022 StApps
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
* Software Foundation, version 3.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along with
* this program. If not, see <https://www.gnu.org/licenses/>.
*/
import {Component, inject, OnInit} from '@angular/core';
import {SCUuid} from '@openstapps/core';
import {DataDetailComponent} from '../../data/detail/data-detail.component';
import {DaiaDataProvider} from '../daia-data.provider';
import {DaiaHolding} from '../protocol/response';
import {groupByStable} from '@openstapps/collection-utils';
/**
* A Component to display an SCThing detailed
*/
@Component({
selector: 'stapps-daia-availability',
styleUrls: ['daia-availability.scss'],
templateUrl: 'daia-availability.html',
})
export class DaiaAvailabilityComponent extends DataDetailComponent implements OnInit {
holdings?: DaiaHolding[];
holdingsByDepartments?: Map<DaiaHolding['department']['id'], DaiaHolding[]>;
private daiaDataProvider = inject(DaiaDataProvider);
/**
* @override
*/
async ngOnInit() {
const uid = this.route.snapshot.paramMap.get('uid');
if (uid) {
await this.getAvailability(uid);
}
}
/**
* Provides data item with given UID
* @param uid Unique identifier of a thing
*/
async getAvailability(uid: SCUuid) {
this.daiaDataProvider.getAvailability(uid).then(holdings => {
if (holdings !== undefined) {
this.holdings = holdings;
this.holdingsByDepartments = groupByStable(holdings, holding => holding.department.id);
}
});
}
}
@@ -1,44 +0,0 @@
<!--
~ Copyright (C) 2022 StApps
~ This program is free software: you can redistribute it and/or modify it
~ under the terms of the GNU General Public License as published by the Free
~ Software Foundation, version 3.
~
~ This program is distributed in the hope that it will be useful, but WITHOUT
~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
~ more details.
~
~ You should have received a copy of the GNU General Public License along with
~ this program. If not, see <https://www.gnu.org/licenses/>.
-->
<ng-container>
<ion-card>
<ion-card-header> {{ 'hebisSearch.daia.availability' | translate }} </ion-card-header>
<ion-card-content>
@if (holdingsByDepartments) {
@for (holdingsByDepartment of holdingsByDepartments | keyvalue; track holdingsByDepartment) {
<ion-label>
@if (holdingsByDepartment.value[0].department.href) {
<stapps-external-link
[text]="holdingsByDepartment.value[0].department.content"
[link]="holdingsByDepartment.value[0].department.href"
>
</stapps-external-link>
}
</ion-label>
@for (holding of holdingsByDepartment.value; track holding) {
<stapps-daia-holding [holding]="holding"></stapps-daia-holding>
}
}
}
@if (!holdings) {
<ion-label> {{ 'hebisSearch.daia.unavailableAvailability' | translate }} </ion-label>
}
@if (holdings?.length === 0) {
<ion-label> {{ 'hebisSearch.daia.unknownAvailability' | translate }} </ion-label>
}
</ion-card-content>
</ion-card>
</ng-container>
@@ -1,34 +0,0 @@
/*!
* Copyright (C) 2022 StApps
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
* Software Foundation, version 3.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along with
* this program. If not, see <https://www.gnu.org/licenses/>.
*/
:host ion-card {
margin: 0;
box-shadow: none;
ion-card-content {
padding-bottom: 8px;
h1 {
margin: 0;
}
}
ion-card-header {
padding-top: 8px;
padding-bottom: 4px;
font-weight: bold;
color: var(--ion-color-dark);
}
}
@@ -1,35 +0,0 @@
/*
* Copyright (C) 2023 StApps
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
* Software Foundation, version 3.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along with
* this program. If not, see <https://www.gnu.org/licenses/>.
*/
import {Component, Input, OnInit} from '@angular/core';
import {DaiaHolding} from '../protocol/response';
import {DaiaDataProvider} from '../daia-data.provider';
@Component({
selector: 'stapps-daia-holding',
templateUrl: './daia-holding.html',
styleUrls: ['./daia-holding.scss'],
})
export class DaiaHoldingComponent implements OnInit {
@Input() holding: DaiaHolding;
constructor(private daiaDataProvider: DaiaDataProvider) {}
resourceLink?: string;
ngOnInit(): void {
this.resourceLink = this.daiaDataProvider.getHoldingLink(this.holding, this.holding.open);
}
}
@@ -1,89 +0,0 @@
<!--
~ Copyright (C) 2022 StApps
~ This program is free software: you can redistribute it and/or modify it
~ under the terms of the GNU General Public License as published by the Free
~ Software Foundation, version 3.
~
~ This program is distributed in the hope that it will be useful, but WITHOUT
~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
~ more details.
~
~ You should have received a copy of the GNU General Public License along with
~ this program. If not, see <https://www.gnu.org/licenses/>.
-->
<ion-grid>
@if (holding.storage && holding.storage.content) {
<ion-row>
<ion-col size="3">{{ 'hebisSearch.daia.location' | translate }}</ion-col>
<ion-col size="9" [innerHTML]="holding.storage.content"></ion-col>
</ion-row>
}
@if (holding.signature && !holding.online) {
<ion-row>
<ion-col size="3">{{ 'hebisSearch.daia.signature' | translate }}</ion-col>
<ion-col size="9">{{ holding.signature }}</ion-col>
</ion-row>
}
@if (holding.holdings) {
<ion-row>
<ion-col size="3">{{ 'hebisSearch.daia.holdings' | translate }}</ion-col>
<ion-col size="9">{{ holding.holdings }}</ion-col>
</ion-row>
}
@if (holding.about) {
<ion-row>
<ion-col size="3">{{ 'hebisSearch.daia.comment' | translate }}</ion-col>
<ion-col size="9" [innerHTML]="holding.about"></ion-col>
</ion-row>
}
@if (holding.available && holding.online && resourceLink) {
<ion-row>
<ion-col size="3">{{ 'Online' }}</ion-col>
<ion-col size="9">
<stapps-external-link
[link]="resourceLink"
[text]="'hebisSearch.daia.fulltext' | translate"
></stapps-external-link
></ion-col>
</ion-row>
}
@if (holding.status) {
<ion-row>
<ion-col size="3">{{ 'hebisSearch.daia.status' | translate }}</ion-col>
<ion-col size="9">
@if (holding.status === 'available') {
<ion-icon name="check_circle" color="success"></ion-icon>
}
@if (holding.status === 'library_only') {
<ion-icon name="check_circle" color="warning"></ion-icon>
}
@if (['checked_out', 'not_yet_available', 'not_available'].indexOf(holding.status) > -1) {
<ion-icon name="cancel" color="danger"> </ion-icon>
}
{{ 'hebisSearch.daia.status_states' + '.' + holding.status | translate }}
@if (
(holding.status === 'available' || holding.status === 'library_only') &&
holding.available &&
holding.available.href
) {
<stapps-external-link [text]="'hebisSearch.daia.order' | translate" [link]="holding.available.href">
</stapps-external-link>
}
@if (holding.status === 'checked_out' && holding.unavailable && holding.unavailable.href) {
<stapps-external-link
[text]="'hebisSearch.daia.reserve' | translate"
[link]="holding.unavailable.href"
>
</stapps-external-link>
}
</ion-col>
</ion-row>
}
@if (holding.dueDate) {
<ion-row>
<ion-col size="3">{{ 'hebisSearch.daia.dueDate' | translate }}</ion-col>
<ion-col size="9">{{ holding.dueDate | amDateFormat: 'll' }}</ion-col>
</ion-row>
}
</ion-grid>
@@ -1,42 +0,0 @@
/*!
* Copyright (C) 2022 StApps
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
* Software Foundation, version 3.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along with
* this program. If not, see <https://www.gnu.org/licenses/>.
*/
ion-label a {
display: block;
margin: 20px 0 5px;
font-weight: 700;
color: var(--ion-color-primary);
text-decoration: none;
}
ion-grid {
margin: 5px;
padding: 0;
ion-row {
color: var(--ion-color-light-contrast);
background-color: var(--ion-color-light);
border-bottom: 1px solid #fff;
ion-col:first-child {
font-weight: 700;
}
}
}
ion-icon {
--fill: 1;
}
@@ -1,231 +0,0 @@
/*
* Copyright (C) 2023 StApps
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
* Software Foundation, version 3.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along with
* this program. If not, see <https://www.gnu.org/licenses/>.
*/
/* eslint-disable @typescript-eslint/no-non-null-assertion, @typescript-eslint/no-explicit-any, unicorn/no-thenable */
import {TestBed} from '@angular/core/testing';
import {DaiaDataProvider} from './daia-data.provider';
import {HebisModule} from './hebis.module';
import {ConfigProvider} from '../config/config.provider';
import {StAppsWebHttpClient} from '../data/stapps-web-http-client.provider';
import {StorageProvider} from '../storage/storage.provider';
import {LoggerTestingModule} from 'ngx-logger/testing';
import {MapModule} from '../map/map.module';
import {provideHttpClient, withInterceptorsFromDi} from '@angular/common/http';
import {StorageModule} from '../storage/storage.module';
import {DaiaHolding, DaiaService} from './protocol/response';
import {Observable, of} from 'rxjs';
import {TranslateLoader, TranslateModule} from '@ngx-translate/core';
const translations: any = {data: {detail: {TITLE: 'Foo'}}};
class TranslateFakeLoader implements TranslateLoader {
getTranslation(_lang: string): Observable<any> {
return of(translations);
}
}
describe('DaiaDataProvider', () => {
let daiaDataProvider: DaiaDataProvider;
let configProvider: ConfigProvider;
const proxyUrl = 'https://some-proxy.com?q=';
const getProxifiedUrl = (url: string) => `${proxyUrl}${encodeURIComponent(url)}`;
beforeEach(async () => {
configProvider = jasmine.createSpyObj('ConfigProvider', ['getValue']);
TestBed.configureTestingModule({
imports: [
HebisModule,
MapModule,
StorageModule,
LoggerTestingModule,
TranslateModule.forRoot({
loader: {provide: TranslateLoader, useClass: TranslateFakeLoader},
}),
],
providers: [
{
provide: ConfigProvider,
useValue: configProvider,
},
StAppsWebHttpClient,
StorageProvider,
DaiaDataProvider,
provideHttpClient(withInterceptorsFromDi()),
],
});
daiaDataProvider = TestBed.inject(DaiaDataProvider);
daiaDataProvider.hebisProxyUrl = proxyUrl;
});
describe('getResourceLink', () => {
it('should return link with proxy when open property is undefined', () => {
const available: DaiaService = {
delay: '',
expected: '',
href: 'https://some-url.com',
limitations: [],
service: 'presentation',
};
const holding: DaiaHolding = {
department: {id: '', content: ''},
id: '',
online: false,
signature: '',
available: available,
};
expect(daiaDataProvider.getHoldingLink(holding, holding.open)).toEqual(
getProxifiedUrl(available.href as string),
);
});
it('should return the resource link without proxy when the resource is open', () => {
const available: DaiaService = {
delay: '',
expected: '',
href: 'https://some-url.com',
limitations: [],
service: 'other',
};
const holding: DaiaHolding = {
department: {id: '', content: ''},
id: '',
online: false,
open: true,
signature: '',
available: available,
};
expect(daiaDataProvider.getHoldingLink(holding, holding.open)).toEqual(available.href as string);
});
it('should return the resource link with proxy when the resource is not open', () => {
const available: DaiaService = {
delay: '',
expected: '',
href: 'https://some-url.com',
limitations: [],
service: 'other',
};
const holding: DaiaHolding = {
department: {id: '', content: ''},
id: '',
online: false,
open: false,
signature: '',
available: available,
};
expect(daiaDataProvider.getHoldingLink(holding, holding.open)).toEqual(
getProxifiedUrl(available.href as string),
);
});
});
describe('getResourceStatus', () => {
// eslint-disable-next-line @typescript-eslint/no-unused-vars
// let available, unavalable: SCDaiaService[];
const checkedOut: DaiaService = {
expected: '2022-09-01',
limitations: [],
service: 'loan',
};
const notYetAvailableOnBuy: DaiaService = {
limitations: [{id: 'OnBuy', content: ''}],
service: 'loan',
};
const notYetAvailableJustReturned: DaiaService = {
limitations: [{id: 'JustReturned', content: ''}],
service: 'loan',
};
const notAvailableCopyIsMissing: DaiaService = {
limitations: [{id: 'CopyIsMissing', content: ''}],
service: 'loan',
};
const notAvailableCanceled: DaiaService = {
limitations: [{id: 'Canceled', content: ''}],
service: 'loan',
};
const libraryOnlyOnlyInHouse: DaiaService = {
limitations: [{id: 'OnlyInHouse', content: ''}],
service: 'loan',
};
const libraryOnlyExternalLoan: DaiaService = {
limitations: [{id: 'ExternalLoan', content: ''}],
service: 'loan',
};
const libraryOnlyPresentation: DaiaService = {
service: 'presentation',
};
const availableLimitationsUndefined: DaiaService = {
service: 'loan',
};
const availableLimitationsEmpty: DaiaService = {
limitations: [],
service: 'loan',
};
it('should return check out', () => {
expect(daiaDataProvider.getHoldingStatus([], [checkedOut])).toEqual('checked_out');
});
it('should return not yet available', () => {
expect(daiaDataProvider.getHoldingStatus([], [notYetAvailableOnBuy])).toEqual('not_yet_available');
expect(daiaDataProvider.getHoldingStatus([], [notYetAvailableJustReturned])).toEqual(
'not_yet_available',
);
});
it('should return not available', () => {
expect(daiaDataProvider.getHoldingStatus([], [notAvailableCopyIsMissing])).toEqual('not_available');
expect(daiaDataProvider.getHoldingStatus([], [notAvailableCanceled])).toEqual('not_available');
});
it('should return library only', () => {
expect(daiaDataProvider.getHoldingStatus([], [libraryOnlyOnlyInHouse])).toEqual('library_only');
expect(daiaDataProvider.getHoldingStatus([libraryOnlyExternalLoan], [])).toEqual('library_only');
expect(daiaDataProvider.getHoldingStatus([libraryOnlyPresentation], [])).toEqual('library_only');
});
it('should return available', () => {
expect(
daiaDataProvider.getHoldingStatus([availableLimitationsUndefined, libraryOnlyPresentation], []),
).toEqual('available');
expect(
daiaDataProvider.getHoldingStatus([availableLimitationsEmpty, libraryOnlyPresentation], []),
).toEqual('available');
});
it('should return unknown otherwise', () => {
const withoutLoan: DaiaService = {
limitations: [],
service: 'anything else',
};
expect(daiaDataProvider.getHoldingStatus([withoutLoan], [])).toEqual('unknown');
expect(daiaDataProvider.getHoldingStatus([], [withoutLoan])).toEqual('unknown');
expect(daiaDataProvider.getHoldingStatus([], [availableLimitationsUndefined])).toEqual('unknown');
expect(daiaDataProvider.getHoldingStatus([], [availableLimitationsEmpty])).toEqual('unknown');
});
});
});
@@ -1,231 +0,0 @@
/*
* Copyright (C) 2023 StApps
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
* Software Foundation, version 3.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along with
* this program. If not, see <https://www.gnu.org/licenses/>.
*/
import {Injectable} from '@angular/core';
import {DaiaAvailabilityResponse, DaiaHolding, DaiaService} from './protocol/response';
import {StorageProvider} from '../storage/storage.provider';
import {HttpClient, HttpHeaders} from '@angular/common/http';
import {ConfigProvider} from '../config/config.provider';
import {SCFeatureConfiguration} from '@openstapps/core';
import {NGXLogger} from 'ngx-logger';
import {TranslateService} from '@ngx-translate/core';
/**
* Generated class for the DataProvider provider.
*
* See https://angular.io/guide/dependency-injection for more info on providers
* and Angular DI.
*/
@Injectable({
providedIn: 'root',
})
export class DaiaDataProvider {
/**
* TODO
*/
storageProvider: StorageProvider;
httpClient: HttpClient;
daiaServiceUrl?: string;
hebisProxyUrl?: string;
clientHeaders = new HttpHeaders();
/**
* TODO
* @param storageProvider TODO
* @param httpClient TODO
* @param configProvider TODO
* @param logger TODO
* @param translateService TODO
*/
constructor(
storageProvider: StorageProvider,
httpClient: HttpClient,
private configProvider: ConfigProvider,
private readonly logger: NGXLogger,
private translateService: TranslateService,
) {
this.storageProvider = storageProvider;
this.httpClient = httpClient;
this.clientHeaders = this.clientHeaders.set('Content-Type', 'application/json');
}
async getAvailability(id: string): Promise<DaiaHolding[] | undefined> {
if (this.daiaServiceUrl === undefined) {
try {
const features = this.configProvider.getValue('features') as SCFeatureConfiguration;
if (features.extern?.daia?.url) {
this.daiaServiceUrl = features.extern?.daia?.url;
} else {
this.logger.error('Daia service url undefined');
return undefined;
}
if (features.extern?.hebisProxy?.url) {
this.hebisProxyUrl = features.extern?.hebisProxy?.url;
} else {
this.logger.error('HeBIS proxy url undefined');
return undefined;
}
} catch (error) {
this.logger.error(error);
return undefined;
}
}
return new Promise(resolve =>
this.httpClient
.get<DaiaAvailabilityResponse>(this.daiaServiceUrl as string, {
params: {id, lang: this.translateService.currentLang},
})
.subscribe(
(response: DaiaAvailabilityResponse) => {
const holdings: DaiaHolding[] = [];
if (response && Array.isArray(response.document)) {
response.document.map(document => {
Array.isArray(document.item) &&
document.item.map(element => {
try {
const {
department: {id: departmentId, content: departmentLabel, href: departmentLink} = {
id: 'noDep',
content: '',
href: '',
},
label,
about,
available,
storage,
chronology,
unavailable,
} = element;
const holdingStatus = this.holdingHasStatus(available || [])
? this.getHoldingStatus(available || [], unavailable || [])
: undefined;
const dueDate =
holdingStatus === 'checked_out'
? (unavailable.find(item => item.service === 'loan') as DaiaService).expected
: undefined;
holdings.push({
id: element.id,
department: {
id: departmentId,
content: departmentLabel,
href: departmentLink,
},
signature: label,
status: holdingStatus,
dueDate: dueDate,
online: Array.isArray(available) && available.some(item => item.service === 'remote'),
available:
(Array.isArray(available) &&
available.find(item =>
['openaccess', 'loan', 'presentation'].includes(item.service),
)) ||
undefined,
unavailable:
(Array.isArray(unavailable) && unavailable.find(item => item.service === 'loan')) ||
undefined,
storage,
about,
holdings: chronology?.about,
open:
(Array.isArray(available) &&
available.some(item => item.service === 'openaccess')) ||
undefined,
});
} catch {
// No element available
}
});
});
}
resolve(holdings);
},
error => {
// handle "availability info not found" separately from the problems with getting the info
if (error.status === 404) resolve([]);
// eslint-disable-next-line unicorn/no-useless-undefined
resolve(undefined);
},
),
);
}
getHoldingLink(holding: DaiaHolding, open = false) {
if (this.hebisProxyUrl === undefined) {
this.logger.error('HeBIS proxy url undefined');
return;
}
const resourceLink = holding.available?.href;
return open ? resourceLink : `${this.hebisProxyUrl}${encodeURIComponent(resourceLink as string)}`;
}
holdingHasStatus(available: DaiaService[]): boolean {
return !available.some(item => item.service === 'remote');
}
getHoldingStatus(available: DaiaService[], unavailable: DaiaService[]): DaiaHolding['status'] {
const loan: {available: number; unavailable: number} = {
available: available.findIndex(item => item.service === 'loan'),
unavailable: unavailable.findIndex(item => item.service === 'loan'),
};
const presentation: {available: number; unavailable: number} = {
available: available.findIndex(item => item.service === 'presentation'),
unavailable: unavailable.findIndex(item => item.service === 'presentation'),
};
if (loan.unavailable !== -1 && unavailable[loan.unavailable].expected !== undefined) {
return 'checked_out';
}
if (
loan.unavailable !== -1 &&
unavailable[loan.unavailable].limitations?.some(limitation =>
['OnBuy', 'JustReturned'].includes(limitation.id),
)
)
return 'not_yet_available';
if (
loan.unavailable !== -1 &&
unavailable[loan.unavailable].limitations?.some(limitation =>
['CopyIsMissing', 'Canceled'].includes(limitation.id),
)
)
return 'not_available';
if (
(loan.unavailable !== -1 &&
unavailable[loan.unavailable].limitations?.some(limitation =>
['OnlyInHouse'].includes(limitation.id),
)) ||
(loan.available !== -1 &&
available[loan.available].limitations?.some(limitation =>
['ExternalLoan'].includes(limitation.id),
)) ||
(loan.available === -1 && presentation.available !== -1 && presentation.unavailable === -1)
)
return 'library_only';
if (loan.available !== -1) return 'available';
return 'unknown';
}
}
@@ -1,114 +0,0 @@
/*
* Copyright (C) 2022 StApps
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
* Software Foundation, version 3.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along with
* this program. If not, see <https://www.gnu.org/licenses/>.
*/
import {Injectable} from '@angular/core';
import {Client} from '@openstapps/api';
import {SCHebisSearchRequest} from './protocol/request';
import {HebisSearchResponse} from './protocol/response';
import {StorageProvider} from '../storage/storage.provider';
import {StAppsWebHttpClient} from '../data/stapps-web-http-client.provider';
import {HttpClient} from '@angular/common/http';
import {DataProvider} from '../data/data.provider';
import {SCHebisSearchRoute} from './protocol/route';
import {SCSearchRequest, SCSearchResponse} from '@openstapps/core';
const HEBIS_PREFIX = 'HEB';
/**
* Generated class for the DataProvider provider.
*
* See https://angular.io/guide/dependency-injection for more info on providers
* and Angular DI.
*/
@Injectable({
providedIn: 'root',
})
export class HebisDataProvider extends DataProvider {
/**
* TODO
*/
storageProvider: StorageProvider;
httpClient: HttpClient;
/**
* Instance of hebis search request route
*/
private readonly hebisSearchRoute = new SCHebisSearchRoute();
constructor(
stAppsWebHttpClient: StAppsWebHttpClient,
storageProvider: StorageProvider,
httpClient: HttpClient,
) {
super(stAppsWebHttpClient, storageProvider);
this.storageProvider = storageProvider;
this.httpClient = httpClient;
this.client = new Client(stAppsWebHttpClient, this.backendUrl, this.appVersion);
}
override async search(query: SCSearchRequest): Promise<SCSearchResponse> {
const response = await this.hebisSearch({
query: query.query ?? '',
page: query.from,
});
console.log(response.pagination);
return {
data: response.data,
facets: [],
pagination: response.pagination,
stats: {
time: Number.NaN,
},
};
}
/**
* Send a search request to the backend
*
* All results will be returned if no size is set in the request.
* @param searchRequest Search request
* @param options Search options
* @param options.addPrefix Add HeBIS prefix (useful when having only an ID, e.g. when using PAIA)
*/
async hebisSearch(
searchRequest: SCHebisSearchRequest,
options?: {addPrefix: boolean},
): Promise<HebisSearchResponse> {
if (options?.addPrefix) {
searchRequest.query = [HEBIS_PREFIX, searchRequest.query].join('');
}
let page: number | undefined = searchRequest.page;
if (page === undefined) {
const preFlightResponse = await this.client.invokeRoute<HebisSearchResponse>(
this.hebisSearchRoute,
undefined,
{
...searchRequest,
page: 0,
},
);
page = preFlightResponse.pagination.total;
}
return this.client.invokeRoute<HebisSearchResponse>(this.hebisSearchRoute, undefined, {
...searchRequest,
page,
});
}
}
@@ -1,31 +0,0 @@
/*
* Copyright (C) 2019 StApps
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
* Software Foundation, version 3.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along with
* this program. If not, see <https://www.gnu.org/licenses/>.
*/
import {Component, Input} from '@angular/core';
import {SCThings} from '@openstapps/core';
/**
* TODO
*/
@Component({
selector: 'stapps-hebis-detail-content',
styleUrls: ['hebis-detail-content.scss'],
templateUrl: 'hebis-detail-content.html',
})
export class HebisDetailContentComponent {
/**
* TODO
*/
@Input() item: SCThings;
}
@@ -1,51 +0,0 @@
<!--
~ Copyright (C) 2023 StApps
~ This program is free software: you can redistribute it and/or modify it
~ under the terms of the GNU General Public License as published by the Free
~ Software Foundation, version 3.
~
~ This program is distributed in the hope that it will be useful, but WITHOUT
~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
~ more details.
~
~ You should have received a copy of the GNU General Public License along with
~ this program. If not, see <https://www.gnu.org/licenses/>.
-->
<div>
@switch (item.type) {
@case ('book') {
<stapps-book-detail-content [item]="$any(item)"></stapps-book-detail-content>
}
@case ('periodical') {
<stapps-periodical-detail-content [item]="$any(item)"></stapps-periodical-detail-content>
}
@case ('article') {
<stapps-article-detail-content [item]="$any(item)"></stapps-article-detail-content>
}
@default {
<ion-item class="ion-text-wrap" lines="inset">
<ion-thumbnail slot="start" class="ion-margin-end">
<ion-icon color="dark" [name]="item.type | dataIcon"></ion-icon>
</ion-thumbnail>
<ion-grid>
<ion-row>
<ion-col>
<div class="ion-text-wrap">
<h2 class="name">{{ item.name }}</h2>
<ion-note>{{ item.type }}</ion-note>
</div>
</ion-col>
</ion-row>
</ion-grid>
</ion-item>
@if (item.description) {
<stapps-simple-card
[title]="'description' | propertyNameTranslate: item | titlecase"
[content]="'description' | thingTranslate: item"
></stapps-simple-card>
}
}
}
</div>
@@ -1,50 +0,0 @@
/*!
* Copyright (C) 2022 StApps
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
* Software Foundation, version 3.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along with
* this program. If not, see <https://www.gnu.org/licenses/>.
*/
:host ::ng-deep {
ion-grid,
ion-col {
padding-top: 0;
padding-bottom: 0;
padding-inline-start: 0;
}
ion-card {
margin: 0;
box-shadow: none;
ion-card-content {
padding-bottom: 8px;
h1 {
margin: 0;
}
}
ion-card-header {
padding-top: 8px;
padding-bottom: 4px;
font-weight: bold;
color: var(--ion-color-dark);
}
ion-grid,
ion-col {
padding-top: 0;
padding-bottom: 0;
padding-inline-start: 0;
}
}
}
@@ -1,114 +0,0 @@
/*
* Copyright (C) 2023 StApps
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
* Software Foundation, version 3.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along with
* this program. If not, see <https://www.gnu.org/licenses/>.
*/
/* eslint-disable @typescript-eslint/no-non-null-assertion,@typescript-eslint/no-explicit-any */
/* eslint-disable @typescript-eslint/no-non-null-assertion,@typescript-eslint/no-explicit-any */
import {CUSTOM_ELEMENTS_SCHEMA} from '@angular/core';
import {ComponentFixture, TestBed} from '@angular/core/testing';
import {ActivatedRoute, RouterModule} from '@angular/router';
import {TranslateLoader, TranslateModule, TranslateService} from '@ngx-translate/core';
import {sampleThingsMap} from '../../../_helpers/data/sample-things';
import {HebisRoutingModule} from '../hebis-routing.module';
import {HebisModule} from '../hebis.module';
import {HebisDataProvider} from '../hebis-data.provider';
import {HebisDetailComponent} from './hebis-detail.component';
import {Observable, of} from 'rxjs';
import {StorageProvider} from '../../storage/storage.provider';
import {LoggerModule, NgxLoggerLevel} from 'ngx-logger';
import {IonIconDirective} from '../../../util/ion-icon/ion-icon.directive';
import {provideIonicAngular} from '@ionic/angular/standalone';
const translations: any = {data: {detail: {TITLE: 'Foo'}}};
class TranslateFakeLoader implements TranslateLoader {
getTranslation(_lang: string): Observable<any> {
return of(translations);
}
}
describe('HebisDetailComponent', () => {
let comp: HebisDetailComponent;
let fixture: ComponentFixture<HebisDetailComponent>;
let dataProvider: HebisDataProvider;
const sampleThing = sampleThingsMap.book[0];
let translateService: TranslateService;
// @Component({ selector: 'stapps-data-list-item', template: '' })
// class DataListItemComponent {
// @Input() item;
// }
const fakeActivatedRoute = {
snapshot: {
paramMap: {
get: () => {
return sampleThing.uid;
},
},
},
};
const storageProviderSpy = jasmine.createSpyObj('StorageProvider', ['init', 'get', 'has', 'put', 'search']);
beforeEach(() => {
TestBed.configureTestingModule({
imports: [
RouterModule.forRoot([]),
HebisRoutingModule,
HebisModule,
IonIconDirective,
TranslateModule.forRoot({
loader: {provide: TranslateLoader, useClass: TranslateFakeLoader},
}),
LoggerModule.forRoot({level: NgxLoggerLevel.TRACE}),
],
providers: [
provideIonicAngular(),
{
provide: ActivatedRoute,
useValue: fakeActivatedRoute,
},
{
provide: StorageProvider,
useValue: storageProviderSpy,
},
],
schemas: [CUSTOM_ELEMENTS_SCHEMA],
}).compileComponents();
});
beforeEach(() => {
dataProvider = TestBed.inject(HebisDataProvider);
translateService = TestBed.inject(TranslateService);
spyOn(dataProvider, 'get' as any).and.returnValue(Promise.resolve(sampleThing));
spyOn(HebisDetailComponent.prototype, 'getItem').and.callThrough();
fixture = TestBed.createComponent(HebisDetailComponent);
comp = fixture.componentInstance;
translateService.use('foo');
fixture.detectChanges();
});
it('should create component', () => expect(comp).toBeDefined());
it('should get a data item', () => {
comp.getItem(sampleThing.uid, false);
expect(HebisDetailComponent.prototype.getItem).toHaveBeenCalledWith(sampleThing.uid, false);
});
it('should get a data item when initialized', () => {
comp.ngOnInit();
expect(HebisDetailComponent.prototype.getItem).toHaveBeenCalledWith(sampleThing.uid, false);
});
});
@@ -1,55 +0,0 @@
/*
* Copyright (C) 2022 StApps
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
* Software Foundation, version 3.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along with
* this program. If not, see <https://www.gnu.org/licenses/>.
*/
import {Component, inject, OnInit} from '@angular/core';
import {SCUuid} from '@openstapps/core';
import {HebisDataProvider} from '../hebis-data.provider';
import {DataDetailComponent} from '../../data/detail/data-detail.component';
import {DaiaHolding} from '../protocol/response';
/**
* A Component to display an SCThing detailed
*/
@Component({
selector: 'stapps-hebis-detail',
styleUrls: ['hebis-detail.scss'],
templateUrl: 'hebis-detail.html',
})
export class HebisDetailComponent extends DataDetailComponent implements OnInit {
holdings: DaiaHolding[];
private hebisDataProvider = inject(HebisDataProvider);
/**
* @override
*/
async ngOnInit() {
const uid = this.route.snapshot.paramMap.get('uid') || '';
await this.getItem(uid ?? '', false);
}
/**
* Provides data item with given UID
* @param uid Unique identifier of a thing
* @param _forceReload Ignore any cached data
*/
async getItem(uid: SCUuid, _forceReload: boolean) {
this.item = await (this.inputItem ??
this.hebisDataProvider.hebisSearch({query: uid, page: 0}).then(
result =>
// eslint-disable-next-line unicorn/no-null
(result.data && result.data[0]) || null,
));
}
}
@@ -1,58 +0,0 @@
<!--
~ Copyright (C) 2022 StApps
~ This program is free software: you can redistribute it and/or modify it
~ under the terms of the GNU General Public License as published by the Free
~ Software Foundation, version 3.
~
~ This program is distributed in the hope that it will be useful, but WITHOUT
~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
~ more details.
~
~ You should have received a copy of the GNU General Public License along with
~ this program. If not, see <https://www.gnu.org/licenses/>.
-->
<ion-header>
<ion-toolbar color="primary" mode="ios">
<ion-buttons slot="start">
<ion-back-button></ion-back-button>
</ion-buttons>
<ion-title>{{ 'data.detail.TITLE' | translate }}</ion-title>
<ion-buttons slot="primary">
@if (item) {
<stapps-favorite-button [item]="$any(item)"></stapps-favorite-button>
}
</ion-buttons>
</ion-toolbar>
</ion-header>
<ion-content class="ion-no-padding">
<div>
@switch (true) {
@case (!item && (isDisconnected | async)) {
<div class="centered-message-container">
<ion-icon name="signal_disconnected"></ion-icon>
<ion-label> {{ 'data.detail.COULD_NOT_CONNECT' | translate }} </ion-label>
</div>
}
@case (item === null) {
<div class="centered-message-container">
<ion-icon name="link_off"></ion-icon>
<ion-label> {{ 'data.detail.NOT_FOUND' | translate }} </ion-label>
</div>
}
@case (!item && item !== null) {
<stapps-skeleton-list-item></stapps-skeleton-list-item>
<stapps-skeleton-simple-card></stapps-skeleton-simple-card>
}
@default {
@if (item) {
<stapps-hebis-detail-content [item]="item"></stapps-hebis-detail-content>
}
@if (item) {
<stapps-daia-availability></stapps-daia-availability>
}
}
}
</div>
</ion-content>
@@ -1,5 +0,0 @@
::ng-deep {
ion-card-header {
font-weight: bold;
}
}
@@ -1,32 +0,0 @@
/*
* Copyright (C) 2022 StApps
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
* Software Foundation, version 3.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along with
* this program. If not, see <https://www.gnu.org/licenses/>.
*/
import {NgModule} from '@angular/core';
import {RouterModule, Routes} from '@angular/router';
import {HebisDetailComponent} from './hebis-detail/hebis-detail.component';
import {HebisSearchPageComponent} from './list/hebis-search-page.component';
const hebisRoutes: Routes = [
{path: 'hebis-search', component: HebisSearchPageComponent},
{path: 'hebis-detail/:uid', component: HebisDetailComponent},
];
/**
* Module defining routes for data module
*/
@NgModule({
exports: [RouterModule],
imports: [RouterModule.forChild(hebisRoutes)],
})
export class HebisRoutingModule {}
@@ -1,21 +0,0 @@
/*
* Copyright (C) 2022 StApps
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
* Software Foundation, version 3.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along with
* this program. If not, see <https://www.gnu.org/licenses/>.
*/
import {Injectable} from '@angular/core';
@Injectable({
providedIn: 'root',
})
export class HebisSearchProvider {}
@@ -1,112 +0,0 @@
/*
* Copyright (C) 2018-2022 StApps
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
* Software Foundation, version 3.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along with
* this program. If not, see <https://www.gnu.org/licenses/>.
*/
import {ScrollingModule} from '@angular/cdk/scrolling';
import {CommonModule} from '@angular/common';
import {provideHttpClient, withInterceptorsFromDi} from '@angular/common/http';
import {NgModule} from '@angular/core';
import {FormsModule} from '@angular/forms';
import {TranslateModule} from '@ngx-translate/core';
import {MarkdownModule} from 'ngx-markdown';
import {MomentModule} from 'ngx-moment';
import {ThingTranslateModule} from '../../translation/thing-translate.module';
import {MenuModule} from '../menu/menu.module';
import {StorageModule} from '../storage/storage.module';
import {HebisDetailComponent} from './hebis-detail/hebis-detail.component';
import {HebisDetailContentComponent} from './hebis-detail/hebis-detail-content.component';
import {HebisSearchPageComponent} from './list/hebis-search-page.component';
import {HebisDataProvider} from './hebis-data.provider';
import {DaiaDataProvider} from './daia-data.provider';
import {StAppsWebHttpClient} from '../data/stapps-web-http-client.provider';
import {HebisRoutingModule} from './hebis-routing.module';
import {DataModule} from '../data/data.module';
import {DaiaAvailabilityComponent} from './daia-availability/daia-availability.component';
import {UtilModule} from '../../util/util.module';
import {DaiaHoldingComponent} from './daia-availability/daia-holding.component';
import {
IonBackButton,
IonButton,
IonButtons,
IonCard,
IonCardContent,
IonCardHeader,
IonCol,
IonContent,
IonGrid,
IonHeader,
IonItem,
IonLabel,
IonNote,
IonRow,
IonThumbnail,
IonTitle,
IonToolbar,
} from '@ionic/angular/standalone';
import {IonIconDirective} from 'src/app/util/ion-icon/ion-icon.directive';
/**
* Module for handling data
*/
@NgModule({
declarations: [
HebisSearchPageComponent,
HebisDetailComponent,
HebisDetailContentComponent,
DaiaAvailabilityComponent,
DaiaHoldingComponent,
],
imports: [
CommonModule,
DataModule,
FormsModule,
HebisRoutingModule,
IonIconDirective,
MarkdownModule.forRoot(),
MenuModule,
MomentModule.forRoot({
relativeTimeThresholdOptions: {
m: 59,
},
}),
ScrollingModule,
StorageModule,
TranslateModule.forChild(),
ThingTranslateModule.forChild(),
UtilModule,
IonBackButton,
IonLabel,
IonButton,
IonContent,
IonButtons,
IonTitle,
IonToolbar,
IonNote,
IonHeader,
IonGrid,
IonRow,
IonCol,
IonCard,
IonCardContent,
IonCardHeader,
IonItem,
IonThumbnail,
],
providers: [
HebisDataProvider,
DaiaDataProvider,
StAppsWebHttpClient,
provideHttpClient(withInterceptorsFromDi()),
],
})
export class HebisModule {}
@@ -1,43 +0,0 @@
/*
* Copyright (C) 2023 StApps
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
* Software Foundation, version 3.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along with
* this program. If not, see <https://www.gnu.org/licenses/>.
*/
import {Component} from '@angular/core';
import {HebisDataProvider} from '../hebis-data.provider';
import {takeUntilDestroyed} from '@angular/core/rxjs-interop';
import {DataProvider} from '../../data/data.provider';
import {DataRoutingService} from '../../data/data-routing.service';
import {Router} from '@angular/router';
/**
* HebisSearchPageComponent queries things and shows list of things as search results and filter as context menu
*/
@Component({
selector: 'stapps-hebissearch-page',
templateUrl: 'hebis-search-page.html',
styleUrls: ['../../data/list/search-page.scss'],
providers: [{provide: DataProvider, useClass: HebisDataProvider}],
})
export class HebisSearchPageComponent {
constructor(dataRoutingService: DataRoutingService, router: Router) {
dataRoutingService
.itemSelectListener()
.pipe(takeUntilDestroyed())
.subscribe(async item => {
void router.navigate(
['hebis-detail', (item.origin && 'originalId' in item.origin && item.origin['originalId']) || ''],
{state: {item}},
);
});
}
}
@@ -1,25 +0,0 @@
<!--
~ Copyright (C) 2022 StApps
~ This program is free software: you can redistribute it and/or modify it
~ under the terms of the GNU General Public License as published by the Free
~ Software Foundation, version 3.
~
~ This program is distributed in the hope that it will be useful, but WITHOUT
~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
~ more details.
~
~ You should have received a copy of the GNU General Public License along with
~ this program. If not, see <https://www.gnu.org/licenses/>.
-->
<stapps-search-page
[placeholder]="'hebisSearch.search_bar.placeholder' | translate"
[title]="'hebisSearch.title' | translate"
[searchInstruction]="'hebisSearch.instruction' | translate"
[itemRouting]="false"
[showContextMenu]="false"
[pageSize]="1"
[navigation]="[{label: 'search.type', routerLink: ['/search']}, {label: 'hebisSearch.type'}]"
>
</stapps-search-page>
@@ -1,20 +0,0 @@
import {SCLicensePlate} from '@openstapps/core';
export interface SCHebisSearchRequest {
/**
* HDS2 will supply results for the speficied insitute / university if available (Defaults to f-u)
*/
institute?: SCLicensePlate;
/**
* Simple pagination support (Defaults to 0)
*/
page?: number;
/**
* Search query for HDS
*/
query: string;
}
export interface SCDaiaAvailabilityRequest {
id: string;
}
@@ -1,77 +0,0 @@
/*
* Copyright (C) 2022 StApps
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
* Software Foundation, version 3.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along with
* this program. If not, see <https://www.gnu.org/licenses/>.
*/
import {SCArticle, SCBook, SCPeriodical, SCSearchResultPagination} from '@openstapps/core';
export interface HebisSearchResponse {
/**
* Response Array of SCBook type or Object
*/
data: Array<SCBook | SCArticle | SCPeriodical>;
/**
* Pagination information
*/
pagination: SCSearchResultPagination;
}
export interface DaiaAvailabilityResponse {
document: Array<{
item: Array<{
id: string;
label: string;
chronology?: {
about?: string;
};
department: DaiaSimpleContent;
available: DaiaService[];
unavailable: DaiaService[];
debugInfo: string;
about?: string;
storage?: DaiaSimpleContent;
}>;
}>;
institution: DaiaSimpleContent;
timestamp: string;
}
export interface DaiaSimpleContent {
id: string;
content: string;
href?: string;
}
export interface DaiaService {
delay?: string;
href?: string;
service: string;
expected?: string;
limitations?: DaiaSimpleContent[];
}
export interface DaiaHolding {
id: string;
department: DaiaSimpleContent;
signature: string;
storage?: DaiaSimpleContent;
available?: DaiaService;
unavailable?: DaiaService;
about?: string;
online: boolean;
open?: boolean;
dueDate?: string;
holdings?: string;
status?: 'checked_out' | 'not_yet_available' | 'not_available' | 'library_only' | 'available' | 'unknown';
}
@@ -1,54 +0,0 @@
import {
SCAbstractRoute,
SCRouteHttpVerbs,
SCInternalServerErrorResponse,
SCMethodNotAllowedErrorResponse,
SCRequestBodyTooLargeErrorResponse,
SCSyntaxErrorResponse,
SCUnsupportedMediaTypeErrorResponse,
SCValidationErrorResponse,
} from '@openstapps/core';
/**
* Route for searching things
*/
export class SCHebisSearchRoute extends SCAbstractRoute {
constructor() {
super();
this.errorNames = [
SCInternalServerErrorResponse,
SCMethodNotAllowedErrorResponse,
SCRequestBodyTooLargeErrorResponse,
SCSyntaxErrorResponse,
SCUnsupportedMediaTypeErrorResponse,
SCValidationErrorResponse,
];
this.method = SCRouteHttpVerbs.POST;
this.requestBodyName = 'SCHebisSearchRequest';
this.responseBodyName = 'SCHebisSearchResponse';
this.statusCodeSuccess = 200;
this.urlPath = '/hebissearch';
}
}
/**
* Route for availability
*/
export class SCDaiaRoute extends SCAbstractRoute {
constructor() {
super();
this.errorNames = [
SCInternalServerErrorResponse,
SCMethodNotAllowedErrorResponse,
SCRequestBodyTooLargeErrorResponse,
SCSyntaxErrorResponse,
SCUnsupportedMediaTypeErrorResponse,
SCValidationErrorResponse,
];
this.method = SCRouteHttpVerbs.GET;
this.requestBodyName = 'SCDaiaAvailabilityRequest';
this.responseBodyName = 'SCDaiaAvailabilityResponse';
this.statusCodeSuccess = 200;
this.urlPath = '/UB_Frankfurt';
}
}
@@ -2,7 +2,6 @@
[title]="'jobs.title' | translate"
[placeholder]="'jobs.placeholder' | translate"
[showDefaultData]="true"
[navigation]="[]"
[forcedFilter]="forcedFilter"
[backUrl]="'/'"
></stapps-search-page>
@@ -1,50 +0,0 @@
<!--
~ Copyright (C) 2022 StApps
~ This program is free software: you can redistribute it and/or modify it
~ under the terms of the GNU General Public License as published by the Free
~ Software Foundation, version 3.
~
~ This program is distributed in the hope that it will be useful, but WITHOUT
~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
~ more details.
~
~ You should have received a copy of the GNU General Public License along with
~ this program. If not, see <https://www.gnu.org/licenses/>.
-->
<ion-header>
<ion-toolbar color="primary" mode="ios">
<ion-buttons slot="start">
<ion-back-button></ion-back-button>
</ion-buttons>
<ion-title>{{ 'library.account.title' | translate | titlecase }}</ion-title>
</ion-toolbar>
</ion-header>
<ion-content>
@if (name) {
<p>
{{ 'library.account.greeting' | translate }} {{ name | firstLastName }}!
{{ 'library.account.login.success' | translate }}
</p>
} @else {
<p><ion-skeleton-text animated style="width: 80%"></ion-skeleton-text></p>
}
<ion-item [routerLink]="['profile']">
<ion-icon name="account_circle" slot="start"></ion-icon
>{{ 'library.account.pages.profile.title' | translate | titlecase }}
</ion-item>
<ion-item [routerLink]="['holds']">
<ion-icon name="collections_bookmark" slot="start"></ion-icon
>{{ 'library.account.pages.holds.title' | translate | titlecase }}
</ion-item>
<ion-item [routerLink]="['checked-out']">
<ion-icon name="book" slot="start"></ion-icon
>{{ 'library.account.pages.checked_out.title' | translate | titlecase }}
</ion-item>
<ion-item [routerLink]="['fines']">
<ion-icon name="request_quote" slot="start"></ion-icon
>{{ 'library.account.pages.fines.title' | translate | titlecase }}
</ion-item>
</ion-content>
@@ -1,4 +0,0 @@
ion-content {
--padding-start: 8px;
--padding-top: 8px;
}
@@ -1,17 +0,0 @@
import {Component} from '@angular/core';
import {LibraryAccountService} from './library-account.service';
@Component({
templateUrl: './account.page.html',
styleUrls: ['./account.page.scss'],
})
export class LibraryAccountPageComponent {
name?: string;
constructor(private readonly libraryAccountService: LibraryAccountService) {}
async ionViewWillEnter(): Promise<void> {
const patron = await this.libraryAccountService.getPatron();
this.name = patron?.name;
}
}
@@ -1,51 +0,0 @@
/*
* Copyright (C) 2023 StApps
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
* Software Foundation, version 3.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along with
* this program. If not, see <https://www.gnu.org/licenses/>.
*/
import {Component} from '@angular/core';
import {DocumentAction, PAIADocument, PAIADocumentStatus} from '../../types';
import {LibraryAccountService} from '../library-account.service';
@Component({
selector: 'app-checked-out',
templateUrl: './checked-out-page.html',
styleUrls: ['./checked-out-page.scss'],
})
export class CheckedOutPageComponent {
checkedOutItems?: PAIADocument[];
constructor(private readonly libraryAccountService: LibraryAccountService) {}
async ionViewWillEnter(): Promise<void> {
await this.fetchItems();
}
async onDocumentAction(documentAction: DocumentAction) {
const answer = await this.libraryAccountService.handleDocumentAction(documentAction);
if (answer) await this.fetchItems();
}
async fetchItems() {
try {
// Prepare patron (status) for the items
await this.libraryAccountService.getPatron();
this.checkedOutItems = undefined;
this.checkedOutItems = await this.libraryAccountService.getFilteredItems([PAIADocumentStatus.Held]);
} catch {
await this.libraryAccountService.handleError();
this.checkedOutItems = [];
}
}
}
@@ -1,43 +0,0 @@
<!--
~ Copyright (C) 2022 StApps
~ This program is free software: you can redistribute it and/or modify it
~ under the terms of the GNU General Public License as published by the Free
~ Software Foundation, version 3.
~
~ This program is distributed in the hope that it will be useful, but WITHOUT
~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
~ more details.
~
~ You should have received a copy of the GNU General Public License along with
~ this program. If not, see <https://www.gnu.org/licenses/>.
-->
<ion-header>
<ion-toolbar color="primary" mode="ios">
<ion-buttons slot="start">
<ion-back-button></ion-back-button>
</ion-buttons>
<ion-title>{{ 'library.account.pages.checked_out.title' | translate | titlecase }}</ion-title>
</ion-toolbar>
</ion-header>
<ion-content>
@if (checkedOutItems) {
@for (checkedOutItem of checkedOutItems; track checkedOutItem) {
<stapps-paia-item
[item]="checkedOutItem"
[propertiesToShow]="['label', 'renewals', 'duedate']"
(documentAction)="onDocumentAction($event)"
listName="checked_out"
>
</stapps-paia-item>
} @empty {
<ion-label class="centered-message-container">
{{ 'search.nothing_found' | translate | titlecase }}
</ion-label>
}
} @else {
<stapps-skeleton-list-item [hideThumbnail]="true"></stapps-skeleton-list-item>
}
</ion-content>
@@ -1,51 +0,0 @@
/*
* Copyright (C) 2023 StApps
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
* Software Foundation, version 3.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along with
* this program. If not, see <https://www.gnu.org/licenses/>.
*/
import {Component, Input} from '@angular/core';
import {PAIAFee} from '../../../types';
import {SCArticle, SCBook, SCPeriodical} from '@openstapps/core';
import {LibraryAccountService} from '../../library-account.service';
@Component({
selector: 'stapps-fee-item',
templateUrl: './fee-item.html',
styleUrls: ['./fee-item.scss'],
})
export class FeeItemComponent {
_fee: PAIAFee;
book?: SCBook | SCPeriodical | SCArticle;
hasEdition = false;
@Input()
set fee(fee: PAIAFee) {
this.hasEdition = !fee.edition?.includes('null');
this._fee = fee;
if (this.hasEdition) {
this.libraryAccountService.getDocumentFromHDS(fee.edition as string).then(book => {
this.book = book;
});
}
}
get fee() {
return this._fee;
}
propertiesToShow: (keyof PAIAFee)[] = ['about', 'date', 'amount'];
constructor(private readonly libraryAccountService: LibraryAccountService) {}
}
@@ -1,40 +0,0 @@
<!--
~ Copyright (C) 2023 StApps
~ This program is free software: you can redistribute it and/or modify it
~ under the terms of the GNU General Public License as published by the Free
~ Software Foundation, version 3.
~
~ This program is distributed in the hope that it will be useful, but WITHOUT
~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
~ more details.
~
~ You should have received a copy of the GNU General Public License along with
~ this program. If not, see <https://www.gnu.org/licenses/>.
-->
<ion-item>
<ion-label class="ion-text-wrap">
@if (hasEdition) {
@if (book) {
<h2 class="name">{{ 'library.account.pages.fines.labels.edition' | translate }}: {{ book.name }}</h2>
} @else {
<h2>
<ion-skeleton-text animated style="width: 80%"></ion-skeleton-text>
</h2>
}
}
@for (property of propertiesToShow; track property) {
@if (fee[property]) {
<p>
{{ 'library.account.pages.fines.labels' + '.' + property | translate }}:
@if (!['date'].includes(property)) {
{{ fee[property] }}
} @else {
{{ fee[property] | amDateFormat: 'll' }}
}
</p>
}
}
</ion-label>
</ion-item>
@@ -1,76 +0,0 @@
/*
* Copyright (C) 2022 StApps
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
* Software Foundation, version 3.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along with
* this program. If not, see <https://www.gnu.org/licenses/>.
*/
import {Component, EventEmitter, Input, Output} from '@angular/core';
import {DocumentAction, PAIADocument, PAIADocumentStatus, PAIADocumentVisualStatus} from '../../../types';
import {LibraryAccountService} from '../../library-account.service';
@Component({
selector: 'stapps-paia-item',
templateUrl: './paiaitem.html',
styleUrls: ['./paiaitem.scss'],
})
export class PAIAItemComponent {
private _item: PAIADocument;
renewable: boolean;
visualStatus?: PAIADocumentVisualStatus;
constructor(private readonly libraryAccountService: LibraryAccountService) {}
@Input()
set item(value: PAIADocument) {
this._item = value;
void this.setRenewable();
this.visualStatus = this.getVisualStatus(Number(this.item.status));
}
get item(): PAIADocument {
return this._item;
}
@Input()
propertiesToShow: (keyof PAIADocument)[];
@Input()
listName: string;
@Output()
documentAction: EventEmitter<DocumentAction> = new EventEmitter<DocumentAction>();
async onClick(action: DocumentAction['action']) {
this.documentAction.emit({doc: this.item, action});
}
private async setRenewable() {
const isActive = await this.libraryAccountService.isActivePatron();
this.renewable = isActive && Number(this.item.status) === PAIADocumentStatus.Held;
}
private getVisualStatus(status: PAIADocumentStatus): PAIADocumentVisualStatus | undefined {
switch (status) {
case PAIADocumentStatus.Ordered: {
return {color: 'warning', status: status, statusText: 'ordered'};
}
case PAIADocumentStatus.Provided: {
return {color: 'success', status: status, statusText: 'ready'};
}
default: {
return undefined;
}
}
}
}
@@ -1,56 +0,0 @@
<!--
~ Copyright (C) 2023 StApps
~ This program is free software: you can redistribute it and/or modify it
~ under the terms of the GNU General Public License as published by the Free
~ Software Foundation, version 3.
~
~ This program is distributed in the hope that it will be useful, but WITHOUT
~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
~ more details.
~
~ You should have received a copy of the GNU General Public License along with
~ this program. If not, see <https://www.gnu.org/licenses/>.
-->
<ion-item>
<ion-label class="ion-text-wrap">
@if (item.about) {
<h2 class="name">
@if (visualStatus) {
<ion-badge [color]="visualStatus.color" slot="start">
{{ 'library.account.pages' + '.' + listName + '.' + visualStatus.statusText | translate }}
</ion-badge>
}
{{ item.about }}
</h2>
}
@for (property of propertiesToShow; track property) {
@if (item[property]) {
<p>
{{ 'library.account.pages' + '.' + listName + '.' + 'labels' + '.' + property | translate }}:
@if (!['starttime', 'duedate'].includes(property)) {
{{ item[property] }}
} @else {
{{ $any(item[property]) | amDateFormat: 'll' }}
}
</p>
}
}
<span class="ion-float-right">
<!-- TODO: Add "cancel button" when functionality ready for production-->
<!-- <ion-button-->
<!-- *ngIf="item.cancancel"-->
<!-- color="primary"-->
<!-- (click)="onClick('cancel')"-->
<!-- >-->
<!-- {{ 'library.account.actions.cancel.header' | translate }}</ion-button-->
<!-- >-->
@if (renewable && item.canrenew) {
<ion-button color="primary" (click)="onClick('renew')">
{{ 'library.account.actions.renew.header' | translate }}</ion-button
>
}
</span>
</ion-label>
</ion-item>
@@ -1,17 +0,0 @@
/*!
* Copyright (C) 2022 StApps
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
* Software Foundation, version 3.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along with
* this program. If not, see <https://www.gnu.org/licenses/>.
*/
ion-badge {
vertical-align: bottom;
}
@@ -1,44 +0,0 @@
import {Component} from '@angular/core';
import {LibraryAccountService} from '../library-account.service';
import {PAIAFee} from '../../types';
@Component({
selector: 'app-fines',
templateUrl: './fines-page.html',
styleUrls: ['./fines-page.scss'],
})
export class FinesPageComponent {
amount?: string;
fines: PAIAFee[];
constructor(private readonly libraryAccountService: LibraryAccountService) {}
async ionViewWillEnter(): Promise<void> {
await this.fetchItems();
}
private async cleanUp(fines: PAIAFee[]): Promise<PAIAFee[]> {
for (const fine of fines) {
for (const property in fine) {
// remove properties with "null" included
if (fine[<keyof PAIAFee>property]?.includes('null')) {
delete fine.item;
}
}
}
return fines;
}
async fetchItems() {
try {
const fees = await this.libraryAccountService.getFees();
if (fees) {
this.amount = fees.amount;
this.fines = await this.cleanUp(fees.fee);
}
} catch {
await this.libraryAccountService.handleError();
}
}
}
@@ -1,55 +0,0 @@
<!--
~ Copyright (C) 2022 StApps
~ This program is free software: you can redistribute it and/or modify it
~ under the terms of the GNU General Public License as published by the Free
~ Software Foundation, version 3.
~
~ This program is distributed in the hope that it will be useful, but WITHOUT
~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
~ more details.
~
~ You should have received a copy of the GNU General Public License along with
~ this program. If not, see <https://www.gnu.org/licenses/>.
-->
<ion-header>
<ion-toolbar color="primary" mode="ios">
<ion-buttons slot="start">
<ion-back-button></ion-back-button>
</ion-buttons>
<ion-title>{{ 'library.account.pages.fines.title' | translate | titlecase }}</ion-title>
</ion-toolbar>
</ion-header>
<ion-content>
@if (fines) {
<ion-list>
@for (fine of fines; track fine) {
<stapps-fee-item [fee]="fine"></stapps-fee-item>
}
</ion-list>
} @else {
@for (_ of [0, 1]; track _) {
<stapps-skeleton-list-item [hideThumbnail]="true"></stapps-skeleton-list-item>
}
}
<ng-template #loading>
@for (_ of [0, 1]; track _) {
<stapps-skeleton-list-item [hideThumbnail]="true"></stapps-skeleton-list-item>
}
</ng-template>
<ion-grid>
@if (amount) {
<ion-row class="ion-float-right">
<ion-col size="auto"> {{ 'library.account.pages.fines.labels.total_amount' | translate }}: </ion-col>
<ion-col size="auto"> {{ amount }} </ion-col>
</ion-row>
} @else {
<ion-row class="ion-float-right">
<ion-col size="auto">
<ion-skeleton-text animated style="width: 100px"></ion-skeleton-text>
</ion-col>
</ion-row>
}
</ion-grid>
</ion-content>
@@ -1,10 +0,0 @@
import {Pipe, PipeTransform} from '@angular/core';
@Pipe({
name: 'firstLastName',
})
export class FirstLastNamePipe implements PipeTransform {
transform(value: string): unknown {
return value.split(', ').reverse().join(' ');
}
}
@@ -1,69 +0,0 @@
/*
* Copyright (C) 2023 StApps
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
* Software Foundation, version 3.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along with
* this program. If not, see <https://www.gnu.org/licenses/>.
*/
import {Component} from '@angular/core';
import {DocumentAction, PAIADocument, PAIADocumentStatus} from '../../types';
import {LibraryAccountService} from '../library-account.service';
type Segment = 'orders' | 'reservations';
@Component({
selector: 'stapps-holds',
templateUrl: './holds-page.html',
styleUrls: ['./holds-page.scss'],
})
export class HoldsPageComponent {
paiaDocuments?: PAIADocument[];
paiaDocumentStatus = PAIADocumentStatus;
activeSegment: Segment = 'orders';
constructor(private readonly libraryAccountService: LibraryAccountService) {}
async ionViewWillEnter(): Promise<void> {
await this.fetchItems(this.activeSegment);
}
async fetchItems(segment: Segment) {
this.activeSegment = segment;
this.paiaDocuments = undefined;
const itemsStatus =
segment === 'reservations'
? [PAIADocumentStatus.Reserved]
: [PAIADocumentStatus.Ordered, PAIADocumentStatus.Provided];
try {
// Prepare patron (status) for the items
await this.libraryAccountService.getPatron();
this.paiaDocuments = await this.libraryAccountService.getFilteredItems(itemsStatus);
} catch {
await this.libraryAccountService.handleError();
this.paiaDocuments = [];
}
}
toNumber = Number;
// eslint-disable-next-line @typescript-eslint/no-explicit-any
async segmentChanged(event: any) {
await this.fetchItems(event.detail.value);
}
async onDocumentAction(documentAction: DocumentAction) {
const answer = await this.libraryAccountService.handleDocumentAction(documentAction);
if (answer) await this.fetchItems(this.activeSegment);
}
}
@@ -1,71 +0,0 @@
<!--
~ Copyright (C) 2023 StApps
~ This program is free software: you can redistribute it and/or modify it
~ under the terms of the GNU General Public License as published by the Free
~ Software Foundation, version 3.
~
~ This program is distributed in the hope that it will be useful, but WITHOUT
~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
~ more details.
~
~ You should have received a copy of the GNU General Public License along with
~ this program. If not, see <https://www.gnu.org/licenses/>.
-->
<ion-header>
<ion-toolbar color="primary" mode="ios">
<ion-buttons slot="start">
<ion-back-button></ion-back-button>
</ion-buttons>
<ion-title>{{ 'library.account.pages.holds.title' | translate | titlecase }}</ion-title>
</ion-toolbar>
</ion-header>
<ion-content>
<ion-segment [(ngModel)]="activeSegment" (ionChange)="segmentChanged($event)" [value]="'orders'" mode="md">
<ion-segment-button [value]="'orders'">
<ion-label>{{ 'library.account.pages.holds.holds' | translate }}</ion-label>
</ion-segment-button>
<ion-segment-button [value]="'reservations'">
<ion-label>{{ 'library.account.pages.holds.reservations' | translate }}</ion-label>
</ion-segment-button>
</ion-segment>
@if (paiaDocuments && paiaDocuments.length > 0) {
<ion-list>
@switch (activeSegment) {
@case ('orders') {
@for (hold of paiaDocuments; track hold) {
<stapps-paia-item
[item]="hold"
[propertiesToShow]="['label', 'storage']"
(documentAction)="onDocumentAction($event)"
listName="holds"
>
</stapps-paia-item>
}
}
@case ('reservations') {
@for (hold of paiaDocuments; track hold) {
<stapps-paia-item
[item]="hold"
[propertiesToShow]="['label', 'starttime', 'storage', 'queue']"
(documentAction)="onDocumentAction($event)"
listName="holds"
>
</stapps-paia-item>
}
}
}
</ion-list>
} @else {
@if (!paiaDocuments) {
<stapps-skeleton-list-item [hideThumbnail]="true"></stapps-skeleton-list-item>
} @else {
@if (paiaDocuments && paiaDocuments.length === 0) {
<ion-label class="centered-message-container">
{{ 'search.nothing_found' | translate | titlecase }}
</ion-label>
}
}
}
</ion-content>
@@ -1,248 +0,0 @@
/*
* Copyright (C) 2023 StApps
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
* Software Foundation, version 3.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along with
* this program. If not, see <https://www.gnu.org/licenses/>.
*/
import {Injectable} from '@angular/core';
import {JQueryRequestor, Requestor} from '@openid/appauth';
import {
SCAuthorizationProviderType,
SCFeatureConfiguration,
SCFeatureConfigurationExtern,
} from '@openstapps/core';
import {
DocumentAction,
PAIADocument,
PAIADocumentStatus,
PAIAFees,
PAIAItems,
PAIAPatron,
PAIAPatronStatus,
} from '../types';
import {HebisDataProvider} from '../../hebis/hebis-data.provider';
import {PAIATokenResponse} from '../../auth/paia/paia-token-response';
import {AuthHelperService} from '../../auth/auth-helper.service';
import {ConfigProvider} from '../../config/config.provider';
import {TranslateService} from '@ngx-translate/core';
import {AlertController, ToastController} from '@ionic/angular/standalone';
import {HebisSearchResponse} from '../../hebis/protocol/response';
@Injectable({
providedIn: 'root',
})
export class LibraryAccountService {
/**
* Base url of the external service
*/
baseUrl: string;
/**
* Authorization provider type
*/
authType: SCAuthorizationProviderType;
/**
* Account (Patron) status
*/
private status?: PAIAPatronStatus;
constructor(
protected requestor: Requestor = new JQueryRequestor(),
private readonly hebisDataProvider: HebisDataProvider,
private readonly authHelper: AuthHelperService,
readonly configProvider: ConfigProvider,
private readonly translateService: TranslateService,
private readonly alertController: AlertController,
private readonly toastController: ToastController,
) {
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
const config: SCFeatureConfigurationExtern = (
configProvider.getValue('features') as SCFeatureConfiguration
).extern!.paia;
this.baseUrl = config.url;
this.authType = config.authProvider as SCAuthorizationProviderType;
}
async getPatron() {
const patronId = ((await this.getValidToken()) as PAIATokenResponse).patron;
const patron = {
...(await this.performRequest<PAIAPatron>(`${this.baseUrl}/{patron}`)),
id: patronId,
} as PAIAPatron;
// Refresh the status
this.status = Number(patron.status);
return patron;
}
async getPatronStatus() {
return this.status ?? (this.status = Number((await this.getPatron()).status) as PAIAPatronStatus);
}
async isActivePatron() {
return (await this.getPatronStatus()) === PAIAPatronStatus.Active;
}
async getItems() {
return this.performRequest<PAIAItems>(`${this.baseUrl}/{patron}/items`);
}
async getFees() {
return this.performRequest<PAIAFees>(`${this.baseUrl}/{patron}/fees`);
}
async getValidToken() {
return this.authHelper.getProvider(this.authType).getValidToken();
}
private async performRequest<T>(
urlTemplate: string,
method = 'GET',
data?: JQuery.PlainObject,
): Promise<T | undefined> {
const token = await this.getValidToken();
const url = urlTemplate.replace('{patron}', (token as PAIATokenResponse).patron);
const settings: JQueryAjaxSettings = {
url: url,
dataType: 'json',
method: method,
headers: {
'Authorization': `Bearer: ${token.accessToken}`,
'Content-Type': 'application/json',
},
};
if (method === 'POST') settings.data = data;
let result: T;
try {
result = await this.requestor.xhr(settings);
return result;
} catch {
void this.handleError();
}
return;
}
getRawId(input: string) {
return input.split(':').pop();
}
async getFilteredItems(documentStatus: PAIADocumentStatus[]) {
return (await this.getItems())?.doc.filter(document => {
return documentStatus.includes(Number(document.status) as PAIADocumentStatus);
});
}
async getDocumentFromHDS(edition: string) {
if (edition === undefined) {
return;
}
let response: HebisSearchResponse;
try {
response = await this.hebisDataProvider.hebisSearch(
{
query: this.getRawId(edition) as string,
page: 0,
},
{addPrefix: true},
);
return response.data[0];
} catch {
await this.handleError();
}
return;
}
async cancelReservation(document: PAIADocument) {
const result = await this.performRequest<void>(`${this.baseUrl}/{patron}/cancel`, 'POST', {
doc: [document],
});
if (result) {
void this.onSuccess('cancel');
}
}
async renewLending(document: PAIADocument) {
const result = await this.performRequest<void>(`${this.baseUrl}/{patron}/renew`, 'POST', {
doc: [document],
});
if (result) {
void this.onSuccess('renew');
}
}
async handleDocumentAction(documentAction: DocumentAction): Promise<boolean> {
return new Promise(async resolve => {
const handleDocument = () => {
switch (documentAction.action) {
case 'cancel': {
return this.cancelReservation(documentAction.doc);
break;
}
case 'renew': {
return this.renewLending(documentAction.doc);
}
}
};
const alert = await this.alertController.create({
buttons: [
{
role: 'cancel',
text: this.translateService.instant('abort'),
handler: () => {
resolve(false);
},
},
{
handler: async () => {
await handleDocument();
resolve(true);
},
text: this.translateService.instant('OK'),
},
],
header: this.translateService.instant(`library.account.actions.${documentAction.action}.header`),
message: this.translateService.instant(`library.account.actions.${documentAction.action}.text`, {
value:
documentAction.doc.about ??
this.translateService.instant(`library.account.actions.${documentAction.doc.about}.unknown_book`),
}),
});
await alert.present();
});
}
async handleError() {
const alert = await this.alertController.create({
header: this.translateService.instant('app.ui.ERROR'),
message: this.translateService.instant('app.errors.SERVICE'),
buttons: ['OK'],
});
await alert.present();
}
async onSuccess(action: DocumentAction['action']) {
const toast = await this.toastController.create({
message: this.translateService.instant(`library.account.actions.${action}.success`),
duration: 2000,
color: 'success',
});
await toast.present();
}
}
@@ -1,41 +0,0 @@
/*
* Copyright (C) 2023 StApps
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
* Software Foundation, version 3.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along with
* this program. If not, see <https://www.gnu.org/licenses/>.
*/
import {Component} from '@angular/core';
import {LibraryAccountService} from '../library-account.service';
import {PAIAPatron} from '../../types';
@Component({
selector: 'app-profile',
templateUrl: './profile-page.html',
styleUrls: ['./profile-page.scss'],
})
export class ProfilePageComponent {
patron?: PAIAPatron;
constructor(private readonly libraryAccountService: LibraryAccountService) {}
async ionViewWillEnter(): Promise<void> {
try {
this.patron = await this.libraryAccountService.getPatron();
} catch {
await this.libraryAccountService.handleError();
}
}
isUnlimitedExpiry(date = ''): boolean {
return new Date(date).getFullYear() === 9999;
}
}
@@ -1,75 +0,0 @@
<!--
~ Copyright (C) 2023 StApps
~ This program is free software: you can redistribute it and/or modify it
~ under the terms of the GNU General Public License as published by the Free
~ Software Foundation, version 3.
~
~ This program is distributed in the hope that it will be useful, but WITHOUT
~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
~ more details.
~
~ You should have received a copy of the GNU General Public License along with
~ this program. If not, see <https://www.gnu.org/licenses/>.
-->
<ion-header>
<ion-toolbar color="primary" mode="ios">
<ion-buttons slot="start">
<ion-back-button></ion-back-button>
</ion-buttons>
<ion-title>{{ 'library.account.pages.profile.title' | translate | titlecase }}</ion-title>
</ion-toolbar>
</ion-header>
<ion-content>
@if (patron) {
<ion-card>
<ion-card-content>
<ion-grid>
<ion-row>
<ion-col> {{ 'library.account.pages.profile.labels.id' | translate }}: </ion-col>
<ion-col>
{{ patron.id }}
</ion-col>
</ion-row>
<ion-row>
<ion-col> {{ 'library.account.pages.profile.labels.name' | translate }}: </ion-col>
<ion-col> {{ patron.name_details?.title ?? '' }} {{ patron.name }} </ion-col>
</ion-row>
@if (patron.email) {
<ion-row>
<ion-col> {{ 'library.account.pages.profile.labels.email' | translate }}: </ion-col>
<ion-col>
{{ patron.email }}
</ion-col>
</ion-row>
}
@if (patron.address) {
<ion-row>
<ion-col> {{ 'library.account.pages.profile.labels.address' | translate }}: </ion-col>
<ion-col>
{{ patron.address }}
</ion-col>
</ion-row>
}
@if (patron.expires) {
<ion-row>
<ion-col> {{ 'library.account.pages.profile.labels.expires' | translate }}: </ion-col>
<ion-col>
@if (isUnlimitedExpiry(patron.expires)) {
{{ 'library.account.pages.profile.values.unlimited' | translate }}
} @else {
{{ 'library.account.pages.profile.values.expires' | translate }}:&nbsp;{{
patron.expires | amDateFormat: 'll'
}}
}
</ion-col>
</ion-row>
}
</ion-grid>
</ion-card-content>
</ion-card>
} @else {
<stapps-skeleton-simple-card [title]="false" [lines]="4"> </stapps-skeleton-simple-card>
}
</ion-content>
@@ -1,131 +0,0 @@
/*
* Copyright (C) 2022 StApps
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
* Software Foundation, version 3.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along with
* this program. If not, see <https://www.gnu.org/licenses/>.
*/
import {NgModule} from '@angular/core';
import {CommonModule} from '@angular/common';
import {FormsModule} from '@angular/forms';
import {RouterModule, Routes} from '@angular/router';
import {TranslateModule} from '@ngx-translate/core';
import {LibraryAccountPageComponent} from './account/account.page';
import {ProfilePageComponent} from './account/profile/profile-page.component';
import {CheckedOutPageComponent} from './account/checked-out/checked-out-page.component';
import {HoldsPageComponent} from './account/holds/holds-page.component';
import {FinesPageComponent} from './account/fines/fines-page.component';
import {PAIAItemComponent} from './account/elements/paia-item/paiaitem.component';
import {FirstLastNamePipe} from './account/first-last-name.pipe';
import {AuthGuardService} from '../auth/auth-guard.service';
import {ProtectedRoutes} from '../auth/protected.routes';
import {MomentModule} from 'ngx-moment';
import {FeeItemComponent} from './account/elements/fee-item/fee-item.component';
import {DataModule} from '../data/data.module';
import {UtilModule} from '../../util/util.module';
import {
IonHeader,
IonToolbar,
IonButtons,
IonBackButton,
IonTitle,
IonContent,
IonSkeletonText,
IonItem,
IonGrid,
IonCol,
IonRow,
IonLabel,
IonCard,
IonCardContent,
IonList,
IonSegment,
IonSegmentButton,
IonButton,
IonBadge,
} from '@ionic/angular/standalone';
import {IonIconDirective} from 'src/app/util/ion-icon/ion-icon.directive';
const routes: ProtectedRoutes | Routes = [
{
path: 'library-account',
component: LibraryAccountPageComponent,
data: {authProvider: 'paia'},
canActivate: [AuthGuardService],
},
{
path: 'library-account/profile',
component: ProfilePageComponent,
data: {authProvider: 'paia'},
canActivate: [AuthGuardService],
},
{
path: 'library-account/checked-out',
component: CheckedOutPageComponent,
data: {authProvider: 'paia'},
canActivate: [AuthGuardService],
},
{
path: 'library-account/holds',
component: HoldsPageComponent,
data: {authProvider: 'paia'},
canActivate: [AuthGuardService],
},
{
path: 'library-account/fines',
component: FinesPageComponent,
data: {authProvider: 'paia'},
canActivate: [AuthGuardService],
},
];
@NgModule({
imports: [
CommonModule,
FormsModule,
IonIconDirective,
RouterModule.forChild(routes),
TranslateModule,
MomentModule,
DataModule,
UtilModule,
IonHeader,
IonBadge,
IonToolbar,
IonButtons,
IonBackButton,
IonTitle,
IonContent,
IonSkeletonText,
IonItem,
IonGrid,
IonCol,
IonRow,
IonLabel,
IonCard,
IonCardContent,
IonList,
IonSegment,
IonSegmentButton,
IonButton,
],
declarations: [
LibraryAccountPageComponent,
ProfilePageComponent,
CheckedOutPageComponent,
HoldsPageComponent,
FinesPageComponent,
PAIAItemComponent,
FirstLastNamePipe,
FeeItemComponent,
],
})
export class LibraryModule {}
@@ -1,103 +0,0 @@
/*
* Copyright (C) 2022 StApps
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
* Software Foundation, version 3.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along with
* this program. If not, see <https://www.gnu.org/licenses/>.
*/
export interface PAIAPatron {
id: string;
name: string;
email?: string;
address?: string;
expires?: string;
status?: PAIAPatronStatus;
type?: string;
note?: string;
// HeBIS specific property (not in PAIA documentation)
name_details?: {
firstname?: string;
lastname?: string;
gender?: string;
title?: string;
};
}
export enum PAIAPatronStatus {
Active = 0,
Inactive = 1,
InactiveExpired = 2,
InactiveOutstandingFees = 3,
InactiveExpiredOutstandingFees = 4,
}
/*
* Document representing a library item received from the HeBIS PAIA service
* TODO: would be good to standardize the items of HeBIS PAIA to match the official PAIA documentation
* e.g. status should be number (0-5), and queue, renewals, reminder should be numbers too
* https://gbv.github.io/paia/paia.html#documents
*/
export interface PAIADocument {
status: string;
item?: string;
edition?: string;
about?: string;
label?: string;
queue?: string;
renewals?: string;
reminder?: string;
starttime?: string;
duedate?: string;
cancancel?: boolean;
canrenew?: boolean;
storage?: string;
// with locations
condition?: unknown;
}
export interface PAIAItems {
doc: PAIADocument[];
}
export interface PAIAFee {
amount: string;
date?: string;
about?: string;
item?: string;
edition?: string;
feetype?: string;
feeid?: string;
}
export interface PAIAFees {
amount?: string;
fee: PAIAFee[];
}
export enum PAIADocumentStatus {
NoRelation = 0,
Reserved = 1,
Ordered = 2,
Held = 3,
Provided = 4,
Rejected = 5,
}
export interface DocumentAction {
action: 'cancel' | 'renew';
doc: PAIADocument;
}
export interface PAIADocumentVisualStatus {
color: 'warning' | 'success';
status: PAIADocumentStatus;
statusText: 'ordered' | 'ready';
}
@@ -17,7 +17,6 @@
[title]="'map.page.TITLE' | translate"
[placeholder]="'map.page.search_bar.placeholder' | translate"
[forcedFilter]="forcedFilter"
[navigation]="[]"
></stapps-search-page>
<ion-content id="map">
@@ -13,7 +13,6 @@
~ this program. If not, see <https://www.gnu.org/licenses/>.
-->
<stapps-search-page
[navigation]="[]"
[showDefaultData]="false"
[forcedFilter]="forcedFilter"
[backUrl]="'..'"
+1 -133
View File
@@ -67,14 +67,6 @@
"header": "Komplett ausloggen",
"message": "Du wurdest innerhalb der App ausgeloggt. Soll zudem die Browser Session beendet werden? Wähle im Zweifelsfall \"Ja\"."
}
},
"paia": {
"logged_in_success": "Erfolgreich ins Bibliothekskonto eingeloggt.",
"logged_out_success": "Erfolgreich aus dem Bibliothekskonto ausgeloggt.",
"log_out_alert": {
"header": "Ausgeloggt...",
"message": "Du wurdest aus der App ausgeloggt. Möchtest du Dich dazu vom Identitätsanbieter der Bibliothek in Deinem Browser ausloggen? Falls unsicher, bitte wähle \"Ja\"."
}
}
}
},
@@ -307,88 +299,6 @@
"EMPTY_CATALOG": "Keine Veranstaltung in diesem Bereich gefunden"
}
},
"library": {
"account": {
"title": "Bibliothekskonto",
"greeting": "Hallo",
"login": {
"success": "Du bist eingeloggt und kannst Dein Konto nutzen.",
"error": "Du bist nicht eingeloggt oder deine Sitzung ist abgelaufen."
},
"pages": {
"profile": {
"title": "Deine persönlichen Daten",
"labels": {
"id": "Bibliotheksausweisnummer",
"name": "Name",
"email": "E-Mail",
"address": "Adresse",
"expires": "Nutzungsberechtigung",
"status": "Status",
"type": "Typ",
"note": "Nachricht"
},
"values": {
"unlimited": "unbefristet",
"expires": "endet am"
}
},
"holds": {
"title": "Bestellungen und Vormerkungen",
"labels": {
"title": "Titel",
"about": "Mehr Informationen",
"label": "Signatur",
"starttime": "Vorgemerkt am",
"endtime": "Abzuholen bis",
"storage": "Abholtheke",
"queue": "Position in der Warteschlange"
},
"holds": "Bestellungen",
"reservations": "Vormerkungen",
"ordered": "Bestellt",
"ready": "Abholbereit"
},
"checked_out": {
"title": "Deine Ausleihen",
"labels": {
"title": "Titel",
"about": "Mehr Informationen",
"label": "Signatur",
"duedate": "Leihfristende",
"renewals": "Verlängerungen"
}
},
"fines": {
"title": "Gebühren",
"labels": {
"amount": "Betrag",
"about": "Information",
"date": "Leihfristende",
"item": "Artikel",
"edition": "Ausgabe",
"feetype": "Gebührenart",
"feeid": "Gebühren ID",
"total_amount": "Gesamtbetrag"
}
}
},
"actions": {
"cancel": {
"header": "Vormerkung löschen",
"text": "Soll die Vormerkung von \"{{value}}\" gelöscht werden?",
"unknown_book": "unbekannter Titel",
"success": "Vormerkung erfolgreich gelöscht."
},
"renew": {
"header": "Ausleihfrist verlängern",
"text": "Soll die Ausleihfrist von \"{{value}}\" verlängert werden?",
"unknown_book": "unbekannter Titel",
"success": "Ausleihfrist erfolgreich verlängert."
}
}
}
},
"menu": {
"context": {
"title": "Kontext Menü",
@@ -419,7 +329,7 @@
"title": "Mensa"
},
"search": {
"title": "Universal Suche",
"title": "Suche",
"type": "Suche",
"search_bar": {
"placeholder": "Veranstaltungen, Personen, Orte und mehr"
@@ -427,44 +337,6 @@
"instruction": "Finde alle Informationen rund ums Studium und den Campus",
"nothing_found": "Keine Ergebnisse"
},
"hebisSearch": {
"title": "Bibliothekssuche",
"type": "Bibliothek",
"search_bar": {
"placeholder": "Bücher, mehrteilige Werke, Zeitschriften und mehr"
},
"instruction": "Durchsuche den Katalog der Bibliothek",
"nothing_found": "Keine Ergebnisse",
"detail": {
"title": "Titel",
"description": "Umfang",
"firstPublished": "Erscheinungsjahr"
},
"daia": {
"availability": "Verfügbarkeit",
"status": "Status",
"status_states": {
"checked_out": "ausgeliehen",
"not_yet_available": "noch nicht verfügbar",
"not_available": "nicht verfügbar",
"library_only": "nur vor Ort benutzbar",
"available": "ausleihbar",
"unknown": "unbekannt"
},
"dueDate": "Leihfristende",
"location": "Standort",
"signature": "Signatur",
"comment": "Kommentar",
"order": "bestellen",
"reserve": "vormerken",
"issn": "ISSN",
"ejournal": "ejournal",
"unknownAvailability": "Keine Information vorhanden",
"unavailableAvailability": "System nicht erreichbar",
"fulltext": "Zum Volltext",
"holdings": "Bestand"
}
},
"schedule": {
"toCalendar": {
"reviewModal": {
@@ -529,10 +401,6 @@
"default": {
"log_in": "Login",
"log_out": "Ausloggen"
},
"paia": {
"log_in": "Login Bibliothek",
"log_out": "Ausloggen (Bibliothek)"
}
},
"userInfo": {
+1 -133
View File
@@ -67,14 +67,6 @@
"header": "Complete logout",
"message": "You are now logged out in your app. Do you want to log out from your identity provider as well? If unsure, please choose \"Yes\"."
}
},
"paia": {
"logged_in_success": "Successfully logged in to library.",
"logged_out_success": "Successfully logged out from library.",
"log_out_alert": {
"header": "Logged out...",
"message": "You are now logged out within the app. Do you also want to end the browser session? If in doubt, choose \"Yes\"."
}
}
}
},
@@ -307,88 +299,6 @@
"EMPTY_CATALOG": "No events were found in this area"
}
},
"library": {
"account": {
"title": "library account",
"greeting": "Hello",
"login": {
"success": "You are logged-in and ready to access your account.",
"error": "Not logged in or login expired."
},
"pages": {
"profile": {
"title": "library profile",
"labels": {
"id": "Card number",
"name": "Name",
"email": "Email",
"address": "Address",
"expires": "Membership",
"status": "Status",
"type": "Type",
"note": "Note"
},
"values": {
"unlimited": "unlimited",
"expires": "expires"
}
},
"holds": {
"title": "Orders and reservations",
"labels": {
"title": "Title",
"about": "More information",
"label": "Shelfmark",
"starttime": "Reserved on",
"endtime": "Available for pickup until",
"storage": "Pickup counter",
"queue": "Position in the queue"
},
"holds": "orders",
"reservations": "reservations",
"ordered": "Ordered",
"ready": "Ready for pickup"
},
"checked_out": {
"title": "checked out items",
"labels": {
"title": "Title",
"about": "More information",
"label": "Label",
"duedate": "Due date",
"renewals": "Renewals"
}
},
"fines": {
"title": "fines",
"labels": {
"amount": "Amount",
"about": "About",
"date": "Due date",
"item": "Item",
"edition": "Edition",
"feetype": "Fee type",
"feeid": "Fee ID",
"total_amount": "Total amount"
}
}
},
"actions": {
"cancel": {
"header": "Cancel reservation",
"text": "Are you sure you want to extend the lending period of \"{{value}}\"?",
"unknown_book": "unknown title",
"success": "Reservation cancelled successfully."
},
"renew": {
"header": "Extend lending period",
"text": "Are you sure you want to extend the lending period of \"{{value}}\"?",
"unknown_book": "unknown title",
"success": "Lending period extended successfully."
}
}
}
},
"menu": {
"context": {
"title": "context menu",
@@ -419,7 +329,7 @@
"title": "Canteens"
},
"search": {
"title": "Universal Search",
"title": "Search",
"type": "Search",
"search_bar": {
"placeholder": "Events, places, persons and more"
@@ -427,44 +337,6 @@
"instruction": "Find all information related to your studies and campus",
"nothing_found": "No results"
},
"hebisSearch": {
"title": "Library Search",
"type": "Library",
"search_bar": {
"placeholder": "Books, journals, multipart items and more"
},
"instruction": "Search through the vast library catalogue",
"nothing_found": "No results",
"detail": {
"title": "Title",
"description": "Scope",
"firstPublished": "Year of publication"
},
"daia": {
"availability": "Availability",
"status": "Status",
"status_states": {
"checked_out": "checked out",
"not_yet_available": "not yet available",
"not_available": "not available",
"library_only": "for use in library only",
"available": "available",
"unknown": "unknown"
},
"dueDate": "Due date",
"location": "Location",
"signature": "Shelfmark",
"comment": "Remark",
"order": "request",
"reserve": "reserve",
"issn": "ISSN",
"ejournal": "ejournal",
"unknownAvailability": "No information available",
"unavailableAvailability": "System unreachable",
"fulltext": "Full text",
"holdings": "Holdings"
}
},
"schedule": {
"toCalendar": {
"reviewModal": {
@@ -529,10 +401,6 @@
"default": {
"log_in": "Login",
"log_out": "Logout"
},
"paia": {
"log_in": "Library Login",
"log_out": "Log Out (Library)"
}
},
"userInfo": {
@@ -158,75 +158,4 @@ export const profilePageSections: SCSection[] = [
},
...SCSectionConstantValues,
},
{
name: 'Library',
authProvider: 'paia',
links: [
{
name: 'Library Catalog',
icon: SCIcon.local_library,
link: ['/hebis-search'],
translations: {
de: {
name: 'Bibliotheks-katalog',
},
},
...SCSectionLinkConstantValues,
},
{
name: 'Library Account',
icon: SCIcon.badge,
needsAuth: true,
link: ['/library-account/profile'],
translations: {
de: {
name: 'Bibliotheks-konto',
},
},
...SCSectionLinkConstantValues,
},
{
name: 'Orders & Reservations',
icon: SCIcon.collections_bookmark,
needsAuth: true,
link: ['/library-account/holds'],
translations: {
de: {
name: 'Bestellungen & Vormerkungen',
},
},
...SCSectionLinkConstantValues,
},
{
name: 'Checked out items',
icon: SCIcon.library_books,
needsAuth: true,
link: ['/library-account/checked-out'],
translations: {
de: {
name: 'Deine Ausleihen',
},
},
...SCSectionLinkConstantValues,
},
{
name: 'Fines',
icon: SCIcon.request_page,
needsAuth: true,
link: ['/library-account/fines'],
translations: {
de: {
name: 'Gebühren',
},
},
...SCSectionLinkConstantValues,
},
],
translations: {
de: {
name: 'Bibliothek',
},
},
...SCSectionConstantValues,
},
];
+20 -50
View File
@@ -4,6 +4,10 @@ settings:
autoInstallPeers: true
excludeLinksFromLockfile: false
overrides:
handlebars@>=4.0.0 <=4.7.8: '>=4.7.9'
tar@<=7.5.18: '>=7.5.19'
pnpmfileChecksum: sha256-97djGzv9LU819ru7JavDNwxjBxa692PveFwWYet5Sbg=
importers:
@@ -5851,10 +5855,6 @@ packages:
chownr@1.1.4:
resolution: {integrity: sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==}
chownr@2.0.0:
resolution: {integrity: sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==}
engines: {node: '>=10'}
chownr@3.0.0:
resolution: {integrity: sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g==}
engines: {node: '>=18'}
@@ -7415,10 +7415,6 @@ packages:
resolution: {integrity: sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==}
engines: {node: '>=10'}
fs-minipass@2.1.0:
resolution: {integrity: sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==}
engines: {node: '>= 8'}
fs-minipass@3.0.3:
resolution: {integrity: sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==}
engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
@@ -7636,8 +7632,8 @@ packages:
handle-thing@2.0.1:
resolution: {integrity: sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==}
handlebars@4.7.8:
resolution: {integrity: sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ==}
handlebars@4.7.9:
resolution: {integrity: sha512-4E71E0rpOaQuJR2A3xDZ+GM1HyWYv1clR58tC8emQNeQe3RH7MAzSbat+V0wG78LQBo6m6bzSG/L4pBuCsgnUQ==}
engines: {node: '>=0.4.7'}
hasBin: true
@@ -9090,10 +9086,6 @@ packages:
resolution: {integrity: sha512-fNzuVyifolSLFL4NzpF+wEF4qrgqaaKX0haXPQEdQ7NKAN+WecoKMHV09YcuL/DHxrUsYQOK3MiuDf7Ip2OXfQ==}
engines: {node: '>=8'}
minipass@5.0.0:
resolution: {integrity: sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==}
engines: {node: '>=8'}
minipass@7.1.2:
resolution: {integrity: sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==}
engines: {node: '>=16 || 14 >=14.17'}
@@ -11098,13 +11090,8 @@ packages:
tar-stream@3.1.8:
resolution: {integrity: sha512-U6QpVRyCGHva435KoNWy9PRoi2IFYCgtEhq9nmrPPpbRacPs9IH4aJ3gbrFC8dPcXvdSZ4XXfXT5Fshbp2MtlQ==}
tar@6.2.1:
resolution: {integrity: sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==}
engines: {node: '>=10'}
deprecated: Old versions of tar are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me
tar@7.5.11:
resolution: {integrity: sha512-ChjMH33/KetonMTAtpYdgUFr0tbz69Fp2v7zWxQfYZX4g5ZN2nOBXm1R2xyA+lMIKrLKIoKAwFj93jE/avX9cQ==}
tar@7.5.22:
resolution: {integrity: sha512-MFO/QzvtAOmJbkhOaCTvbGcFN9L9b+JunIsDwaKljSOdcLMea3NJ1k9Usz/rjdfSXTq4dfzfeS7W4p4YOAAHeA==}
engines: {node: '>=18'}
tarr@1.1.0:
@@ -13933,7 +13920,7 @@ snapshots:
prompts: 2.4.2
rimraf: 4.4.1
semver: 7.6.0
tar: 6.2.1
tar: 7.5.22
tslib: 2.6.2
xml2js: 0.5.0
transitivePeerDependencies:
@@ -13955,7 +13942,7 @@ snapshots:
prompts: 2.4.2
rimraf: 6.1.3
semver: 7.7.4
tar: 7.5.11
tar: 7.5.22
tslib: 2.8.1
xml2js: 0.6.2
transitivePeerDependencies:
@@ -14207,7 +14194,7 @@ snapshots:
fast-glob: 3.3.3
fs-extra: 11.3.4
glob: 10.5.0
handlebars: 4.7.8
handlebars: 4.7.9
html-entities: 2.6.0
i18next: 23.16.8
json5: 2.2.3
@@ -14840,7 +14827,7 @@ snapshots:
ssh-config: 1.1.6
stream-combiner2: 1.1.1
superagent: 9.0.2
tar: 6.2.1
tar: 7.5.22
tslib: 2.6.2
transitivePeerDependencies:
- supports-color
@@ -16952,7 +16939,7 @@ snapshots:
minipass-pipeline: 1.2.4
p-map: 4.0.0
ssri: 10.0.6
tar: 6.2.1
tar: 7.5.22
unique-filename: 3.0.0
cacheable-lookup@7.0.0: {}
@@ -17105,8 +17092,6 @@ snapshots:
chownr@1.1.4: {}
chownr@2.0.0: {}
chownr@3.0.0: {}
chrome-trace-event@1.0.4: {}
@@ -17391,7 +17376,7 @@ snapshots:
dependencies:
conventional-commits-filter: 2.0.7
dateformat: 3.0.3
handlebars: 4.7.8
handlebars: 4.7.9
json-stringify-safe: 5.0.1
lodash: 4.17.21
meow: 8.1.2
@@ -19057,10 +19042,6 @@ snapshots:
jsonfile: 6.2.0
universalify: 2.0.1
fs-minipass@2.1.0:
dependencies:
minipass: 3.3.6
fs-minipass@3.0.3:
dependencies:
minipass: 7.1.3
@@ -19316,7 +19297,7 @@ snapshots:
handle-thing@2.0.1: {}
handlebars@4.7.8:
handlebars@4.7.9:
dependencies:
minimist: 1.2.8
neo-async: 2.6.2
@@ -20986,7 +20967,7 @@ snapshots:
minipass-fetch@3.0.5:
dependencies:
minipass: 7.1.2
minipass: 7.1.3
minipass-sized: 1.0.3
minizlib: 2.1.2
optionalDependencies:
@@ -21010,8 +20991,6 @@ snapshots:
minipass@4.2.8: {}
minipass@5.0.0: {}
minipass@7.1.2: {}
minipass@7.1.3: {}
@@ -21294,7 +21273,7 @@ snapshots:
nopt: 7.2.1
proc-log: 4.2.0
semver: 7.7.4
tar: 6.2.1
tar: 7.5.22
which: 4.0.0
transitivePeerDependencies:
- supports-color
@@ -21641,7 +21620,7 @@ snapshots:
promise-retry: 2.0.1
sigstore: 2.3.1
ssri: 10.0.6
tar: 6.2.1
tar: 7.5.22
transitivePeerDependencies:
- bluebird
- supports-color
@@ -23421,16 +23400,7 @@ snapshots:
- bare-buffer
- react-native-b4a
tar@6.2.1:
dependencies:
chownr: 2.0.0
fs-minipass: 2.1.0
minipass: 5.0.0
minizlib: 2.1.2
mkdirp: 1.0.4
yallist: 4.0.0
tar@7.5.11:
tar@7.5.22:
dependencies:
'@isaacs/fs-minipass': 4.0.1
chownr: 3.0.0
@@ -23842,7 +23812,7 @@ snapshots:
typedoc@0.18.0(typescript@3.8.3):
dependencies:
fs-extra: 9.1.0
handlebars: 4.7.8
handlebars: 4.7.9
highlight.js: 10.7.3
lodash: 4.17.21
lunr: 2.3.9
+8
View File
@@ -6,6 +6,10 @@ packages:
- packages/*
- images/*
auditConfig:
ignoreGhsas:
- GHSA-hmx5-qpq5-p643
forceLegacyDeploy: true
onlyBuiltDependencies:
@@ -20,3 +24,7 @@ onlyBuiltDependencies:
- sharp
- ssh2
- swiper
overrides:
handlebars@>=4.0.0 <=4.7.8: '>=4.7.9'
tar@<=7.5.18: '>=7.5.19'