From 21359009664b2d5181f3551e3e7222ca60e311a4 Mon Sep 17 00:00:00 2001
From: Jack Brinkman <jack.brinkman@csiro.au>
Date: Tue, 9 Jan 2024 10:38:51 +1000
Subject: [PATCH] #812 Improved visibility of image file names for image link,
 edit & details dialog

---
 gradle.properties                                        | 2 +-
 .../profileEditor/templates/imageMetadata.tpl.htm        | 9 +++++++++
 .../profileEditor/templates/imageUpload.tpl.htm          | 9 +++++++++
 grails-app/views/profile/_images.gsp                     | 4 ++--
 4 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 4e54b88c..e71955b8 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-profileHubVersion=4.2.1
+profileHubVersion=4.2.2-SNAPSHOT
 grailsVersion=5.2.4
 grailsGradlePluginVersion=5.2.3
 groovyVersion=3.0.11
diff --git a/grails-app/assets/javascripts/profileEditor/templates/imageMetadata.tpl.htm b/grails-app/assets/javascripts/profileEditor/templates/imageMetadata.tpl.htm
index 84b89445..cf416948 100644
--- a/grails-app/assets/javascripts/profileEditor/templates/imageMetadata.tpl.htm
+++ b/grails-app/assets/javascripts/profileEditor/templates/imageMetadata.tpl.htm
@@ -78,6 +78,15 @@ <h4 class="modal-title">Image details</h4>
                 <span>{{ imageMetadataCtrl.image.metadata.licence }}</span>
             </div>
         </div>
+
+        <div class= "row margin-bottom-1" ng-show="imageMetadataCtrl.image.metadata.originalFileName">
+            <div class="col-sm-3">
+                <span class="output-label">File Name</span>
+            </div>
+            <div class="col-sm-9">
+                <span>{{ imageMetadataCtrl.image.metadata.originalFileName }}</span>
+            </div>
+        </div>
     </div>
 
     <div class="modal-footer">
diff --git a/grails-app/assets/javascripts/profileEditor/templates/imageUpload.tpl.htm b/grails-app/assets/javascripts/profileEditor/templates/imageUpload.tpl.htm
index 756cbef2..8ab50280 100644
--- a/grails-app/assets/javascripts/profileEditor/templates/imageUpload.tpl.htm
+++ b/grails-app/assets/javascripts/profileEditor/templates/imageUpload.tpl.htm
@@ -1,4 +1,13 @@
 <div class="form-horizontal">
+    <div class="form-horizontal" ng-if="metadata.originalFileName">
+        <div class="form-group">
+            <label for="licence" class="col-sm-3" style="text-align: right">Current Image</label>
+
+            <div class="col-sm-9">
+                <span>{{ metadata.originalFileName }}</span>
+            </div>
+        </div>
+    </div>
     <div class="form-group" ng-hide="disableSource">
         <label class="col-sm-3 control-label">Upload source</label>
         <div class="col-sm-9">
diff --git a/grails-app/views/profile/_images.gsp b/grails-app/views/profile/_images.gsp
index 0da0c7b8..bc7374b7 100644
--- a/grails-app/views/profile/_images.gsp
+++ b/grails-app/views/profile/_images.gsp
@@ -19,7 +19,7 @@
                          ng-show="!image.excluded">
                         <div class="imgCon ">
                             <a href="" ng-click="imageCtrl.showMetadata(image)" target="_blank"
-                               ng-if="image.thumbnailUrl" title="View details">
+                               ng-if="image.thumbnailUrl" title="{{image.metadata.originalFileName}}">
                                 <img ng-src="{{image.thumbnailUrl}}"
                                      ng-if="image.thumbnailUrl && image.type.name == 'OPEN'"
                                      class="thumbnail"/>
@@ -100,7 +100,7 @@
                         <div class="col-sm-4">
                             <div class="imgCon">
                                 <a href="" ng-click="imageCtrl.showMetadata(image)" target="_blank"
-                                   ng-if="image.largeImageUrl" title="View details">
+                                   ng-if="image.largeImageUrl" title="{{image.metadata.originalFileName}}">
                                     <img ng-src="{{image.largeImageUrl}}"
                                          ng-if="image.largeImageUrl && image.type.name == 'OPEN'"
                                          class="thumbnail"/>