Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

records: edit metadata of files #262

Merged
merged 1 commit into from
Sep 18, 2020
Merged

records: edit metadata of files #262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 23 additions & 1 deletion projects/ng-core-tester/src/app/app-routing.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,23 @@ const aggregations = (agg: object) => {
return of(agg);
};

/**
* Filter files list (callback function called in Array.prototype.filter)
*/
const filterFilesList = (file: any): boolean => {
return file.key.indexOf('.pdf') !== -1;
};

const orderFilesList = (a: any, b: any) => {
if (a.metadata.order < b.metadata.order) {
return -1;
}
if (a.metadata.order > b.metadata.order) {
return 1;
}
return 0;
};

/**
* Returned matched URL.
*
Expand Down Expand Up @@ -257,7 +274,12 @@ const routes: Routes = [
itemHeaders: {
'Content-Type': 'application/rero+json'
},
filesEnabled: true,
files: {
enabled: true,
filterList: filterFilesList,
orderList: orderFilesList,
infoExcludedFields: ['restriction', 'type']
},
searchFields: [
{
label: 'Full-text',
Expand Down
2 changes: 1 addition & 1 deletion projects/rero/ng-core/src/lib/record/detail/detail.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ export class DetailComponent implements OnInit, OnDestroy {
* @returns True if file management is enabled.
*/
get filesEnabled(): boolean {
return this._config.filesEnabled ? this._config.filesEnabled : false;
return this._config.files && this._config.files.enabled ? this._config.files.enabled : false;
}

/**
Expand Down
70 changes: 54 additions & 16 deletions projects/rero/ng-core/src/lib/record/files/files.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ <h5 class="m-0" translate>Files</h5>
<ng-container *ngFor="let file of files">
<li class="list-group-item" *ngIf="showItem(file)">
<div class="row">
<div class="col-sm-8" [ngClass]="{ 'pl-5 text-muted': !file.is_head }">
<div class="col-sm-6" [ngClass]="{ 'pl-5 text-muted': !file.is_head }">
<p class="m-0">
{{ file.key }}
<a href="#" class="ml-2" (click)="$event.preventDefault(); file.showInfo = !file.showInfo">
Expand All @@ -34,24 +34,15 @@ <h5 class="m-0" translate>Files</h5>
<i class="fa fa-history"></i>
</a>
</p>
<dl class="row mt-2 mb-0" *ngIf="file.showInfo">
<dt class="col-sm-3" translate>Size</dt>
<dd class="col-sm-9">{{ file.size | filesize }}</dd>

<dt class="col-sm-3" translate>Mime type</dt>
<dd class="col-sm-9">{{ file.mimetype }}</dd>

<dt class="col-sm-3" translate>Checksum</dt>
<dd class="col-sm-9">{{ file.checksum }}</dd>

<dt class="col-sm-3" translate>Modified at</dt>
<dd class="col-sm-9">{{ file.updated | dateTranslate:'medium' }}</dd>
</dl>
</div>
<div class="col-sm-4 text-right">
<button class="btn btn-sm btn-outline-primary" (click)="manageFile(file)">
<div class="col-sm-6 text-right">
<button class="btn btn-sm btn-outline-primary" (click)="editMetadata(file)"
*ngIf="file.is_head && file.metadata">
<i class="fa fa-pencil mr-1"></i>{{ 'Edit' | translate }}
</button>
<button class="btn btn-sm btn-outline-primary ml-1" (click)="manageFile(file)" *ngIf="file.is_head">
<i class="fa fa-upload mr-1"></i>{{ 'New version' | translate }}
</button>
<a [href]="getFileUrl(file)" target="_blank" class="btn btn-sm btn-outline-primary ml-1" download>
<i class="fa fa-download mr-1"></i>{{ 'Download' | translate }}
</a>
Expand All @@ -60,6 +51,33 @@ <h5 class="m-0" translate>Files</h5>
</button>
</div>
</div>
<div class="row mt-2" *ngIf="file.showInfo">
<div class="col-lg-6" *ngIf="file.is_head">
<dl class="row mt-2 mb-0">
<ng-container *ngFor="let item of file.metadata | keyvalue">
<ng-container *ngIf="!infoExcludedFields.includes(item.key) && item.value">
<dt class="col-sm-4">{{ item.key | translate }}</dt>
<dd class="col-sm-8">{{ item.value }}</dd>
</ng-container>
</ng-container>
</dl>
</div>
<div class="col-lg-6"[ngClass]="{ 'pl-5 text-muted': !file.is_head }">
<dl class="row mt-2 mb-0">
<dt class="col-sm-4" translate>Size</dt>
<dd class="col-sm-8">{{ file.size | filesize }}</dd>

<dt class="col-sm-4" translate>Mime type</dt>
<dd class="col-sm-8">{{ file.mimetype }}</dd>

<dt class="col-sm-4" translate>Checksum</dt>
<dd class="col-sm-8">{{ file.checksum }}</dd>

<dt class="col-sm-4" translate>Modified at</dt>
<dd class="col-sm-8">{{ file.updated | dateTranslate:'medium' }}</dd>
</dl>
</div>
</div>
</li>
</ng-container>
</ul>
Expand Down Expand Up @@ -105,3 +123,23 @@ <h4 class="modal-title pull-left">{{ currentFile ? currentFile.key : 'Add a new
</div>
</div>
</ng-template>

<ng-template #metadataFormModal>
<div class="modal-header">
<h4 class="modal-title pull-left">{{ metadataForm.model.key }}</h4>
<button type="button" class="close pull-right" aria-label="Close" (click)="formModalRef.hide()">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
<form [formGroup]="metadataForm.form" (ngSubmit)="saveMetadata()">
<formly-form [form]="metadataForm.form" [model]="metadataForm.model" [fields]="metadataForm.fields"></formly-form>
<div class="text-center">
<button type="submit" class="btn btn-primary btn-block">
<i class="fa fa-floppy-o mr-2"></i>
{{ 'Save' | translate }}
</button>
</div>
</form>
</div>
</ng-template>
10 changes: 10 additions & 0 deletions projects/rero/ng-core/src/lib/record/files/files.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,33 +16,43 @@
*/
import { HttpClientTestingModule } from '@angular/common/http/testing';
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { RouterTestingModule } from '@angular/router/testing';
import {
TranslateFakeLoader,
TranslateLoader,
TranslateModule
} from '@ngx-translate/core';
import { RecordUiService } from '../record-ui.service';
import { RecordModule } from '../record.module';
import { RecordFilesComponent } from './files.component';

describe('RecordFilesComponent', () => {
let component: RecordFilesComponent;
let fixture: ComponentFixture<RecordFilesComponent>;

const recordUiServiceSpy = jasmine.createSpyObj('RecordUiService', [
'getResourceConfig',
]);
recordUiServiceSpy.getResourceConfig.and.returnValue({ key: 'documents', files: { enabled: true } });

beforeEach(async(() => {
TestBed.configureTestingModule({
imports: [
RecordModule,
HttpClientTestingModule,
RouterTestingModule,
TranslateModule.forRoot({
loader: { provide: TranslateLoader, useClass: TranslateFakeLoader },
}),
],
providers: [{ provide: RecordUiService, useValue: recordUiServiceSpy }],
}).compileComponents();
}));

beforeEach(() => {
fixture = TestBed.createComponent(RecordFilesComponent);
component = fixture.componentInstance;
component.type = 'documents';
fixture.detectChanges();
});

Expand Down
Loading