Organizations now load only once

This commit is contained in:
Arseni
2025-12-08 19:10:33 +03:00
parent f478219990
commit 8115abb569

View File

@@ -20,6 +20,7 @@ class OrganizationsProvider extends ChangeNotifier {
Organization get current => isOrganizationSet ? _current! : throw StateError('Organization is not set'); Organization get current => isOrganizationSet ? _current! : throw StateError('Organization is not set');
Organization? _org(String? orgRef) => organizations.firstWhereOrNull((org) => org.id == orgRef); Organization? _org(String? orgRef) => organizations.firstWhereOrNull((org) => org.id == orgRef);
Organization? _orgInList(String? orgRef, List<Organization> list) => list.firstWhereOrNull((org) => org.id == orgRef);
Organization? get _current => _org(_currentOrg); Organization? get _current => _org(_currentOrg);
bool get isOrganizationSet => _current != null; bool get isOrganizationSet => _current != null;
@@ -41,7 +42,7 @@ class OrganizationsProvider extends ChangeNotifier {
org = orgs.firstWhereOrNull((o) => o.id == org)?.id; org = orgs.firstWhereOrNull((o) => o.id == org)?.id;
// fallback if org is not set or not available // fallback if org is not set or not available
org ??= orgs.first.id; org ??= orgs.first.id;
await setCurrentOrganization(org); await setCurrentOrganization(org, availableOrganizations: orgs);
_setResource(Resource(data: orgs, isLoading: false)); _setResource(Resource(data: orgs, isLoading: false));
return orgs; return orgs;
} catch (e) { } catch (e) {
@@ -54,7 +55,7 @@ class OrganizationsProvider extends ChangeNotifier {
_setResource(_resource.copyWith(isLoading: true, error: null)); _setResource(_resource.copyWith(isLoading: true, error: null));
try { try {
final org = await OrganizationService.loadByInvitation(invitationRef); final org = await OrganizationService.loadByInvitation(invitationRef);
await setCurrentOrganization(org.id); await setCurrentOrganization(org.id, availableOrganizations: [org]);
_setResource(Resource(data: [org], isLoading: false)); _setResource(Resource(data: [org], isLoading: false));
return org; return org;
} catch (e) { } catch (e) {
@@ -63,17 +64,23 @@ class OrganizationsProvider extends ChangeNotifier {
} }
} }
bool _setCurrentOrganization(String? orgRef) { bool _setCurrentOrganization(
final organizationRef = _org(orgRef)?.id; String? orgRef, {
List<Organization>? availableOrganizations,
}) {
final organizationRef = _orgInList(orgRef, availableOrganizations ?? organizations)?.id;
if (organizationRef == null) return false; if (organizationRef == null) return false;
_currentOrg = organizationRef; _currentOrg = organizationRef;
return true; return true;
} }
Future<bool> setCurrentOrganization(String? orgRef) async { Future<bool> setCurrentOrganization(
if (!_setCurrentOrganization(orgRef)) return false; String? orgRef, {
await SecureStorageService.set(Constants.currentOrgKey, orgRef); List<Organization>? availableOrganizations,
}) async {
if (!_setCurrentOrganization(orgRef, availableOrganizations: availableOrganizations)) return false;
await SecureStorageService.set(Constants.currentOrgKey, _currentOrg);
notifyListeners(); notifyListeners();
return true; return true;
} }