Add linking to users and groups tab view, fix various linking bugs

Author: CodeDoctorDE

api/lib/models/event/user.dart

@@ -23,7 +23,7 @@ class EventUserDatabaseConnector extends DatabaseModelConnector<User, Event> {
       '$tableName JOIN events ON eventId = events.id',
       limit: limit,
       offset: offset,
-      where: 'groupId = ?',
+      where: 'userId = ?',
       whereArgs: [itemId],
     );
     return result?.map((e) => Event.fromDatabase(e)).toList() ?? [];
@@ -36,7 +36,7 @@ class EventUserDatabaseConnector extends DatabaseModelConnector<User, Event> {
       '$tableName JOIN users ON userId = users.id',
       limit: limit,
       offset: offset,
-      where: 'userId = ?',
+      where: 'eventId = ?',
       whereArgs: [connectId],
     );
     return result?.map((e) => User.fromDatabase(e)).toList() ?? [];

api/pubspec.lock

@@ -121,6 +121,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.0.3"
+  cli_config:
+    dependency: transitive
+    description:
+      name: cli_config
+      sha256: ac20a183a07002b700f0c25e61b7ee46b23c309d76ab7b7640a028f18e4d99ec
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.2.0"
   code_builder:
     dependency: transitive
     description:
@@ -149,10 +157,10 @@ packages:
     dependency: transitive
     description:
       name: coverage
-      sha256: e3493833ea012784c740e341952298f1cc77f1f01b1bbc3eb4eecf6984fb7f43
+      sha256: "9086475ef2da7102a0c0a4e37e1e30707e7fb7b6d28c209f559a9c5f8ce42016"
       url: "https://pub.dev"
     source: hosted
-    version: "1.11.1"
+    version: "1.12.0"
   crypto:
     dependency: transitive
     description:

app/android/Gemfile.lock

@@ -11,7 +11,7 @@ GEM
     artifactory (3.0.17)
     atomos (0.1.3)
     aws-eventstream (1.3.2)
-    aws-partitions (1.1082.0)
+    aws-partitions (1.1086.0)
     aws-sdk-core (3.222.1)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
@@ -71,7 +71,7 @@ GEM
     faraday_middleware (1.2.1)
       faraday (~> 1.0)
     fastimage (2.4.0)
-    fastlane (2.227.0)
+    fastlane (2.227.1)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -111,7 +111,7 @@ GEM
       tty-spinner (>= 0.8.0, < 1.0.0)
       word_wrap (~> 1.0.0)
       xcodeproj (>= 1.13.0, < 2.0.0)
-      xcpretty (~> 0.4.0)
+      xcpretty (~> 0.4.1)
       xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
     fastlane-sirp (1.0.0)
       sysrandom (~> 1.0)
@@ -231,4 +231,4 @@ DEPENDENCIES
   screengrab
 
 BUNDLED WITH
-   2.6.7
+   2.6.8

app/lib/blocs/sourced_paging.dart

@@ -40,7 +40,10 @@ class SourcedPagingBloc<T>
   }
 
   SourcedPagingBloc.item(
-      {required this.cubit, this.sources, required fetch, this.pageSize = 50})
+      {required this.cubit,
+      this.sources,
+      required ItemFetcher<T> fetch,
+      this.pageSize = 50})
       : useDates = false,
         _fetch = _buildDatedFetch(fetch),
         super(const SourcedPagingInitial()) {
@@ -50,7 +53,7 @@ class SourcedPagingBloc<T>
   SourcedPagingBloc.source({
     required this.cubit,
     required String source,
-    required SourceFetcher fetch,
+    required SourceFetcher<T> fetch,
     this.pageSize = 50,
   })  : sources = [source],
         useDates = false,
@@ -164,12 +167,12 @@ class SourcedPagingBloc<T>
   void removeSourced(T item) => add(SourcedPagingRemoved(item));
 }
 
