Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@
"jsonschema": "1.4.0",
"jwt-decode": "^3.1.2",
"klaro": "^0.7.10",
"lindat-common": "^1.5.0",
"lodash": "^4.17.21",
"mirador": "^3.3.0",
"mirador-dl-plugin": "^0.13.0",
Expand Down Expand Up @@ -129,6 +130,7 @@
"@angular/cli": "~11.2.15",
"@angular/compiler-cli": "~11.2.14",
"@angular/language-service": "~11.2.14",
"@angular/material": "^11.2.13",
"@cypress/schematic": "^1.5.0",
"@fortawesome/fontawesome-free": "^5.5.0",
"@ngrx/store-devtools": "^11.1.1",
Expand Down
3 changes: 3 additions & 0 deletions src/app/admin/admin-sidebar/admin-sidebar.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@
<div class="shortcut-icon navbar-brand logo-wrapper">
<img class="admin-logo" src="assets/images/dspace-logo-mini.svg"
[alt]="('menu.header.image.logo') | translate">
<!-- <a href="https://www.clarin.eu/">-->
<!-- <img class="clarin-logo" src="assets/images/clarin-logo.svg" alt="Clarin logo" >-->
<!-- </a>-->
</div>
<div class="sidebar-collapsible navbar-brand">
<div class="mr-0">
Expand Down
5 changes: 5 additions & 0 deletions src/app/admin/admin-sidebar/admin-sidebar.component.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
.clarin-logo {
height: var(--ds-login-logo-height);
width: var(--ds-login-logo-width);
}

