Edit album status and add/remove group permissions

ReightI · ReightI · commit 6784822bcf57 · 2023-07-19T18:54:47.000+02:00
diff --git a/lib/network/albums.dart b/lib/network/albums.dart
@@ -206,24 +206,29 @@ Future<ApiResponse<bool>> moveAlbum(int catId, int parentCatId) async {
   return ApiResponse(error: ApiErrors.moveAlbumError);
 }
 
-Future<ApiResponse<bool>> editAlbum(
-    {required String name,
-    required int albumId,
-    String description = ''}) async {
+Future<ApiResponse<bool>> editAlbum({
+  required int albumId,
+  String? name,
+  String? description,
+  AlbumStatus? status,
+}) async {
   Map<String, String> queries = {
     'format': 'json',
     'method': 'pwg.categories.setInfo',
   };
-  FormData formData = FormData.fromMap({
+  Map<String, dynamic> data = {
     'category_id': albumId,
-    'name': name,
-    'comment': description,
-  });
+  };
+  if (name != null) data['name'] = name;
+  if (description != null) data['comment'] = description;
+  if (status != null) data['status'] = status.toJson();
+
+  final FormData formData = FormData.fromMap(data);
 
   try {
     Response response = await ApiClient.post(
-      data: formData,
       queryParameters: queries,
+      data: formData,
     );
 
     if (response.statusCode == 200) {
@@ -232,6 +237,7 @@ Future<ApiResponse<bool>> editAlbum(
         debugPrint("$data");
         return ApiResponse(error: ApiErrors.editAlbumError);
       }
+      print(data);
       return ApiResponse(data: true);
     }
   } on DioError catch (e) {
diff --git a/lib/network/groups.dart b/lib/network/groups.dart
@@ -24,7 +24,7 @@ Future<List<GroupModel>?> getAllGroups({
     'page': page,
   };
 
-  if (groups != null) queries['groups[]'] = groups;
+  if (groups != null) queries['group_id[]'] = groups;
   if (name != null) queries['name'] = "$name%";
 
   try {
diff --git a/lib/network/permissions.dart b/lib/network/permissions.dart
@@ -79,24 +79,25 @@ Future<bool> addPermission({
     'method': 'pwg.permissions.add',
   };
 
-  Map<String, dynamic> body = {
+  Map<String, dynamic> data = {
     'cat_id': albumId,
     'pwg_token': prefs.getString(Preferences.tokenKey),
   };
 
-  if (users != null) body['user_id'] = users;
-  if (groups != null) body['group_id'] = groups;
-  if (recursive != null) body['recursive'] = recursive;
+  if (users != null) data['user_id'] = users;
+  if (groups != null) data['group_id'] = groups;
+  if (recursive != null) data['recursive'] = recursive;
+
+  final FormData formData = FormData.fromMap(data);
 
   try {
     Response response = await ApiClient.post(
       queryParameters: queries,
-      data: body,
+      data: formData,
     );
 
     if (response.statusCode == 200) {
       Map<String, dynamic> data = json.decode(response.data);
-      print(data);
       return true;
     }
   } on DioError catch (e) {
@@ -119,23 +120,24 @@ Future<bool> removePermission({
     'method': 'pwg.permissions.remove',
   };
 
-  Map<String, dynamic> body = {
+  Map<String, dynamic> data = {
     'cat_id': albumId,
     'pwg_token': prefs.getString(Preferences.tokenKey),
   };
 
-  if (users != null) body['user_id'] = users;
-  if (groups != null) body['group_id'] = groups;
+  if (users != null) data['user_id'] = users;
+  if (groups != null) data['group_id'] = groups;
+
+  final FormData formData = FormData.fromMap(data);
 
   try {
     Response response = await ApiClient.post(
       queryParameters: queries,
-      data: body,
+      data: formData,
     );
 
     if (response.statusCode == 200) {
       Map<String, dynamic> data = json.decode(response.data);
-      print(data);
       return true;
     }
   } on DioError catch (e) {
diff --git a/lib/views/album/album_privacy_page.dart b/lib/views/album/album_privacy_page.dart
@@ -7,6 +7,7 @@ import 'package:piwigo_ng/models/album_model.dart';
 import 'package:piwigo_ng/models/album_permission_model.dart';
 import 'package:piwigo_ng/models/group_model.dart';
 import 'package:piwigo_ng/models/user_model.dart';
+import 'package:piwigo_ng/network/albums.dart';
 import 'package:piwigo_ng/network/api_error.dart';
 import 'package:piwigo_ng/network/groups.dart';
 import 'package:piwigo_ng/network/permissions.dart';
@@ -48,7 +49,6 @@ class _AlbumPrivacyPageState extends State<AlbumPrivacyPage> {
       return;
     }
     _admins = response.data;
-    print(_admins);
   }
 
   Future<void> _getPermissions() async {
@@ -72,6 +72,33 @@ class _AlbumPrivacyPageState extends State<AlbumPrivacyPage> {
     _groups = [..._groups, ..._allowedGroups].toSet().toList();
   }
 
+  Future<void> _onConfirmPermissions() async {
+    ApiResponse editResult = await editAlbum(
+      albumId: widget.album.id,
+      status: _selectedMode,
+    );
+    if (!editResult.hasData || !editResult.data) return;
+
+    if (_selectedMode == AlbumStatus.private) {
+      List<GroupModel> newGroups =
+          _groups.where((e) => !_allowedGroups.contains(e)).toList();
+      List<GroupModel> removedGroups =
+          _allowedGroups.where((e) => !_groups.contains(e)).toList();
+
+      bool addSuccess = await addPermission(
+        albumId: widget.album.id,
+        groups: newGroups.map((group) => group.id).toList(),
+      );
+
+      bool removeSuccess = await removePermission(
+        albumId: widget.album.id,
+        groups: removedGroups.map((group) => group.id).toList(),
+      );
+    }
+
+    Navigator.of(context).pop();
+  }
+
   void _onChangeMode(AlbumStatus? mode) {
     if (mode == null) return;
     setState(() {
@@ -102,56 +129,67 @@ class _AlbumPrivacyPageState extends State<AlbumPrivacyPage> {
       appBar: AppBar(
         title: Text(appStrings.categoryPrivacy),
       ),
-      body: ListView(
-        padding: const EdgeInsets.symmetric(
-          vertical: 16.0,
-        ),
+      body: Column(
         children: [
-          Text(
-            appStrings.categoryPrivacy_subtitle(widget.album.name),
-            textAlign: TextAlign.center,
-          ),
-          Padding(
-            padding: const EdgeInsets.symmetric(
-              vertical: 8.0,
-            ),
-            child: Column(
+          Expanded(
+            child: ListView(
+              padding: const EdgeInsets.symmetric(
+                vertical: 16.0,
+              ),
               children: [
-                RadioListTile<AlbumStatus>(
-                  value: AlbumStatus.public,
-                  groupValue: _selectedMode,
-                  activeColor: Theme.of(context).colorScheme.secondary,
-                  title: Text(appStrings.categoryPrivacyMode_public),
-                  subtitle: Text(appStrings.categoryPrivacyMode_publicMessage),
-                  onChanged: _onChangeMode,
+                Text(
+                  appStrings.categoryPrivacy_subtitle(widget.album.name),
+                  textAlign: TextAlign.center,
+                ),
+                Padding(
+                  padding: const EdgeInsets.symmetric(
+                    vertical: 8.0,
+                  ),
+                  child: Column(
+                    children: [
+                      RadioListTile<AlbumStatus>(
+                        value: AlbumStatus.public,
+                        groupValue: _selectedMode,
+                        activeColor: Theme.of(context).colorScheme.secondary,
+                        title: Text(appStrings.categoryPrivacyMode_public),
+                        subtitle:
+                            Text(appStrings.categoryPrivacyMode_publicMessage),
+                        onChanged: _onChangeMode,
+                      ),
+                      RadioListTile(
+                        value: AlbumStatus.private,
+                        groupValue: _selectedMode,
+                        activeColor: Theme.of(context).colorScheme.secondary,
+                        title: Text(appStrings.categoryPrivacyMode_private),
+                        subtitle:
+                            Text(appStrings.categoryPrivacyMode_privateMessage),
+                        onChanged: _onChangeMode,
+                      ),
+                    ],
+                  ),
                 ),
-                RadioListTile(
-                  value: AlbumStatus.private,
-                  groupValue: _selectedMode,
-                  activeColor: Theme.of(context).colorScheme.secondary,
-                  title: Text(appStrings.categoryPrivacyMode_private),
-                  subtitle: Text(appStrings.categoryPrivacyMode_privateMessage),
-                  onChanged: _onChangeMode,
+                AnimatedSize(
+                  duration: const Duration(milliseconds: 300),
+                  reverseDuration: const Duration(milliseconds: 150),
+                  curve: Curves.ease,
+                  alignment: Alignment.topCenter,
+                  child: SizedBox(
+                    height: _selectedMode == AlbumStatus.public ? .0 : null,
+                    child: _privateSection,
+                  ),
                 ),
               ],
             ),
           ),
-          AnimatedSize(
-            duration: const Duration(milliseconds: 300),
-            reverseDuration: const Duration(milliseconds: 150),
-            curve: Curves.ease,
-            alignment: Alignment.topCenter,
-            child: SizedBox(
-              height: _selectedMode == AlbumStatus.public ? .0 : null,
-              child: _privateSection,
-            ),
-          ),
-          PiwigoButton(
-            margin: const EdgeInsets.symmetric(
+          Padding(
+            padding: const EdgeInsets.symmetric(
               horizontal: 24.0,
               vertical: 16.0,
             ),
-            text: appStrings.alertConfirmButton,
+            child: PiwigoButton(
+              onPressed: _onConfirmPermissions,
+              text: appStrings.alertConfirmButton,
+            ),
           ),
         ],
       ),
@@ -179,22 +217,14 @@ class _AlbumPrivacyPageState extends State<AlbumPrivacyPage> {
             child: FutureBuilder(
               future: _permissionsFuture,
               builder: (context, snapshot) {
-                if (snapshot.connectionState == ConnectionState.done) {
-                  return Wrap(
-                    spacing: 8.0,
-                    runSpacing: .0,
-                    children: List.generate(_groups.length, (index) {
-                      GroupModel group = _groups[index];
-                      return PiwigoChip(
-                        onRemove: () => _onRemoveGroup(index),
-                        label: group.name,
-                      );
-                    }),
-                  );
+                switch (snapshot.connectionState) {
+                  case ConnectionState.done:
+                    return _buildGroupPermissions;
+                  default:
+                    return Center(
+                      child: CircularProgressIndicator(),
+                    );
                 }
-                return Center(
-                  child: CircularProgressIndicator(),
-                );
               },
             ),
           ),
@@ -206,7 +236,6 @@ class _AlbumPrivacyPageState extends State<AlbumPrivacyPage> {
                 switch (snapshot.connectionState) {
                   case ConnectionState.done:
                     return _buildUserPermissions;
-                  case ConnectionState.waiting:
                   default:
                     return Center(
                       child: CircularProgressIndicator(),
@@ -220,6 +249,20 @@ class _AlbumPrivacyPageState extends State<AlbumPrivacyPage> {
     );
   }
 
+  Widget get _buildGroupPermissions {
+    return Wrap(
+      spacing: 8.0,
+      runSpacing: .0,
+      children: List.generate(_groups.length, (index) {
+        GroupModel group = _groups[index];
+        return PiwigoChip(
+          onRemove: () => _onRemoveGroup(index),
+          label: group.name,
+        );
+      }),
+    );
+  }
+
   Widget get _buildUserPermissions {
     if (_admins == null) {
       return Text(appStrings.none);
