Skip to content

PE-7850: feat(manifest select the folder in view as target folder when creting a manifest #2007

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

PE-7850: feat(manifest select the folder in view as target folder when creting a manifest #2007

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f6e7116
feat(manifest): select the folder in view as target folder when creat…
thiagocarvalhodev Mar 21, 2025
d632337
merge
thiagocarvalhodev Mar 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 20 additions & 9 deletions lib/blocs/create_manifest/create_manifest_cubit.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ part 'create_manifest_state.dart';

// TODO: Add tests for CreateManifestCubit
class CreateManifestCubit extends Cubit<CreateManifestState> {
late FolderNode targetFolderNode;
late FolderNode rootFolderNode;

final ProfileCubit _profileCubit;
Expand Down Expand Up @@ -119,16 +120,26 @@ class CreateManifestCubit extends Cubit<CreateManifestState> {
}

/// Validate form before User begins choosing a target folder
Future<void> chooseTargetFolder() async {
Future<void> chooseTargetFolder({String? currentFolderId}) async {
rootFolderNode = await _folderRepository.getFolderNode(
_drive.id,
_drive.rootFolderId,
);

logger.i('Choosing target folder for drive: ${_drive.id}');
rootFolderNode =
await _folderRepository.getFolderNode(_drive.id, _drive.rootFolderId);
logger.d('Root folder node loaded with id: ${rootFolderNode.folder.id}');
logger.d('Current folder id: $currentFolderId');
targetFolderNode = await _folderRepository.getFolderNode(
_drive.id,
currentFolderId ?? _drive.rootFolderId,
);

logger.d('Root folder node loaded with id: ${targetFolderNode.folder.id}');

_hasPendingFiles = await _hasPendingFilesInFolder(targetFolderNode);

_hasPendingFiles = await _hasPendingFilesInFolder(rootFolderNode);
logger.d('Folder has pending files: $_hasPendingFiles');

await loadFolder(_drive.rootFolderId);
await loadFolder(currentFolderId ?? _drive.rootFolderId);
}

/// User has confirmed that they would like to submit a manifest revision transaction
Expand Down Expand Up @@ -305,9 +316,9 @@ class CreateManifestCubit extends Cubit<CreateManifestState> {
'Existing manifest file ID: $existingManifestFileId, Target folder ID: $folderId');
FolderEntry parentFolder;
if (folderId != null) {
rootFolderNode =
targetFolderNode =
await _folderRepository.getFolderNode(_drive.id, folderId);
parentFolder = rootFolderNode.folder;
parentFolder = targetFolderNode.folder;
} else {
switch (state) {
case CreateManifestPreparingManifestWithARNS s:
Expand All @@ -324,7 +335,7 @@ class CreateManifestCubit extends Cubit<CreateManifestState> {
final manifestFile = await _manifestRepository.getManifestFile(
parentFolder: parentFolder,
manifestName: manifestName,
rootFolderNode: rootFolderNode,
rootFolderNode: targetFolderNode,
driveId: _drive.id,
fallbackTxId: _getFallbackTxId(),
);
Expand Down
24 changes: 18 additions & 6 deletions lib/components/create_manifest_form.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,6 @@ class _CreateManifestFormState extends State<CreateManifestForm> {
bool _isFormValid = false;

ArDriveTextFieldNew manifestNameForm() {
final readCubitContext = context.read<CreateManifestCubit>();

return ArDriveTextFieldNew(
hintText: appLocalizationsOf(context).manifestName,
controller: _manifestNameController,
Expand All @@ -118,7 +116,14 @@ class _CreateManifestFormState extends State<CreateManifestForm> {
},
autofocus: true,
onFieldSubmitted: (s) {
readCubitContext.processManifestName(s);
final state = context.read<DriveDetailCubit>().state;
if (state is DriveDetailLoadSuccess) {
context.read<CreateManifestCubit>().chooseTargetFolder(
currentFolderId: state.folderInView.folder.id,
);
} else {
context.read<CreateManifestCubit>().chooseTargetFolder();
}
},
);
}
Expand Down Expand Up @@ -458,7 +463,6 @@ class _CreateManifestFormState extends State<CreateManifestForm> {
required TextStyle textStyle,
required CreateManifestNameInput state,
}) {
final readCubitContext = context.read<CreateManifestCubit>();
return ArDriveStandardModalNew(
width: kLargeDialogWidth,
title: appLocalizationsOf(context).addnewManifestEmphasized,
Expand All @@ -469,8 +473,16 @@ class _CreateManifestFormState extends State<CreateManifestForm> {
),
ModalAction(
isEnable: _isFormValid,
action: () => readCubitContext
.processManifestName(_manifestNameController.text),
action: () {
final state = context.read<DriveDetailCubit>().state;
if (state is DriveDetailLoadSuccess) {
context.read<CreateManifestCubit>().chooseTargetFolder(
currentFolderId: state.folderInView.folder.id,
);
} else {
context.read<CreateManifestCubit>().chooseTargetFolder();
}
},
title: appLocalizationsOf(context).nextEmphasized,
),
],
Expand Down