-_buildDatedFetch<T>(ItemFetcher fetch) => (String source, SourceService service,
-        int offset, int limit, int date) async {
+_buildDatedFetch<T>(ItemFetcher<T> fetch) => (String source,
+        SourceService service, int offset, int limit, int date) async {
       final items = await fetch(source, service, offset, limit);
       return items;
     };
-_buildDatedFetchSource<T>(SourceFetcher fetch) => (String source,
+_buildDatedFetchSource<T>(SourceFetcher<T> fetch) => (String source,
         SourceService service, int offset, int limit, int date) async {
       final items = await fetch(service, offset, limit);
       return items;

app/lib/pages/groups/page.dart

@@ -92,7 +92,7 @@ class _GroupsBodyViewState extends State<GroupsBodyView> {
   @override
   void initState() {
     _flowCubit = context.read<FlowCubit>();
-    _bloc = SourcedPagingBloc.item(
+    _bloc = SourcedPagingBloc<Group>.item(
         cubit: _flowCubit,
         fetch: (source, service, offset, limit) async =>
             service.group?.getGroups(offset: offset, limit: limit));

app/lib/pages/groups/view.dart

@@ -1,4 +1,5 @@
 import 'package:flow/blocs/sourced_paging.dart';
+import 'package:flow/pages/groups/select.dart';
 import 'package:flow/widgets/paging/list.dart';
 import 'package:flow_api/services/source.dart';
 import 'package:flutter/material.dart';
@@ -66,7 +67,10 @@ class _GroupsViewState<T extends DescriptiveModel>
                       key: ValueKey(item.id),
                       background: Container(color: Colors.red),
                       onDismissed: (direction) {
-                        _groupService?.deleteGroup(item.id!);
+                        widget.connector.disconnect(
+                          widget.model.id!,
+                          item.id!,
+                        );
                         _bloc.removeSourced(item);
                       },
                       child: ListTile(
@@ -94,12 +98,12 @@ class _GroupsViewState<T extends DescriptiveModel>
             child: Padding(
               padding: const EdgeInsets.all(16.0),
               child: FloatingActionButton.extended(
-                label: Text(AppLocalizations.of(context).create),
-                icon: const PhosphorIcon(PhosphorIconsLight.plus),
+                label: Text(AppLocalizations.of(context).link),
+                icon: const PhosphorIcon(PhosphorIconsLight.link),
                 onPressed: () async {
                   final group = await showDialog<SourcedModel<Group>>(
                     context: context,
-                    builder: (context) => GroupDialog(
+                    builder: (context) => GroupSelectDialog(
                       source: widget.source,
                     ),
                   );

app/lib/pages/notes/view.dart

@@ -64,7 +64,10 @@ class _NotesViewState<T extends DescriptiveModel> extends State<NotesView<T>> {
                       key: ValueKey(item.id),
                       background: Container(color: Colors.red),
                       onDismissed: (direction) {
-                        _noteService?.deleteNote(item.id!);
+                        widget.connector.disconnect(
+                          widget.model.id!,
+                          item.id!,
+                        );
                         _bloc.removeSourced(item);
                       },
                       child: ListTile(

app/lib/pages/resources/view.dart

@@ -64,7 +64,10 @@ class _ResourcesViewState<T extends DescriptiveModel>
                       key: ValueKey(item.id),
                       background: Container(color: Colors.red),
                       onDismissed: (direction) {
-                        _resourceService?.deleteResource(item.id!);
+                        widget.connector.disconnect(
+                          widget.model.id!,
+                          item.id!,
+                        );
                         _bloc.removeSourced(item);
                       },
                       child: ListTile(

app/lib/pages/users/page.dart

@@ -109,7 +109,7 @@ class _UsersBodyViewState extends State<UsersBodyView> {
   @override
   void initState() {
     _flowCubit = context.read<FlowCubit>();
-    _bloc = SourcedPagingBloc.item(
+    _bloc = SourcedPagingBloc<User>.item(
         cubit: _flowCubit,
         fetch: (source, service, offset, limit) async =>
             _filter.source != null && _filter.source != source
@@ -141,49 +141,51 @@ class _UsersBodyViewState extends State<UsersBodyView> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      body: Column(
-        children: [
-          UserFilterView(
-            initialFilter: _filter,
-            onChanged: (filter) {
-              setState(() {
-                _filter = filter;
-              });
-              _bloc.refresh();
-            },
-          ),
-          const SizedBox(height: 8),
-          Expanded(
-            child: PagedListView.item(
-              bloc: _bloc,
-              itemBuilder: (ctx, item, index) => Align(
-                alignment: Alignment.topCenter,
-                child: Container(
-                  constraints: const BoxConstraints(maxWidth: 800),
-                  child: Dismissible(
-                    key: ValueKey('${item.model.id}@${item.source}'),
-                    onDismissed: (direction) async {
-                      await _flowCubit
-                          .getService(item.source)
-                          .user
-                          ?.deleteUser(item.model.id!);
-                      _bloc.remove(item);
-                    },
-                    background: Container(
-                      color: Colors.red,
-                    ),
-                    child: UserTile(
-                      flowCubit: _flowCubit,
-                      bloc: _bloc,
-                      source: item.source,
-                      user: item.model,
+      body: Center(
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.center,
+          children: [
+            UserFilterView(
+              initialFilter: _filter,
+              onChanged: (filter) {
+                setState(() {
+                  _filter = filter;
+                });
+                _bloc.refresh();
+              },
+            ),
+            const SizedBox(height: 8),
+            Expanded(
+              child: PagedListView.item(
+                bloc: _bloc,
+                itemBuilder: (ctx, item, index) => Center(
+                  child: Container(
+                    constraints: const BoxConstraints(maxWidth: 800),
+                    child: Dismissible(
+                      key: ValueKey('${item.model.id}@${item.source}'),
+                      onDismissed: (direction) async {
+                        await _flowCubit
+                            .getService(item.source)
+                            .user
+                            ?.deleteUser(item.model.id!);
+                        _bloc.remove(item);
+                      },
+                      background: Container(
+                        color: Colors.red,
+                      ),
+                      child: UserTile(
+                        flowCubit: _flowCubit,
+                        bloc: _bloc,
+                        source: item.source,
+                        user: item.model,
+                      ),
                     ),
                   ),
                 ),
               ),
             ),
-          ),
-        ],
+          ],
+        ),
       ),
       floatingActionButton: FloatingActionButton.extended(
         onPressed: () => showDialog(

app/lib/pages/users/user.dart

@@ -1,4 +1,5 @@
 import 'package:flow/widgets/markdown_field.dart';
+import 'package:flow_api/models/model.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flow/src/generated/i18n/app_localizations.dart';
@@ -83,7 +84,8 @@ class UserDialog extends StatelessWidget {
               await currentService?.updateUser(currentUser);
             }
             if (context.mounted) {
-              Navigator.of(context).pop(currentUser);
+              Navigator.of(context)
+                  .pop(SourcedModel(currentSource, currentUser));
             }
           },
           child: Text(AppLocalizations.of(context).save),