From b18622cc6ffdf313cbd2cfd0e1509c08de1a986d Mon Sep 17 00:00:00 2001
From: Linda Joy <wawirajoy98@gmail.com>
Date: Fri, 23 Apr 2021 15:25:47 +0300
Subject: [PATCH 1/3] Revert "Revert """

This reverts commit cfde6d7dd2d9f14a2ea27224cf951be5d6eb3759.
---
 .../add-folder-modal.component.html           | 22 ++++++++++++-------
 .../add-folder-modal.component.scss           |  5 +++++
 .../add-folder-modal.component.ts             | 14 +++++++++---
 3 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/ngfire/files/src/lib/file-manager/components/add-folder-modal/add-folder-modal.component.html b/ngfire/files/src/lib/file-manager/components/add-folder-modal/add-folder-modal.component.html
index d587907..ffff817 100644
--- a/ngfire/files/src/lib/file-manager/components/add-folder-modal/add-folder-modal.component.html
+++ b/ngfire/files/src/lib/file-manager/components/add-folder-modal/add-folder-modal.component.html
@@ -1,19 +1,25 @@
-<iote-modal>
-  <div modalTitle>Add folder</div>
+<iote-modal (click)="exitModal()" class="close-modal-btn">
+  <div modalTitle>{{'ADD.FOLDER.TITLE' | transloco }}</div>
 
-  <form [formGroup]="createFolderForm" (ngSubmit)="createFolder(createFolderForm.value)">'
-
-    <mat-form-field>
-      <mat-label>Name</mat-label>
+  <form [formGroup]="createFolderForm" (ngSubmit)="createFolder(createFolderForm.value)">
+   
+    <mat-form-field id="name-input">
+      <mat-label>{{'FORMS.FIELDS.NAME' | transloco}}</mat-label>
       <input matInput type="text" formControlName="name" name="name" />
     </mat-form-field>
 
+    <div class="errorMessage" > 
+      <mat-error *ngIf="createFolderForm.controls['name'].touched && createFolderForm.controls['name'].hasError('maxlength')">
+      {{'ADD.FOLDER.VALIDATION.MAX.ERROR' | transloco}}
+      </mat-error>
+    </div>
+    
     <div footer>
       <button type="submit" [disabled]="!createFolderForm.valid"
               fxLayoutAlign="end" mat-raised-button color="accent">
-        Create
+            {{'ADD.FOLDER.CREATE' | transloco }}
       </button>
     </div>
 
   </form>
-</iote-modal>
+</iote-modal> 
diff --git a/ngfire/files/src/lib/file-manager/components/add-folder-modal/add-folder-modal.component.scss b/ngfire/files/src/lib/file-manager/components/add-folder-modal/add-folder-modal.component.scss
index e69de29..81c8a3c 100644
--- a/ngfire/files/src/lib/file-manager/components/add-folder-modal/add-folder-modal.component.scss
+++ b/ngfire/files/src/lib/file-manager/components/add-folder-modal/add-folder-modal.component.scss
@@ -0,0 +1,5 @@
+.errorMessage {
+    font-size: 13px;
+    padding-right: 45px;
+    margin-top: -10px;
+  }
\ No newline at end of file
diff --git a/ngfire/files/src/lib/file-manager/components/add-folder-modal/add-folder-modal.component.ts b/ngfire/files/src/lib/file-manager/components/add-folder-modal/add-folder-modal.component.ts
index c7fa6e4..7e281fd 100644
--- a/ngfire/files/src/lib/file-manager/components/add-folder-modal/add-folder-modal.component.ts
+++ b/ngfire/files/src/lib/file-manager/components/add-folder-modal/add-folder-modal.component.ts
@@ -1,5 +1,8 @@
 import {Component, EventEmitter, OnInit, Input, Output, Inject } from '@angular/core';
 import { FormGroup, FormBuilder, Validators } from '@angular/forms';
+import { TranslocoLoader, Translation, TRANSLOCO_LOADER } from '@ngneat/transloco';
+
+
 
 import * as _ from 'lodash';
 import { Logger } from '@iote/bricks-angular';
