Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring

This commit is contained in:
Diamantis Tziotzios 2024-04-12 18:16:43 +03:00
commit c19fc7276b
4 changed files with 26 additions and 147 deletions

View File

@ -14,8 +14,6 @@ spring:
optional:classpath:config/keycloak.yml[.yml], optional:classpath:config/keycloak-${spring.profiles.active}.yml[.yml], optional:file:../config/keycloak-${spring.profiles.active}.yml[.yml], optional:classpath:config/keycloak.yml[.yml], optional:classpath:config/keycloak-${spring.profiles.active}.yml[.yml], optional:file:../config/keycloak-${spring.profiles.active}.yml[.yml],
optional:classpath:config/logging.yml[.yml], optional:classpath:config/logging-${spring.profiles.active}.yml[.yml], optional:file:../config/logging-${spring.profiles.active}.yml[.yml], optional:classpath:config/logging.yml[.yml], optional:classpath:config/logging-${spring.profiles.active}.yml[.yml], optional:file:../config/logging-${spring.profiles.active}.yml[.yml],
optional:classpath:config/cache.yml[.yml], optional:classpath:config/cache-${spring.profiles.active}.yml[.yml], optional:file:../config/cache-${spring.profiles.active}.yml[.yml], optional:classpath:config/cache.yml[.yml], optional:classpath:config/cache-${spring.profiles.active}.yml[.yml], optional:file:../config/cache-${spring.profiles.active}.yml[.yml],
optional:classpath:config/actuator.yml[.yml], optional:classpath:config/actuator-${spring.profiles.active}.yml[.yml], optional:file:../config/actuator-${spring.profiles.active}.yml[.yml],
optional:classpath:config/email.yml[.yml], optional:classpath:config/email-${spring.profiles.active}.yml[.yml], optional:file:../config/email-${spring.profiles.active}.yml[.yml],
optional:classpath:config/elasticsearch.yml[.yml], optional:classpath:config/elasticsearch-${spring.profiles.active}.yml[.yml], optional:file:../config/elasticsearch-${spring.profiles.active}.yml[.yml], optional:classpath:config/elasticsearch.yml[.yml], optional:classpath:config/elasticsearch-${spring.profiles.active}.yml[.yml], optional:file:../config/elasticsearch-${spring.profiles.active}.yml[.yml],
optional:classpath:config/idpclaims.yml[.yml], optional:classpath:config/idpclaims-${spring.profiles.active}.yml[.yml], optional:file:../config/idpclaims-${spring.profiles.active}.yml[.yml], optional:classpath:config/idpclaims.yml[.yml], optional:classpath:config/idpclaims-${spring.profiles.active}.yml[.yml], optional:file:../config/idpclaims-${spring.profiles.active}.yml[.yml],
optional:classpath:config/external.yml[.yml], optional:classpath:config/external-${spring.profiles.active}.yml[.yml], optional:file:../config/external-${spring.profiles.active}.yml[.yml], optional:classpath:config/external.yml[.yml], optional:classpath:config/external-${spring.profiles.active}.yml[.yml], optional:file:../config/external-${spring.profiles.active}.yml[.yml],

View File

@ -41,7 +41,7 @@ queue:
generate-file-topic: generate.file generate-file-topic: generate.file
rabbitmq: rabbitmq:
enable: true enable: true
interval-seconds: 3 interval-seconds: 30
options: options:
retry-threashold: 100 retry-threashold: 100
retry-delay-step-seconds: 300 retry-delay-step-seconds: 300
@ -54,7 +54,7 @@ queue:
exchange: null exchange: null
rabbitmq: rabbitmq:
enable: true enable: true
interval-seconds: 3 interval-seconds: 30
options: options:
retry-threashold: 100 retry-threashold: 100
retry-delay-step-seconds: 300 retry-delay-step-seconds: 300

View File

@ -1,131 +0,0 @@
reference-type:
grant:
fields:
- code: startDate
dataType: Date
- code: endDate
dataType: Date
- code: pid
dataType: Text
- code: tag
dataType: Text
- code: key
dataType: Text
funder:
fields:
- code: uri
dataType: Text
- code: pid
dataType: Text
- code: tag
dataType: Text
- code: key
dataType: Text
researcher:
fields:
- code: pid
dataType: Text
- code: tag
dataType: Text
- code: key
dataType: Text
- code: firstName
dataType: Text
- code: lastName
dataType: Text
- code: uri
dataType: Text
service:
fields:
- code: pid
dataType: Text
- code: tag
dataType: Text
- code: key
dataType: Text
- code: uri
dataType: Text
registry:
fields:
- code: pid
dataType: Text
- code: tag
dataType: Text
- code: key
dataType: Text
- code: uri
dataType: Text
project:
fields:
- code: startDate
dataType: Date
- code: endDate
dataType: Date
organisation:
fields:
- code: tag
dataType: Text
- code: key
dataType: Text
- code: pid
dataType: Text
- code: uri
dataType: Text
- code: pidTypeField
dataType: Text
dataset:
fields:
- code: tag
dataType: Text
- code: key
dataType: Text
- code: pid
dataType: Text
- code: pidTypeField
dataType: Text
dataRepository:
fields:
- code: pid
dataType: Text
- code: tag
dataType: Text
- code: key
dataType: Text
pubRepository:
fields:
- code: pid
dataType: Text
- code: tag
dataType: Text
- code: key
dataType: Text
journal:
fields:
- code: pid
dataType: Text
- code: tag
dataType: Text
- code: key
dataType: Text
publication:
fields:
- code: tag
dataType: Text
- code: key
dataType: Text
- code: pid
dataType: Text
- code: pidTypeField
dataType: Text
licence:
fields:
- code: pid
dataType: Text
- code: tag
dataType: Text
- code: key
dataType: Text
- code: uri
dataType: Text
taxonomy:
fields:

