Merge pull request #1309 from Esri/df/apollo/1427

`FeatureFormView` - UI tests for adding UNA associations, warning resolutions, logging improvements, small bug fix

Author: dfeinzimer

Sources/ArcGISToolkit/Components/FeatureFormView/EmbeddedFeatureFormViewModel.swift

@@ -15,6 +15,8 @@
 import ArcGIS
 import Observation
 
+private import os
+
 @MainActor @Observable
 class EmbeddedFeatureFormViewModel {
     /// The current focused element, if one exists.
@@ -88,7 +90,13 @@ class EmbeddedFeatureFormViewModel {
     func evaluateExpressions() {
         evaluateTask?.cancel()
         evaluateTask = Task {
-            _ = try? await featureForm.evaluateExpressions()
+            if let errors = try? await featureForm.evaluateExpressions(), !errors.isEmpty {
+                for evaluationError in errors {
+                    Logger.featureFormView.error(
+                        "Error evaluating expression: \(evaluationError.error.localizedDescription)"
+                    )
+                }
+            }
         }
     }
 

Sources/ArcGISToolkit/Components/FeatureFormView/Subviews/FormElements/UtilityAssociationsFormElement/UtilityAssociationAssetTypesView.swift

@@ -63,6 +63,7 @@ extension FeatureFormView {
                                 embeddedFeatureFormViewModel, element, filter, source, assetType
                             )
                         )
+                        .accessibilityIdentifier("Asset Type \(assetType.name) \(assetType.code)")
                     }
                 } header: {
                     HStack {

Sources/ArcGISToolkit/Components/FeatureFormView/Subviews/FormElements/UtilityAssociationsFormElement/UtilityAssociationCreationView.swift

@@ -15,6 +15,8 @@
 import ArcGIS
 import SwiftUI
 
+private import os
+
 extension FeatureFormView {
     /// A view to configure and add a utility network association.
     struct UtilityAssociationCreationView: View {
@@ -30,7 +32,7 @@ extension FeatureFormView {
         /// See also: `includeContentVisibility`.
         @State private var contentIsVisible: Bool = false
         /// How far along an edge the association is located.
-        @State private var fractionAlongEdge: Double = 0.5
+        @State private var fractionAlongEdge: Double = 0
         /// The options for a utility network feature when creating an association.
         @State private var options: UtilityAssociationFeatureOptions? = nil
         /// A Boolean value which indicates when the configured association is being added.
@@ -82,17 +84,18 @@ extension FeatureFormView {
         func addAssociation() async {
             guard let options else { return }
             do {
+                let result: UtilityAssociationResult
                 if includeContentVisibility {
-                    try await element.addAssociation(feature: candidate.feature, filter: filter, isContainmentVisible: contentIsVisible)
+                    result = try await element.addAssociation(feature: candidate.feature, filter: filter, isContainmentVisible: contentIsVisible)
                 } else {
-                    switch (options.isFractionAlongEdgeValid, terminalForFromSide, terminalForToSide) {
+                    result = switch (options.isFractionAlongEdgeValid, terminalForFromSide, terminalForToSide) {
                     case let (true, .some(terminal), .none):
                         try await element.addAssociation(feature: candidate.feature, filter: filter, fractionAlongEdge: fractionAlongEdge, terminal: terminal)
                     case let (true, .none, .some(terminal)):
                         try await element.addAssociation(feature: candidate.feature, filter: filter, fractionAlongEdge: fractionAlongEdge, terminal: terminal)
                     case (true, .none, .none):
                         try await element.addAssociation(feature: candidate.feature, filter: filter, fractionAlongEdge: fractionAlongEdge)
-                    case (false, .some, .some):
+                    case (false, _, _):
                         try await element.addAssociation(
                             feature: candidate.feature,
                             featureTerminal: candidateIsToElement
@@ -107,6 +110,7 @@ extension FeatureFormView {
                         try await element.addAssociation(feature: candidate.feature, filter: filter)
                     }
                 }
+                Logger.featureFormView.info("Association added to \(result.title)")
                 // After the association is created, remove the creation
                 // workflow views from the navigation path. This includes:
                 //  1. UtilityAssociationCreationView
@@ -120,6 +124,9 @@ extension FeatureFormView {
                 // views to avoid errors here. (FB20395585)
                 // https://developer.apple.com/forums/thread/802221#802221021
                 navigationPath?.wrappedValue.removeLast(4)
+            } catch let error as ArcGIS.InvalidArgumentError {
+                addAssociationError = .other(error.details)
+                alertIsPresented = true
             } catch {
                 addAssociationError = .anyError(error)
                 alertIsPresented = true
@@ -243,8 +250,8 @@ extension FeatureFormView {
                     } label: {
                         Text(LocalizedStringResource.fractionAlongEdge)
                     }
-                    Slider(value: $fractionAlongEdge, in: 0...1) { _ in
-                        LocalizedStringResource.fractionAlongEdge
+                    Slider(value: $fractionAlongEdge, in: 0...1) {
+                        Text(LocalizedStringResource.fractionAlongEdge)
                     }
                 }
             }

Test Runner/Test Runner/TestViews/FeatureFormTestView.swift

@@ -230,6 +230,9 @@ private extension FeatureFormTestView {
         .init("testCase_12_4", objectID: 2584, layerName: "Electric Distribution Device", portalID: .napervilleElectricUtilityNetwork, credentialInfo: .sampleServer7Viewer01),
         .init("testCase_12_5", objectID: 3321, layerName: "Electric Distribution Device", portalID: .napervilleElectricUtilityNetwork, credentialInfo: .sampleServer7Viewer01),
         .init("testCase_12_6", objectID: 3321, layerName: "Electric Distribution Device", portalID: .napervilleElectricUtilityNetwork, credentialInfo: .sampleServer7Viewer01),
+        .init("testCase_13_1", objectID: 3321, layerName: "Electric Distribution Device", portalID: .napervilleElectricUtilityNetwork, credentialInfo: .sampleServer7Viewer01),
+        .init("testCase_13_2", objectID: 5050, layerName: "Electric Distribution Device", portalID: .napervilleElectricUtilityNetwork, credentialInfo: .sampleServer7Viewer01),
+        .init("testCase_13_3", objectID: 311, layerName: "Electric Distribution Junction", portalID: .napervilleElectricUtilityNetwork, credentialInfo: .sampleServer7Viewer01),
     ]}
 }