Add info button to display actual configuration persist path behind t…

…he context path.
wcm-io · Mar 19, 2024 · 9eb06c7 · 9eb06c7
1 parent 944316e
commit 9eb06c7
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 3 deletions.
diff --git a/bundle/src/main/resources/angularjs-partials/detailView.html b/bundle/src/main/resources/angularjs-partials/detailView.html
@@ -36,6 +36,8 @@
   <p class="caconfig-contextPath"
      bo-if="detail.current.contextPath">
      <span bo-text="i18n('contextPath')"></span>: <code bo-text="detail.current.contextPath"></code>
+     <caconfig-help-inline-popup bo-if="detail.current.configSourcePath"
+         content="i18n('configSourcePath') + ' ' + detail.current.configSourcePath"></caconfig-help-inline-popup>
   </p>
   <p class="caconfig-contextPath"
      bo-if="!detail.current.contextPath" bo-text="i18n('noContextPath')">

diff --git a/bundle/src/main/resources/i18n/de.json b/bundle/src/main/resources/i18n/de.json
@@ -1,6 +1,7 @@
 {
   "io.wcm.caconfig.editor": {
     "contextPath": "Kontext-Pfad",
+    "configSourcePath": "Speichern nach:",
     "deepLinkError": "Deep-Linking zu geschachtelten Konfigurationen wird nur teilweise unterstützt. Bitte navigieren Sie zunächst manuell zur Konfiguration.",
     "noContextPath": "Der Kontext-Pfad konnte nicht ermittelt werden.",
     "title": "Konfiguration bearbeiten",

diff --git a/bundle/src/main/resources/i18n/en.json b/bundle/src/main/resources/i18n/en.json
@@ -1,6 +1,7 @@
 {
   "io.wcm.caconfig.editor": {
     "contextPath": "Context Path",
+    "configSourcePath": "Persist to:",
     "deepLinkError": "Deep linking to nested configurations is only partially supported. Please first navigate to the configuration manually.",
     "noContextPath": "No context path detected.",
     "title": "Configuration Editor",

diff --git a/bundle/src/main/webapp/app-root/clientlibs/io.wcm.caconfig.editor/css/editor.css b/bundle/src/main/webapp/app-root/clientlibs/io.wcm.caconfig.editor/css/editor.css
@@ -242,5 +242,4 @@ span.caconfig-tagbrowser {
 .caconfig-help-inline-popup button {
   padding: 0;
   min-height: 0;
-  margin-top: 8px;
 }
diff --git a/...le/src/main/webapp/app-root/clientlibs/io.wcm.caconfig.editor/js/editor/config.service.js b/...le/src/main/webapp/app-root/clientlibs/io.wcm.caconfig.editor/js/editor/config.service.js
@@ -119,7 +119,8 @@
               configs: response.data.configs,
               configNameObject: configNameObject,
               collectionProperties: response.data.collectionProperties,
-              propertyTypes: configCacheService.getPropertyTypes(configName)
+              propertyTypes: configCacheService.getPropertyTypes(configName),
+              configSourcePath: response.data.configSourcePath
             };
             currentConfigService.setCurrent(current);
             return current;

diff --git a/...ain/webapp/app-root/clientlibs/io.wcm.caconfig.editor/js/editor/current-config.service.js b/...ain/webapp/app-root/clientlibs/io.wcm.caconfig.editor/js/editor/current-config.service.js
@@ -75,6 +75,7 @@
       current.configNameObject = data.configNameObject;
       current.collectionProperties = data.collectionProperties;
       current.propertyTypes = data.propertyTypes;
+      current.configSourcePath = data.configSourcePath;
     };
 
     /**

diff --git a/...c/main/webapp/app-root/clientlibs/io.wcm.caconfig.editor/js/editor/data-helper.service.js b/...c/main/webapp/app-root/clientlibs/io.wcm.caconfig.editor/js/editor/data-helper.service.js
@@ -54,7 +54,8 @@
       return {
         configs: setDefaultValues(configs),
         newItem: newItem !== null ? setDefaultValues([newItem])[0] : null,
-        collectionProperties: collectionProperties
+        collectionProperties: collectionProperties,
+        configSourcePath: configData.configSourcePath
       };
     };
 

diff --git a/...src/main/webapp/app-root/clientlibs/io.wcm.caconfig.editor/js/editor/detail.controller.js b/...src/main/webapp/app-root/clientlibs/io.wcm.caconfig.editor/js/editor/detail.controller.js
@@ -178,6 +178,7 @@
             that.current.description = currentData.configNameObject.description;
             that.current.contextPath = configService.getState().contextPath;
             that.current.readOnly = currentData.configs.find(item => item.readOnly) != undefined;
+            that.current.configSourcePath = currentData.configSourcePath;
             $rootScope.title = $rootScope.i18n("title") + ": " + that.current.label;
             $rootScope.configForm = that.configForm;
             that.configLimit = MAX_CONFIGS_PER_PAGE;

diff --git a/changes.xml b/changes.xml
@@ -27,6 +27,9 @@
       <action type="add" dev="sseifert">
         Check permissions of configuration persistence path and render configuration as read-only if current user does not have write permissions.
       </action>
+      <action type="add" dev="sseifert">
+        Add info button to display actual configuration persist path behind the context path.
+      </action>
       <action type="update" dev="sseifert">
         Switch to AEM 6.5.17 as minimum version.
       </action>