mirror of
https://github.com/DSpace/dspace-angular.git
synced 2025-10-08 02:24:11 +00:00
Resolve conflicts after merge of part 1
This commit is contained in:
FrancescoMolinaro
@@ -6,7 +6,7 @@ export const REGISTRIES_MODULE_PATH = 'registries';
|
||||
export const NOTIFICATIONS_MODULE_PATH = 'notifications';
|
||||
export const LDN_PATH = 'ldn';
|
||||
export const REPORTS_MODULE_PATH = 'reports';
|
||||
|
||||
export const NOTIFY_DASHBOARD_MODULE_PATH = 'notify-dashboard';
|
||||
|
||||
|
||||
export function getRegistriesModuleRoute() {
|
||||
|
||||
@@ -8,7 +8,7 @@ import { I18nBreadcrumbsService } from '../core/breadcrumbs/i18n-breadcrumbs.ser
|
||||
import { AdminCurationTasksComponent } from './admin-curation-tasks/admin-curation-tasks.component';
|
||||
import {
|
||||
LDN_PATH,
|
||||
NOTIFICATIONS_MODULE_PATH,
|
||||
NOTIFICATIONS_MODULE_PATH, NOTIFY_DASHBOARD_MODULE_PATH,
|
||||
REGISTRIES_MODULE_PATH, REPORTS_MODULE_PATH,
|
||||
} from './admin-routing-paths';
|
||||
import { BatchImportPageComponent } from './admin-import-batch-page/batch-import-page.component';
|
||||
@@ -88,6 +88,11 @@ import {
|
||||
loadChildren: () => import('./admin-reports/admin-reports.module')
|
||||
.then((m) => m.AdminReportsModule),
|
||||
},
|
||||
{
|
||||
path: NOTIFY_DASHBOARD_MODULE_PATH,
|
||||
loadChildren: () => import('./admin-notify-dashboard/admin-notify-dashboard.module')
|
||||
.then((m) => m.AdminNotifyDashboardModule),
|
||||
},
|
||||
])
|
||||
],
|
||||
providers: [
|
||||
|
||||
@@ -198,6 +198,7 @@ import { NotifyRequestsStatus } from '../item-page/simple/notify-requests-status
|
||||
import { LdnService } from '../admin/admin-ldn-services/ldn-services-model/ldn-services.model';
|
||||
import { Itemfilter } from '../admin/admin-ldn-services/ldn-services-model/ldn-service-itemfilters';
|
||||
import { SubmissionCoarNotifyConfig } from '../submission/sections/section-coar-notify/submission-coar-notify.config';
|
||||
import { AdminNotifyMessage } from "../admin/admin-notify-dashboard/models/admin-notify-message.model";
|
||||
|
||||
/**
|
||||
* When not in production, endpoint responses can be mocked for testing purposes
|
||||
@@ -411,6 +412,7 @@ export const models =
|
||||
Itemfilter,
|
||||
SubmissionCoarNotifyConfig,
|
||||
NotifyRequestsStatus,
|
||||
AdminNotifyMessage
|
||||
];
|
||||
|
||||
@NgModule({
|
||||
|
||||
@@ -368,18 +368,40 @@ export class MenuResolver implements Resolve<boolean> {
|
||||
icon: 'terminal',
|
||||
index: 10
|
||||
},
|
||||
/* COAR Notify section */
|
||||
{
|
||||
id: 'coar_notify',
|
||||
active: false,
|
||||
visible: isSiteAdmin,
|
||||
model: {
|
||||
type: MenuItemType.TEXT,
|
||||
text: 'menu.section.coar_notify'
|
||||
} as TextMenuItemModel,
|
||||
icon: 'inbox',
|
||||
index: 13
|
||||
},
|
||||
{
|
||||
id: 'notify_dashboard',
|
||||
active: false,
|
||||
parentID: 'coar_notify',
|
||||
visible: isSiteAdmin,
|
||||
model: {
|
||||
type: MenuItemType.LINK,
|
||||
text: 'menu.section.notify_dashboard',
|
||||
link: '/admin/notify-dashboard'
|
||||
} as LinkMenuItemModel,
|
||||
},
|
||||
/* LDN Services */
|
||||
{
|
||||
id: 'ldn_services',
|
||||
active: false,
|
||||
parentID: 'coar_notify',
|
||||
visible: isSiteAdmin && isCoarNotifyEnabled,
|
||||
model: {
|
||||
type: MenuItemType.LINK,
|
||||
text: 'menu.section.services',
|
||||
link: '/admin/ldn/services'
|
||||
} as LinkMenuItemModel,
|
||||
icon: 'inbox',
|
||||
index: 14
|
||||
},
|
||||
{
|
||||
id: 'health',
|
||||
|
||||
@@ -1,190 +0,0 @@
|
||||
import { SuggestionsService } from './suggestions.service';
|
||||
import { AuthService } from '../../core/auth/auth.service';
|
||||
import { ResearcherProfileDataService } from '../../core/profile/researcher-profile-data.service';
|
||||
|
||||
import { TestScheduler } from 'rxjs/testing';
|
||||
import { getTestScheduler } from 'jasmine-marbles';
|
||||
import { of as observableOf } from 'rxjs';
|
||||
import { FindListOptions } from '../../core/data/find-list-options.model';
|
||||
import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
|
||||
import { ResearcherProfile } from '../../core/profile/model/researcher-profile.model';
|
||||
import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
|
||||
import { WorkspaceitemDataService } from '../../core/submission/workspaceitem-data.service';
|
||||
import { mockSuggestionPublicationOne } from '../../shared/mocks/reciter-suggestion.mock';
|
||||
import { ResourceType } from '../../core/shared/resource-type';
|
||||
import { SuggestionsDataService } from '../../core/notifications/reciter-suggestions/suggestions-data.service';
|
||||
import {
|
||||
SuggestionSourceDataService
|
||||
} from '../../core/notifications/reciter-suggestions/source/suggestion-source-data.service';
|
||||
import {
|
||||
SuggestionTargetDataService
|
||||
} from '../../core/notifications/reciter-suggestions/target/suggestion-target-data.service';
|
||||
import { SuggestionTarget } from '../../core/notifications/reciter-suggestions/models/suggestion-target.model';
|
||||
|
||||
|
||||
describe('SuggestionsService test', () => {
|
||||
let scheduler: TestScheduler;
|
||||
let service: SuggestionsService;
|
||||
let authService: AuthService;
|
||||
let researcherProfileService: ResearcherProfileDataService;
|
||||
let suggestionsDataService: SuggestionsDataService;
|
||||
let suggestionSourceDataService: SuggestionSourceDataService;
|
||||
let suggestionTargetDataService: SuggestionTargetDataService;
|
||||
let translateService: any = {
|
||||
instant: (str) => str,
|
||||
};
|
||||
const suggestionTarget = {
|
||||
id: '1234:4321',
|
||||
display: 'display',
|
||||
source: 'source',
|
||||
total: 8,
|
||||
type: new ResourceType('suggestiontarget')
|
||||
};
|
||||
|
||||
const mockResercherProfile = {
|
||||
id: '1234',
|
||||
uuid: '1234',
|
||||
visible: true
|
||||
};
|
||||
|
||||
function initTestService() {
|
||||
return new SuggestionsService(
|
||||
authService,
|
||||
researcherProfileService,
|
||||
suggestionsDataService,
|
||||
suggestionSourceDataService,
|
||||
suggestionTargetDataService,
|
||||
translateService
|
||||
);
|
||||
}
|
||||
|
||||
beforeEach(() => {
|
||||
scheduler = getTestScheduler();
|
||||
|
||||
|
||||
suggestionSourceDataService = jasmine.createSpyObj('suggestionSourcesDataService', {
|
||||
getSources: observableOf(null),
|
||||
});
|
||||
|
||||
researcherProfileService = jasmine.createSpyObj('researcherProfileService', {
|
||||
findById: createSuccessfulRemoteDataObject$(mockResercherProfile as ResearcherProfile),
|
||||
findRelatedItemId: observableOf('1234'),
|
||||
});
|
||||
|
||||
suggestionTargetDataService = jasmine.createSpyObj('suggestionTargetsDataService', {
|
||||
getTargets: observableOf(null),
|
||||
findById: observableOf(null),
|
||||
});
|
||||
|
||||
suggestionsDataService = jasmine.createSpyObj('suggestionsDataService', {
|
||||
searchBy: observableOf(null),
|
||||
delete: observableOf(null),
|
||||
deleteSuggestion: createSuccessfulRemoteDataObject$({}),
|
||||
getSuggestionsByTargetAndSource : observableOf(null),
|
||||
clearSuggestionRequests : null,
|
||||
getTargetsByUser: observableOf(null),
|
||||
});
|
||||
|
||||
service = initTestService();
|
||||
|
||||
});
|
||||
|
||||
describe('Suggestion service', () => {
|
||||
it('should create', () => {
|
||||
expect(service).toBeDefined();
|
||||
});
|
||||
|
||||
it('should get targets', () => {
|
||||
const sortOptions = new SortOptions('display', SortDirection.ASC);
|
||||
const findListOptions: FindListOptions = {
|
||||
elementsPerPage: 10,
|
||||
currentPage: 1,
|
||||
sort: sortOptions
|
||||
};
|
||||
service.getTargets('source', 10, 1);
|
||||
expect(suggestionTargetDataService.getTargets).toHaveBeenCalledWith('source', findListOptions);
|
||||
});
|
||||
|
||||
it('should get suggestions', () => {
|
||||
const sortOptions = new SortOptions('display', SortDirection.ASC);
|
||||
const findListOptions: FindListOptions = {
|
||||
elementsPerPage: 10,
|
||||
currentPage: 1,
|
||||
sort: sortOptions
|
||||
};
|
||||
service.getSuggestions('source:target', 10, 1, sortOptions);
|
||||
expect(suggestionsDataService.getSuggestionsByTargetAndSource).toHaveBeenCalledWith('target', 'source', findListOptions);
|
||||
});
|
||||
|
||||
it('should clear suggestions', () => {
|
||||
service.clearSuggestionRequests();
|
||||
expect(suggestionsDataService.clearSuggestionRequests).toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it('should delete reviewed suggestion', () => {
|
||||
service.deleteReviewedSuggestion('1234');
|
||||
expect(suggestionsDataService.deleteSuggestion).toHaveBeenCalledWith('1234');
|
||||
});
|
||||
|
||||
it('should retrieve current user suggestions', () => {
|
||||
service.retrieveCurrentUserSuggestions('1234');
|
||||
expect(researcherProfileService.findById).toHaveBeenCalledWith('1234');
|
||||
});
|
||||
|
||||
it('should approve and import suggestion', () => {
|
||||
spyOn(service, 'resolveCollectionId');
|
||||
const workspaceitemService = {importExternalSourceEntry: (x,y) => observableOf(null)};
|
||||
service.approveAndImport(workspaceitemService as unknown as WorkspaceitemDataService, mockSuggestionPublicationOne, '1234');
|
||||
expect(service.resolveCollectionId).toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it('should approve and import suggestions', () => {
|
||||
spyOn(service, 'approveAndImport');
|
||||
const workspaceitemService = {importExternalSourceEntry: (x,y) => observableOf(null)};
|
||||
service.approveAndImportMultiple(workspaceitemService as unknown as WorkspaceitemDataService, [mockSuggestionPublicationOne], '1234');
|
||||
expect(service.approveAndImport).toHaveBeenCalledWith(workspaceitemService as unknown as WorkspaceitemDataService, mockSuggestionPublicationOne, '1234');
|
||||
});
|
||||
|
||||
it('should delete suggestion', () => {
|
||||
spyOn(service, 'deleteReviewedSuggestion').and.returnValue(createSuccessfulRemoteDataObject$({}));
|
||||
service.notMine('1234');
|
||||
expect(service.deleteReviewedSuggestion).toHaveBeenCalledWith('1234');
|
||||
});
|
||||
|
||||
it('should delete suggestions', () => {
|
||||
spyOn(service, 'notMine');
|
||||
service.notMineMultiple([mockSuggestionPublicationOne]);
|
||||
expect(service.notMine).toHaveBeenCalledWith(mockSuggestionPublicationOne.id);
|
||||
});
|
||||
|
||||
it('should get target Uuid', () => {
|
||||
expect(service.getTargetUuid(suggestionTarget as SuggestionTarget)).toBe('4321');
|
||||
expect(service.getTargetUuid({id: ''} as SuggestionTarget)).toBe(null);
|
||||
});
|
||||
|
||||
it('should get suggestion interpolation', () => {
|
||||
const result = service.getNotificationSuggestionInterpolation(suggestionTarget as SuggestionTarget);
|
||||
expect(result.count).toEqual(suggestionTarget.total);
|
||||
expect(result.source).toEqual('reciter.suggestion.source.' + suggestionTarget.source);
|
||||
expect(result.type).toEqual('reciter.suggestion.type.' + suggestionTarget.source);
|
||||
expect(result.suggestionId).toEqual(suggestionTarget.id);
|
||||
expect(result.displayName).toEqual(suggestionTarget.display);
|
||||
});
|
||||
|
||||
it('should translate suggestion type', () => {
|
||||
expect(service.translateSuggestionType('source')).toEqual('reciter.suggestion.type.source');
|
||||
});
|
||||
|
||||
it('should translate suggestion source', () => {
|
||||
expect(service.translateSuggestionSource('source')).toEqual('reciter.suggestion.source.source');
|
||||
});
|
||||
|
||||
it('should resolve collection id', () => {
|
||||
expect(service.resolveCollectionId(mockSuggestionPublicationOne, '1234')).toEqual('1234');
|
||||
});
|
||||
|
||||
it('should check if collection is fixed', () => {
|
||||
expect(service.isCollectionFixed([mockSuggestionPublicationOne])).toBeFalse();
|
||||
});
|
||||
});
|
||||
});
|
||||
@@ -23,7 +23,7 @@
|
||||
</div>
|
||||
<div id="search-content" class="col-12">
|
||||
<div class="d-block d-md-none search-controls clearfix">
|
||||
<ds-view-mode-switch *ngIf="inPlaceSearch" [viewModeList]="viewModeList"
|
||||
<ds-view-mode-switch *ngIf="inPlaceSearch && showViewModes" [viewModeList]="viewModeList"
|
||||
[inPlaceSearch]="inPlaceSearch"></ds-view-mode-switch>
|
||||
<button (click)="openSidebar()" aria-controls="#search-body"
|
||||
class="btn btn-outline-primary float-right open-sidebar"><i
|
||||
@@ -31,7 +31,8 @@
|
||||
| translate}}
|
||||
</button>
|
||||
</div>
|
||||
<ds-themed-search-results *ngIf="inPlaceSearch" [searchResults]="resultsRD$ | async"
|
||||
<ds-themed-search-results *ngIf="inPlaceSearch"
|
||||
[searchResults]="resultsRD$ | async"
|
||||
[searchConfig]="searchOptions$ | async"
|
||||
[configuration]="(currentConfiguration$ | async)"
|
||||
[disableHeader]="!searchEnabled"
|
||||
|
||||
@@ -287,6 +287,20 @@ import { QualityAssuranceSourceDataService } from '../core/notifications/qa/sour
|
||||
import { DynamicComponentLoaderDirective } from './abstract-component-loader/dynamic-component-loader.directive';
|
||||
import { StartsWithLoaderComponent } from './starts-with/starts-with-loader.component';
|
||||
import { IpV4Validator } from './utils/ipV4.validator';
|
||||
import { ObjectTableComponent } from "./object-table/object-table.component";
|
||||
import {
|
||||
AbstractTabulatableElementComponent
|
||||
} from "./object-collection/shared/objects-collection-tabulatable/objects-collection-tabulatable.component";
|
||||
import {
|
||||
TabulatableObjectsLoaderComponent
|
||||
} from "./object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component";
|
||||
import {
|
||||
TabulatableResultListElementsComponent
|
||||
} from "./object-list/search-result-list-element/tabulatable-search-result/tabulatable-result-list-elements.component";
|
||||
import {
|
||||
TabulatableObjectsDirective
|
||||
} from "./object-collection/shared/tabulatable-objects/tabulatable-objects.directive";
|
||||
import { NotificationBoxComponent } from "./notification-box/notification-box.component";
|
||||
|
||||
const MODULES = [
|
||||
CommonModule,
|
||||
@@ -350,7 +364,9 @@ const COMPONENTS = [
|
||||
ThemedObjectListComponent,
|
||||
ObjectDetailComponent,
|
||||
ObjectGridComponent,
|
||||
ObjectTableComponent,
|
||||
AbstractListableElementComponent,
|
||||
AbstractTabulatableElementComponent,
|
||||
ObjectCollectionComponent,
|
||||
PaginationComponent,
|
||||
RSSComponent,
|
||||
@@ -416,6 +432,7 @@ const ENTRY_COMPONENTS = [
|
||||
CollectionListElementComponent,
|
||||
CommunityListElementComponent,
|
||||
SearchResultListElementComponent,
|
||||
TabulatableResultListElementsComponent,
|
||||
CommunitySearchResultListElementComponent,
|
||||
CollectionSearchResultListElementComponent,
|
||||
CollectionGridElementComponent,
|
||||
@@ -471,7 +488,9 @@ const ENTRY_COMPONENTS = [
|
||||
AdvancedClaimedTaskActionRatingComponent,
|
||||
EpersonGroupListComponent,
|
||||
EpersonSearchBoxComponent,
|
||||
GroupSearchBoxComponent
|
||||
GroupSearchBoxComponent,
|
||||
NotificationBoxComponent,
|
||||
TabulatableObjectsLoaderComponent,
|
||||
];
|
||||
|
||||
const PROVIDERS = [
|
||||
@@ -498,6 +517,7 @@ const DIRECTIVES = [
|
||||
ContextHelpDirective,
|
||||
DynamicComponentLoaderDirective,
|
||||
IpV4Validator,
|
||||
TabulatableObjectsDirective
|
||||
];
|
||||
|
||||
@NgModule({
|
||||
|
||||
@@ -6312,4 +6312,336 @@
|
||||
"advancesearch.form.submit": "Add",
|
||||
|
||||
"ldn.no-filter.label": "None",
|
||||
|
||||
"admin.notify.dashboard": "Dashboard",
|
||||
|
||||
"menu.section.notify_dashboard": "Dashboard",
|
||||
|
||||
"menu.section.coar_notify": "COAR Notify",
|
||||
|
||||
"admin-notify-dashboard.title": "Notify Dashboard",
|
||||
|
||||
"admin-notify-dashboard.description": "The Notify dashboard monitor the general usage of the COAR Notify protocol across the repository. In the “Metrics” tab are statistics about usage of the COAR Notify protocol. In the “Logs/Inbound” and “Logs/Outbound” tabs it’s possible to search and check the individual status of each LDN message, either received or sent.",
|
||||
|
||||
"admin-notify-dashboard.metrics": "Metrics",
|
||||
|
||||
"admin-notify-dashboard.received-ldn": "Number of received LDN",
|
||||
|
||||
"admin-notify-dashboard.generated-ldn": "Number of generated LDN",
|
||||
|
||||
"admin-notify-dashboard.NOTIFY.incoming.accepted": "Accepted",
|
||||
|
||||
"admin-notify-dashboard.NOTIFY.incoming.accepted.description": "Accepted inbound notifications",
|
||||
|
||||
"admin-notify-logs.NOTIFY.incoming.accepted": "Currently displaying: Accepted notifications",
|
||||
|
||||
"admin-notify-dashboard.NOTIFY.incoming.processed": "Processed LDN",
|
||||
|
||||
"admin-notify-dashboard.NOTIFY.incoming.processed.description": "Processed inbound notifications",
|
||||
|
||||
"admin-notify-logs.NOTIFY.incoming.processed": "Currently displaying: Processed LDN",
|
||||
|
||||
"admin-notify-logs.NOTIFY.incoming.failure": "Currently displaying: Failed notifications",
|
||||
|
||||
"admin-notify-dashboard.NOTIFY.incoming.failure": "Failure",
|
||||
|
||||
"admin-notify-dashboard.NOTIFY.incoming.failure.description": "Failed inbound notifications",
|
||||
|
||||
"admin-notify-logs.NOTIFY.outgoing.failure": "Currently displaying: Failed notifications",
|
||||
|
||||
"admin-notify-dashboard.NOTIFY.outgoing.failure": "Failure",
|
||||
|
||||
"admin-notify-dashboard.NOTIFY.outgoing.failure.description": "Failed outbound notifications",
|
||||
|
||||
"admin-notify-logs.NOTIFY.incoming.untrusted": "Currently displaying: Untrusted notifications",
|
||||
|
||||
"admin-notify-dashboard.NOTIFY.incoming.untrusted": "Untrusted",
|
||||
|
||||
"admin-notify-dashboard.NOTIFY.incoming.untrusted.description": "Inbound notifications not trusted",
|
||||
|
||||
"admin-notify-logs.NOTIFY.incoming.delivered": "Currently displaying: Delivered notifications",
|
||||
|
||||
"admin-notify-dashboard.NOTIFY.incoming.delivered.description": "Inbound notifications successfully delivered",
|
||||
|
||||
"admin-notify-dashboard.NOTIFY.outgoing.delivered": "Delivered",
|
||||
|
||||
"admin-notify-logs.NOTIFY.outgoing.delivered": "Currently displaying: Delivered notifications",
|
||||
|
||||
"admin-notify-dashboard.NOTIFY.outgoing.delivered.description": "Outbound notifications successfully delivered",
|
||||
|
||||
"admin-notify-logs.NOTIFY.outgoing.queued": "Currently displaying: Queued notifications",
|
||||
|
||||
"admin-notify-dashboard.NOTIFY.outgoing.queued.description": "Notifications currently queued",
|
||||
|
||||
"admin-notify-dashboard.NOTIFY.outgoing.queued": "Queued",
|
||||
|
||||
"admin-notify-logs.NOTIFY.outgoing.queued_for_retry": "Currently displaying: Queued for retry notifications",
|
||||
|
||||
"admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry": "Queued for retry",
|
||||
|
||||
"admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry.description": "Notifications currently queued for retry",
|
||||
|
||||
"admin-notify-dashboard.NOTIFY.incoming.involvedItems": "Involved items",
|
||||
|
||||
"admin-notify-dashboard.NOTIFY.incoming.involvedItems.description": "Items related to inbound notifications",
|
||||
|
||||
"admin-notify-dashboard.NOTIFY.outgoing.involvedItems": "Involved items",
|
||||
|
||||
"admin-notify-dashboard.NOTIFY.outgoing.involvedItems.description": "Items related to outbound notifications",
|
||||
|
||||
"admin.notify.dashboard.breadcrumbs": "Dashboard",
|
||||
|
||||
"admin.notify.dashboard.inbound": "Inbound messages",
|
||||
|
||||
"admin.notify.dashboard.inbound-logs": "Logs/Inbound",
|
||||
|
||||
"admin.notify.dashboard.filter": "Filter: ",
|
||||
|
||||
"search.filters.applied.f.relateditem": "Related items",
|
||||
|
||||
"search.filters.applied.f.ldn_service": "LDN Service",
|
||||
|
||||
"search.filters.applied.f.notifyReview": "Notify Review",
|
||||
|
||||
"search.filters.applied.f.notifyEndorsement": "Notify Endorsement",
|
||||
|
||||
"search.filters.applied.f.notifyRelation": "Notify Relation",
|
||||
|
||||
"search.filters.filter.queue_last_start_time.head": "Last processing time ",
|
||||
|
||||
"search.filters.filter.queue_last_start_time.min.label": "Min range",
|
||||
|
||||
"search.filters.filter.queue_last_start_time.max.label": "Max range",
|
||||
|
||||
"search.filters.applied.f.queue_last_start_time.min": "Min range",
|
||||
|
||||
"search.filters.applied.f.queue_last_start_time.max": "Max range",
|
||||
|
||||
"admin.notify.dashboard.outbound": "Outbound messages",
|
||||
|
||||
"admin.notify.dashboard.outbound-logs": "Logs/Outbound",
|
||||
|
||||
"NOTIFY.incoming.search.results.head": "Incoming",
|
||||
|
||||
"search.filters.filter.relateditem.head": "Related item",
|
||||
|
||||
"search.filters.filter.origin.head": "Origin",
|
||||
|
||||
"search.filters.filter.ldn_service.head": "LDN Service",
|
||||
|
||||
"search.filters.filter.target.head": "Target",
|
||||
|
||||
"search.filters.filter.queue_status.head": "Queue status",
|
||||
|
||||
"search.filters.filter.activity_stream_type.head": "Activity stream type",
|
||||
|
||||
"search.filters.filter.coar_notify_type.head": "COAR Notify type",
|
||||
|
||||
"search.filters.filter.notification_type.head": "Notification type",
|
||||
|
||||
"search.filters.filter.relateditem.label": "Search related items",
|
||||
|
||||
"search.filters.filter.queue_status.label": "Search queue status",
|
||||
|
||||
"search.filters.filter.target.label": "Search target",
|
||||
|
||||
"search.filters.filter.activity_stream_type.label": "Search activity stream type",
|
||||
|
||||
"search.filters.applied.f.queue_status": "Queue Status",
|
||||
|
||||
"search.filters.queue_status.0,authority": "Untrusted Ip",
|
||||
|
||||
"search.filters.queue_status.1,authority": "Queued",
|
||||
|
||||
"search.filters.queue_status.2,authority": "Processing",
|
||||
|
||||
"search.filters.queue_status.3,authority": "Processed",
|
||||
|
||||
"search.filters.queue_status.4,authority": "Failed",
|
||||
|
||||
"search.filters.queue_status.5,authority": "Untrusted",
|
||||
|
||||
"search.filters.queue_status.6,authority": "Unmapped Action",
|
||||
|
||||
"search.filters.queue_status.7,authority": "Queued for retry",
|
||||
|
||||
"search.filters.applied.f.activity_stream_type": "Activity stream type",
|
||||
|
||||
"search.filters.applied.f.coar_notify_type": "COAR Notify type",
|
||||
|
||||
"search.filters.applied.f.notification_type": "Notification type",
|
||||
|
||||
"search.filters.filter.coar_notify_type.label": "Search COAR Notify type",
|
||||
|
||||
"search.filters.filter.notification_type.label": "Search notification type",
|
||||
|
||||
"search.filters.filter.relateditem.placeholder": "Related items",
|
||||
|
||||
"search.filters.filter.target.placeholder": "Target",
|
||||
|
||||
"search.filters.filter.origin.label": "Search source",
|
||||
|
||||
"search.filters.filter.origin.placeholder": "Source",
|
||||
|
||||
"search.filters.filter.ldn_service.label": "Search LDN Service",
|
||||
|
||||
"search.filters.filter.ldn_service.placeholder": "LDN Service",
|
||||
|
||||
"search.filters.filter.queue_status.placeholder": "Queue status",
|
||||
|
||||
"search.filters.filter.activity_stream_type.placeholder": "Activity stream type",
|
||||
|
||||
"search.filters.filter.coar_notify_type.placeholder": "COAR Notify type",
|
||||
|
||||
"search.filters.filter.notification_type.placeholder": "Notification",
|
||||
|
||||
"search.filters.filter.notifyRelation.head": "Notify Relation",
|
||||
|
||||
"search.filters.filter.notifyRelation.label": "Search Notify Relation",
|
||||
|
||||
"search.filters.filter.notifyRelation.placeholder": "Notify Relation",
|
||||
|
||||
"search.filters.filter.notifyReview.head": "Notify Review",
|
||||
|
||||
"search.filters.filter.notifyReview.label": "Search Notify Review",
|
||||
|
||||
"search.filters.filter.notifyReview.placeholder": "Notify Review",
|
||||
|
||||
"search.filters.coar_notify_type.coar-notify:ReviewAction": "Review action",
|
||||
|
||||
"search.filters.coar_notify_type.coar-notify:ReviewAction,authority": "Review action",
|
||||
|
||||
"notify-detail-modal.coar-notify:ReviewAction": "Review action",
|
||||
|
||||
"search.filters.coar_notify_type.coar-notify:EndorsementAction": "Endorsement action",
|
||||
|
||||
"search.filters.coar_notify_type.coar-notify:EndorsementAction,authority": "Endorsement action",
|
||||
|
||||
"notify-detail-modal.coar-notify:EndorsementAction": "Endorsement action",
|
||||
|
||||
"search.filters.coar_notify_type.coar-notify:IngestAction": "Ingest action",
|
||||
|
||||
"search.filters.coar_notify_type.coar-notify:IngestAction,authority": "Ingest action",
|
||||
|
||||
"notify-detail-modal.coar-notify:IngestAction": "Ingest action",
|
||||
|
||||
"search.filters.coar_notify_type.coar-notify:RelationshipAction": "Relationship action",
|
||||
|
||||
"search.filters.coar_notify_type.coar-notify:RelationshipAction,authority": "Relationship action",
|
||||
|
||||
"notify-detail-modal.coar-notify:RelationshipAction": "Relationship action",
|
||||
|
||||
"search.filters.queue_status.QUEUE_STATUS_QUEUED": "Queued",
|
||||
|
||||
"notify-detail-modal.QUEUE_STATUS_QUEUED": "Queued",
|
||||
|
||||
"search.filters.queue_status.QUEUE_STATUS_QUEUED_FOR_RETRY": "Queued for retry",
|
||||
|
||||
"notify-detail-modal.QUEUE_STATUS_QUEUED_FOR_RETRY": "Queued for retry",
|
||||
|
||||
"search.filters.queue_status.QUEUE_STATUS_PROCESSING": "Processing",
|
||||
|
||||
"notify-detail-modal.QUEUE_STATUS_PROCESSING": "Processing",
|
||||
|
||||
"search.filters.queue_status.QUEUE_STATUS_PROCESSED": "Processed",
|
||||
|
||||
"notify-detail-modal.QUEUE_STATUS_PROCESSED": "Processed",
|
||||
|
||||
"search.filters.queue_status.QUEUE_STATUS_FAILED": "Failed",
|
||||
|
||||
"notify-detail-modal.QUEUE_STATUS_FAILED": "Failed",
|
||||
|
||||
"search.filters.queue_status.QUEUE_STATUS_UNTRUSTED": "Untrusted",
|
||||
|
||||
"search.filters.queue_status.QUEUE_STATUS_UNTRUSTED_IP": "Untrusted Ip",
|
||||
|
||||
"notify-detail-modal.QUEUE_STATUS_UNTRUSTED": "Untrusted",
|
||||
|
||||
"notify-detail-modal.QUEUE_STATUS_UNTRUSTED_IP": "Untrusted Ip",
|
||||
|
||||
"search.filters.queue_status.QUEUE_STATUS_UNMAPPED_ACTION": "Unmapped Action",
|
||||
|
||||
"notify-detail-modal.QUEUE_STATUS_UNMAPPED_ACTION": "Unmapped Action",
|
||||
|
||||
"sorting.queue_last_start_time.DESC": "Last started queue Descending",
|
||||
|
||||
"sorting.queue_last_start_time.ASC": "Last started queue Ascending",
|
||||
|
||||
"sorting.queue_attempts.DESC": "Queue attempted Descending",
|
||||
|
||||
"sorting.queue_attempts.ASC": "Queue attempted Ascending",
|
||||
|
||||
"NOTIFY.incoming.involvedItems.search.results.head": "Items involved in incoming LDN",
|
||||
|
||||
"NOTIFY.outgoing.involvedItems.search.results.head": "Items involved in outgoing LDN",
|
||||
|
||||
"type.notify-detail-modal": "Type",
|
||||
|
||||
"id.notify-detail-modal": "Id",
|
||||
|
||||
"coarNotifyType.notify-detail-modal": "COAR Notify type",
|
||||
|
||||
"activityStreamType.notify-detail-modal": "Activity stream type",
|
||||
|
||||
"inReplyTo.notify-detail-modal": "In reply to",
|
||||
|
||||
"object.notify-detail-modal": "Repository Item",
|
||||
|
||||
"context.notify-detail-modal": "Repository Item",
|
||||
|
||||
"queueAttempts.notify-detail-modal": "Queue attempts",
|
||||
|
||||
"queueLastStartTime.notify-detail-modal": "Queue last started",
|
||||
|
||||
"origin.notify-detail-modal": "LDN Service",
|
||||
|
||||
"target.notify-detail-modal": "LDN Service",
|
||||
|
||||
"queueStatusLabel.notify-detail-modal": "Queue status",
|
||||
|
||||
"queueTimeout.notify-detail-modal": "Queue timeout",
|
||||
|
||||
"notify-message-modal.title": "Message Detail",
|
||||
|
||||
"notify-message-modal.show-message": "Show message",
|
||||
|
||||
"notify-message-result.timestamp": "Timestamp",
|
||||
|
||||
"notify-message-result.repositoryItem": "Repository Item",
|
||||
|
||||
"notify-message-result.ldnService": "LDN Service",
|
||||
|
||||
"notify-message-result.type": "Type",
|
||||
|
||||
"notify-message-result.status": "Status",
|
||||
|
||||
"notify-message-result.action": "Action",
|
||||
|
||||
"notify-message-result.detail": "Detail",
|
||||
|
||||
"notify-message-result.reprocess": "Reprocess",
|
||||
|
||||
"notify-queue-status.processed": "Processed",
|
||||
|
||||
"notify-queue-status.failed": "Failed",
|
||||
|
||||
"notify-queue-status.queue_retry": "Queued for retry",
|
||||
|
||||
"notify-queue-status.unmapped_action": "Unmapped action",
|
||||
|
||||
"notify-queue-status.processing": "Processing",
|
||||
|
||||
"notify-queue-status.queued": "Queued",
|
||||
|
||||
"notify-queue-status.untrusted": "Untrusted",
|
||||
|
||||
"ldnService.notify-detail-modal": "LDN Service",
|
||||
|
||||
"relatedItem.notify-detail-modal": "Related Item",
|
||||
|
||||
"search.filters.filter.notifyEndorsement.head": "Notify Endorsement",
|
||||
|
||||
"search.filters.filter.notifyEndorsement.placeholder": "Notify Endorsement",
|
||||
|
||||
"search.filters.filter.notifyEndorsement.label": "Search Notify Endorsement"
|
||||
}
|
||||
|
||||
@@ -26,6 +26,9 @@ import { FilterVocabularyConfig } from './filter-vocabulary-config';
|
||||
import { DiscoverySortConfig } from './discovery-sort.config';
|
||||
import { QualityAssuranceConfig } from './quality-assurance.config';
|
||||
import { SearchConfig } from './search-page-config.interface';
|
||||
import {
|
||||
AdminNotifyMetricsRow
|
||||
} from "../app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.model";
|
||||
interface AppConfig extends Config {
|
||||
ui: UIServerConfig;
|
||||
rest: ServerConfig;
|
||||
@@ -55,6 +58,7 @@ interface AppConfig extends Config {
|
||||
comcolSelectionSort: DiscoverySortConfig;
|
||||
qualityAssuranceConfig: QualityAssuranceConfig;
|
||||
search: SearchConfig;
|
||||
notifyMetrics: AdminNotifyMetricsRow[];
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -26,6 +26,9 @@ import { DiscoverySortConfig } from './discovery-sort.config';
|
||||
import { CommunityPageConfig } from './community-page-config.interface';
|
||||
import { QualityAssuranceConfig } from './quality-assurance.config';
|
||||
import { SearchConfig } from './search-page-config.interface';
|
||||
import {
|
||||
AdminNotifyMetricsRow
|
||||
} from "../app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.model";
|
||||
export class DefaultAppConfig implements AppConfig {
|
||||
production = false;
|
||||
|
||||
@@ -506,4 +509,79 @@ export class DefaultAppConfig implements AppConfig {
|
||||
filter: ['title', 'author', 'subject', 'entityType']
|
||||
}
|
||||
};
|
||||
|
||||
notifyMetrics: AdminNotifyMetricsRow[] = [
|
||||
{
|
||||
title: 'admin-notify-dashboard.received-ldn',
|
||||
boxes: [
|
||||
{
|
||||
color: '#B8DAFF',
|
||||
title: 'admin-notify-dashboard.NOTIFY.incoming.accepted',
|
||||
config: 'NOTIFY.incoming.accepted',
|
||||
description: 'admin-notify-dashboard.NOTIFY.incoming.accepted.description'
|
||||
},
|
||||
{
|
||||
color: '#D4EDDA',
|
||||
title: 'admin-notify-dashboard.NOTIFY.incoming.processed',
|
||||
config: 'NOTIFY.incoming.processed',
|
||||
description: 'admin-notify-dashboard.NOTIFY.incoming.processed.description'
|
||||
},
|
||||
{
|
||||
color: '#FDBBC7',
|
||||
title: 'admin-notify-dashboard.NOTIFY.incoming.failure',
|
||||
config: 'NOTIFY.incoming.failure',
|
||||
description: 'admin-notify-dashboard.NOTIFY.incoming.failure.description'
|
||||
},
|
||||
{
|
||||
color: '#FDBBC7',
|
||||
title: 'admin-notify-dashboard.NOTIFY.incoming.untrusted',
|
||||
config: 'NOTIFY.incoming.untrusted',
|
||||
description: 'admin-notify-dashboard.NOTIFY.incoming.untrusted.description'
|
||||
},
|
||||
{
|
||||
color: '#43515F',
|
||||
title: 'admin-notify-dashboard.NOTIFY.incoming.involvedItems',
|
||||
textColor: '#fff',
|
||||
config: 'NOTIFY.incoming.involvedItems',
|
||||
description: 'admin-notify-dashboard.NOTIFY.incoming.involvedItems.description'
|
||||
},
|
||||
]
|
||||
},
|
||||
{
|
||||
title: 'admin-notify-dashboard.generated-ldn',
|
||||
boxes: [
|
||||
{
|
||||
color: '#D4EDDA',
|
||||
title: 'admin-notify-dashboard.NOTIFY.outgoing.delivered',
|
||||
config: 'NOTIFY.outgoing.delivered',
|
||||
description: 'admin-notify-dashboard.NOTIFY.outgoing.delivered.description'
|
||||
},
|
||||
{
|
||||
color: '#B8DAFF',
|
||||
title: 'admin-notify-dashboard.NOTIFY.outgoing.queued',
|
||||
config: 'NOTIFY.outgoing.queued',
|
||||
description: 'admin-notify-dashboard.NOTIFY.outgoing.queued.description'
|
||||
},
|
||||
{
|
||||
color: '#FDEEBB',
|
||||
title: 'admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry',
|
||||
config: 'NOTIFY.outgoing.queued_for_retry',
|
||||
description: 'admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry.description'
|
||||
},
|
||||
{
|
||||
color: '#FDBBC7',
|
||||
title: 'admin-notify-dashboard.NOTIFY.outgoing.failure',
|
||||
config: 'NOTIFY.outgoing.failure',
|
||||
description: 'admin-notify-dashboard.NOTIFY.outgoing.failure.description'
|
||||
},
|
||||
{
|
||||
color: '#43515F',
|
||||
title: 'admin-notify-dashboard.NOTIFY.outgoing.involvedItems',
|
||||
textColor: '#fff',
|
||||
config: 'NOTIFY.outgoing.involvedItems',
|
||||
description: 'admin-notify-dashboard.NOTIFY.outgoing.involvedItems.description'
|
||||
},
|
||||
]
|
||||
}
|
||||
];
|
||||
}
|
||||
|
||||
@@ -341,6 +341,80 @@ export const environment: BuildConfig = {
|
||||
enabled: false,
|
||||
filter: ['title', 'author', 'subject', 'entityType']
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
notifyMetrics: [
|
||||
{
|
||||
title: 'admin-notify-dashboard.received-ldn',
|
||||
boxes: [
|
||||
{
|
||||
color: '#B8DAFF',
|
||||
title: 'admin-notify-dashboard.NOTIFY.incoming.accepted',
|
||||
config: 'NOTIFY.incoming.accepted',
|
||||
description: 'admin-notify-dashboard.NOTIFY.incoming.accepted.description'
|
||||
},
|
||||
{
|
||||
color: '#D4EDDA',
|
||||
title: 'admin-notify-dashboard.NOTIFY.incoming.processed',
|
||||
config: 'NOTIFY.incoming.processed',
|
||||
description: 'admin-notify-dashboard.NOTIFY.incoming.processed.description'
|
||||
},
|
||||
{
|
||||
color: '#FDBBC7',
|
||||
title: 'admin-notify-dashboard.NOTIFY.incoming.failure',
|
||||
config: 'NOTIFY.incoming.failure',
|
||||
description: 'admin-notify-dashboard.NOTIFY.incoming.failure.description'
|
||||
},
|
||||
{
|
||||
color: '#FDBBC7',
|
||||
title: 'admin-notify-dashboard.NOTIFY.incoming.untrusted',
|
||||
config: 'NOTIFY.incoming.untrusted',
|
||||
description: 'admin-notify-dashboard.NOTIFY.incoming.untrusted.description'
|
||||
},
|
||||
{
|
||||
color: '#43515F',
|
||||
title: 'admin-notify-dashboard.NOTIFY.incoming.involvedItems',
|
||||
textColor: '#fff',
|
||||
config: 'NOTIFY.incoming.involvedItems',
|
||||
description: 'admin-notify-dashboard.NOTIFY.incoming.involvedItems.description'
|
||||
},
|
||||
]
|
||||
},
|
||||
{
|
||||
title: 'admin-notify-dashboard.generated-ldn',
|
||||
boxes: [
|
||||
{
|
||||
color: '#D4EDDA',
|
||||
title: 'admin-notify-dashboard.NOTIFY.outgoing.delivered',
|
||||
config: 'NOTIFY.outgoing.delivered',
|
||||
description: 'admin-notify-dashboard.NOTIFY.outgoing.delivered.description'
|
||||
},
|
||||
{
|
||||
color: '#B8DAFF',
|
||||
title: 'admin-notify-dashboard.NOTIFY.outgoing.queued',
|
||||
config: 'NOTIFY.outgoing.queued',
|
||||
description: 'admin-notify-dashboard.NOTIFY.outgoing.queued.description'
|
||||
},
|
||||
{
|
||||
color: '#FDEEBB',
|
||||
title: 'admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry',
|
||||
config: 'NOTIFY.outgoing.queued_for_retry',
|
||||
description: 'admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry.description'
|
||||
},
|
||||
{
|
||||
color: '#FDBBC7',
|
||||
title: 'admin-notify-dashboard.NOTIFY.outgoing.failure',
|
||||
config: 'NOTIFY.outgoing.failure',
|
||||
description: 'admin-notify-dashboard.NOTIFY.outgoing.failure.description'
|
||||
},
|
||||
{
|
||||
color: '#43515F',
|
||||
title: 'admin-notify-dashboard.NOTIFY.outgoing.involvedItems',
|
||||
textColor: '#fff',
|
||||
config: 'NOTIFY.outgoing.involvedItems',
|
||||
description: 'admin-notify-dashboard.NOTIFY.outgoing.involvedItems.description'
|
||||
},
|
||||
]
|
||||
}
|
||||
]
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user