Use linking instead of creating inside details tab views

CodeDoctorDE · CodeDoctorDE · commit fc440408cbc1 · 2025-03-30T14:24:43.000+02:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -728,7 +728,7 @@ jobs:
       - name: Setup Fastlane
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.3.7"
+          ruby-version: "3.4.2"
           bundler-cache: true
           working-directory: app/android
       - name: 🚀 Deploy to Play Store
diff --git a/api/lib/models/user/database.dart b/api/lib/models/user/database.dart
@@ -81,6 +81,18 @@ class UserDatabaseService extends UserService with TableService {
         1;
   }
 
+  @override
+  Future<User?> getUser(Uint8List id) async {
+    return await db?.query(
+      'users',
+      where: 'id = ?',
+      whereArgs: [id],
+    ).then((value) {
+      if (value.isEmpty) return null;
+      return User.fromDatabase(value.first);
+    });
+  }
+
   @override
   Future<void> clear() async {
     await db?.delete('users');
diff --git a/api/lib/models/user/service.dart b/api/lib/models/user/service.dart
@@ -18,4 +18,6 @@ abstract class UserService extends ModelService {
   FutureOr<bool> updateUser(User user);
 
   FutureOr<bool> deleteUser(Uint8List id);
+
+  FutureOr<User?> getUser(Uint8List id);
 }
diff --git a/api/lib/services/database.dart b/api/lib/services/database.dart
@@ -127,7 +127,7 @@ class DatabaseService extends SourceService {
   }
 
   FutureOr<void> _onUpgrade(Database db, int oldVersion, int newVersion) async {
-    migrateDatabase(this, db, oldVersion, newVersion);
+    return migrateDatabase(this, db, oldVersion, newVersion);
   }
 
   Future<int> getVersion() {
diff --git a/api/lib/services/migration.dart b/api/lib/services/migration.dart
@@ -57,7 +57,9 @@ Future<void> migrateDatabase(DatabaseService service, Database db,
       await service.calendarItem.create(txn, 'calendarItems_temp');
       await txn.execute(
         "INSERT INTO calendarItems_temp "
-        "SELECT id, parentId, blocked, name, description, location, extra "
+        "SELECT runtimeType, id, name, description, location, eventId, start, end, "
+        "status, repeatType, interval, variation, count, until, exceptions, "
+        "autoGroupId, searchStart, autoDuration "
         "FROM calendarItems",
       );
       await txn.execute(
diff --git a/app/android/Gemfile.lock b/app/android/Gemfile.lock
@@ -10,13 +10,14 @@ GEM
     artifactory (3.0.17)
     atomos (0.1.3)
     aws-eventstream (1.3.2)
-    aws-partitions (1.1071.0)
-    aws-sdk-core (3.220.2)
+    aws-partitions (1.1077.0)
+    aws-sdk-core (3.222.1)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
       base64
       jmespath (~> 1, >= 1.6.1)
+      logger
     aws-sdk-kms (1.99.0)
       aws-sdk-core (~> 3, >= 3.216.0)
       aws-sigv4 (~> 1.5)
@@ -159,6 +160,7 @@ GEM
     json (2.10.2)
     jwt (2.10.1)
       base64
+    logger (1.7.0)
     mini_magick (4.13.2)
     mini_mime (1.1.5)
     multi_json (1.15.0)
@@ -211,7 +213,7 @@ GEM
       colored2 (~> 3.1)
       nanaimo (~> 0.4.0)
       rexml (>= 3.3.6, < 4.0)
-    xcpretty (0.4.0)
+    xcpretty (0.4.1)
       rouge (~> 3.28.0)
     xcpretty-travis-formatter (1.0.1)
       xcpretty (~> 0.2, >= 0.0.7)
diff --git a/app/android/settings.gradle b/app/android/settings.gradle
@@ -18,7 +18,7 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version '8.9.0' apply false
+    id "com.android.application" version '8.9.1' apply false
     id "org.jetbrains.kotlin.android" version "2.0.21" apply false
 }
 
diff --git a/app/lib/l10n/app_en.arb b/app/lib/l10n/app_en.arb
@@ -4,6 +4,7 @@
   "calendar": "Calendar",
   "resources": "Resources",
   "users": "Users",
+  "user": "User",
   "sources": "Sources",
   "settings": "Settings",
   "create": "Create",
diff --git a/app/lib/pages/groups/select.dart b/app/lib/pages/groups/select.dart
@@ -1,4 +1,5 @@
 import 'package:flow/widgets/select.dart';
+import 'package:flow_api/models/group/model.dart';
 import 'package:flutter/material.dart';
 import 'package:flow/src/generated/i18n/app_localizations.dart';
 import 'dart:typed_data';
@@ -61,6 +62,14 @@ class GroupSelectDialog extends StatelessWidget {
         limit: limit,
         search: search,
       ),
+      onCreate: (source) => showDialog<SourcedModel<Group>>(
+        context: context,
+        builder: (context) => GroupDialog(
+          source: source,
+          group: null,
+          create: true,
+        ),
+      ),
       title: AppLocalizations.of(context).group,
       selected: selected,
     );
diff --git a/app/lib/pages/resources/resource.dart b/app/lib/pages/resources/resource.dart
@@ -1,6 +1,7 @@
 import 'package:flow/pages/groups/view.dart';
 import 'package:flow/pages/users/view.dart';
 import 'package:flow/widgets/markdown_field.dart';
+import 'package:flow_api/models/model.dart';
 import 'package:flow_api/models/resource/model.dart';
 import 'package:flow_api/models/resource/service.dart';
 import 'package:flutter/material.dart';
@@ -154,7 +155,8 @@ class ResourceDialog extends StatelessWidget {
               await currentService?.updateResource(currentResource);
             }
             if (context.mounted) {
-              Navigator.of(context).pop(currentResource);
+              Navigator.of(context)
+                  .pop(SourcedModel(currentSource, currentResource));
             }
           },
           child: Text(AppLocalizations.of(context).save),
diff --git a/app/lib/pages/resources/select.dart b/app/lib/pages/resources/select.dart
@@ -1,4 +1,5 @@
 import 'package:flow/widgets/select.dart';
+import 'package:flow_api/models/resource/model.dart';
 import 'package:flutter/material.dart';
 import 'package:flow/src/generated/i18n/app_localizations.dart';
 import 'dart:typed_data';
@@ -62,6 +63,13 @@ class ResourceSelectDialog extends StatelessWidget {
         limit: limit,
         search: search,
       ),
+      onCreate: (source) => showDialog<SourcedModel<Resource>>(
+        context: context,
+        builder: (context) => ResourceDialog(
+          source: source,
+          create: true,
+        ),
+      ),
       title: AppLocalizations.of(context).resource,
       selected: selected,
     );
