@neuralinnovations/dataisland-sdk 0.0.1-dev22 → 0.0.1-dev24

package/src/storages/groups/groups.ts

@@ -1,86 +1,19 @@
-import { AccessGroupDto } from "../../dto/accessGroupResponse"
-import { UserDto } from "../../dto/userInfoResponse"
 import { EventDispatcher } from "../../events"
-import { UserId } from "../user/userProfile"
-import { WorkspaceId } from "../workspaces/workspaces"
-import { Workspace } from "../workspaces/workspace"
-
-/**
- * Group id.
- */
-export type GroupId = string
+import { Group, GroupId } from "./group"
 
 /**
  * Group event.
  */
-export enum GroupEvent {
+export enum GroupsEvent {
   ADDED = "added",
   REMOVED = "removed",
   UPDATED = "updated"
 }
 
-/**
- * Group.
- */
-export abstract class Group extends EventDispatcher<GroupEvent, Group> {
-
-  /**
-   * Group id.
-   */
-  abstract get id(): GroupId
-
-  /**
-   * Group information.
-   */
-  abstract get group(): AccessGroupDto
-
-  /**
-   * Group members.
-   */
-  abstract get members(): UserDto[]
-
-  /**
-   * Group workspaces.
-   */
-  abstract get workspaces(): readonly Workspace[]
-
-  /**
-   * Set workspaces.
-   */
-  abstract setWorkspaces(workspaces: WorkspaceId[]): Promise<void>
-
-  /**
-   * Set name.
-   */
-  abstract setName(name: string): Promise<void>
-
-  /**
-   * Set permits.
-   */
-  abstract setPermits(permits: { isAdmin: boolean }): Promise<void>
-
-  /**
-   * Set members.
-   */
-  abstract setMembersIds(members: UserId[]): Promise<void>
-
-  /**
-   * Remove members.
-   * @param members
-   */
-  abstract removeMembers(members: UserId[]): Promise<void>
-
-  /**
-   * Remove workspaces.
-   * @param workspaces
-   */
-  abstract removeWorkspaces(workspaces: WorkspaceId[]): Promise<void>
-}
-
 /**
  * Groups storage.
  */
-export abstract class Groups extends EventDispatcher<GroupEvent, Group> {
+export abstract class Groups extends EventDispatcher<GroupsEvent, Group> {
 
   /**
    * Collection.

package/src/storages/organizations/organization.ts

@@ -1,9 +1,10 @@
 import { Workspaces } from "../workspaces/workspaces"
 import { OrganizationId } from "./organizations"
-import { GroupId, Groups } from "../groups/groups"
+import { Groups } from "../groups/groups"
 import { Chats } from "../chats/chats"
 import { EventDispatcher } from "../../events"
 import { UserDto } from "../../dto/userInfoResponse"
+import { GroupId } from "../groups/group"
 
 
 /**

package/src/storages/organizations/organizations.impl.ts

@@ -175,23 +175,32 @@ export class OrganizationsImpl extends Organizations {
     organizations: OrganizationDto[],
     settings: UserSettings | null | undefined
   ): Promise<void> {
+
+    // set current organization
     this.currentOrganizationId = settings?.activeOrganizationId
+
+    // wait list
+    const waitList: Promise<OrganizationImpl>[] = []
+
+    // init organizations
     for (const organization of organizations) {
       // create organization and init from content
-      const org = await new OrganizationImpl(this.context).initFrom(
+      const orgPromise = new OrganizationImpl(this.context).initFrom(
         organization,
         adminInOrganization.includes(organization.id)
       )
 
+      // add organization to wait list
+      waitList.push(orgPromise)
+    }
+
+    // wait for all organizations
+    const orgImpls = await Promise.all(waitList)
+
+    // add organizations to collection
+    for (const org of orgImpls) {
       // add organization to collection
       this.organizations.push(org)
-
-      // dispatch event, organization added
-      this.dispatch({
-        type: OrganizationsEvent.ADDED,
-        data: org
-      })
     }
   }
-
 }