Merge branch 'IIMAGE-9'

99x · Feb 6, 2025 · ae2702b · ae2702b
2 parents c30e4e5 + 074028e
commit ae2702b
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 36 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,6 @@
 # Gradle Project settings
 projectName = imageshop
-version = 2.0.4
+version = 2.0.5
 
 # XP App values
 appDisplayName = ImageShop

diff --git a/src/main/resources/lib/modules/iimage.js b/src/main/resources/lib/modules/iimage.js
@@ -23,8 +23,6 @@ module.exports = {
   translate
 }
 
-let connection = null
-
 function getSitesWithIImageAppInstalled() {
   const sites = libs.content.query({
     query: `data.siteConfig.applicationKey = '${app.name}'`,
@@ -73,36 +71,39 @@ function getInputsAllowedToUploadImage(contentId) {
   let partsWithImageSelector = []
 
   if (connection) {
-    const n = connection.draft.get(contentId)
-    const parts = n.components ? libs.objects.forceArray(n.components).filter(c => c.type === 'part') : []
-
-    const processedParts = {}
-
-    parts.forEach(p => {
-      const descriptor = p.part.descriptor
-
-      const part = libs.schema.getComponent({ key: descriptor, type: 'PART' })
-
-      const form = explodeFieldSets(part.form)
+    const contentNode = connection.draft.get(contentId)
 
-      const filteredInputs = form.filter(item => item.formItemType === 'Input' && item.inputType === 'ImageSelector')
-
-      if (processedParts[part.displayName]) processedParts[part.displayName]++
-      else processedParts[part.displayName] = 1
-
-      filteredInputs.forEach(item => {
-        let label = `${item.label} (${part.displayName} PART)`
-
-        if (processedParts[part.displayName] > 1) label += ` (${processedParts[part.displayName]})`
-
-        partsWithImageSelector.push({
-          name: item.name,
-          label,
-          path: p.path,
-          type: 'PART'
+    if (contentNode) {
+      const parts = contentNode.components ? libs.objects.forceArray(contentNode.components).filter(c => c.type === 'part') : []
+
+      const processedParts = {}
+
+      parts.forEach(p => {
+        const descriptor = p.part.descriptor
+
+        const part = libs.schema.getComponent({ key: descriptor, type: 'PART' })
+
+        const form = explodeFieldSets(part.form)
+
+        const filteredInputs = form.filter(item => item.formItemType === 'Input' && item.inputType === 'ImageSelector')
+
+        if (processedParts[part.displayName]) processedParts[part.displayName]++
+        else processedParts[part.displayName] = 1
+
+        filteredInputs.forEach(item => {
+          let label = `${item.label} (${part.displayName} PART)`
+
+          if (processedParts[part.displayName] > 1) label += ` (${processedParts[part.displayName]})`
+
+          partsWithImageSelector.push({
+            name: item.name,
+            label,
+            path: p.path,
+            type: 'PART'
+          })
         })
       })
-    })
+    }
   }
 
   //Make fieldsets flat
@@ -214,7 +215,7 @@ function requestImageInfoAndModifyContent (params) {
 
     const data = JSON.parse(response.body)
 
-    getConnection()
+    const connection = getConnection()
 
     const draftContentVersion = connection.draft.getActiveVersion({ key: imageId })
     const masterContentVersion = connection.master.getActiveVersion({ key: imageId })
@@ -269,12 +270,8 @@ function translate (key, values = []) {
 function getConnection () {
   const context = libs.context.get()
 
-  if (connection) return connection
-
-  connection = {
+  return {
     draft: libs.node.connect({ repoId: context.repository, branch: 'draft' }),
     master: libs.node.connect({ repoId: context.repository, branch: 'master' })
   }
-
-  return connection
 }