-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Story #13560: link from ingest to archive search
- Loading branch information
Showing
20 changed files
with
164 additions
and
173 deletions.
There are no files selected for viewing
22 changes: 10 additions & 12 deletions
22
...est-preview/ingest-information-tab/ingest-event-detail/ingest-event-detail.component.html
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,13 +1,11 @@ | ||
| <div class="row"> | ||
| <div class="arrow"> | ||
| <button class="btn-circle" (click)="toggleShow()"> | ||
| <i class="material-icons" [@rotateAnimation]="isShown ? 'collapse' : 'expand'">keyboard_arrow_down</i> | ||
| </button> | ||
| </div> | ||
|
|
||
| <div *ngIf="isShown" class="row container-fluid"> | ||
| <div *ngFor="let event of events; let i = index"> | ||
| <app-vitam-event-display [event]="event"></app-vitam-event-display> | ||
| </div> | ||
| </div> | ||
| <div class="text-right"> | ||
| <button class="btn-circle" (click)="toggleShow()"> | ||
| <i class="material-icons" [@rotateAnimation]="isShown ? 'collapse' : 'expand'">keyboard_arrow_down</i> | ||
| </button> | ||
| </div> | ||
|
|
||
| @if (isShown) { | ||
| @for (event of events; track event) { | ||
| <app-vitam-event-display [event]="event"></app-vitam-event-display> | ||
| } | ||
| } |
4 changes: 2 additions & 2 deletions
4
...est-preview/ingest-information-tab/ingest-event-detail/ingest-event-detail.component.scss
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
122 changes: 53 additions & 69 deletions
122
...rc/app/ingest/ingest-preview/ingest-information-tab/ingest-information-tab.component.html
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,77 +1,61 @@ | ||
| <div *ngIf="ingest"> | ||
| <br /> | ||
| <div class="row"> | ||
| <div class="col-6 mb-3"> | ||
| <label>{{ 'INGEST_DETAIL.DEPOSIT_ID' | translate }}</label> | ||
| <div>{{ ingest?.obIdIn }}</div> | ||
| </div> | ||
| </div> | ||
| <div *ngIf="ingest" class="gap-2"> | ||
| <vitamui-common-data [label]="'INGEST_DETAIL.DEPOSIT_ID' | translate" [value]="ingest.obIdIn"></vitamui-common-data> | ||
| <vitamui-common-data [label]="'INGEST_DETAIL.NAME' | translate" [value]="evDetDataDeflated?.EvDetailReq"></vitamui-common-data> | ||
| <vitamui-common-data | ||
| [label]="'INGEST_DETAIL.OPERATION_ID' | translate" | ||
| [value]="ingest.id" | ||
| [valueUrl]="getOpiUrl$() | async" | ||
| [valueTooltip]="'INGEST_DETAIL.OPERATION_ID_TOOLTIP' | translate" | ||
| [canCopyValue]="true" | ||
| ></vitamui-common-data> | ||
|
|
||
| <div class="row"> | ||
| <div class="col-6 mb-3"> | ||
| <label>{{ 'INGEST_DETAIL.NAME' | translate }}</label> | ||
| <div>{{ evDetDataDeflated?.EvDetailReq }}</div> | ||
| </div> | ||
| </div> | ||
| <div class="row gap-2"> | ||
| <vitamui-common-data | ||
| class="col-6" | ||
| [label]="'INGEST_DETAIL.START_DATE' | translate" | ||
| [value]="ingest?.evDateTime | dateTime: 'dd/MM/yyyy'" | ||
| ></vitamui-common-data> | ||
| <vitamui-common-data | ||
| class="col-6" | ||
| [label]="'INGEST_DETAIL.END_DATE' | translate" | ||
| [value]="ingestEndDate(ingest) | dateTime: 'dd/MM/yyyy'" | ||
| ></vitamui-common-data> | ||
|
|
||
| <div class="row"> | ||
| <div class="col-12 mb-3"> | ||
| <label>{{ 'INGEST_DETAIL.OPERATION_ID' | translate }}</label> | ||
| <div>{{ ingest?.id }}</div> | ||
| </div> | ||
| <br /> | ||
| <vitamui-common-data | ||
| class="col-6" | ||
| [label]="'INGEST_DETAIL.PRODUCT_SERVICE' | translate" | ||
| [value]="agIdExtDeflated?.originatingAgency" | ||
| ></vitamui-common-data> | ||
| <vitamui-common-data | ||
| class="col-6" | ||
| [label]="'INGEST_DETAIL.VERSATILE_SERVICE' | translate" | ||
| [value]="agIdExtDeflated?.submissionAgency" | ||
| ></vitamui-common-data> | ||
|
|
||
| <div class="col-6 mb-3"> | ||
| <label>{{ 'INGEST_DETAIL.START_DATE' | translate }}</label> | ||
| <div>{{ ingest?.evDateTime | dateTime: 'dd/MM/yyyy' }}</div> | ||
| </div> | ||
| <div class="col-6 mb-3"> | ||
| <label>{{ 'INGEST_DETAIL.END_DATE' | translate }}</label> | ||
| <div>{{ ingestEndDate(ingest) | dateTime: 'dd/MM/yyyy' }}</div> | ||
| </div> | ||
| <br /> | ||
| <div class="col-6 mb-3"> | ||
| <label>{{ 'INGEST_DETAIL.PRODUCT_SERVICE' | translate }}</label> | ||
| <div>{{ agIdExtDeflated?.originatingAgency }}</div> | ||
| </div> | ||
| <div class="col-6 mb-3"> | ||
| <label>{{ 'INGEST_DETAIL.VERSATILE_SERVICE' | translate }}</label> | ||
| <div>{{ agIdExtDeflated?.submissionAgency }}</div> | ||
| </div> | ||
| <br /> | ||
| <div class="col-6 mb-3"> | ||
| <label>{{ 'INGEST_DETAIL.ENTRY_CONTRACT' | translate }}</label> | ||
| <div>{{ evDetDataDeflated?.ArchivalAgreement }}</div> | ||
| </div> | ||
| <div class="col-6 mb-3"> | ||
| <label>{{ 'INGEST_DETAIL.ARCHIVING_PROFIL' | translate }}</label> | ||
| <div>{{ evDetDataDeflated?.ArchivalProfile }}</div> | ||
| </div> | ||
| <br /> | ||
| <div class="col-6 mb-3"> | ||
| <label>{{ 'INGEST_DETAIL.STATUS' | translate }}</label> | ||
| <div>{{ evDetDataDeflated?.LegalStatus }}</div> | ||
| </div> | ||
| <vitamui-common-data | ||
| class="col-6" | ||
| [label]="'INGEST_DETAIL.ENTRY_CONTRACT' | translate" | ||
| [value]="evDetDataDeflated?.ArchivalAgreement" | ||
| ></vitamui-common-data> | ||
| <vitamui-common-data | ||
| class="col-6" | ||
| [label]="'INGEST_DETAIL.ARCHIVING_PROFIL' | translate" | ||
| [value]="evDetDataDeflated?.ArchivalProfile" | ||
| ></vitamui-common-data> | ||
| </div> | ||
|
|
||
| <div class="row"> | ||
| <div class="col-12 mb-3"> | ||
| <label>{{ 'INGEST_DETAIL.MESSAGE' | translate }}</label> | ||
| <div class="vitamui-snack-bar-content" [ngSwitch]="getIngestStatus(ingest)"> | ||
| <div *ngSwitchCase="'OK'" class="text success bold">{{ ingestMessage(ingest) }}</div> | ||
| <div *ngSwitchCase="'WARNING'" class="text warning bold">{{ ingestMessage(ingest) }}</div> | ||
| <div *ngSwitchCase="'KO'" class="text danger bold">{{ ingestMessage(ingest) }}</div> | ||
| <div *ngSwitchCase="'FATAL'" class="text danger bold">{{ ingestMessage(ingest) }}</div> | ||
| <div *ngSwitchCase="'En cours'" class="text light bold">{{ ingestMessage(ingest) }}</div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| <div class="row"> | ||
| <div class="col-12 mb-3"> | ||
| <label>{{ 'INGEST_DETAIL.OPERATION_DETAILS' | translate }}</label> | ||
| <div *ngIf="hasEvent()"> | ||
| <app-ingest-event-detail [ingest]="ingest"></app-ingest-event-detail> | ||
| </div> | ||
| <vitamui-common-data [label]="'INGEST_DETAIL.STATUS' | translate" [value]="evDetDataDeflated?.LegalStatus"></vitamui-common-data> | ||
|
|
||
| <vitamui-common-data | ||
| [label]="'INGEST_DETAIL.MESSAGE' | translate" | ||
| [value]="ingestMessage()" | ||
| [valueCss]="'bold ' + getIngestStatusClass()" | ||
| ></vitamui-common-data> | ||
|
|
||
| <div class="w-100"> | ||
| <label class="text caption bold primary">{{ 'INGEST_DETAIL.OPERATION_DETAILS' | translate }}</label> | ||
| <div *ngIf="hasEvent()"> | ||
| <app-ingest-event-detail [ingest]="ingest"></app-ingest-event-detail> | ||
| </div> | ||
| </div> | ||
| </div> |
24 changes: 0 additions & 24 deletions
24
...rc/app/ingest/ingest-preview/ingest-information-tab/ingest-information-tab.component.scss
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,24 +0,0 @@ | ||
| @import 'variables/colors'; | ||
|
|
||
| label { | ||
| font-size: 12px; | ||
| font-weight: 700; | ||
| color: var(--vitamui-primary); | ||
| font-family: Mulish; | ||
| box-sizing: inherit; | ||
| visibility: visible; | ||
| } | ||
|
|
||
| label + div { | ||
| font-size: 16px; | ||
| color: var(--vitamui-grey-900); | ||
| font-weight: 700; | ||
| display: block; | ||
| box-sizing: inherit; | ||
| display: block; | ||
| font-family: Mulish; | ||
| visibility: visible; | ||
| } | ||
| .status { | ||
| font-weight: bold; | ||
| } | ||
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
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
29 changes: 25 additions & 4 deletions
29
ui/ui-frontend/projects/vitamui-library/src/app/modules/components/data/data.component.html
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,5 +1,26 @@ | ||
| <label class="text caption bold primary">{{ label | empty }}</label> | ||
| <div *ngIf="!isArray(value)" class="text medium">{{ value | empty }}</div> | ||
| <ul *ngIf="isArray(value)"> | ||
| <li *ngFor="let item of value" class="text medium">{{ item | empty }}</li> | ||
| </ul> | ||
| @if (isArray(value)) { | ||
| <ul> | ||
| <li *ngFor="let item of value" class="text medium">{{ item | empty }}</li> | ||
| </ul> | ||
| } @else { | ||
| <div> | ||
| <span class="text medium" [class]="valueCss" [vitamuiTooltip]="valueTooltip" [outline]="true" vitamuiTooltipClass="secondary"> | ||
| @if (valueUrl) { | ||
| <a [href]="valueUrl">{{ value | empty }}</a> | ||
| } @else { | ||
| {{ value | empty }} | ||
| } | ||
| </span> | ||
| <span | ||
| *ngIf="canCopyValue" | ||
| class="button-copy" | ||
| (click)="copyToClipboard(value)" | ||
| [vitamuiTooltip]="'COMMON.COPY' | translate" | ||
| [outline]="true" | ||
| vitamuiTooltipClass="secondary" | ||
| > | ||
| <i class="vitamui-icon vitamui-icon-content-copy"></i> | ||
| </span> | ||
| </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 |
|---|---|---|
|
|
@@ -19,3 +19,7 @@ ul { | |
| li { | ||
| overflow-wrap: anywhere; | ||
| } | ||
|
|
||
| a { | ||
| color: var(--vitamui-secondary); | ||
| } | ||
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.