merge group api request

src/stores/auth.js

@@ -12,7 +12,7 @@ import { createAuthAutoLoginCoordinator } from './coordinators/authAutoLoginCoor
 import { createAuthCoordinator } from './coordinators/authCoordinator';
 import { database } from '../service/database';
 import { escapeTag } from '../shared/utils';
-import { queryClient } from '../query';
+import { queryClient } from '../queries';
 import { request } from '../service/request';
 import { useAdvancedSettingsStore } from './settings/advanced';
 import { useGeneralSettingsStore } from './settings/general';

src/stores/avatar.js

@@ -17,7 +17,7 @@ import {
 import { avatarRequest, miscRequest } from '../api';
 import { AppDebug } from '../service/appConfig';
 import { database } from '../service/database';
-import { patchAvatarFromEvent } from '../query';
+import { patchAvatarFromEvent } from '../queries';
 import { processBulk } from '../service/request';
 import { useAdvancedSettingsStore } from './settings/advanced';
 import { useAvatarProviderStore } from './avatarProvider';

src/stores/group.js

@@ -18,7 +18,7 @@ import {
 } from '../api';
 import { database } from '../service/database';
 import { groupDialogFilterOptions } from '../shared/constants/';
-import { patchGroupFromEvent } from '../query';
+import { patchGroupFromEvent } from '../queries';
 import { useGameStore } from './game';
 import { useInstanceStore } from './instance';
 import { useModalStore } from './modal';
@@ -170,7 +170,7 @@ export const useGroupStore = defineStore('Group', () => {
         D.calendar = [];
         const loadGroupRequest = groupRequest.getGroup({
             groupId,
-            includeRoles: false
+            includeRoles: true
         });
 
         loadGroupRequest
@@ -208,7 +208,7 @@ export const useGroupStore = defineStore('Group', () => {
                         }
                     });
                     instanceStore.applyGroupDialogInstances();
-                    getGroupDialogGroup(groupId);
+                    getGroupDialogGroup(groupId, ref);
                 }
             });
     }
@@ -457,17 +457,25 @@ export const useGroupStore = defineStore('Group', () => {
     /**
      *
      * @param groupId
+     * @param {object} [existingRef]
+     * @returns { Promise<object> }
      */
-    function getGroupDialogGroup(groupId) {
+    function getGroupDialogGroup(groupId, existingRef) {
         const D = groupDialog.value;
         D.isGetGroupDialogGroupLoading = false;
-        return groupRequest
-            .getCachedGroup({ groupId, includeRoles: true })
+
+        const refPromise = existingRef
+            ? Promise.resolve({ ref: existingRef })
+            : groupRequest
+                  .getCachedGroup({ groupId, includeRoles: true })
+                  .then((args) => ({ ref: applyGroup(args.json), args }));
+
+        return refPromise
             .catch((err) => {
                 throw err;
             })
-            .then((args) => {
-                const ref = applyGroup(args.json);
+            .then((result) => {
+                const ref = result.ref;
                 if (D.id === ref.id) {
                     D.loading = false;
                     D.ref = ref;
@@ -537,7 +545,7 @@ export const useGroupStore = defineStore('Group', () => {
                         });
                 }
                 nextTick(() => (D.isGetGroupDialogGroupLoading = false));
-                return args;
+                return result.args || result;
             });
     }
 

src/stores/instance.js

@@ -33,7 +33,7 @@ import {
     instanceContentSettings
 } from '../shared/constants';
 import { database } from '../service/database';
-import { patchInstanceFromEvent } from '../query';
+import { patchInstanceFromEvent } from '../queries';
 import { resolveRef } from '../shared/utils/resolveRef';
 import { useAppearanceSettingsStore } from './settings/appearance';
 import { useFriendStore } from './friend';

src/stores/user.js

@@ -36,7 +36,7 @@ import { AppDebug } from '../service/appConfig';
 import { createUserEventCoordinator } from './coordinators/userEventCoordinator';
 import { createUserSessionCoordinator } from './coordinators/userSessionCoordinator';
 import { database } from '../service/database';
-import { patchUserFromEvent } from '../query';
+import { patchUserFromEvent } from '../queries';
 import { useAppearanceSettingsStore } from './settings/appearance';
 import { useAuthStore } from './auth';
 import { useAvatarStore } from './avatar';

src/stores/world.js

@@ -16,7 +16,7 @@ import {
 } from '../shared/utils';
 import { instanceRequest, miscRequest, worldRequest } from '../api';
 import { database } from '../service/database';
-import { patchWorldFromEvent } from '../query';
+import { patchWorldFromEvent } from '../queries';
 import { processBulk } from '../service/request';
 import { useFavoriteStore } from './favorite';
 import { useInstanceStore } from './instance';