:host {
--ds-icon-z-index: 10;

Expand Down
20 changes: 13 additions & 7 deletions src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,12 @@ import { PageInternalServerErrorComponent } from './page-internal-server-error/p
import { DtqTestExampleComponent } from './dtq-test-example/dtq-test-example.component';

import { APP_CONFIG, AppConfig } from '../config/app-config.interface';
import { DevTableComponent } from './dev-table/dev-table.component';
import {MatTableModule} from '@angular/material/table';
import {MatTreeModule} from '@angular/material/tree';
import {MatIconModule} from '@angular/material/icon';
import {MatButtonModule} from '@angular/material/button';
import {ScrollingModule} from '@angular/cdk/scrolling';

export function getConfig() {
return environment;
Expand Down Expand Up @@ -187,27 +193,27 @@ const DECLARATIONS = [
IdleModalComponent,
ThemedPageInternalServerErrorComponent,
PageInternalServerErrorComponent,
DtqTestExampleComponent
DtqTestExampleComponent,
];

const EXPORTS = [
];

@NgModule({
imports: [
BrowserModule.withServerTransition({ appId: 'dspace-angular' }),
...IMPORTS
BrowserModule.withServerTransition({appId: 'dspace-angular'}),
...IMPORTS,
],
providers: [
...PROVIDERS
],
declarations: [
...DECLARATIONS,
],
exports: [
...EXPORTS,
...DECLARATIONS,
]
exports: [
...EXPORTS,
...DECLARATIONS,
]
})
export class AppModule {

Expand Down
210 changes: 210 additions & 0 deletions src/app/dev-table/dev-progress.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,210 @@
{
"Submission extensions": {
"percentage": "100",
"status": "done",
"Different fields for different types of submission": {
"percentage": 100,
"status": "done"
},
"Retrieve information on complex fields": {
"percentage": 100,
"status": "done"
},
"Hints, examples, suggestions": {
"percentage": 100,
"status": "done"
},
"Handling of the unknown date or date range of an item": {
"percentage": 100,
"status": "done"
},
"OpenAIRE": {
"percentage": 100,
"status": "done"
},
"Sanity checks": {
"percentage": 100,
"status": "done"
},
"Admin only fields": {
"percentage": 100,
"status": "done"
},
"Upload CMDI file": {
"percentage": 100,
"status": "done"
},
"User friendly settings": {
"percentage": 100,
"status": "done"
},
"Support files over 2GB": {
"percentage": 100,
"status": "done"
}
},
"Dissemination extensions": {
"status": "done",
"percentage": 100,
"Harvestable metadata via OAI-PMH": {
"percentage": 100,
"status": "done"
},
"TombStone": {
"percentage": 100,
"status": "done"
},
"Item is hidden from search, harvestable only for oai": {
"percentage": 65,
"status": "done"
},
"Harvest CMDI metadata format": {
"percentage": 70,
"status": "done"
},
"Harvest OLAC metadata format": {
"percentage": 70,
"status": "done"
},
"Google scholar mapping metadata": {
"percentage": 70,
"status": "done"
}
},
"PIDs": {
"status": "done",
"percentage": 100,
"PIDs associat. to metadata records": {
"percentage": 100,
"status": "done"
},
"HTTP-accept header for content negotiation": {
"percentage": 100,
"status": "done"
},
"Return directly cmdi": {
"percentage": 100,
"status": "done"
},
"Config handle prefix for communities": {
"percentage": 100,
"status": "done"
},
"Manage handle table": {
"percentage": 100,
"status": "done"
},
"Support DOIs": {
"percentage": 100,
"status": "done"
}
},
"Licensing Framework": {
"percentage": 60,
"status": "waiting",
"License administrator": {
"percentage": 0,
"status": "done"
},
"Choose license in submission process": {
"percentage": 0,
"status": "waiting"
},
"Item view - show item license": {
"percentage": 30,
"status": "waiting"
},
"Technical support for restricted items": {
"percentage": 0,
"status": "not-done"
},
"Attach/dettach license to/from item": {
"percentage": 0,
"status": "not-done"
},
"New search filter option in search page - Licenses": {
"percentage": 0,
"status": "not-done"
}
},
"Statistics": {
"percentage": 0,
"status": "not-done",
"Bitstream downloads": {
"percentage": 0,
"status": "not-done"
},
"Stat based on Matomo Analytics": {
"percentage": 0,
"status": "not-done"
}
},
"Look&Feel": {
"percentage": 0,
"status": "not-done",
"Support Ref Table citations - CMDI, bib": {
"percentage": 0,
"status": "not-done"
},
"After DB update, OAI gets updated": {
"percentage": 0,
"status": "not-done"
},
"Item view shows versioning": {
"percentage": 0,
"status": "not-done"
},
"Create new version of item": {
"percentage": 0,
"status": "not-done"
}
},
"Data downloads": {
"percentage": 0,
"status": "not-done",
"Resumable downloads, restrictive": {
"percentage": 0,
"status": "not-done"
}
},
"AAI using Shibboleth": {
"percentage": 0,
"status": "not-done",
"Federated SSO, authorization via Shibboleth": {
"percentage": 11,
"status": "not-done"
},
"Page with a list of released attributes (from IdP)": {
"percentage": 0,
"status": "not-done"
},
"Item deposit by registered users only": {
"percentage": 0,
"status": "not-done"
},
"Is it possible to hide item?": {
"percentage": 0,
"status": "not-done"
},
"Implement GÉANT.. - DP-CoC": {
"percentage": 0,
"status": "not-done"
},
"Login - select federated login": {
"percentage": 0,
"status": "not-done"
}
},
"Unicode Support": {
"percentage": 0,
"status": "not-done",
"DSpace should support UTF-8": {
"percentage": 0,
"status": "not-done"
},
"Multilingual Support": {
"percentage": 0,
"status": "not-done"
}
}
}
47 changes: 47 additions & 0 deletions src/app/dev-table/dev-table.component.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
<h1>Modifications being done:</h1>
<!--<span class="material-icons done">thumb_up</span>-->
<!--<span class="material-icons done">check</span>-->
<!--<span class="material-icons waiting">query_builder</span>-->
<!--<span class="material-icons not-done">close</span>-->
<!--<span class="material-icons not-done"></span>-->
<!--<span class="material-icons">help</span>-->
<div id="scroll-dev-table">
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
<mat-tree [dataSource]="nestedDataSource" [treeControl]="nestedTreeControl" class="example-tree">
<mat-tree-node *matTreeNodeDef="let node" matTreeNodeToggle>
<li class="mat-tree-node {{node.status}}">
<button mat-icon-button disabled>
<mat-icon class="mat-icon-rtl-mirror">
remove
</mat-icon>
</button>
{{node.taskName + node.getParsedPercentage()}}
<span *ngIf="node.status=='done'" class="material-icons done" >check</span>
<span *ngIf="node.status=='waiting'" class="material-icons waiting">query_builder</span>
<span *ngIf="node.status=='not-done'" class="material-icons not-done">close</span>
<span *ngIf="node.status=='unspecified'" class="material-icons unspecified">help</span>
</li>
</mat-tree-node>

<mat-nested-tree-node *matTreeNodeDef="let node; when: hasNestedChild">
<li>
<div class="mat-tree-node {{node.status}}">
<button mat-icon-button matTreeNodeToggle
[attr.aria-label]="'toggle ' + node.taskName">
<mat-icon class="mat-icon-rtl-mirror">
{{nestedTreeControl.isExpanded(node) ? 'expand_more' : 'chevron_right'}}
</mat-icon>
</button>
{{node.taskName + node.getParsedPercentage()}}
<span *ngIf="node.status=='done'" class="material-icons done" >check</span>
<span *ngIf="node.status=='waiting'" class="material-icons waiting">query_builder</span>
<span *ngIf="node.status=='not-done'" class="material-icons not-done">close</span>
<span *ngIf="node.status=='unspecified'" class="material-icons unspecified">help</span>
</div>
<ul [class.example-tree-invisible]="!nestedTreeControl.isExpanded(node)">
<ng-container matTreeNodeOutlet></ng-container>
</ul>
</li>
</mat-nested-tree-node>
</mat-tree>
</div>
Loading