merge

Author: thiagocarvalhodev

lib/blocs/create_manifest/create_manifest_cubit.dart

@@ -63,6 +63,43 @@ class CreateManifestCubit extends Cubit<CreateManifestState> {
       // Private manifests need more consideration and are currently unavailable
       emit(CreateManifestPrivacyMismatch());
     }
+    // Initialize folder selection immediately in the new workflow
+    _initFolderSelection();
+  }
+
+  /// Initialize folder selection on creation
+  Future<void> _initFolderSelection() async {
+    logger.i('Initializing folder selection for drive: ${_drive.id}');
+    rootFolderNode =
+        await _folderRepository.getFolderNode(_drive.id, _drive.rootFolderId);
+    logger.d('Root folder node loaded with id: ${rootFolderNode.folder.id}');
+
+    _hasPendingFiles = await _hasPendingFilesInFolder(rootFolderNode);
+    logger.d('Folder has pending files: $_hasPendingFiles');
+
+    await loadFolder(_drive.rootFolderId);
+  }
+
+  /// User has selected a folder and is ready to proceed to name input
+  void promptForManifestName() {
+    logger.i('Prompting for manifest name');
+    final state = this.state as CreateManifestFolderLoadSuccess;
+    emit(CreateManifestNameInput(
+      parentFolder: state.viewingFolder.folder,
+      fallbackTxId: state.fallbackTxId,
+    ));
+  }
+
+  /// Process manifest name and check for conflicts
+  Future<void> processManifestName(String name) async {
+    logger.i('Processing manifest name: $name');
+    if (state is CreateManifestNameInput) {
+      final nameInputState = state as CreateManifestNameInput;
+      final parentFolder = nameInputState.parentFolder;
+
+      emit(CreateManifestCheckingForConflicts(parentFolder: parentFolder));
+      await checkNameConflicts(name);
+    }
   }
 
   void selectUploadMethod(
@@ -371,6 +408,7 @@ class CreateManifestCubit extends Cubit<CreateManifestState> {
 
         emit(CreateManifestSuccess(
           nameAssignedByArNS: _selectedUndername != null,
+          parentFolder: createManifestUploadReview.parentFolder,
         ));
       } catch (e) {
         logger.e('An error occured uploading the manifest.', e);

lib/blocs/create_manifest/create_manifest_state.dart

@@ -6,9 +6,23 @@ abstract class CreateManifestState extends Equatable {
   List get props => [];
 }
 
-/// Initial state where user begins by selecting a name for the manifest
+/// Initial state where user begins by selecting a folder for the manifest
 class CreateManifestInitial extends CreateManifestState {}
 
+/// Folder has been selected, now user enters a name for the manifest
+class CreateManifestNameInput extends CreateManifestState {
+  final FolderEntry parentFolder;
+  final String? fallbackTxId;
+
+  CreateManifestNameInput({
+    required this.parentFolder,
+    this.fallbackTxId,
+  });
+
+  @override
+  List<Object?> get props => [parentFolder, fallbackTxId];
+}
+
 /// Name has been selected, user is now selecting which folder to create a manifest of
 class CreateManifestFolderLoadSuccess extends CreateManifestState {
   final bool viewingRootFolder;
@@ -218,8 +232,12 @@ class CreateManifestFailure extends CreateManifestState {}
 /// Manifest transaction has been successfully uploaded
 class CreateManifestSuccess extends CreateManifestState {
   final bool nameAssignedByArNS;
+  final FolderEntry parentFolder;
 
-  CreateManifestSuccess({this.nameAssignedByArNS = false});
+  CreateManifestSuccess({
+    required this.parentFolder,
+    this.nameAssignedByArNS = false,
+  });
 }
 
 enum CreateManifestUploadProgress {

lib/components/create_manifest_form.dart

@@ -201,9 +201,15 @@ class _CreateManifestFormState extends State<CreateManifestForm> {
           textStyle: textStyle,
         );
       } else if (state is CreateManifestInitial) {
-        return _createManifestInitial(
+        return const ProgressDialog(
+          useNewArDriveUI: true,
+          title: 'Loading Folders...',
+        );
+      } else if (state is CreateManifestNameInput) {
+        return _createManifestNameInput(
           context: context,
           textStyle: textStyle,
+          state: state,
         );
       }
       if (state is CreateManifestUploadInProgress) {
@@ -292,7 +298,9 @@ class _CreateManifestFormState extends State<CreateManifestForm> {
       actions: [
         ModalAction(
           action: () {
-            context.read<DriveDetailCubit>().refreshDriveDataTable();
+            context
+                .read<DriveDetailCubit>()
+                .openFolder(folderId: state.parentFolder.id);
             Navigator.pop(context);
           },
           title: 'Close',
@@ -450,9 +458,10 @@ class _CreateManifestFormState extends State<CreateManifestForm> {
     );
   }
 
-  Widget _createManifestInitial({
+  Widget _createManifestNameInput({
     required BuildContext context,
     required TextStyle textStyle,
+    required CreateManifestNameInput state,
   }) {
     return ArDriveStandardModalNew(
       width: kLargeDialogWidth,
@@ -999,8 +1008,8 @@ class _CreateManifestFormState extends State<CreateManifestForm> {
       ),
       action: ModalAction(
         isEnable: state.enableManifestCreationButton,
-        action: () => cubit.checkForConflicts(_manifestNameController.text),
-        title: appLocalizationsOf(context).createHereEmphasized,
+        action: () => cubit.promptForManifestName(),
+        title: appLocalizationsOf(context).nextEmphasized,
       ),
     );
   }

lib/components/new_button/new_button.dart

@@ -337,15 +337,22 @@ class NewButton extends StatelessWidget {
           if (driveDetailState.currentDrive.privacy == 'public')
             ArDriveNewButtonItem(
               onClick: () {
-                promptToCreateManifest(
-                  context,
-                  drive: drive!,
-                  // TODO: for big drives, this might will be slow
-                  hasPendingFiles: driveDetailState.currentFolderContents.any(
-                    (element) =>
-                        element.fileStatusFromTransactions ==
-                        TransactionStatus.pending,
-                  ),
+                // wait 100 ms before creating manifest
+                Future.delayed(
+                  const Duration(milliseconds: 100),
+                  () {
+                    promptToCreateManifest(
+                      context,
+                      drive: drive!,
+                      // TODO: for big drives, this might will be slow
+                      hasPendingFiles:
+                          driveDetailState.currentFolderContents.any(
+                        (element) =>
+                            element.fileStatusFromTransactions ==
+                            TransactionStatus.pending,
+                      ),
+                    );
+                  },
                 );
               },
               isDisabled: !driveDetailState.hasWritePermissions ||

lib/components/side_bar.dart

@@ -691,6 +691,8 @@ class _Accordion extends StatelessWidget {
                         hasAlert: state.drivesWithAlerts.contains(d.id),
                         drive: d,
                         onTap: () {
+                          _closeDrawer(context);
+
                           if (state.selectedDriveId == d.id) {
                             // opens the root folder
                             context.read<DriveDetailCubit>().openFolder();
@@ -726,6 +728,8 @@ class _Accordion extends StatelessWidget {
                         hasAlert: state.drivesWithAlerts.contains(d.id),
                         drive: d,
                         onTap: () {
+                          _closeDrawer(context);
+
                           context.read<DrivesCubit>().selectDrive(d.id);
                         },
                         isSelected: state.selectedDriveId == d.id,
@@ -751,6 +755,8 @@ class _Accordion extends StatelessWidget {
                         hasAlert: state.drivesWithAlerts.contains(d.id),
                         drive: d,
                         onTap: () {
+                          _closeDrawer(context);
+
                           context.read<DrivesCubit>().selectDrive(d.id);
                         },
                         isSelected: state.selectedDriveId == d.id,
@@ -764,5 +770,11 @@ class _Accordion extends StatelessWidget {
       },
     );
   }
+
+  void _closeDrawer(BuildContext context) {
+    if (Scaffold.maybeOf(context) != null) {
+      Scaffold.of(context).closeDrawer();
+    }
+  }
 }
 //

lib/pages/no_drives/no_drives_page.dart

@@ -1,6 +1,7 @@
 import 'package:ardrive/app_shell.dart';
 import 'package:ardrive/authentication/components/login_modal.dart';
 import 'package:ardrive/blocs/drive_detail/drive_detail_cubit.dart';
+import 'package:ardrive/components/app_top_bar.dart';
 import 'package:ardrive/components/drive_create_form.dart';
 import 'package:ardrive/components/profile_card.dart';
 import 'package:ardrive/components/topbar/help_button.dart';
@@ -64,6 +65,8 @@ class NoDrivesPage extends StatelessWidget {
             const Row(
               mainAxisAlignment: MainAxisAlignment.end,
               children: [
+                SyncButton(),
+                SizedBox(width: 8),
                 HelpButtonTopBar(),
                 SizedBox(width: 8),
                 ProfileCard(),