diff --git a/app/lib/pages/resources/view.dart b/app/lib/pages/resources/view.dart
@@ -1,3 +1,4 @@
+import 'package:flow/pages/resources/select.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flow/src/generated/i18n/app_localizations.dart';
@@ -86,7 +87,7 @@ class _ResourcesViewState<T extends DescriptiveModel>
                         child: ListTile(
                           title: Text(item.name),
                           onTap: () async {
-                            await showDialog<Resource>(
+                            await showDialog(
                               context: context,
                               builder: (context) => ResourceDialog(
                                 source: widget.source,
@@ -109,18 +110,18 @@ class _ResourcesViewState<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 resource = await showDialog<Resource>(
+                  final resource = await showDialog<SourcedModel<Resource>>(
                     context: context,
-                    builder: (context) => ResourceDialog(
+                    builder: (context) => ResourceSelectDialog(
                       source: widget.source,
                     ),
                   );
                   if (resource != null) {
                     await widget.connector
-                        .connect(widget.model.id!, resource.id!);
+                        .connect(widget.model.id!, resource.model.id!);
                   }
                   _pagingController.refresh();
                 },
diff --git a/app/lib/pages/users/select.dart b/app/lib/pages/users/select.dart
@@ -0,0 +1,77 @@
+import 'package:flow/widgets/select.dart';
+import 'package:flow_api/models/user/model.dart';
+import 'package:flutter/material.dart';
+import 'package:flow/src/generated/i18n/app_localizations.dart';
+import 'dart:typed_data';
+import 'package:phosphor_flutter/phosphor_flutter.dart';
+import 'package:flow_api/models/model.dart';
+
+import 'user.dart';
+
+class UserSelectTile extends StatelessWidget {
+  final String source;
+  final Uint8List? value;
+  final ValueChanged<SourcedModel<Uint8List>?> onChanged;
+
+  const UserSelectTile({
+    super.key,
+    required this.source,
+    this.value,
+    required this.onChanged,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return SelectTile(
+      source: source,
+      onChanged: onChanged,
+      onModelFetch: (source, service, id) async => service.user?.getUser(id),
+      title: AppLocalizations.of(context).user,
+      leadingBuilder: (context, model) => PhosphorIcon(model?.model == null
+          ? PhosphorIconsLight.users
+          : PhosphorIconsFill.users),
+      dialogBuilder: (context, sourcedModel) => UserDialog(
+        source: sourcedModel?.source,
+        user: sourcedModel?.model,
+        create: sourcedModel?.model == null,
+      ),
+      selectBuilder: (context, model) => UserSelectDialog(
+        selected: model?.toIdentifierModel(),
+        source: source,
+      ),
+    );
+  }
+}
+
+class UserSelectDialog extends StatelessWidget {
+  final String? source;
+  final SourcedModel<Uint8List>? selected;
+
+  const UserSelectDialog({
+    super.key,
+    this.source,
+    this.selected,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return SelectDialog(
+      onFetch: (source, service, search, offset, limit) async =>
+          service.user?.getUsers(
+        offset: offset,
+        limit: limit,
+        search: search,
+      ),
+      onCreate: (source) => showDialog<SourcedModel<User>>(
+        context: context,
+        builder: (context) => UserDialog(
+          source: source,
+          user: null,
+          create: true,
+        ),
+      ),
+      title: AppLocalizations.of(context).user,
+      selected: selected,
+    );
+  }
+}
diff --git a/app/lib/pages/users/user.dart b/app/lib/pages/users/user.dart
@@ -8,7 +8,6 @@ import 'package:flow_api/models/user/service.dart';
 
 import '../../cubits/flow.dart';
 import '../../widgets/source_dropdown.dart';
-import '../groups/select.dart';
 
 class UserDialog extends StatelessWidget {
   final String? source;
diff --git a/app/lib/pages/users/view.dart b/app/lib/pages/users/view.dart
@@ -93,7 +93,7 @@ class _UsersViewState<T extends DescriptiveModel> extends State<UsersView<T>> {
                         child: ListTile(
                           title: Text(item.name),
                           onTap: () async {
-                            await showDialog<User>(
+                            await showDialog(
                               context: context,
                               builder: (context) => UserDialog(
                                 source: widget.source,
@@ -116,17 +116,18 @@ class _UsersViewState<T extends DescriptiveModel> extends State<UsersView<T>> {
             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 user = await showDialog<User>(
+                  final user = await showDialog<SourcedModel<User>>(
                     context: context,
                     builder: (context) => UserDialog(
                       source: widget.source,
                     ),
                   );
                   if (user != null) {
-                    await widget.connector.connect(widget.model.id!, user.id!);
+                    await widget.connector
+                        .connect(widget.model.id!, user.model.id!);
                   }
                   _pagingController.refresh();
                 },
diff --git a/app/lib/widgets/select.dart b/app/lib/widgets/select.dart
@@ -148,13 +148,15 @@ class SelectDialog<T extends NamedModel> extends StatefulWidget {
   final String? source;
   final SourcedModel<Uint8List>? selected;
   final SelectFetchCallback<T> onFetch;
+  final Future<SourcedModel<T>?> Function(String?)? onCreate;
 
   const SelectDialog({
     super.key,
     this.source,
     this.selected,
     required this.onFetch,
     required this.title,
+    this.onCreate,
   });
 
   @override
@@ -185,6 +187,7 @@ class _SelectDialogState<T extends NamedModel> extends State<SelectDialog<T>> {
 
   @override
   Widget build(BuildContext context) {
+    final onCreate = widget.onCreate;
     return AlertDialog(
       title: Text(widget.title),
       content: SizedBox(
@@ -230,6 +233,16 @@ class _SelectDialogState<T extends NamedModel> extends State<SelectDialog<T>> {
           onPressed: () => Navigator.of(context).pop(),
           child: Text(AppLocalizations.of(context).cancel),
         ),
+        if (onCreate != null)
+          OutlinedButton(
+            onPressed: () async {
+              final created = await onCreate(widget.source);
+              if (created != null && context.mounted) {
+                Navigator.of(context).pop(created);
+              }
+            },
+            child: Text(AppLocalizations.of(context).create),
+          ),
       ],
     );
   }
diff --git a/app/linux/CMakeLists.txt b/app/linux/CMakeLists.txt
@@ -2,6 +2,14 @@
 cmake_minimum_required(VERSION 3.10)
 project(runner LANGUAGES CXX)
 
+# Fix flutter_secure_storage_linux build error on newer versions of CMake.
+include(CheckCXXCompilerFlag)
+check_cxx_compiler_flag("-Wno-error=deprecated-literal-operator" COMPILER_SUPPORTS_NO_ERROR_DEPRECATED_LITERAL_OPERATOR)
+if(COMPILER_SUPPORTS_NO_ERROR_DEPRECATED_LITERAL_OPERATOR)
+  message(STATUS "Disabling error for deprecated literal operator")
+  add_definitions(-Wno-error=deprecated-literal-operator)
+endif()
+
 # The name of the executable created for the application. Change this to change
 # the on-disk name of your application.
 set(BINARY_NAME "flow")
diff --git a/app/pubspec.lock b/app/pubspec.lock
diff --git a/docs/package.json b/docs/package.json
diff --git a/docs/pnpm-lock.yaml b/docs/pnpm-lock.yaml
diff --git a/metadata/en-US/changelogs/10.txt b/metadata/en-US/changelogs/10.txt

Original file line number	Diff line number	Diff line change
`@@ -18,4 +18,6 @@ abstract class UserService extends ModelService {`
`18`	`18`	`FutureOr<bool> updateUser(User user);`
`19`	`19`
`20`	`20`	`FutureOr<bool> deleteUser(Uint8List id);`
	`21`	`+`
	`22`	`+ FutureOr<User?> getUser(Uint8List id);`
`21`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ class DatabaseService extends SourceService {`
`127`	`127`	`}`
`128`	`128`
`129`	`129`	`FutureOr<void> _onUpgrade(Database db, int oldVersion, int newVersion) async {`
`130`		`- migrateDatabase(this, db, oldVersion, newVersion);`
	`130`	`+ return migrateDatabase(this, db, oldVersion, newVersion);`
`131`	`131`	`}`
`132`	`132`
`133`	`133`	`Future<int> getVersion() {`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ pluginManagement {`
`18`	`18`
`19`	`19`	`plugins {`
`20`	`20`	`id "dev.flutter.flutter-plugin-loader" version "1.0.0"`
`21`		`- id "com.android.application" version '8.9.0' apply false`
	`21`	`+ id "com.android.application" version '8.9.1' apply false`
`22`	`22`	`id "org.jetbrains.kotlin.android" version "2.0.21" apply false`
`23`	`23`	`}`
`24`	`24`