@@ -14,11 +17,14 @@ import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
 /** Creates a bill/invoice =  a debit towards a supplier. */
 export class AddFolderModalComponent implements OnInit
 {
+  
   @Output() folderNamed = new EventEmitter<string>();
+  
 
   // Form Data
   createFolderForm: FormGroup;
-
+  
+ 
   constructor(private _fb: FormBuilder,
               private _dialogRef: MatDialogRef<AddFolderModalComponent>,
               @Inject(MAT_DIALOG_DATA) private _data: any,
@@ -28,10 +34,10 @@ export class AddFolderModalComponent implements OnInit
   ngOnInit()
   {
     this.createFolderForm = this._fb.group({
-      name: ['', [Validators.required]]
+      name: ['', [Validators.required,Validators.maxLength(30)]]
     });
   }
-
+   
   // --
   // Create Bill
 
@@ -42,5 +48,7 @@ export class AddFolderModalComponent implements OnInit
       this._dialogRef.close(frm.name);
     }
   }
+  
+  exitModal = () => this._dialogRef.close();
 
 }

From d105ac23f1e8efd7193299bfce5f4f158e46ba3d Mon Sep 17 00:00:00 2001
From: Linda Joy <wawirajoy98@gmail.com>
Date: Mon, 10 May 2021 14:16:06 +0300
Subject: [PATCH 2/3] Revert "Revert "Revert """"

This reverts commit b18622cc6ffdf313cbd2cfd0e1509c08de1a986d.
---
 .../add-folder-modal.component.html           | 22 +++++++------------
 .../add-folder-modal.component.scss           |  5 -----
 .../add-folder-modal.component.ts             | 14 +++---------
 3 files changed, 11 insertions(+), 30 deletions(-)

diff --git a/ngfire/files/src/lib/file-manager/components/add-folder-modal/add-folder-modal.component.html b/ngfire/files/src/lib/file-manager/components/add-folder-modal/add-folder-modal.component.html
index ffff817..d587907 100644
--- a/ngfire/files/src/lib/file-manager/components/add-folder-modal/add-folder-modal.component.html
+++ b/ngfire/files/src/lib/file-manager/components/add-folder-modal/add-folder-modal.component.html
@@ -1,25 +1,19 @@
-<iote-modal (click)="exitModal()" class="close-modal-btn">
-  <div modalTitle>{{'ADD.FOLDER.TITLE' | transloco }}</div>
+<iote-modal>
+  <div modalTitle>Add folder</div>
 
-  <form [formGroup]="createFolderForm" (ngSubmit)="createFolder(createFolderForm.value)">
-   
-    <mat-form-field id="name-input">
-      <mat-label>{{'FORMS.FIELDS.NAME' | transloco}}</mat-label>
+  <form [formGroup]="createFolderForm" (ngSubmit)="createFolder(createFolderForm.value)">'
+
+    <mat-form-field>
+      <mat-label>Name</mat-label>
       <input matInput type="text" formControlName="name" name="name" />
     </mat-form-field>
 
-    <div class="errorMessage" > 
-      <mat-error *ngIf="createFolderForm.controls['name'].touched && createFolderForm.controls['name'].hasError('maxlength')">
-      {{'ADD.FOLDER.VALIDATION.MAX.ERROR' | transloco}}
-      </mat-error>
-    </div>
-    
     <div footer>
       <button type="submit" [disabled]="!createFolderForm.valid"
               fxLayoutAlign="end" mat-raised-button color="accent">
-            {{'ADD.FOLDER.CREATE' | transloco }}
+        Create
       </button>
     </div>
 
   </form>
-</iote-modal> 
+</iote-modal>
diff --git a/ngfire/files/src/lib/file-manager/components/add-folder-modal/add-folder-modal.component.scss b/ngfire/files/src/lib/file-manager/components/add-folder-modal/add-folder-modal.component.scss
index 81c8a3c..e69de29 100644
--- a/ngfire/files/src/lib/file-manager/components/add-folder-modal/add-folder-modal.component.scss
+++ b/ngfire/files/src/lib/file-manager/components/add-folder-modal/add-folder-modal.component.scss
@@ -1,5 +0,0 @@
-.errorMessage {
-    font-size: 13px;
-    padding-right: 45px;
-    margin-top: -10px;
-  }
\ No newline at end of file
diff --git a/ngfire/files/src/lib/file-manager/components/add-folder-modal/add-folder-modal.component.ts b/ngfire/files/src/lib/file-manager/components/add-folder-modal/add-folder-modal.component.ts
index 7e281fd..c7fa6e4 100644
--- a/ngfire/files/src/lib/file-manager/components/add-folder-modal/add-folder-modal.component.ts
+++ b/ngfire/files/src/lib/file-manager/components/add-folder-modal/add-folder-modal.component.ts
@@ -1,8 +1,5 @@
 import {Component, EventEmitter, OnInit, Input, Output, Inject } from '@angular/core';
 import { FormGroup, FormBuilder, Validators } from '@angular/forms';
-import { TranslocoLoader, Translation, TRANSLOCO_LOADER } from '@ngneat/transloco';
-
-
 
 import * as _ from 'lodash';
 import { Logger } from '@iote/bricks-angular';
@@ -17,14 +14,11 @@ import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
 /** Creates a bill/invoice =  a debit towards a supplier. */
 export class AddFolderModalComponent implements OnInit
 {
-  
   @Output() folderNamed = new EventEmitter<string>();
-  
 
   // Form Data
   createFolderForm: FormGroup;
-  
- 
+
   constructor(private _fb: FormBuilder,
               private _dialogRef: MatDialogRef<AddFolderModalComponent>,
               @Inject(MAT_DIALOG_DATA) private _data: any,
@@ -34,10 +28,10 @@ export class AddFolderModalComponent implements OnInit
   ngOnInit()
   {
     this.createFolderForm = this._fb.group({
-      name: ['', [Validators.required,Validators.maxLength(30)]]
+      name: ['', [Validators.required]]
     });
   }
-   
+
   // --
   // Create Bill
 
@@ -48,7 +42,5 @@ export class AddFolderModalComponent implements OnInit
       this._dialogRef.close(frm.name);
     }
   }
-  
-  exitModal = () => this._dialogRef.close();
 
 }

From 3f50286cb60c3f3b8bb31feed237a6cc7758afbc Mon Sep 17 00:00:00 2001
From: Linda Joy <wawirajoy98@gmail.com>
Date: Mon, 10 May 2021 15:10:47 +0300
Subject: [PATCH 3/3] =?UTF-8?q?=F0=9F=90=9B=20Added=20character=20limit=20?=
 =?UTF-8?q?to=20folder=20with=20correct=20translations?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../add-folder-modal.component.html           | 20 ++++++++++++-------
 .../add-folder-modal.component.scss           |  5 +++++
 .../add-folder-modal.component.ts             | 14 ++++++++++---
 .../lib/file-manager/file-manager.module.ts   |  4 +++-
 4 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/ngfire/files/src/lib/file-manager/components/add-folder-modal/add-folder-modal.component.html b/ngfire/files/src/lib/file-manager/components/add-folder-modal/add-folder-modal.component.html
index d587907..a696ee9 100644
--- a/ngfire/files/src/lib/file-manager/components/add-folder-modal/add-folder-modal.component.html
+++ b/ngfire/files/src/lib/file-manager/components/add-folder-modal/add-folder-modal.component.html
@@ -1,19 +1,25 @@
-<iote-modal>
-  <div modalTitle>Add folder</div>
+<iote-modal (click)="exitModal()" class="close-modal-btn">
+  <div modalTitle>{{'ADD.FOLDER.TITLE' | transloco }}</div>
 
-  <form [formGroup]="createFolderForm" (ngSubmit)="createFolder(createFolderForm.value)">'
+  <form [formGroup]="createFolderForm" (ngSubmit)="createFolder(createFolderForm.value)">
 
-    <mat-form-field>
-      <mat-label>Name</mat-label>
+    <mat-form-field id="name-input">
+      <mat-label>{{'FORMS.FIELDS.NAME' | transloco}}</mat-label>
       <input matInput type="text" formControlName="name" name="name" />
     </mat-form-field>
 
+    <div class="errorMessage" > 
+      <mat-error *ngIf="createFolderForm.controls['name'].touched && createFolderForm.controls['name'].hasError('maxlength')">
+      {{'ADD.FOLDER.VALIDATION.MAX.ERROR' | transloco}}
+      </mat-error>
+    </div>
+    
     <div footer>
       <button type="submit" [disabled]="!createFolderForm.valid"
               fxLayoutAlign="end" mat-raised-button color="accent">
-        Create
+            {{'ADD.FOLDER.CREATE' | transloco }}
       </button>
     </div>
 
   </form>
-</iote-modal>
+</iote-modal> 
diff --git a/ngfire/files/src/lib/file-manager/components/add-folder-modal/add-folder-modal.component.scss b/ngfire/files/src/lib/file-manager/components/add-folder-modal/add-folder-modal.component.scss
index e69de29..81c8a3c 100644
--- a/ngfire/files/src/lib/file-manager/components/add-folder-modal/add-folder-modal.component.scss
+++ b/ngfire/files/src/lib/file-manager/components/add-folder-modal/add-folder-modal.component.scss
@@ -0,0 +1,5 @@
+.errorMessage {
+    font-size: 13px;
+    padding-right: 45px;
+    margin-top: -10px;
+  }
\ No newline at end of file
diff --git a/ngfire/files/src/lib/file-manager/components/add-folder-modal/add-folder-modal.component.ts b/ngfire/files/src/lib/file-manager/components/add-folder-modal/add-folder-modal.component.ts
index c7fa6e4..7e281fd 100644
--- a/ngfire/files/src/lib/file-manager/components/add-folder-modal/add-folder-modal.component.ts
+++ b/ngfire/files/src/lib/file-manager/components/add-folder-modal/add-folder-modal.component.ts
@@ -1,5 +1,8 @@
 import {Component, EventEmitter, OnInit, Input, Output, Inject } from '@angular/core';
 import { FormGroup, FormBuilder, Validators } from '@angular/forms';
+import { TranslocoLoader, Translation, TRANSLOCO_LOADER } from '@ngneat/transloco';
+
+
 
 import * as _ from 'lodash';
 import { Logger } from '@iote/bricks-angular';
@@ -14,11 +17,14 @@ import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
 /** Creates a bill/invoice =  a debit towards a supplier. */
 export class AddFolderModalComponent implements OnInit
 {
+  
   @Output() folderNamed = new EventEmitter<string>();
+  
 
   // Form Data
   createFolderForm: FormGroup;
-
+  
+ 
   constructor(private _fb: FormBuilder,
               private _dialogRef: MatDialogRef<AddFolderModalComponent>,
               @Inject(MAT_DIALOG_DATA) private _data: any,
@@ -28,10 +34,10 @@ export class AddFolderModalComponent implements OnInit
   ngOnInit()
   {
     this.createFolderForm = this._fb.group({
-      name: ['', [Validators.required]]
+      name: ['', [Validators.required,Validators.maxLength(30)]]
     });
   }
-
+   
   // --
   // Create Bill
 
@@ -42,5 +48,7 @@ export class AddFolderModalComponent implements OnInit
       this._dialogRef.close(frm.name);
     }
   }
+  
+  exitModal = () => this._dialogRef.close();
 
 }
diff --git a/ngfire/files/src/lib/file-manager/file-manager.module.ts b/ngfire/files/src/lib/file-manager/file-manager.module.ts
index 695d933..a2f7990 100644
--- a/ngfire/files/src/lib/file-manager/file-manager.module.ts
+++ b/ngfire/files/src/lib/file-manager/file-manager.module.ts
@@ -22,13 +22,15 @@ import { FileDetailsPathComponent } from './components/file-details-path/file-de
 import { FileDragUploadDirective } from './directives/file-drag-upload/file-drag-upload.directive';
 import { AddFolderModalComponent } from './components/add-folder-modal/add-folder-modal.component';
 import { ItemContextMenuComponent } from './components/item-context-menu/item-context-menu.component';
+import { MultiLangModule } from '@s4y/app/multi-lang';
+
 
 /**
  * Module that contains a file manager.
  */
 @NgModule({
   imports: [CommonModule, FlexLayoutModule, FormsModule, ReactiveFormsModule,
-            MaterialDesignModule, MaterialBricksModule, FilesModule, UIModalsModule,
+            MaterialDesignModule, MaterialBricksModule, FilesModule, UIModalsModule,MultiLangModule,
             AngularFireStorageModule, UIWorkflowModule],
 
   declarations: [FileManagerComponent, FileManagerNavComponent, FileDragUploadDirective,