Revert "Create an album stage 2 - Naming logic"

AmanKumar225 · gmagpayo · commit e0a900aab0b6 · 2023-01-11T19:42:04.000+13:00
diff --git a/MEGAUnitTests/Album/AlbumListViewModelTests.swift b/MEGAUnitTests/Album/AlbumListViewModelTests.swift
@@ -13,7 +13,7 @@ final class AlbumListViewModelTests: XCTestCase {
         let rawAlbum = AlbumEntity(id: 3, name: "", coverNode: NodeEntity(handle: 2), count: 1, type: .raw)
         let userAlbum = AlbumEntity(id: 3, name: "Custom Name", coverNode: NodeEntity(handle: 3), count: 1, type: .user)
         let useCase = MockAlbumListUseCase(albums: [favouriteAlbum, gifAlbum, rawAlbum, userAlbum])
-        let sut = AlbumListViewModel(usecase: useCase, alertViewModel: alertViewModel())
+        let sut = AlbumListViewModel(usecase: useCase)
         
         let exp = expectation(description: "albums titles are updated when retrieved")
         sut.$albums
@@ -33,7 +33,7 @@ final class AlbumListViewModelTests: XCTestCase {
     }
     
     func testLoadAlbums_onAlbumsLoadedFinsihed_shouldLoadSetToFalse() async throws {
-        let sut = AlbumListViewModel(usecase: MockAlbumListUseCase(), alertViewModel: alertViewModel())
+        let sut = AlbumListViewModel(usecase: MockAlbumListUseCase())
         let exp = expectation(description: "should load set after album load")
         
         sut.$shouldLoad
@@ -50,7 +50,7 @@ final class AlbumListViewModelTests: XCTestCase {
     
     func testCancelLoading_stopMonitoringForNodeUpdates() async throws {
         let useCase = MockAlbumListUseCase()
-        let sut = AlbumListViewModel(usecase: useCase, alertViewModel: alertViewModel())
+        let sut = AlbumListViewModel(usecase: useCase)
         XCTAssertTrue(useCase.startMonitoringNodesUpdateCalled == 0)
         XCTAssertTrue(useCase.stopMonitoringNodesUpdateCalled == 0)
         await sut.loadAlbums()
@@ -63,7 +63,7 @@ final class AlbumListViewModelTests: XCTestCase {
     func testCreateUserAlbum_shouldCreateUserAlbum() {
         let exp = expectation(description: "should load album at first after creating")
         let useCase = MockAlbumListUseCase()
-        let sut = AlbumListViewModel(usecase: useCase, alertViewModel: alertViewModel())
+        let sut = AlbumListViewModel(usecase: useCase)
         sut.createUserAlbum(with: "userAlbum")
         sut.$shouldLoad
             .dropFirst()
@@ -77,65 +77,5 @@ final class AlbumListViewModelTests: XCTestCase {
         XCTAssertEqual(sut.albums.last?.type, .user)
         XCTAssertEqual(sut.albums.last?.count, 0)
     }
-    
-    func testNewAlbumName_whenAlbumContainsNoNewAlbum() async {
-        let useCase = MockAlbumListUseCase()
-        let sut = AlbumListViewModel(usecase: useCase, alertViewModel: alertViewModel())
-        await sut.loadAlbums()
-        await sut.albumLoadingTask?.value
-        XCTAssertEqual(sut.newAlbumName(), Strings.Localizable.CameraUploads.Albums.Create.Alert.placeholder)
-    }
-    
-    func testNewAlbumName_whenAlbumContainsNewAlbum() async {
-        let newAlbum = MockAlbumListUseCase.sampleUserAlbum(name: Strings.Localizable.CameraUploads.Albums.Create.Alert.placeholder)
-        let useCase = MockAlbumListUseCase(albums: [newAlbum])
-        let sut = AlbumListViewModel(usecase: useCase, alertViewModel: alertViewModel())
-        await sut.loadAlbums()
-        await sut.albumLoadingTask?.value
-        XCTAssertEqual(sut.albums.count, 1)
-        XCTAssertEqual(sut.newAlbumName(), Strings.Localizable.CameraUploads.Albums.Create.Alert.placeholder + " \("(1)")")
-    }
-    
-    func testValidateAlbum_whenAlbumNameIsNil_returnsNil() {
-        let sut = AlbumListViewModel(usecase: MockAlbumListUseCase(), alertViewModel: alertViewModel())
-        XCTAssertNil(sut.validateAlbum(name: nil))
-    }
-    
-    func testValidateAlbum_whenAlbumNameIsEmpty_returnsNil() {
-        let sut = AlbumListViewModel(usecase: MockAlbumListUseCase(), alertViewModel: alertViewModel())
-        XCTAssertNil(sut.validateAlbum(name: ""))
-    }
-    
-    func testValidateAlbum_whenAlbumNameContainsInvalidChars_returnsErrorMessage() {
-        let sut = AlbumListViewModel(usecase: MockAlbumListUseCase(), alertViewModel: alertViewModel())
-        XCTAssertNotNil(sut.validateAlbum(name: "userAlbum:/;"))
-    }
-    
-    func testValidateAlbum_whenAlbumNameIsSameAsExistingUserAlbum_returnsErrorMessage() async {
-        let newAlbum = MockAlbumListUseCase.sampleUserAlbum(name: "userAlbum")
-        let useCase = MockAlbumListUseCase(albums: [newAlbum])
-        let sut = AlbumListViewModel(usecase: useCase, alertViewModel: alertViewModel())
-        await sut.loadAlbums()
-        await sut.albumLoadingTask?.value
-        XCTAssertEqual(sut.albums.count, 1)
-        XCTAssertNotNil(sut.validateAlbum(name: newAlbum.name))
-    }
-    
-    func testValidateAlbum_whenAlbumNameIsSameAsExistingSystemAlbum_returnsErrorMessage() async {
-        let newSysAlbum = AlbumEntity(id: AlbumIdEntity.favourite.rawValue, name: Strings.Localizable.CameraUploads.Albums.Favourites.title, coverNode: NodeEntity(handle: AlbumIdEntity.favourite.rawValue), count: 0, type: .favourite)
-        let useCase = MockAlbumListUseCase(albums: [newSysAlbum])
-        let sut = AlbumListViewModel(usecase: useCase, alertViewModel: alertViewModel())
-        await sut.loadAlbums()
-        await sut.albumLoadingTask?.value
-        XCTAssertEqual(sut.albums.count, 1)
-        XCTAssertNotNil(sut.validateAlbum(name: newSysAlbum.name))
-    }
-    
-    private func alertViewModel() -> TextFieldAlertViewModel {
-        TextFieldAlertViewModel(title: Strings.Localizable.CameraUploads.Albums.Create.Alert.title,
-                                                   placeholderText: Strings.Localizable.CameraUploads.Albums.Create.Alert.placeholder,
-                                                   affirmativeButtonTitle: Strings.Localizable.createFolderButton,
-                                                   message: nil)
-    }
 }
 
diff --git a/Modules/MEGADomain/Sources/MEGADomainMock/MockUseCases/MockAlbumListUseCase.swift b/Modules/MEGADomain/Sources/MEGADomainMock/MockUseCases/MockAlbumListUseCase.swift
@@ -8,8 +8,8 @@ public final class MockAlbumListUseCase: AlbumListUseCaseProtocol {
     public var startMonitoringNodesUpdateCalled = 0
     public var stopMonitoringNodesUpdateCalled = 0
     
-    public static func sampleUserAlbum(name: String) -> AlbumEntity {
-        AlbumEntity(id: 4, name: name, coverNode: NodeEntity(handle: 4), count: 0, type: .user)
+    private var sampleUserAlbum: AlbumEntity {
+        AlbumEntity(id: 4, name: "Custom Name", coverNode: NodeEntity(handle: 4), count: 0, type: .user)
     }
     
     public init(cameraUploadNode: NodeEntity? = nil, albums: [AlbumEntity] = []) {
@@ -34,6 +34,6 @@ public final class MockAlbumListUseCase: AlbumListUseCaseProtocol {
     }
     
     public func createUserAlbum(with name: String?) async throws -> AlbumEntity {
-        MockAlbumListUseCase.sampleUserAlbum(name: name ?? "Custom Name")
+        sampleUserAlbum.update(name: name ?? "")
     }
 }
diff --git a/iMEGA/Languages/Base.lproj/Localizable.strings b/iMEGA/Languages/Base.lproj/Localizable.strings
@@ -530,10 +530,6 @@
 "cameraUploads.albums.create.alert.title"="Enter album name";
 /* Used in create album popup. */
 "cameraUploads.albums.create.alert.placeholder"="New album";
-/* Used in create album popup user album name validation*/
-"cameraUploads.albums.create.alert.userAlbumExists"="An album with that name already exists";
-/* Used in create album popup system album name validation*/
-"cameraUploads.albums.create.alert.systemAlbumExists"="This album name is not allowed";
 /* Used in add content album view. */
 "cameraUploads.albums.create.location"="Add items to";
 /* Used in empty album view. */
diff --git a/iMEGA/Languages/en.lproj/Localizable.strings b/iMEGA/Languages/en.lproj/Localizable.strings
@@ -530,10 +530,6 @@
 "cameraUploads.albums.create.alert.title"="Enter album name";
 /* Used in create album popup. */
 "cameraUploads.albums.create.alert.placeholder"="New album";
-/* Used in create album popup user album name validation*/
-"cameraUploads.albums.create.alert.userAlbumExists"="An album with that name already exists";
-/* Used in create album popup system album name validation*/
-"cameraUploads.albums.create.alert.systemAlbumExists"="This album name is not allowed";
 /* Used in add content album view. */
 "cameraUploads.albums.create.location"="Add items to";
 /* Used in empty album view. */
diff --git a/iMEGA/Media Consumption/Album Library/AlbumContentAdditionView.swift b/iMEGA/Media Consumption/Album Library/AlbumContentAdditionView.swift
@@ -25,12 +25,10 @@ struct AlbumContentAdditionView: View {
     var navigationBar: some View {
         VStack(spacing: 0) {
             Text(viewModel.navigationTitle)
-                .lineLimit(1)
                 .font(.footnote)
                 .foregroundColor(.primary)
                 .padding(.bottom, 14)
                 .padding(.top, 18)
-                .padding(.horizontal, 30)
             
             HStack {
                 Button {
diff --git a/iMEGA/Media Consumption/Album Library/AlbumListView.swift b/iMEGA/Media Consumption/Album Library/AlbumListView.swift
@@ -3,6 +3,8 @@ import SwiftUI
 struct AlbumListView: View {
     @StateObject var viewModel: AlbumListViewModel
     @ObservedObject var createAlbumCellViewModel: CreateAlbumCellViewModel
+    @State var alertViewModel: TextFieldAlertViewModel
+    
     var router: AlbumListViewRouting
     
     var body: some View {
@@ -26,7 +28,7 @@ struct AlbumListView: View {
             }
             .padding(.horizontal, 6)
         }
-        .alert(isPresented: $viewModel.showCreateAlbumAlert, viewModel.alertViewModel)
+        .alert(isPresented: $viewModel.showCreateAlbumAlert, alertViewModel)
         .overlay(viewModel.shouldLoad ? ProgressView()
             .scaleEffect(1.5) : nil)
         .fullScreenCover(item: $viewModel.album) {
diff --git a/iMEGA/Media Consumption/Album Library/AlbumListViewModel.swift b/iMEGA/Media Consumption/Album Library/AlbumListViewModel.swift
@@ -3,32 +3,27 @@ import SwiftUI
 import MEGADomain
 
 final class AlbumListViewModel: NSObject, ObservableObject  {
+    var columns: [GridItem] = Array(
+        repeating: .init(.flexible(), spacing: 10),
+        count: 3
+    )
+    
     @Published var cameraUploadNode: NodeEntity?
     @Published var album: AlbumEntity?
     @Published var shouldLoad = true
     @Published var albums = [AlbumEntity]()
     @Published var showCreateAlbumAlert = false
     @Published var newlyAddedAlbum: AlbumEntity?
-    var columns: [GridItem] = Array(
-        repeating: .init(.flexible(), spacing: 10),
-        count: 3
-    )
+    
     var albumLoadingTask: Task<Void, Never>?
+    private let usecase: AlbumListUseCaseProtocol
+    
     var isCreateAlbumFeatureFlagEnabled: Bool {
         FeatureFlagProvider().isFeatureFlagEnabled(for: .createAlbum)
     }
     
-    private let usecase: AlbumListUseCaseProtocol
-    private(set) var alertViewModel: TextFieldAlertViewModel
-    
-    init(usecase: AlbumListUseCaseProtocol, alertViewModel: TextFieldAlertViewModel) {
+    init(usecase: AlbumListUseCaseProtocol) {
         self.usecase = usecase
-        self.alertViewModel = alertViewModel
-        super.init()
-        self.alertViewModel.action = { newAlbumName in
-            Task { await self.createUserAlbum(with: newAlbumName) }
-        }
-        self.alertViewModel.validator = validateAlbum
     }
     
     @MainActor
@@ -44,29 +39,8 @@ final class AlbumListViewModel: NSObject, ObservableObject  {
         albumLoadingTask?.cancel()
     }
     
-    @MainActor
-    func createUserAlbum(with name: String?) {
-        guard let name = name else { return }
-        guard name.isNotEmpty else {
-            createUserAlbum(with: newAlbumName())
-            return
-        }
-        
-        shouldLoad = true
-        Task {
-            do {
-                let newAlbum = try await usecase.createUserAlbum(with: name)
-                albums.append(newAlbum)
-                albums.sort(by: { $0.name < $1.name })
-                newlyAddedAlbum = newAlbum
-            } catch {
-                MEGALogError("Error creating album: \(error.localizedDescription)")
-            }
-            shouldLoad = false
-        }
-    }
-    
     // MARK: - Private
+    
     @MainActor
     private func loadAllAlbums() {
         albumLoadingTask = Task {
@@ -93,23 +67,20 @@ final class AlbumListViewModel: NSObject, ObservableObject  {
         }
     }
     
-    func newAlbumName() -> String {
-        var newAlbumName = Strings.Localizable.CameraUploads.Albums.Create.Alert.placeholder
-        let count = self.albums.filter({ $0.name.hasPrefix(newAlbumName) }).count
-        if count > 0 {
-            newAlbumName += " (\(count))"
-        }
-        return newAlbumName
-    }
-    
-    func validateAlbum(name: String?) -> String? {
-        guard let name = name, name.isNotEmpty else { return nil }
-        if name.mnz_containsInvalidChars() {
-            return Strings.Localizable.General.Error.charactersNotAllowed(String.Constants.invalidFileFolderNameCharacters)
-        }
-        if let existingAlbum = self.albums.first(where: { $0.name.lowercased() == name.lowercased() }) {
-            return existingAlbum.type == .user ?  Strings.Localizable.CameraUploads.Albums.Create.Alert.userAlbumExists : Strings.Localizable.CameraUploads.Albums.Create.Alert.systemAlbumExists
+    @MainActor
+    func createUserAlbum(with name: String?) {
+        guard let name = name, !name.isEmpty else { return }
+        shouldLoad = true
+        Task {
+            do {
+                let newAlbum = try await usecase.createUserAlbum(with: name)
+                albums.append(newAlbum)
+                albums.sort(by: { $0.name < $1.name })
+                newlyAddedAlbum = newAlbum
+            } catch {
+                MEGALogError("Error creating album: \(error.localizedDescription)")
+            }
+            shouldLoad = false
         }
-        return nil
     }
 }
diff --git a/iMEGA/Media Consumption/Album Library/AlbumListViewRouter.swift b/iMEGA/Media Consumption/Album Library/AlbumListViewRouter.swift
@@ -27,14 +27,20 @@ struct AlbumListViewRouter: AlbumListViewRouting, Routing {
                 userAlbumRepository: UserAlbumRepository.newRepo,
                 fileSearchRepository: FileSearchRepository.newRepo,
                 mediaUseCase: MediaUseCase()
-            ), alertViewModel: TextFieldAlertViewModel(title: Strings.Localizable.CameraUploads.Albums.Create.Alert.title,
-                                                       placeholderText: Strings.Localizable.CameraUploads.Albums.Create.Alert.placeholder,
-                                                       affirmativeButtonTitle: Strings.Localizable.createFolderButton,
-                                                       message: nil)
+            )
         )
         
+        let alertVm = TextFieldAlertViewModel(title: Strings.Localizable.CameraUploads.Albums.Create.Alert.title,
+                                              invalidTextTitle: Strings.Localizable.General.Error.charactersNotAllowed(String.Constants.invalidFileFolderNameCharacters),
+                                              placeholderText: Strings.Localizable.CameraUploads.Albums.Create.Alert.placeholder,
+                                              affirmativeButtonTitle: Strings.Localizable.createFolderButton,
+                                              message: nil) { newAlbumName in
+            Task { await vm.createUserAlbum(with: newAlbumName) }
+        }
+        
         let content = AlbumListView(viewModel: vm,
                                     createAlbumCellViewModel: CreateAlbumCellViewModel(),
+                                    alertViewModel: alertVm,
                                     router: self)
         
         return UIHostingController(rootView: content)
diff --git a/iMEGA/Media Consumption/Album Library/Alert/TextFieldAlertViewModel.swift b/iMEGA/Media Consumption/Album Library/Alert/TextFieldAlertViewModel.swift
@@ -1,13 +1,11 @@
 import Foundation
 
-typealias TextFieldAlertError = String?
-
 public struct TextFieldAlertViewModel {
     let textString: String = ""
     let title: String
+    let invalidTextTitle: String
     let placeholderText: String
     let affirmativeButtonTitle: String
     let message: String?
-    var action: ((String?) -> Void)?
-    var validator: ((String?) -> TextFieldAlertError)?
+    var action: (String?) -> ()
 }
diff --git a/iMEGA/Media Consumption/Album Library/Alert/TextFieldAlertViewWrapper.swift b/iMEGA/Media Consumption/Album Library/Alert/TextFieldAlertViewWrapper.swift
@@ -26,7 +26,7 @@ struct TextFieldAlertWrapper<Content: View>: UIViewControllerRepresentable {
             var alert = self.alert
             alert.action = {
                 self.isPresented = false
-                self.alert.action?($0)
+                self.alert.action($0)
             }
             context.coordinator.alertController = UIAlertController(alert: alert)
             uiViewController.present(context.coordinator.alertController!, animated: true)
diff --git a/iMEGA/Media Consumption/Album Library/Alert/UIAlertController+Extension.swift b/iMEGA/Media Consumption/Album Library/Alert/UIAlertController+Extension.swift
@@ -11,28 +11,23 @@ extension UIAlertController {
         }
         
         addAction(UIAlertAction(title: Strings.Localizable.cancel, style: .cancel) { _ in
-            alert.action?(nil)
+            alert.action(nil)
         })
         let textField = self.textFields?.first
         let affirmativeAction = UIAlertAction(title: alert.affirmativeButtonTitle, style: .default) { _ in
-            alert.action?(textField?.text)
+            alert.action(textField?.text)
         }
         addAction(affirmativeAction)
+        affirmativeAction.isEnabled = !alert.textString.mnz_isEmpty()
         
         func actionFor(textField: UITextField, within alert: UIAlertController, viewModel: TextFieldAlertViewModel) -> UIAction {
             UIAction(handler: { _ in
                 guard let updatedText = textField.text else { return }
-                var isEnabled = true
-                if let errorText = viewModel.validator?(updatedText) {
-                    alert.title = errorText
-                    textField.textColor = UIColor.mnz_redError()
-                    isEnabled = false
-                } else {
-                    alert.title = viewModel.title
-                    textField.textColor = UIColor.mnz_label()
-                    isEnabled = true
-                }
-                alert.actions.last?.isEnabled = isEnabled
+                let containsInvalidChars = updatedText.mnz_containsInvalidChars()
+                alert.title = containsInvalidChars ? viewModel.invalidTextTitle : viewModel.title
+                textField.textColor = containsInvalidChars ? UIColor.mnz_redError() : UIColor.mnz_label()
+                let empty = updatedText.mnz_isEmpty()
+                alert.actions.last?.isEnabled = (!empty && !containsInvalidChars)
             })
         }
     }
diff --git a/iMEGA/SwiftGen/Strings+Generated.swift b/iMEGA/SwiftGen/Strings+Generated.swift
@@ -2910,12 +2910,8 @@ public enum Strings {
           public enum Alert {
             /// New album
             public static let placeholder = Strings.tr("Localizable", "cameraUploads.albums.create.alert.placeholder")
-            /// This album name is not allowed
-            public static let systemAlbumExists = Strings.tr("Localizable", "cameraUploads.albums.create.alert.systemAlbumExists")
             /// Enter album name
             public static let title = Strings.tr("Localizable", "cameraUploads.albums.create.alert.title")
-            /// An album with that name already exists
-            public static let userAlbumExists = Strings.tr("Localizable", "cameraUploads.albums.create.alert.userAlbumExists")
           }
         }
         public enum CreateAlbum {

Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,8 @@ public final class MockAlbumListUseCase: AlbumListUseCaseProtocol {`
`8`	`8`	`public var startMonitoringNodesUpdateCalled = 0`
`9`	`9`	`public var stopMonitoringNodesUpdateCalled = 0`
`10`	`10`
`11`		`- public static func sampleUserAlbum(name: String) -> AlbumEntity {`
`12`		`- AlbumEntity(id: 4, name: name, coverNode: NodeEntity(handle: 4), count: 0, type: .user)`
	`11`	`+ private var sampleUserAlbum: AlbumEntity {`
	`12`	`+ AlbumEntity(id: 4, name: "Custom Name", coverNode: NodeEntity(handle: 4), count: 0, type: .user)`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`public init(cameraUploadNode: NodeEntity? = nil, albums: [AlbumEntity] = []) {`
`@@ -34,6 +34,6 @@ public final class MockAlbumListUseCase: AlbumListUseCaseProtocol {`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`public func createUserAlbum(with name: String?) async throws -> AlbumEntity {`
`37`		`- MockAlbumListUseCase.sampleUserAlbum(name: name ?? "Custom Name")`
	`37`	`+ sampleUserAlbum.update(name: name ?? "")`
`38`	`38`	`}`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ struct TextFieldAlertWrapper<Content: View>: UIViewControllerRepresentable {`
`26`	`26`	`var alert = self.alert`
`27`	`27`	`alert.action = {`
`28`	`28`	`self.isPresented = false`
`29`		`- self.alert.action?($0)`
	`29`	`+ self.alert.action($0)`
`30`	`30`	`}`
`31`	`31`	`context.coordinator.alertController = UIAlertController(alert: alert)`
`32`	`32`	`uiViewController.present(context.coordinator.alertController!, animated: true)`