Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring

This commit is contained in:
Sofia Papacharalampous 2024-04-16 18:04:17 +03:00
commit 7305fe7afa
4 changed files with 18 additions and 26 deletions

View File

@ -7,15 +7,15 @@ import { Subscription } from "rxjs";
selector: 'rich-text-editor-component',
template: `
<div class="editor-wrapper" [class]="wrapperClasses">
<!-- <angular-editor class="full-width editor" [ngClass]="editable ? '': 'disabled'" [id]="id"
<angular-editor class="full-width editor" [ngClass]="editable ? '': 'disabled'" [id]="id"
[config]="editorConfig" [formControl]="form"
placeholder="{{(placeholder? (placeholder | translate) : '') + (required ? ' *': '')}}"
(paste)="pasteWithoutFormatting($event)"></angular-editor>
<mat-icon *ngIf="form.value && editable" (click)="parentFormGroup.get(controlName).patchValue('')" class="clear">close</mat-icon> -->
<mat-form-field class="full-width editor">
<mat-icon *ngIf="form.value && editable" (click)="parentFormGroup.get(controlName).patchValue('')" class="clear">close</mat-icon>
<!-- <mat-form-field class="full-width editor">
<mat-label>{{(placeholder? (placeholder | translate) : '')}}</mat-label>
<textarea matInput [formControl]="form" rows="5"></textarea>
</mat-form-field>
</mat-form-field> -->
</div>
`,
styleUrls: ['./rich-text-editor.component.scss'],

View File

@ -1 +1 @@
<h2>{{'IDP-SERVICE.AUTHENTICATION.MESSAGES.SIGN-OUT-IN-PROGRESS' | translate}}</h2>
<h2>{{'GENERAL.SNACK-BAR.SIGN-OUT-IN-PROGRESS' | translate}}</h2>

View File

@ -3,7 +3,7 @@
<mat-expansion-panel class="row expansion-panel toc-section-header" [id]="path" [(expanded)]="panelExpanded">
<mat-expansion-panel-header>
<mat-panel-title>
<h6 class='panel-title' *ngIf="section?.sections?.length >= 0">{{path}}.section {{section.title}}</h6>
<h6 class='panel-title' *ngIf="section?.sections?.length > 0">{{path}}.section {{section.title}}</h6>
<h6 class='panel-title' *ngIf="section?.fieldSets?.length > 0">{{path}} {{section.title}}</h6>
</mat-panel-title>
</mat-expansion-panel-header>

View File

@ -16,6 +16,7 @@
"SUCCESSFUL-EMAIL-SEND": "Email sent successfully",
"SUCCESSFUL-COPY-TO-CLIPBOARD": "Copied to Clipboard",
"UNSUCCESSFUL-LOGIN": "Unsuccessful Login",
"SIGN-OUT-IN-PROGRESS": "Sign out in progress...",
"SUCCESSFUL-DELETE": "Successful Delete",
"UNSUCCESSFUL-DELETE": "Unsuccessful Delete",
"UNSUCCESSFUL-EMAIL-SEND": "Failed sending email",
@ -258,7 +259,6 @@
"SUCCESS": "Comment successfully saved",
"THREADS": {
"NEW-THREAD": "New comment",
"FROM-USER": "From",
"SEND": "Send",
"CANCEL": "Cancel",
"REPLY": "Reply",
@ -1144,6 +1144,13 @@
"DESCRIPTION-TEMPLATE-INVITATION-TYPE": "Description Template invitation",
"CONTACT-SUPPORT-TYPE": "Contact Support",
"PUBLIC-CONTACT-SUPPORT-TYPE": "Public Contact Support"
},
"NOTIFICATION-NOTIFY-STATE": {
"PENDING": "Pending",
"PROCESSING": "Processing",
"SUCCESSFUL": "Successful",
"ERROR": "Error",
"OMITTED": "Omitted"
}
},
"USER-PROFILE": {
@ -1198,25 +1205,19 @@
},
"EXTERNAL-FETCHER-SOURCE-EDITOR": {
"FIELDS": {
"SOURCE-CONFIGURATION": "Source Configuration",
"RESULTS": "Results",
"SOURCES": "Sources",
"FIELD-MAPPINGS": "Field Mappings",
"AUTHENTICATION": "Authentication",
"QUERIES": "Queries",
"QUERY": "Query",
"OPTIONS": "Options",
"OPTION": "Option",
"STATIC-ITEMS": "Static Items",
"STATIC-ITEM": "Item",
"NAME": "Name",
"CODE": "Code",
"VALUE": "Value",
"RESPONSE-PATH": "Response Path",
"DATA-TYPE": "Data Type",
"KEY": "Key",
"LABEL": "Label",
"DESCRIPTION": "Description",
"ORDINAL": "Ordinal",
"URL": "Url",
"SOURCE-TYPE": "Source Type",
@ -1244,8 +1245,7 @@
"REMOVE-CASE": "Remove Case",
"ADD-STATIC-ITEM": "Add Item",
"REMOVE-STATIC-ITEM": "Remove Item"
},
"STATIC-REQUIRED": "Required"
}
},
"TENANT-EDITOR": {
"NEW": "New Tenant",
@ -1559,7 +1559,7 @@
},
"REFERENCE-FIELD-COMPONENT": {
"EXTERNAL-SOURCE": "Source",
"INTERNAL-SOURCE": "Not bind with source"
"INTERNAL-SOURCE": "Internal"
},
"TENANT-CHOOSE-DIALOG": {
"TITLE": "Please select your Tenant",
@ -1760,13 +1760,6 @@
"EMAIL": "Email",
"INAPP": "In App"
},
"NOTIFICATION-NOTIFY-STATE": {
"PENDING": "Pending",
"PROCESSING": "Processing",
"SUCCESSFUL": "Successful",
"ERROR": "Error",
"OMITTED": "Omitted"
},
"NOTIFICATION-TRACKING-STATE": {
"UNDEFINED": "Undefined",
"NA": "NA",
@ -2009,8 +2002,7 @@
"CONFIRMATION": "Are you sure that you want to merge this account?"
},
"ACTIONS": {
"CONFIRM": "Confirm",
"CANCEL": "Cancel"
"CONFIRM": "Confirm"
}
}
}
}