From 98db94d18033e00d7cdaab70beb184fd7a201ed3 Mon Sep 17 00:00:00 2001 From: Javier Cicchelli Date: Wed, 14 Dec 2022 01:41:10 +0100 Subject: [PATCH] Fixed the naming of the FileSystemIdIdentifiable protocol for the Browse module as FileSystemItemIdentifiable. --- Modules/Sources/Browse/Logic/Models/Document.swift | 2 +- Modules/Sources/Browse/Logic/Models/Folder.swift | 2 +- Modules/Sources/Browse/Logic/Protocols/FileSystemItem.swift | 2 +- Modules/Sources/Browse/Logic/Use Cases/GetItemsUseCase.swift | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Modules/Sources/Browse/Logic/Models/Document.swift b/Modules/Sources/Browse/Logic/Models/Document.swift index 74bb69f..46df5eb 100644 --- a/Modules/Sources/Browse/Logic/Models/Document.swift +++ b/Modules/Sources/Browse/Logic/Models/Document.swift @@ -38,4 +38,4 @@ struct Document { // MARK: - FileSystemIdIdentifiable -extension Document: FileSystemIdIdentifiable {} +extension Document: FileSystemItemIdentifiable {} diff --git a/Modules/Sources/Browse/Logic/Models/Folder.swift b/Modules/Sources/Browse/Logic/Models/Folder.swift index 7c879b9..b089e36 100644 --- a/Modules/Sources/Browse/Logic/Models/Folder.swift +++ b/Modules/Sources/Browse/Logic/Models/Folder.swift @@ -27,7 +27,7 @@ public struct Folder { // MARK: - FileSystemIdIdentifiable -extension Folder: FileSystemIdIdentifiable {} +extension Folder: FileSystemItemIdentifiable {} // MARK: - Equatable diff --git a/Modules/Sources/Browse/Logic/Protocols/FileSystemItem.swift b/Modules/Sources/Browse/Logic/Protocols/FileSystemItem.swift index ffbb1e7..d4f4d04 100644 --- a/Modules/Sources/Browse/Logic/Protocols/FileSystemItem.swift +++ b/Modules/Sources/Browse/Logic/Protocols/FileSystemItem.swift @@ -13,4 +13,4 @@ protocol FileSystemItem { // MARK: - Type aliases -typealias FileSystemIdIdentifiable = FileSystemItem & Identifiable +typealias FileSystemItemIdentifiable = FileSystemItem & Identifiable & Hashable diff --git a/Modules/Sources/Browse/Logic/Use Cases/GetItemsUseCase.swift b/Modules/Sources/Browse/Logic/Use Cases/GetItemsUseCase.swift index 7f14d9f..bbd219f 100644 --- a/Modules/Sources/Browse/Logic/Use Cases/GetItemsUseCase.swift +++ b/Modules/Sources/Browse/Logic/Use Cases/GetItemsUseCase.swift @@ -22,7 +22,7 @@ struct GetItemsUseCase { id: String, username: String, password: String - ) async throws -> [any FileSystemIdIdentifiable] { + ) async throws -> [any FileSystemItemIdentifiable] { let items = try await apiService.getItems( id: id, credentials: .init( @@ -32,7 +32,7 @@ struct GetItemsUseCase { ) return items - .compactMap { item -> any FileSystemIdIdentifiable in + .compactMap { item -> any FileSystemItemIdentifiable in if item.isDirectory { return Folder( id: item.id,