From d08fd52e515e503d98d6f2f09a0ebf12cc9eb2e8 Mon Sep 17 00:00:00 2001
From: "Scott E. Graves" <scott.e.graves@protonmail.com>
Date: Sat, 15 Mar 2025 11:22:03 -0500
Subject: [PATCH] refactor

---
 web/repertory/lib/models/mount.dart              |  1 +
 web/repertory/lib/models/mount_list.dart         | 16 +++++++---------
 web/repertory/lib/widgets/mount_list_widget.dart |  3 +--
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/web/repertory/lib/models/mount.dart b/web/repertory/lib/models/mount.dart
index db941f9a..de8aa1a8 100644
--- a/web/repertory/lib/models/mount.dart
+++ b/web/repertory/lib/models/mount.dart
@@ -14,6 +14,7 @@ class Mount with ChangeNotifier {
     refresh();
   }
 
+  String? get bucket => mountConfig.bucket;
   String get name => mountConfig.name;
   String get path => mountConfig.path;
   IconData? get state => mountConfig.state;
diff --git a/web/repertory/lib/models/mount_list.dart b/web/repertory/lib/models/mount_list.dart
index 6aa4d4d5..1aa0ea1f 100644
--- a/web/repertory/lib/models/mount_list.dart
+++ b/web/repertory/lib/models/mount_list.dart
@@ -4,6 +4,7 @@ import 'package:collection/collection.dart';
 import 'package:flutter/foundation.dart';
 import 'package:http/http.dart' as http;
 import 'package:repertory/helpers.dart';
+import 'package:repertory/models/mount.dart';
 import 'package:repertory/types/mount_config.dart';
 
 class MountList with ChangeNotifier {
@@ -11,10 +12,10 @@ class MountList with ChangeNotifier {
     _fetch();
   }
 
-  List<MountConfig> _mountList = [];
+  List<Mount> _mountList = [];
 
-  UnmodifiableListView<MountConfig> get items =>
-      UnmodifiableListView<MountConfig>(_mountList);
+  UnmodifiableListView<Mount> get items =>
+      UnmodifiableListView<Mount>(_mountList);
 
   bool hasBucketName(String mountType, String bucket, {String? excludeName}) {
     final list = items.where(
@@ -27,7 +28,7 @@ class MountList with ChangeNotifier {
                   (item) =>
                       item.name.toLowerCase() == excludeName.toLowerCase(),
                 ))
-            .firstWhereOrNull((MountConfig item) {
+            .firstWhereOrNull((Mount item) {
               return item.bucket != null &&
                   item.bucket!.toLowerCase() == bucket.toLowerCase();
             }) !=
@@ -50,11 +51,11 @@ class MountList with ChangeNotifier {
       if (response.statusCode != 200) {
         return;
       }
-      List<MountConfig> nextList = [];
+      List<Mount> nextList = [];
 
       jsonDecode(response.body).forEach((key, value) {
         nextList.addAll(
-          value.map((name) => MountConfig.fromJson(key, name)).toList(),
+          value.map((name) => Mount(MountConfig.fromJson(key, name))).toList(),
         );
       });
       _sort(nextList);
@@ -90,9 +91,6 @@ class MountList with ChangeNotifier {
           ),
         ),
       );
-
-      _mountList = [];
-      notifyListeners();
     } catch (e) {
       debugPrint('$e');
     }
diff --git a/web/repertory/lib/widgets/mount_list_widget.dart b/web/repertory/lib/widgets/mount_list_widget.dart
index 087fa436..385478a4 100644
--- a/web/repertory/lib/widgets/mount_list_widget.dart
+++ b/web/repertory/lib/widgets/mount_list_widget.dart
@@ -1,7 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:repertory/constants.dart' as constants;
-import 'package:repertory/models/mount.dart';
 import 'package:repertory/models/mount_list.dart';
 import 'package:repertory/widgets/mount_widget.dart';
 
@@ -15,7 +14,7 @@ class MountListWidget extends StatelessWidget {
         return ListView.builder(
           itemBuilder: (context, idx) {
             return ChangeNotifierProvider(
-              create: (context) => Mount(mountList.items[idx]),
+              create: (context) => mountList.items[idx],
               child: Padding(
                 padding: EdgeInsets.only(
                   bottom: