Merge pull request exadel-inc#686 from exadel-inc/1.0.x

1.0.x
khojametov · Dec 22, 2021 · 4be0812 · 4be0812
2 parents bacf344 + a4142c0
commit 4be0812
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 6 deletions.
diff --git a/java/api/src/main/java/com/exadel/frs/core/trainservice/filter/SecurityValidationFilter.java b/java/api/src/main/java/com/exadel/frs/core/trainservice/filter/SecurityValidationFilter.java
@@ -134,7 +134,8 @@ private void buildException(final HttpServletResponse response, final ResponseEn
         response.setStatus(responseEntity.getStatusCode().value());
         response.setContentType(MediaType.APPLICATION_JSON_VALUE);
         response.getWriter().append(objectMapper.writeValueAsString(responseEntity.getBody()));
-        response.getWriter().flush();
+        //response.getWriter().flush();
+        //don't need to flush or close the writer
     }
 
     private ModelType getModelTypeByUrl(String url) {

diff --git a/...bject-left/collection-manager-subject-left/collection-manager-subject-left.component.html b/...bject-left/collection-manager-subject-left/collection-manager-subject-left.component.html
@@ -34,6 +34,7 @@
           (click)="selectedSubject.emit(subject)"
           class="option"
           [attr.selected]="subject === currentSubject"
+          [ngStyle]="{ 'pointer-events': subject === currentSubject ? 'none' : 'auto' }"
         >
           <div class="avatar">
             <mat-icon class="material-icon" [ngClass]="{ 'selected-icon': subject === currentSubject }"> account_circle </mat-icon>

diff --git a/.../collection-manager-subject-right/collection-manager-subject-right.container.component.ts b/.../collection-manager-subject-right/collection-manager-subject-right.container.component.ts
@@ -48,6 +48,7 @@ import { SubjectModeEnum } from 'src/app/data/enums/subject-mode.enum';
     (deleteSelectedExamples)="deleteSelectedExamples($event)"
     (loadMore)="loadMore($event)"
     (selectExample)="selectExample($event)"
+    (restartUploading)="restartUploading($event)"
   ></app-collection-manager-subject-right>`,
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
@@ -146,6 +147,11 @@ export class CollectionManagerSubjectRightContainerComponent implements OnInit,
       .subscribe(() => this.collectionRightFacade.edit(editName, name, this.apiKey));
   }
 
+  restartUploading(item: CollectionItem[]): void {
+    const filesArr = item.map(item => item.file);
+    this.collectionRightFacade.addImageFilesToCollection(filesArr);
+  }
+
   readFiles(fileList: File[]): void {
     this.collectionRightFacade.addImageFilesToCollection(fileList);
   }

diff --git a/...ject-right/collection-manager-subject-right/collection-manager-subject-right.component.ts b/...ject-right/collection-manager-subject-right/collection-manager-subject-right.component.ts
@@ -52,6 +52,7 @@ export class CollectionManagerSubjectRightComponent implements OnChanges {
   @Output() deleteSelectedExamples = new EventEmitter<string[]>();
   @Output() selectExample = new EventEmitter<CollectionItem>();
   @Output() loadMore = new EventEmitter<CollectionItem>();
+  @Output() restartUploading = new EventEmitter<CollectionItem[]>();
 
   ngOnChanges(changes: SimpleChanges) {
     const change = changes['collectionItems'];
@@ -61,6 +62,12 @@ export class CollectionManagerSubjectRightComponent implements OnChanges {
 
       this.isCollectionOnHold = !!collectionOnHold.length;
 
+      const itemInProgress = this.collectionItems.find(item => item.status === CircleLoadingProgressEnum.InProgress);
+
+      if (this.isCollectionOnHold && !itemInProgress) {
+        this.restartUploading.emit(collectionOnHold);
+      }
+
       const examples = this.collectionItems.filter(
         item => item['totalElements'] === undefined && item.status === CircleLoadingProgressEnum.Uploaded
       );

diff --git a/ui/src/app/store/manage-collectiom/reducers.ts b/ui/src/app/store/manage-collectiom/reducers.ts
@@ -60,8 +60,8 @@ function updateCollectionItemStatus(
   state: CollectionEntityState,
   item: CollectionItem,
   status: CircleLoadingProgressEnum,
-  id?: string,
-  error?: string
+  error?: string,
+  id?: string
 ): CollectionEntityState {
   const collectionCopy = [...state.collection];
   const targetItemIndex = collectionCopy.findIndex(collectionCopyItem => item.url === collectionCopyItem.url);
@@ -175,9 +175,9 @@ const reducer: ActionReducer<CollectionEntityState> = createReducer(
     };
   }),
   on(uploadImage, deleteSubjectExample, (state, { item }) => updateCollectionItemStatus(state, item, CircleLoadingProgressEnum.InProgress)),
-  on(uploadImageSuccess, (state, { item, itemId }) => {
-    return updateCollectionItemStatus(state, item, CircleLoadingProgressEnum.Uploaded, itemId);
-  }),
+  on(uploadImageSuccess, (state, { item, itemId }) =>
+    updateCollectionItemStatus(state, item, CircleLoadingProgressEnum.Uploaded, null, itemId)
+  ),
   on(deleteSubjectExampleSuccess, (state, { item }) => updateCollectionItemStatus(state, item, CircleLoadingProgressEnum.Uploaded)),
   on(uploadImageFail, deleteSubjectExampleFail, (state, { item, error }) =>
     updateCollectionItemStatus(state, item, CircleLoadingProgressEnum.Failed, error)