View File

@ -7,35 +7,47 @@
<mat-menu #filterMenu> <mat-menu #filterMenu>
<div class="p-3" (click)="$event?.stopPropagation?.()"> <div class="container-fluid" (click)="$event?.stopPropagation?.()">
<div class="search-listing-filters-container"> <div class="row justify-content-between">
<div class="d-flex align-items-center justify-content-between"> <div class="col-auto mt-2">
<h4>{{'NOTIFICATION-SERVICE.INAPP-NOTIFICATION-LISTING.FILTER.TITLE' | translate}}</h4> <h4>{{'NOTIFICATION-SERVICE.INAPP-NOTIFICATION-LISTING.FILTER.TITLE' | translate}}</h4>
</div>
<div class="col-auto">
<button color="accent" mat-button (click)="clearFilters()"> <button color="accent" mat-button (click)="clearFilters()">
{{'COMMONS.LISTING-COMPONENT.CLEAR-ALL-FILTERS' | translate}} {{'COMMONS.LISTING-COMPONENT.CLEAR-ALL-FILTERS' | translate}}
</button> </button>
</div> </div>
</div>
<div> <div class="mt-3 row">
<mat-label>{{'NOTIFICATION-SERVICE.INAPP-NOTIFICATION-LISTING.FILTER.NOTIFICATION-TYPE' | translate}} <div class="col-12">
<mat-form-field class="w-100">
<mat-label>{{'NOTIFICATION-SERVICE.INAPP-NOTIFICATION-LISTING.FILTER.NOTIFICATION-TYPE' | translate}}</mat-label>
<mat-select multiple [(ngModel)]="internalFilters.type"> <mat-select multiple [(ngModel)]="internalFilters.type">
<mat-option *ngFor="let type of notificationTypeEnumValues" [value]="type">{{enumUtils.toNotificationTypeString(type)}}</mat-option> <mat-option *ngFor="let type of notificationTypeEnumValues" [value]="type">{{enumUtils.toNotificationTypeString(type)}}</mat-option>
</mat-select> </mat-select>
</mat-label> </mat-form-field>
</div> </div>
<div> </div>
<mat-label>{{'NOTIFICATION-SERVICE.INAPP-NOTIFICATION-LISTING.FILTER.TRACKING-STATE' | translate}} <div class="row">
<div class="col-12">
<mat-form-field class="w-100">
<mat-label>{{'NOTIFICATION-SERVICE.INAPP-NOTIFICATION-LISTING.FILTER.TRACKING-STATE' | translate}}</mat-label>
<mat-select multiple [(ngModel)]="internalFilters.trackingState"> <mat-select multiple [(ngModel)]="internalFilters.trackingState">
<mat-option *ngFor="let state of notificationInAppTrackingEnumValues" [value]="state">{{enumUtils.toNotificationInAppTrackingString(state)}}</mat-option> <mat-option *ngFor="let state of notificationInAppTrackingEnumValues" [value]="state">{{enumUtils.toNotificationInAppTrackingString(state)}}</mat-option>
</mat-select> </mat-select>
</mat-label> </mat-form-field>
</div> </div>
</div>
<div class="d-flex justify-content-end align-items-center mt-4 gap-1-rem"> <div class="row justify-content-end align-items-center mt-4 gap-1-rem">
<button mat-stroked-button color="primary" (click)="filterMenuTrigger?.closeMenu()"> <div class="col-auto">
<button class="normal-btn-light-sm" (click)="filterMenuTrigger?.closeMenu()">
{{'NOTIFICATION-SERVICE.INAPP-NOTIFICATION-LISTING.FILTER.CANCEL' | translate}} {{'NOTIFICATION-SERVICE.INAPP-NOTIFICATION-LISTING.FILTER.CANCEL' | translate}}
</button> </button>
<button mat-raised-button color="primary" (click)="filterMenuTrigger.closeMenu(); applyFilters();"> </div>
<div class="col-auto">
<button class="normal-btn-sm" (click)="filterMenuTrigger.closeMenu(); applyFilters();">
{{'NOTIFICATION-SERVICE.INAPP-NOTIFICATION-LISTING.FILTER.APPLY-FILTERS' | translate}} {{'NOTIFICATION-SERVICE.INAPP-NOTIFICATION-LISTING.FILTER.APPLY-FILTERS' | translate}}
</button> </button>
</div> </div>