From d3ebd309c0a656aac5312db1c775dd45a4688ef8 Mon Sep 17 00:00:00 2001 From: Mark Dostal Date: Fri, 21 Jun 2024 09:46:47 -0500 Subject: [PATCH] Build fixes for latest SDK API changes. --- .../Common/AttachmentsFeatureElementView.swift | 2 +- .../AttachmentHelpers/AttachmentImportMenu.swift | 6 +++++- .../ArcGIS/AttachmentHelpers/AttachmentsFormElement.swift | 3 +-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Sources/ArcGISToolkit/Common/AttachmentsFeatureElementView.swift b/Sources/ArcGISToolkit/Common/AttachmentsFeatureElementView.swift index 9ff57b691..51af82b63 100644 --- a/Sources/ArcGISToolkit/Common/AttachmentsFeatureElementView.swift +++ b/Sources/ArcGISToolkit/Common/AttachmentsFeatureElementView.swift @@ -191,7 +191,7 @@ struct AttachmentsFeatureElementView: View { func onDelete(attachmentModel: AttachmentModel) -> Void { if let element = featureElement as? AttachmentsFormElement, let attachment = attachmentModel.attachment as? FormAttachment { - element.deleteAttachment(attachment) + element.delete(attachment) guard case .initialized(var models) = attachmentModelsState else { return } models.removeAll { $0 == attachmentModel } attachmentModelsState = .initialized(models) diff --git a/Sources/ArcGISToolkit/Components/FeatureFormView/AttachmentHelpers/AttachmentImportMenu.swift b/Sources/ArcGISToolkit/Components/FeatureFormView/AttachmentHelpers/AttachmentImportMenu.swift index c8107822b..cf216e5f0 100644 --- a/Sources/ArcGISToolkit/Components/FeatureFormView/AttachmentHelpers/AttachmentImportMenu.swift +++ b/Sources/ArcGISToolkit/Components/FeatureFormView/AttachmentHelpers/AttachmentImportMenu.swift @@ -142,7 +142,11 @@ struct AttachmentImportMenu: View { if let presetFileName = newAttachmentImportData.fileName { fileName = presetFileName } else { - let attachmentNumber = element.attachments.count + 1 + // `element.attachments` is now marked `async throws`, so this + // needs to be modified. We can address it as part of + // Apollo #682. Temporarily, just use a random Int. +// let attachmentNumber = element.attachments.count + 1 + let attachmentNumber = Int.random(in: 0...99) if let fileExtension = newAttachmentImportData.fileExtension { fileName = "Attachment \(attachmentNumber).\(fileExtension)" } else { diff --git a/Sources/ArcGISToolkit/Extensions/ArcGIS/AttachmentHelpers/AttachmentsFormElement.swift b/Sources/ArcGISToolkit/Extensions/ArcGIS/AttachmentHelpers/AttachmentsFormElement.swift index d37fc1d02..cadafa06e 100644 --- a/Sources/ArcGISToolkit/Extensions/ArcGIS/AttachmentHelpers/AttachmentsFormElement.swift +++ b/Sources/ArcGISToolkit/Extensions/ArcGIS/AttachmentHelpers/AttachmentsFormElement.swift @@ -27,8 +27,7 @@ extension AttachmentsFormElement : AttachmentsFeatureElement { /// This property will be empty if the element has not yet been evaluated. public var featureAttachments: [FeatureAttachment] { get async throws { - try await fetchAttachments() - return attachments.map { $0 as FeatureAttachment } + try await attachments.map { $0 as FeatureAttachment } } }