Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
admin: uniformize fields display in detailed views
* Removes useless detailed views. * Redirects to the search view after record edition. * Uses short editor when it is possible. * Uses a generic component to display fields in detailed views. * Removes useless test files. Co-Authored-by: Johnny Mariéthoz <[email protected]>
- Loading branch information
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
|
|
||
| @if (field()) { | ||
| <div class="grid"> | ||
| <dt class="col-4">{{ label() }}</dt> | ||
| <dd class="col mb-0"> | ||
| @if(type() == 'array') { | ||
|
Check failure on line 6 in projects/sonar/src/app/core/field-description/field-description.component.html
|
||
| <ul class="list-none p-0 mb-0"> | ||
| @for (value of field(); track value; let last=$last; let index=$index) { | ||
| <li> | ||
| @if (template) { | ||
| <ng-container | ||
| *ngTemplateOutlet="template; context: { $implicit: value, last, index }"/> | ||
| } @else { | ||
| {{ value }} | ||
| } | ||
| </li> | ||
| } | ||
| </ul> | ||
| } | ||
| @else { | ||
| @if (template) { | ||
| <ng-container | ||
| *ngTemplateOutlet="template; context: { $implicit: field() }"/> | ||
| } @else { | ||
| {{ field() }} | ||
| } | ||
| } | ||
| </dd> | ||
| </div> | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| import { AfterContentInit, Component, ContentChildren, QueryList, TemplateRef, computed, input } from '@angular/core'; | ||
| import { PrimeTemplate } from 'primeng/api'; | ||
| import { Nullable } from 'primeng/ts-helpers'; | ||
|
|
||
| @Component({ | ||
| selector: 'sonar-field-description', | ||
| templateUrl: './field-description.component.html' | ||
| }) | ||
| export class FieldDescriptionComponent implements AfterContentInit { | ||
| label = input<string>(); | ||
| field = input<any>(); | ||
| type = computed(() => this.getType()); | ||
| template: Nullable<TemplateRef<any>>; | ||
|
|
||
| @ContentChildren(PrimeTemplate) templates: QueryList<PrimeTemplate> | null; | ||
|
|
||
| ngAfterContentInit() { | ||
| (this.templates as QueryList<PrimeTemplate>).forEach((item) => { | ||
| switch (item.getType()) { | ||
| case 'template': | ||
| this.template = item.template; | ||
| break; | ||
| } | ||
| }); | ||
| } | ||
| getType() { | ||
| const field = this.field(); | ||
| if (Array.isArray(field)) { | ||
| return 'array'; | ||
| } | ||
| return typeof field; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,25 +1,23 @@ | ||
| <!-- | ||
| SONAR User Interface | ||
| Copyright (C) 2021 RERO | ||
| This program is free software: you can redistribute it and/or modify | ||
| it under the terms of the GNU Affero General Public License as published by | ||
| the Free Software Foundation, version 3 of the License. | ||
| 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 Affero General Public License for more details. | ||
| You should have received a copy of the GNU Affero General Public License | ||
| along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| --> | ||
| <ng-container *ngIf="record$ | async as record"> | ||
| <h1 class="mb-4">{{ record.metadata.name | languageValue | async }}</h1> | ||
| @if(record.metadata.description) { | ||
| <h4 translate>Description</h4> | ||
| <p [innerHtml]="record.metadata.description | languageValue | async | markdown"></p> | ||
| } | ||
| </ng-container> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.