From cabdeaa8757820bae388a899b39e1bf1705aec1c Mon Sep 17 00:00:00 2001
From: Willem Dantuma <willem.dantuma@dobs.nl>
Date: Tue, 2 Mar 2021 08:09:42 +0100
Subject: [PATCH] Reload image on change

---
 package-lock.json                                | 16 +++++++++-------
 package.json                                     |  6 +++---
 .../selected-item/selected-item.component.html   |  2 +-
 .../edit-image-modal.component.ts                |  2 +-
 .../components/thumbnail/thumbnail.component.ts  |  9 ++++++---
 5 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 4033f1f..090ffc3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1865,23 +1865,25 @@
       }
     },
     "@farmmaps/common": {
-      "version": "file:dist/common",
+      "version": "0.0.1-prerelease.548",
+      "resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common/-/common-0.0.1-prerelease.548.tgz",
+      "integrity": "sha512-gI+5kwpdimDkJUqU51PsyfZ0My5QRrEtwHGpCivd4kHxBZJ053cz6vHFnH1HquxesIXBVmDxjyeYGCrxhXVIOA==",
       "requires": {
         "tslib": "^2.0.0"
       }
     },
     "@farmmaps/common-map": {
-      "version": "0.0.1-prerelease.542",
-      "resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common-map/-/common-map-0.0.1-prerelease.542.tgz",
-      "integrity": "sha512-UTz3FnIKEJ9PGgGTGy8UuWqY+ZBY6cW4oIL9VgHrUg9yXtfRt2zT9kaNDTeSUVOiLWcocGbJZX7zt5gjM/50PQ==",
+      "version": "0.0.1-prerelease.548",
+      "resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common-map/-/common-map-0.0.1-prerelease.548.tgz",
+      "integrity": "sha512-rrlYUZvq4r1ANlbinucdasy5iRidOt8DI9V7ra4pKcgZqlsD5hteeosX45DnDlbSvcNzTtY3A0E28e4WXd25jA==",
       "requires": {
         "tslib": "^2.0.0"
       }
     },
     "@farmmaps/common-map3d": {
-      "version": "0.0.1-prerelease.542",
-      "resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common-map3d/-/common-map3d-0.0.1-prerelease.542.tgz",
-      "integrity": "sha512-igy1g7ritVE2+hgc6jIO4+OriCeV6k2MubQcoszWWG4F6RZYuMgKciIWSdlDZ8yvZsA8WMdtxlT5vJ3wgvmesA==",
+      "version": "0.0.1-prerelease.548",
+      "resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common-map3d/-/common-map3d-0.0.1-prerelease.548.tgz",
+      "integrity": "sha512-l3XQMSclt6x0fIjKw4K9j1IAr+L+0alHLd/9p80jfCkhB0qo1jZf/TorA636PSYB9NIBioiXOKMDVqTuPi+s/w==",
       "requires": {
         "tslib": "^2.0.0"
       }
diff --git a/package.json b/package.json
index ff2e82a..1ad2d5b 100644
--- a/package.json
+++ b/package.json
@@ -19,9 +19,9 @@
     "@angular/platform-browser": "~10.2.4",
     "@angular/platform-browser-dynamic": "~10.2.4",
     "@angular/router": "~10.2.4",
-    "@farmmaps/common": "file:dist/common",
-    "@farmmaps/common-map": ">=0.0.1-prerelease.540 <0.0.1",
-    "@farmmaps/common-map3d": ">=0.0.1-prerelease.540 <0.0.1",
+    "@farmmaps/common": ">=0.0.1-prerelease.548 <0.0.1",
+    "@farmmaps/common-map": ">=0.0.1-prerelease.548 <0.0.1",
+    "@farmmaps/common-map3d": ">=0.0.1-prerelease.548 <0.0.1",
     "@microsoft/signalr": "^3.1.3",
     "@ng-bootstrap/ng-bootstrap": "^7.0",
     "@ngrx/effects": "^10.0",
diff --git a/projects/common-map/src/fm-map/components/selected-item/selected-item.component.html b/projects/common-map/src/fm-map/components/selected-item/selected-item.component.html
index c32bc37..025f82f 100644
--- a/projects/common-map/src/fm-map/components/selected-item/selected-item.component.html
+++ b/projects/common-map/src/fm-map/components/selected-item/selected-item.component.html
@@ -1,6 +1,6 @@
 <div *ngIf="item;let item">
   <div class="card border-0">
-    <fm-thumbnail [item]="item" [edit]="true"></fm-thumbnail>
+    <fm-thumbnail [item]="item" [edit]="item.isEditable"></fm-thumbnail>
   </div>
   <div class="card">
     <div class="card-body">
diff --git a/projects/common/src/fm/components/edit-image-modal/edit-image-modal.component.ts b/projects/common/src/fm/components/edit-image-modal/edit-image-modal.component.ts
index 4f9c44c..3b8e7fb 100644
--- a/projects/common/src/fm/components/edit-image-modal/edit-image-modal.component.ts
+++ b/projects/common/src/fm/components/edit-image-modal/edit-image-modal.component.ts
@@ -56,7 +56,7 @@ export class EditImageModalComponent implements OnInit {
       this.imageService.putImage(this.endpointUrl,this.imageService.b64toBlob(body,"image/jpeg")).subscribe(() => {
         this.changed.emit({});
       });    
-      (this.modal as any).close('Save click');
+      this,this.modalService.dismissAll("Save");
     }
   }
 }
diff --git a/projects/common/src/fm/components/thumbnail/thumbnail.component.ts b/projects/common/src/fm/components/thumbnail/thumbnail.component.ts
index 4caa5cc..075be8e 100644
--- a/projects/common/src/fm/components/thumbnail/thumbnail.component.ts
+++ b/projects/common/src/fm/components/thumbnail/thumbnail.component.ts
@@ -1,4 +1,4 @@
-import { Component,Input ,ViewChild,ElementRef} from '@angular/core';
+import { Component,Input ,ViewChild,ElementRef,ChangeDetectorRef} from '@angular/core';
 import { Store } from '@ngrx/store';
 
 import { IListItem  } from '../../models/list.item';
@@ -19,7 +19,7 @@ import { AppConfig } from "../../shared/app.config";
     @ViewChild('thumbnail') el:ElementRef;
     @ViewChild('modal') modal:EditImageModalComponent;
 
-    constructor(public store: Store<commonReducers.State>, public itemTypeService: ItemTypeService,public appConfig: AppConfig,) {
+    constructor(public store: Store<commonReducers.State>, public itemTypeService: ItemTypeService,public appConfig: AppConfig,private changeDetector:ChangeDetectorRef) {
     }
 
     getThumbnailUrl(item:IListItem):string {
@@ -53,6 +53,9 @@ import { AppConfig } from "../../shared/app.config";
     }
 
     onChanged() {
-        console.log("changed");        
+        if(this.item) {
+            this.item.updated = new Date(new Date().getTime()).toISOString();
+            this.changeDetector.detectChanges();
+        }
     }
   }
\ No newline at end of file