fix: ios check for image label

qlik-oss · Dec 6, 2022 · 44c8cfa · 44c8cfa
1 parent a3bec42
commit 44c8cfa
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 18 deletions.
diff --git a/ios/DataColumn.swift b/ios/DataColumn.swift
@@ -40,6 +40,7 @@ struct Representation: Codable {
   let globalMax: Double?
   let globalMin: Double?
   let imageSize: String?
+  let imageSetting: String?
   let imagePosition: String?
   let linkUrl: String?
   let urlLabel: String?

diff --git a/ios/ImageCell.swift b/ios/ImageCell.swift
@@ -127,26 +127,40 @@ class ImageCell: UIView, ConstraintCellProtocol, SelectionsListener {
   func setData(data: DataCell, representedAs rep: Representation, index: Int?) {
     self.representation = rep
     self.cell = data
-    guard let qAttrExps = data.qAttrExps else {return}
-    guard let qValues = qAttrExps.qValues else {return}
-    guard let attrIndex = index else { return }
-    if qValues.count > 0 {
-      guard let urlString = qValues[attrIndex].qText else {return}
-      guard let url = URL(string: urlString) else {return}
-      self.imagedata = nil;
-      if let pendingWorkItem = self.workItem {
-        pendingWorkItem.cancel();
+
+    guard let urlString = getUrlString(data: data, representedAs: rep, index: index) else { return }
+    guard let url = URL(string: urlString) else {return}
+    self.imagedata = nil;
+    if let pendingWorkItem = self.workItem {
+      pendingWorkItem.cancel();
+    }
+    let task = URLSession.shared.dataTask(with: url, completionHandler: { data, response, error in
+      guard let data = data, error == nil else { return }
+      DispatchQueue.main.async {
+        self.imagedata = data
+        self.setNeedsLayout()
       }
-      let task = URLSession.shared.dataTask(with: url, completionHandler: { data, response, error in
-        guard let data = data, error == nil else { return }
-        DispatchQueue.main.async {
-          self.imagedata = data
-          self.setNeedsLayout()
-        }
-      })
-      self.workItem = task;
-      task.resume()
+    })
+    self.workItem = task;
+    task.resume()
+  }
+
+  func getUrlString(data: DataCell, representedAs rep: Representation, index: Int?) -> String? {
+    var urlString = ""
+    if(rep.imageSetting == "label") {
+      urlString = data.qText ?? ""
+      return urlString
+    }
+
+    guard let qAttrExps = data.qAttrExps else {return nil}
+    guard let qValues = qAttrExps.qValues else {return nil}
+    guard let attrIndex = index else { return nil }
+
+    if qValues.count > 0 {
+      guard let urlString = qValues[attrIndex].qText else {return nil}
+      return urlString
     }
+    return nil
   }
 
   override func layoutSubviews() {