Skip to content

GitLab

Commit bb5339a0 authored by Florent Poittevin's avatar Florent Poittevin
Browse files

fix: change indicator and message for checksum

parent d6c581d0
Hide whitespace changes
Inline Side-by-side
src/app/features/deposit/components/dialogs/deposit-file-upload/deposit-file-upload.dialog.html
View file @ bb5339a0
......@@ -114,13 +114,9 @@
>
{{labelTranslateEnum.provideChecksums | translate}}
</mat-checkbox>
<div *ngIf="formValidationHelper.getFormControl(formGroup, formDefinitionChecksum.checksumGeneratedIsLoadingCounter)?.value > 0 as isLoading"
class="checksum-generated-indicator"
[solidifySpinner]="isLoading"
[solidifySpinnerDiameter]="24"
[solidifySpinnerStrokeWidth]="2"
>
</div>
<span *ngIf="formValidationHelper.getFormControl(formGroup, formDefinitionChecksum.checksumGeneratedIsLoadingCounter)?.value > 0"
class="checksum-generated-indicator"
>{{labelTranslateEnum.checksumComputing | translate}}</span>
</div>
<div *ngIf="formValidationHelper.getFormControl(formGroup, formDefinitionChecksum.isChecksumUser)?.value | isTrue"
......@@ -139,8 +135,10 @@
<mat-error *ngIf="fd.errors?.mismatch && formValidationHelper.getFormControl(formGroup, formDefinitionChecksum.checksumGeneratedMd5).value"
solidifyTooltipOnEllipsis
>
{{labelTranslateEnum.expectedValueX | translate : {value: formValidationHelper.getFormControl(formGroup, formDefinitionChecksum.checksumGeneratedMd5).value} }}</mat-error>
<mat-error *ngIf="fd.errors?.minlength || fd.errors?.maxlength">{{labelTranslateEnum.theFormatIsNotTheOneExpected | translate}}</mat-error>
{{labelTranslateEnum.checksumInconsistentWithExpectedValueX | translate : {value: formValidationHelper.getFormControl(formGroup, formDefinitionChecksum.checksumGeneratedMd5).value} }}</mat-error>
<mat-error *ngIf="fd.errors?.minlength || fd.errors?.maxlength"
solidifyTooltipOnEllipsis
>{{labelTranslateEnum.theChecksumFormatIsNotTheExpectedOne | translate}}</mat-error>
</mat-form-field>
<mat-form-field *ngIf="formValidationHelper.getFormControl(formGroup, formDefinitionChecksum.checksumUserSha1) as fd"
......@@ -156,8 +154,10 @@
<mat-error *ngIf="fd.errors?.mismatch && formValidationHelper.getFormControl(formGroup, formDefinitionChecksum.checksumGeneratedSha1).value"
solidifyTooltipOnEllipsis
>
{{labelTranslateEnum.expectedValueX | translate : {value: formValidationHelper.getFormControl(formGroup, formDefinitionChecksum.checksumGeneratedSha1).value} }}</mat-error>
<mat-error *ngIf="fd.errors?.minlength || fd.errors?.maxlength">{{labelTranslateEnum.theFormatIsNotTheOneExpected | translate}}</mat-error>
{{labelTranslateEnum.checksumInconsistentWithExpectedValueX | translate : {value: formValidationHelper.getFormControl(formGroup, formDefinitionChecksum.checksumGeneratedSha1).value} }}</mat-error>
<mat-error *ngIf="fd.errors?.minlength || fd.errors?.maxlength"
solidifyTooltipOnEllipsis
>{{labelTranslateEnum.theChecksumFormatIsNotTheExpectedOne | translate}}</mat-error>
</mat-form-field>
<mat-form-field *ngIf="formValidationHelper.getFormControl(formGroup, formDefinitionChecksum.checksumUserSha256) as fd"
......@@ -173,8 +173,10 @@
<mat-error *ngIf="fd.errors?.mismatch && formValidationHelper.getFormControl(formGroup, formDefinitionChecksum.checksumGeneratedSha256).value"
solidifyTooltipOnEllipsis
>
{{labelTranslateEnum.expectedValueX | translate : {value: formValidationHelper.getFormControl(formGroup, formDefinitionChecksum.checksumGeneratedSha256).value} }}</mat-error>
<mat-error *ngIf="fd.errors?.minlength || fd.errors?.maxlength">{{labelTranslateEnum.theFormatIsNotTheOneExpected | translate}}</mat-error>
{{labelTranslateEnum.checksumInconsistentWithExpectedValueX | translate : {value: formValidationHelper.getFormControl(formGroup, formDefinitionChecksum.checksumGeneratedSha256).value} }}</mat-error>
<mat-error *ngIf="fd.errors?.minlength || fd.errors?.maxlength"
solidifyTooltipOnEllipsis
>{{labelTranslateEnum.theChecksumFormatIsNotTheExpectedOne | translate}}</mat-error>
</mat-form-field>
<mat-form-field *ngIf="formValidationHelper.getFormControl(formGroup, formDefinitionChecksum.checksumUserCrc32) as fd"
......@@ -190,8 +192,10 @@
<mat-error *ngIf="fd.errors?.mismatch && formValidationHelper.getFormControl(formGroup, formDefinitionChecksum.checksumGeneratedCrc32).value"
solidifyTooltipOnEllipsis
>
{{labelTranslateEnum.expectedValueX | translate : {value: formValidationHelper.getFormControl(formGroup, formDefinitionChecksum.checksumGeneratedCrc32).value} }}</mat-error>
<mat-error *ngIf="fd.errors?.minlength || fd.errors?.maxlength">{{labelTranslateEnum.theFormatIsNotTheOneExpected | translate}}</mat-error>
{{labelTranslateEnum.checksumInconsistentWithExpectedValueX | translate : {value: formValidationHelper.getFormControl(formGroup, formDefinitionChecksum.checksumGeneratedCrc32).value} }}</mat-error>
<mat-error *ngIf="fd.errors?.minlength || fd.errors?.maxlength"
solidifyTooltipOnEllipsis
>{{labelTranslateEnum.theChecksumFormatIsNotTheExpectedOne | translate}}</mat-error>
</mat-form-field>
</div>
</ng-container>
......
src/app/features/deposit/components/dialogs/deposit-file-upload/deposit-file-upload.dialog.scss
View file @ bb5339a0
......@@ -17,8 +17,11 @@
}
.checksum-generated-indicator {
width: 24px;
height: 24px;
background-color: $extra-light-grey;
padding: 0 5px;
border-radius: 5px;
animation: blink-animation 1.5s infinite;
}
}
......@@ -29,3 +32,15 @@
}
}
}
@keyframes blink-animation {
from {
opacity: 1;
}
50% {
opacity: 0.5;
}
to {
opacity: 1;
}
}
src/app/shared/enums/label-translate.enum.ts
View file @ bb5339a0
......@@ -418,7 +418,8 @@ export class LabelTranslateEnum {
static unaccessibleTab: string = MARK_AS_TRANSLATABLE("general.label.unaccessibleTab");
static fileSizeTooBig: string = MARK_AS_TRANSLATABLE("general.label.fileSizeTooBig");
static provideChecksums: string = MARK_AS_TRANSLATABLE("general.label.provideChecksums");
static theFormatIsNotTheOneExpected: string = MARK_AS_TRANSLATABLE("general.label.theFormatIsNotTheOneExpected");
static theChecksumFormatIsNotTheExpectedOne: string = MARK_AS_TRANSLATABLE("general.label.theChecksumFormatIsNotTheExpectedOne");
static checksumComputing: string = MARK_AS_TRANSLATABLE("general.label.checksumComputing");
static hide: string = MARK_AS_TRANSLATABLE("general.link.hide");
static show: string = MARK_AS_TRANSLATABLE("general.link.show");
......@@ -489,6 +490,6 @@ export class LabelTranslateEnum {
static moreThanXContributors: string = MARK_AS_TRANSLATABLE("general.injected.moreThanXContributorsReturnedPleaseSpecifyYourSearch");
static commentsOnDepositX: string = MARK_AS_TRANSLATABLE("general.injected.commentsOnDepositX");
static expectedValueX: string = MARK_AS_TRANSLATABLE("general.injected.expectedValueX");
static checksumInconsistentWithExpectedValueX: string = MARK_AS_TRANSLATABLE("general.injected.checksumInconsistentWithExpectedValueX");
static providedByX: string = MARK_AS_TRANSLATABLE("general.injected.providedByX");
}
src/assets/i18n/de.json
View file @ bb5339a0
......@@ -1059,8 +1059,8 @@
"selectAllElement": "Wählen Sie alle {{numberAllElement}} Elemente der Suche aus."
},
"injected": {
"checksumInconsistentWithExpectedValueX": "general.injected.checksumInconsistentWithExpectedValueX",
"commentsOnDepositX": "Kommentare zur Kaution '{{title}}'",
"expectedValueX": "general.injected.expectedValueX",
"moreThanXContributorsReturnedPleaseSpecifyYourSearch": "Mehr als {{limit}} Autoren gefunden, bitte spezifizieren Sie Ihre Suche",
"providedByX": "general.injected.providedByX",
"seeInStoragionInjectNumber": "Siehe in Storagion {{number}}",
......@@ -1107,6 +1107,7 @@
"category": "Kategorie",
"changeTime": "Änderungsdatum",
"characters": "Zeichen",
"checksumComputing": "Prüfsummenberechnung",
"checksums": "Prüfsummen",
"clearFilters": "Filter löschen",
"clickHereToAddAContributor": "Klicken Sie hier, um einen Beitragenden hinzuzufügen",
......@@ -1355,9 +1356,9 @@
"submissionPolicies": "Einreichungsrichtlinien",
"submissionPolicy": "Einreichungsrichtlinie",
"submittedDate": "Einreichungsdatum",
"theChecksumFormatIsNotTheExpectedOne": "general.label.theChecksumFormatIsNotTheExpectedOne",
"theDepositHasAnEmbargo": "Die Datenablage unterliegt einem Embargo",
"theFollowingPastedValue": "general.label.theFollowingPastedValue",
"theFormatIsNotTheOneExpected": "general.label.theFormatIsNotTheOneExpected",
"themes": "Theme",
"thereAreNoCurrentOrderForArchives": "Es gibt keine aktuelle Anfrage nach Archiven",
"thisWebsiteUsesCookiesToEnsureYouGetTheBestExperienceOnOurWebsite": "Diese Website verwendet Cookies, um Ihnen die bestmögliche Nutzung unserer Website zu gewährleisten.",
......@@ -2189,4 +2190,4 @@
"title": "Benutzerhandbuch",
"tooltipClose": "Benutzerhandbuch schliessen"
}
}
\ No newline at end of file
}
src/assets/i18n/en.json
View file @ bb5339a0
......@@ -1059,8 +1059,8 @@
"selectAllElement": "Select all {{numberAllElement}} elements of the search."
},
"injected": {
"checksumInconsistentWithExpectedValueX": "Checksum inconsistent with expected value '{{checksum}}'",
"commentsOnDepositX": "Comments on the deposit '{{title}}'",
"expectedValueX": "Expected value '{{value}}'",
"moreThanXContributorsReturnedPleaseSpecifyYourSearch": "More than {{limit}} authors returned, please specify your search",
"providedByX": "provided by {{origin}}",
"seeInStoragionInjectNumber": "See in Storagion {{number}}",
......@@ -1107,6 +1107,7 @@
"category": "Category",
"changeTime": "Change time",
"characters": "Characters",
"checksumComputing": "Checksum computing",
"checksums": "Checksums",
"clearFilters": "Clear filters",
"clickHereToAddAContributor": "Click here to add a contributor",
......@@ -1355,9 +1356,9 @@
"submissionPolicies": "Submission policies",
"submissionPolicy": "Submission policy",
"submittedDate": "Submission date",
"theChecksumFormatIsNotTheExpectedOne": "The checksum format is not the expected one",
"theDepositHasAnEmbargo": "The deposit has an embargo",
"theFollowingPastedValue": "The following pasted value",
"theFormatIsNotTheOneExpected": "The format is not the one expected",
"themes": "Themes",
"thereAreNoCurrentOrderForArchives": "There currently aren't any archives in the download order",
"thisWebsiteUsesCookiesToEnsureYouGetTheBestExperienceOnOurWebsite": "This website uses cookies to ensure you get the best experience on our website.",
......
src/assets/i18n/fr.json
View file @ bb5339a0
......@@ -1059,8 +1059,8 @@
"selectAllElement": "Sélectionner les {{numberAllElement}} éléments de la recherche"
},
"injected": {
"checksumInconsistentWithExpectedValueX": "Checksum incohérent avec valeur attendue '{{value}}'",
"commentsOnDepositX": "Commentaires sur le dépôt '{{title}}'",
"expectedValueX": "Valeur attendue '{{value}}'",
"moreThanXContributorsReturnedPleaseSpecifyYourSearch": "Plus de {{limit}} auteurs retournés, veuillez préciser votre recherche",
"providedByX": "fourni par {{origin}}",
"seeInStoragionInjectNumber": "Voir dans Storagion {{number}}",
......@@ -1107,6 +1107,7 @@
"category": "Catégorie",
"changeTime": "Date de changement",
"characters": "Caractères",
"checksumComputing": "Calcul des checksums",
"checksums": "Checksums",
"clearFilters": "Effacer les filtres",
"clickHereToAddAContributor": "Cliquez ici pour ajouter un-e contributeur-trice",
......@@ -1355,9 +1356,9 @@
"submissionPolicies": "Politiques de soumission",
"submissionPolicy": "Politique de soumission",
"submittedDate": "Date de soumission",
"theChecksumFormatIsNotTheExpectedOne": "Le format du checksum n'est pas celui attendu",
"theDepositHasAnEmbargo": "Le dépôt est soumis à un embargo",
"theFollowingPastedValue": "La valeur collé suivante",
"theFormatIsNotTheOneExpected": "Le format n'est pas celui attendu",
"themes": "Thèmes",
"thereAreNoCurrentOrderForArchives": "Il n'y a aucune demande de téléchargement en cours",
"thisWebsiteUsesCookiesToEnsureYouGetTheBestExperienceOnOurWebsite": "Ce site web utilise des cookies pour vous garantir la meilleure expérience possible sur notre site web.",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment