Compare revisions

Florent POITTEVIN · Nicolas.Rod · Florent POITTEVIN · Nicolas.Rod · Florent POITTEVIN · Nicolas.Rod
--- a/README.md
+++ b/README.md
@@ -103,7 +103,7 @@ To get more help on the Angular CLI use `ng help` or go check out the [Angular C
 ## Grid

 There is no grid used in the project.
-We use pure [flex box](https://css-tricks.com/snippets/css/a-guide-to-flexbox/) css rule instead.
+We use pure [flex box](https://css-tricks.com/snippets/css/a-guide-to-flexbox/) and grid css rule instead.

 If you want to manage specific css behavior depending of screen size, you should use the following mixins :


--- a/package-lock.json
+++ b/package-lock.json
@@ -7210,14 +7210,6 @@
      "integrity": "sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==",
      "dev": true
    },
-    "flexboxgrid-sass": {
-      "version": "8.0.5",
-      "resolved": "https://nexus.unige.ch/repository/npm-all/flexboxgrid-sass/-/flexboxgrid-sass-8.0.5.tgz",
-      "integrity": "sha1-GAJ7x6kvmM6HdyXLNvAXO9HnTxc=",
-      "requires": {
-        "sass-flex-mixin": "^1.0.3"
-      }
-    },
    "flush-write-stream": {
      "version": "1.1.1",
      "resolved": "https://nexus.unige.ch/repository/npm-all/flush-write-stream/-/flush-write-stream-1.1.1.tgz",
@@ -14046,11 +14038,6 @@
        "chokidar": ">=2.0.0 <4.0.0"
      }
    },
-    "sass-flex-mixin": {
-      "version": "1.0.3",
-      "resolved": "https://nexus.unige.ch/repository/npm-all/sass-flex-mixin/-/sass-flex-mixin-1.0.3.tgz",
-      "integrity": "sha1-pQTWIGL3sOdzrrw5XeH0WqpuT9A="
-    },
    "sass-loader": {
      "version": "8.0.2",
      "resolved": "https://nexus.unige.ch/repository/npm-all/sass-loader/-/sass-loader-8.0.2.tgz",
@@ -14849,9 +14836,9 @@
      }
    },
    "solidify-frontend": {
-      "version": "1.1.14",
-      "resolved": "https://nexus.unige.ch/repository/npm-all/solidify-frontend/-/solidify-frontend-1.1.14.tgz",
-      "integrity": "sha512-O0PkZ+Xjnq0tHSizAyXrJm1wzA277xEOTLhd9gQ3amLuEWsAB+EF2voEcI+A7iWJpBG+K7UR1cpBQ4wENzYHbw==",
+      "version": "1.1.19",
+      "resolved": "https://nexus.unige.ch/repository/npm-all/solidify-frontend/-/solidify-frontend-1.1.19.tgz",
+      "integrity": "sha512-S2FS4tWkAkj7N5dIuVgg1k/rLJ60hGEcY+TlXv56ivHCspsVe+9pUcBbZYRoSHcDoZ8fBjuDAe0L8OkkBkVsiQ==",
      "requires": {
        "tslib": "^2.0.0"
      }

--- a/package.json
+++ b/package.json
@@ -80,7 +80,6 @@
    "core-js": "3.6.5",
    "decimal.js": "10.2.0",
    "file-saver": "2.0.2",
-    "flexboxgrid-sass": "8.0.5",
    "highlight.js": "10.1.2",
    "http-status-codes": "1.4.0",
    "iso3166-2-db": "2.3.6",
@@ -94,7 +93,7 @@
    "normalize.css": "8.0.1",
    "patch-package": "6.2.2",
    "rxjs": "6.6.0",
-    "solidify-frontend": "1.1.14",
+    "solidify-frontend": "1.1.19",
    "streamsaver": "2.0.4",
    "sync-pom-version-to-package": "1.5.0",
    "ts-key-enum": "2.0.3",

--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -6,7 +6,7 @@ sonar.projectName=Archive ouverte UNIGE Angular Portal
 sonar.projectVersion=1.0
 sonar.sourceEncoding=UTF-8
 sonar.sources=./src
-sonar.exclusions=**/node_modules/**,**/*.spec.ts,**/assembly/**
+sonar.exclusions=**/node_modules/**,**/*.spec.ts,**/assembly/**,src/ngsw-worker-original.js,src/ngsw-worker-custom.js,src/ngsw-worker-download.js
 sonar.tests=./src
 sonar.test.inclusions=**/*.spec.ts
 sonar.ts.tslintconfigpath=tslint.json

--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -55,7 +55,8 @@
    </div>

    <div class="content-and-sidebar-userguide">
-      <main class="content mat-typography"
+      <main #main
+            class="content mat-typography"
            cdkTrapFocus
            (scroll)="scrollHandler($event)"
      >

--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -53,7 +53,7 @@ import {
  templateUrl: "./app.component.html",
  styleUrls: ["./app.component.scss"],
 })
-export class AppComponent extends AbstractAppComponent implements OnInit {
+export class AppComponent extends AbstractAppComponent {
  currentPhotoUserObs: Observable<string> = MemoizedUtil.select(this._store, AppUserState, state => state.logo);
  userRolesObs: Observable<Enums.UserApplicationRole.UserApplicationRoleEnum[]> = MemoizedUtil.select(this._store, AppState, state => state.userRoles);
  currentModule: string;
@@ -114,36 +114,6 @@ export class AppComponent extends AbstractAppComponent implements OnInit {
    this.checkOrcidQueryParam();
  }

-  ngOnInit(): void {
-    super.ngOnInit();
-
-    // this.subscribe(this._dialog.open(StructureDialog, {
-    //   width: "90%",
-    //   // data: this._sharedUploadImageDialogData as SharedUploadImageDialogData,
-    // }).afterClosed().pipe(
-    //   tap((blob: Blob | undefined) => {
-    //     if (isNullOrUndefined(blob)) {
-    //       return;
-    //     }
-    //     // this.subscribe(
-    //     //   this._actions$.pipe(
-    //     //     ofActionCompleted(this.resourceLogoNameSpace.UploadPhotoSuccess),
-    //     //     take(1),
-    //     //     tap(action => {
-    //     //       if (isFalse(action.result.successful)) {
-    //     //         return;
-    //     //       }
-    //     //       this._store.dispatch(new this.resourceLogoNameSpace.GetPhoto(this.resId));
-    //     //       this._avatarChangeBS.next(true);
-    //     //     }),
-    //     //   ),
-    //     // );
-    //     // this._store.dispatch(new this.resourceLogoNameSpace.UploadPhoto(this.resId, blob as any));
-    //     // this.fileInput.nativeElement.value = null;
-    //   }),
-    // ));
-  }
-
  private observeLoggedUserForCart(): Observable<boolean> {
    return combineLatest([this.isLoggedObs, this.userRolesObs])
      .pipe(

--- a/src/app/components/dialogs/user/user.dialog.scss
+++ b/src/app/components/dialogs/user/user.dialog.scss
@@ -28,10 +28,6 @@
      width: 100%;
    }

-    .administrative-information-content {
-
-    }
-
    .personal-information-content {
      display: grid;
      grid-template-columns: min-content 1fr;

--- a/src/app/components/presentationals/main-toolbar/burger-menu/burger-menu.presentational.scss
+++ b/src/app/components/presentationals/main-toolbar/burger-menu/burger-menu.presentational.scss
@@ -104,9 +104,7 @@ $coefficient-animation-speed: 0.5;
          height: 80%;
          transition-delay: $coefficient-animation-speed * 625ms;
        }
-      }

-      span {
        &:nth-child(2) {
          width: 80%;
          transition-delay: $coefficient-animation-speed * 375ms;

--- a/src/app/components/presentationals/main-toolbar/main-toolbar-desktop-vertical/main-toolbar-desktop-vertical.presentational.scss
+++ b/src/app/components/presentationals/main-toolbar/main-toolbar-desktop-vertical/main-toolbar-desktop-vertical.presentational.scss
@@ -42,24 +42,6 @@ $logo-height: 68px;
  }
 }

-aou-language-selector ::ng-deep {
-  display: flex;
-  align-items: center;
-  flex-direction: column;
-
-  .separator {
-    visibility: hidden;
-    font-size: 2px;
-  }
-}
-
-aou-theme-selector ::ng-deep {
-  transform: scale(0.75, 0.75);
-  width: $toolbar-width;
-  display: flex;
-  justify-content: center;
-}
-
 .right-part {
  flex-grow: 1;
  display: flex;

--- a/src/app/components/presentationals/user-form/user-form.html
+++ b/src/app/components/presentationals/user-form/user-form.html
 <form [formGroup]="form">
-  <!--  <mat-form-field *ngIf="getFormControl(formDefinition.firstName) as fd">-->
-  <!--    <mat-label>{{labelTranslateEnum.firstName | translate }}</mat-label>-->
-  <!--    <input matInput-->
-  <!--           [solidifyValidation]="errors"-->
-  <!--           [formControl]="fd"-->
-  <!--           [required]="formValidationHelper.hasRequiredField(fd)"-->
-  <!--    >-->
-  <!--    <mat-error #errors></mat-error>-->
-  <!--  </mat-form-field>-->
-
-  <!--  <mat-form-field *ngIf="getFormControl(formDefinition.lastName) as fd">-->
-  <!--    <mat-label>{{labelTranslateEnum.lastName | translate }}</mat-label>-->
-  <!--    <input matInput-->
-  <!--           [solidifyValidation]="errors"-->
-  <!--           [formControl]="fd"-->
-  <!--           [required]="formValidationHelper.hasRequiredField(fd)"-->
-  <!--    >-->
-  <!--    <mat-error #errors></mat-error>-->
-  <!--  </mat-form-field>-->

  <mat-form-field *ngIf="getFormControl(formDefinition.homeOrganization) as fd">
    <mat-label>{{labelTranslateEnum.homeOrganization | translate }}</mat-label>

--- a/src/app/features/admin/structure/components/routables/admin-structure-list/admin-structure-list.routable.html
+++ b/src/app/features/admin/structure/components/routables/admin-structure-list/admin-structure-list.routable.html
@@ -33,17 +33,5 @@
      </ng-template>
    </ng-template>

-    <!--    <solidify-data-table #dataTablePresentational-->
-    <!--                           [columns]="columns"-->
-    <!--                           [actions]="actions"-->
-    <!--                           [isLoading]="isLoadingObs | async"-->
-    <!--                           [datas]="listObs | async"-->
-    <!--                           [listHighlightingId]="listNewId"-->
-    <!--                           [skipInitialQuery]="skipInitialQuery"-->
-    <!--                           [columnsSkippedToClear]="columnsSkippedToClear"-->
-    <!--                           [queryParameters]="queryParametersObs | async"-->
-    <!--                           (selectChange)="showDetail($event)"-->
-    <!--                           (queryParametersChange)="onQueryParametersEvent($event)"-->
-    <!--    ></solidify-data-table>-->
  </div>
 </div>
--- a/src/app/features/deposit/components/containers/deposit-document-file/deposit-document-file.container.html
+++ b/src/app/features/deposit/components/containers/deposit-document-file/deposit-document-file.container.html
@@ -37,17 +37,6 @@
    {{labelTranslateEnum.deleteAll | translate}}
  </button>

-  <!--<button *ngIf="canEdit && (listDocumentFileObs | async)?.length > 0 && isInErrorStatusFilter"-->
-  <!--        (click)="selectAndResumeAll()"-->
-  <!--        mat-button-->
-  <!--        type="button"-->
-  <!--        color="primary"-->
-  <!--        class="button-select-and-resume"-->
-  <!--&gt;-->
-  <!--  <solidify-icon [iconName]="iconNameEnum.resumeAll"></solidify-icon>-->
-  <!--  {{'deposit.file.button.selectAndResumeAll' | translate}}-->
-  <!--</button>-->
-
  <ng-template [ngIf]="dataTablePresentational?.multiSelectionValueOnAllPages.length > 0">
    <ng-container *ngFor="let bulkAction of bulkActions">
      <button *ngIf="bulkAction.displayOnCondition(dataTablePresentational?.multiSelectionValueOnAllPages)"

--- a/src/app/features/deposit/components/containers/deposit-document-file/deposit-document-file.container.scss
+++ b/src/app/features/deposit/components/containers/deposit-document-file/deposit-document-file.container.scss
@@ -5,6 +5,9 @@

  .wrapper {
    min-height: 550px;
+    display: grid;
+    justify-content: center;
+    grid-template-columns: 1fr;
  }

  .upload-button-wrapper {
@@ -29,10 +32,4 @@
    grid-template-columns: repeat(4, min-content);
  }

-  .wrapper {
-    display: grid;
-    justify-content: center;
-    grid-template-columns: 1fr;
-  }
-
 }
--- a/src/app/features/deposit/components/containers/deposit-document-file/deposit-document-file.container.ts
+++ b/src/app/features/deposit/components/containers/deposit-document-file/deposit-document-file.container.ts
@@ -206,13 +206,12 @@ export class DepositDocumentFileContainer extends SharedAbstractRoutable impleme
              protected readonly _securityService: SecurityService
              /*@Inject(FILE_VISUALIZERS) private readonly _fileVisualizers: AbstractFileVisualizer[]*/) {
    super();
+    this._defineColumns();
  }

  ngOnInit(): void {
    super.ngOnInit();

-    this._defineColumns();
-
    if (this.canEdit) {
      this._createPollingListenerForFileReady();
    }
@@ -241,30 +240,7 @@ export class DepositDocumentFileContainer extends SharedAbstractRoutable impleme
        isFilterable: true,
        translate: true,
        filterEnum: Enums.DocumentFile.AccessLevelEnumTranslate,
-        component: DataTableComponentHelper.get(DataTableComponentEnum.accessLevel),
-      },
-      {
-        field: "embargoAccessLevel",
-        header: LabelTranslateEnum.embargoAccessLevel,
-        type: DataTableFieldTypeEnum.singleSelect,
-        order: OrderEnum.none,
-        filterableField: "embargoAccessLevel" as any,
-        sortableField: "embargoAccessLevel" as any,
-        isSortable: true,
-        isFilterable: true,
-        translate: true,
-        filterEnum: Enums.DocumentFile.AccessLevelEnumTranslate,
-        component: DataTableComponentHelper.get(DataTableComponentEnum.accessLevel),
-      },
-      {
-        field: "embargoEndDate",
-        header: LabelTranslateEnum.embargoEndDate,
-        type: DataTableFieldTypeEnum.date,
-        order: OrderEnum.none,
-        filterableField: "embargoEndDate" as any,
-        sortableField: "embargoEndDate" as any,
-        isSortable: true,
-        isFilterable: false,
+        component: DataTableComponentHelper.get(DataTableComponentEnum.accessLevelWithEmbargo),
      },
      {
        field: "documentFileType.value",

--- a/src/app/features/deposit/components/containers/deposit-table-contributor/deposit-table-contributor.container.html
+++ b/src/app/features/deposit/components/containers/deposit-table-contributor/deposit-table-contributor.container.html
@@ -41,7 +41,6 @@
    <th *ngIf="mode === modeEnum.contributors"
        class="function"
    >{{labelTranslateEnum.function | translate}}</th>
-    <!--    <th class="corresponding-author">{{labelTranslateEnum.correspondingAuthor | translate}}</th>-->
    <th *ngIf="!readonly"
        class="sort"
    ></th>
@@ -66,7 +65,6 @@
        (cdkDragDropped)="refreshLastnameFirstnameInput()"
    >
      <td class="member-cell">
-        <!--        INDEX:{{i}}-->
        <mat-radio-group *ngIf="formValidationHelper.getFormControl(f, formDefinition.institution) as fd"
                         class="radio-vertical"
                         color="primary"
@@ -131,7 +129,6 @@
      >
        <mat-form-field *ngIf="formValidationHelper.getFormControl(f, formDefinition.role) as fd">
          <mat-select [formControl]="fd">
-            <!--            <mat-option [value]="null"></mat-option>-->
            <mat-option *ngFor="let role of roleContributorEnumTranslate"
                        [value]="role.key"
            >
@@ -140,17 +137,7 @@
          </mat-select>
        </mat-form-field>
      </td>
-      <!--      <td class="corresponding-author-cell">-->
-      <!--        <ng-template [ngIf]="formValidationHelper.getFormControl(f, formDefinition.role)?.value === roleContributorEnum.author">-->
-      <!--          <mat-radio-group *ngIf="formValidationHelper.getFormControl(f, formDefinition.correspondingAuthor) as fd"-->
-      <!--                           [formControl]="fd"-->
-      <!--          >-->
-      <!--            <mat-radio-button color="primary"-->
-      <!--                              [value]="true"-->
-      <!--            ></mat-radio-button>-->
-      <!--          </mat-radio-group>-->
-      <!--        </ng-template>-->
-      <!--      </td>-->
+
      <td *ngIf="!readonly"
          class="sort-cell"
          cdkDragHandle
@@ -176,14 +163,7 @@
          <solidify-icon [iconName]="iconNameEnum.delete"></solidify-icon>
        </button>
      </td>
-      <td [class.invalid-cell]="f.invalid">
-        <!-- INVALID BAR INDICATOR -->
-        <!--        <pre>{{f.value | json}}</pre>-->
-        <!--        <pre>Role : {{f.get(formDefinition.role).invalid}}</pre>-->
-        <!--        <pre>Firstname : {{f.get(formDefinition.firstname).invalid}}</pre>-->
-        <!--        <pre>Lastname : {{f.get(formDefinition.lastname).invalid}}</pre>-->
-        <!--        <pre>cnIndividu : {{f.get(formDefinition.cnIndividu).invalid}}</pre>-->
-      </td>
+      <td [class.invalid-cell]="f.invalid"></td>
    </tr>
    <ng-template [ngIf]="!readonly">
      <tr *ngIf="getSearchContributorInfos(f) as searchContributorInfos"
@@ -246,7 +226,6 @@
            </div>
          </ng-template>
        </td>
-        <!--        <td>&lt;!&ndash; CORRESPONDING AUTHOR &ndash;&gt;</td>-->
        <td><!-- MOVE --></td>
        <td>
          <div [solidifySpinner]="searchContributorInfos.isLoading"

--- a/src/app/features/deposit/components/containers/deposit-table-contributor/deposit-table-contributor.container.ts
+++ b/src/app/features/deposit/components/containers/deposit-table-contributor/deposit-table-contributor.container.ts
@@ -310,9 +310,7 @@ export class DepositTableContributorContainer extends SharedAbstractContainer im
    const formControlInstitution = form.get(this.formDefinition.institution);
    const formControlCnIndividu = form.get(this.formDefinition.cnIndividu);
    const formControlOrcid = form.get(this.formDefinition.orcid);
-    const formControlEmail = form.get(this.formDefinition.email);
    const formControlRole = form.get(this.formDefinition.role);
-    // const formControlCorrespondingAuthor = form.get(this.formDefinition.correspondingAuthor);

    if (this.mode === DepositTableContributorModeEnum.collaborationMembers) {
      formControlRole.setValue(Enums.Deposit.RoleContributorEnum.collaborator);

--- a/src/app/features/deposit/components/presentationals/deposit-comment-form/deposit-comment-form.presentational.html
+++ b/src/app/features/deposit/components/presentationals/deposit-comment-form/deposit-comment-form.presentational.html
@@ -18,15 +18,19 @@
        class="comment"
    >
      <div class="infos">
-        <span class="comment-text">{{comment.text}}</span>
-        <span class="separator">–</span>
-        <a (click)="goToUser()"
-           class="user"
-        >{{comment.person.fullName}}</a>
+        <ng-template [ngIf]="comment.resId !== idCommentEdited">
+          <span class="comment-text">{{comment.text}}</span>
+          <span class="separator">–</span>
+        </ng-template>
+        <span class="user">{{comment.person.fullName}}</span>
        <span class="date">{{comment.creation.when | datetime}}</span>
+        <span *ngIf="comment.lastUpdate && comment.lastUpdate.when !== comment.creation.when"
+              class="date"
+        >({{labelTranslateEnum.lastEdit | translate}}: {{comment.lastUpdate.when | datetime}})</span>
      </div>
      <div class="buttons-wrapper">
-        <button type="button"
+        <button *ngIf="!showCommentForm"
+                type="button"
                (click)="editComment(comment)"
                mat-icon-button
                mat-button
@@ -37,7 +41,8 @@
                         class="md icon"
          ></solidify-icon>
        </button>
-        <button type="button"
+        <button *ngIf="!showCommentForm"
+                type="button"
                (click)="deleteComment(comment)"
                mat-icon-button
                mat-button
@@ -49,11 +54,30 @@
          ></solidify-icon>
        </button>
      </div>
+
+      <ng-template [ngIf]="showCommentForm && idCommentEdited === comment.resId">
+        <ng-template [ngTemplateOutlet]="commentInput"></ng-template>
+      </ng-template>
+
    </li>
  </ul>

-  <form *ngIf="showCommentForm"
-        [formGroup]="form"
+  <ng-template [ngIf]="showCommentForm && (idCommentEdited | isNullOrUndefined)">
+    <ng-template [ngTemplateOutlet]="commentInput"></ng-template>
+  </ng-template>
+
+  <div class="add-comment-wrapper">
+    <a *ngIf="!showCommentForm"
+       class="add-comment"
+       (click)="openCommentForm()"
+    >{{labelTranslateEnum.addAComment | translate}}</a>
+  </div>
+</solidify-panel-expandable>
+
+<!--TEMPLATE BELOW-->
+
+<ng-template #commentInput>
+  <form [formGroup]="form"
        class="form"
  >
    <mat-form-field class="textarea"
@@ -61,17 +85,18 @@
                    [appearance]="appearanceInputMaterial"
    >
      <mat-label>{{labelTranslateEnum.comment | translate}}</mat-label>
-      <textarea matInput
-                solidifyAutoFocus
+      <textarea #textAreaElement
+                matInput
                [placeholder]="labelTranslateEnum.writeYourCommentHere | translate"
                cdkTextareaAutosize
                cdkAutosizeMinRows="3"
                cdkAutosizeMaxRows="20"
+                [maxlength]="MAX_NUMBER_CHARACTER"
                [solidifyValidation]="errors"
                [formControl]="fd"
                [required]="formValidationHelper.hasRequiredField(fd)"
      >
-    </textarea>
+      </textarea>
      <mat-error #errors></mat-error>
      <mat-hint>{{labelTranslateEnum.characters | translate}} : {{getFormControl(formDefinition.text).value.length}} / {{MAX_NUMBER_CHARACTER}}</mat-hint>
    </mat-form-field>
@@ -82,6 +107,7 @@
                mat-button
                mat-flat-button
                color="primary"
+                [disabled]="!getFormControl(formDefinition.text)?.valid"
                (click)="submit()"
        >
          {{labelTranslateEnum.save | translate}}
@@ -97,11 +123,4 @@

  </form>

-  <div class="add-comment-wrapper">
-    <a *ngIf="!showCommentForm"
-       class="add-comment"
-       (click)="openCommentForm()"
-    >{{labelTranslateEnum.addAComment | translate}}</a>
-  </div>
-
-</solidify-panel-expandable>
+</ng-template>
--- a/src/app/features/deposit/components/presentationals/deposit-comment-form/deposit-comment-form.presentational.scss
+++ b/src/app/features/deposit/components/presentationals/deposit-comment-form/deposit-comment-form.presentational.scss
@@ -40,16 +40,12 @@
              margin-top: auto;
              margin-bottom: auto;

-              .comment-text {
-
-              }
-
              .separator {
                padding: 0 5px;
              }

              .user {
-
+                color: $primary-color;
              }

              .date {
@@ -59,7 +55,7 @@
            }

            .buttons-wrapper {
-
+              height: 40px;
            }
          }
        }
@@ -69,10 +65,6 @@
          grid-template-columns: 1fr min-content;
          grid-gap: 15px;

-          .textarea {
-
-          }
-
          .right-part {
            padding-top: 4px;

@@ -86,13 +78,8 @@

        .add-comment-wrapper {
          padding-left: 10px;
-
-          .add-comment {
-
-          }
        }

-
      }
    }
  }

--- a/src/app/features/deposit/components/presentationals/deposit-comment-form/deposit-comment-form.presentational.ts
+++ b/src/app/features/deposit/components/presentationals/deposit-comment-form/deposit-comment-form.presentational.ts
@@ -6,13 +6,13 @@ import {
  Injector,
  Input,
  Output,
+  ViewChild,
 } from "@angular/core";
 import {
  FormBuilder,
  Validators,
 } from "@angular/forms";
 import {MatDialog} from "@angular/material/dialog";
-import {UploadFileStatus} from "@app/features/deposit/models/upload-file-status.model";
 import {Comment} from "@models";
 import {IconNameEnum} from "@shared/enums/icon-name.enum";
 import {LabelTranslateEnum} from "@shared/enums/label-translate.enum";
@@ -24,7 +24,6 @@ import {
  BaseFormDefinition,
  ConfirmDialog,
  ConfirmDialogData,
-  Guid,
  isNullOrUndefined,
  isTrue,
  MARK_AS_TRANSLATABLE,
@@ -40,12 +39,15 @@ import {
  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class DepositCommentFormPresentational extends AbstractFormPresentational<Comment> {
-  readonly MAX_NUMBER_CHARACTER: number = 254;
+  readonly MAX_NUMBER_CHARACTER: number = 4000;

  formDefinition: FormComponentFormDefinition = new FormComponentFormDefinition();
  showCommentForm: boolean = false;
  idCommentEdited: string | undefined = undefined;

+  @ViewChild("textAreaElement")
+  private _textAreaElement: ElementRef;
+
  private _listComments: Comment[];

  @Input()
@@ -118,12 +120,14 @@ export class DepositCommentFormPresentational extends AbstractFormPresentational
  openCommentForm(): void {
    this.initNewForm();
    this.showCommentForm = true;
+    setTimeout(() => this._textAreaElement?.nativeElement?.focus(), 0);
  }

  editComment(comment: Comment): void {
    this.bindFormTo(comment);
    this.showCommentForm = true;
    this.idCommentEdited = comment.resId;
+    setTimeout(() => this._textAreaElement?.nativeElement?.focus(), 0);
  }

  deleteComment(comment: Comment): void {
@@ -146,10 +150,6 @@ export class DepositCommentFormPresentational extends AbstractFormPresentational
      }),
    ));
  }
-
-  goToUser(): void {
-    // TODO : Redirect to page when ready
-  }
 }

 class FormComponentFormDefinition extends BaseFormDefinition {

--- a/src/app/features/deposit/components/presentationals/deposit-document-file-uploading/deposit-document-file-uploading.presentational.scss
+++ b/src/app/features/deposit/components/presentationals/deposit-document-file-uploading/deposit-document-file-uploading.presentational.scss
@@ -32,12 +32,8 @@ $progress-bar-height: 20px;
      @include truncate-with-ellipsis;
    }

-    .ico-file {
-    }
-
  }

-
  &.is-uploading { // FILE IN PROGRESS WITH PROGRESS BAR

    @include respond-to-smaller-than-breakpoint('sm') {
@@ -125,7 +121,3 @@ $progress-bar-height: 20px;
 .progression-value {
  z-index: 1;
 }
-
-.uploaded {
-
-}
No results found