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

package/src/storages/groups/group.ts

@@ -0,0 +1,73 @@
+import { EventDispatcher } from "../../events"
+import { AccessGroupDto } from "../../dto/accessGroupResponse"
+import { UserDto } from "../../dto/userInfoResponse"
+import { Workspace } from "../workspaces/workspace"
+import { WorkspaceId } from "../workspaces/workspaces"
+import { UserId } from "../user/userProfile"
+
+/**
+ * Group id.
+ */
+export type GroupId = string
+
+export enum GroupEvent {
+  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>
+}

package/src/storages/groups/groups.impl.ts

@@ -1,254 +1,14 @@
 import { Context } from "../../context"
-import { Disposable } from "../../disposable"
 import {
-  AccessGroupDto,
   AccessGroupResponse,
   AccessGroupsResponse
 } from "../../dto/accessGroupResponse"
-import { UserDto } from "../../dto/userInfoResponse"
-import { WorkspacesResponse } from "../../dto/workspacesResponse"
 import { RpcService } from "../../services/rpcService"
-import { Group, GroupEvent, GroupId, Groups } from "./groups"
+import { Groups, GroupsEvent } from "./groups"
 import { OrganizationImpl } from "../organizations/organization.impl"
 import { ResponseUtils } from "../../services/responseUtils"
-import { Organization } from "../organizations/organization"
-import { UserId } from "../user/userProfile"
-import { Workspace } from "../workspaces/workspace"
-import { WorkspaceId } from "../workspaces/workspaces"
-
-export class GroupImpl extends Group implements Disposable {
-  private _isDisposed: boolean = false
-  private _content?: AccessGroupDto
-  private _members?: UserDto[]
-  private _workspaces: Workspace[] = []
-
-  constructor(
-    private readonly context: Context,
-    public readonly organization: Organization
-  ) {
-    super()
-  }
-
-  async initFrom(id: GroupId): Promise<Group> {
-    await this.reloadGroup(id)
-    await this.reloadWorkspaces()
-    return this
-  }
-
-  async reloadGroup(id: GroupId): Promise<void> {
-    // fetch group
-    const response = await this.context.resolve(RpcService)
-      ?.requestBuilder("api/v1/AccessGroups")
-      .searchParam("groupId", id)
-      .sendGet()
-
-    // check response status
-    if (ResponseUtils.isFail(response)) {
-      await ResponseUtils.throwError(`Failed to get group: ${id}, organization: ${this.organization.id}`, response)
-    }
-
-    // parse group from the server's response
-    const group = (await response!.json()) as AccessGroupResponse
-    // init group
-    this._content = group.group
-    this._members = group.members
-  }
-
-  async reloadWorkspaces(): Promise<void> {
-    const groupWorkspaces = await this.loadWorkspaces(this.id)
-    this._workspaces.length = 0
-    this._workspaces.push(...groupWorkspaces)
-  }
-
-  async loadWorkspaces(groupId: GroupId): Promise<Workspace[]> {
-    // fetch workspaces
-    const response = await this.context.resolve(RpcService)
-      ?.requestBuilder("api/v1/AccessGroups/workspaces")
-      .searchParam("groupId", groupId)
-      .sendGet()
-
-    if (ResponseUtils.isFail(response)) {
-      await ResponseUtils.throwError(`Failed to get workspaces for group: ${this.id}, organization: ${this.organization.id}`, response)
-    }
-
-    // parse workspaces from the server's response
-    const workspaces = (await response!.json()) as WorkspacesResponse
-
-    // get workspaces
-    const result: Workspace[] = []
-    for (const workspaceDto of workspaces.workspaces) {
-      result.push(this.organization.workspaces.get(workspaceDto.id))
-    }
-
-    return result
-  }
-
-  get id(): GroupId {
-    if (this._content) {
-      return this._content.id
-    }
-    throw new Error("Access group is not loaded.")
-  }
-
-  get group(): AccessGroupDto {
-    if (this._content) {
-      return this._content
-    }
-    throw new Error("Access group is not loaded.")
-  }
-
-  get workspaces(): readonly Workspace[] {
-    return this._workspaces
-  }
-
-  get members(): UserDto[] {
-    if (this._members) {
-      return this._members
-    }
-    throw new Error("Access group is not loaded.")
-  }
-
-  async setName(name: string): Promise<void> {
-    if (name === undefined || name === null) {
-      throw new Error("Groups change, name is undefined or null")
-    }
-    if (name.length === 0 || name.trim().length === 0) {
-      throw new Error("Groups change, name is empty")
-    }
-    // send request to the server
-    const response = await this.context
-      .resolve(RpcService)
-      ?.requestBuilder("api/v1/AccessGroups/name")
-      .sendPutJson({
-        groupId: this.id,
-        name: name
-      })
-
-    // check response status
-    if (ResponseUtils.isFail(response)) {
-      await ResponseUtils.throwError(`Failed to change group name, group: ${this.id}, organization: ${this.organization.id}`, response)
-    }
-
-    // change name
-    if (this._content) {
-      this._content.name = name
-    }
-  }
-
-  async setPermits(permits: { isAdmin: boolean }): Promise<void> {
-    // send request to the server
-    const response = await this.context
-      .resolve(RpcService)
-      ?.requestBuilder("api/v1/AccessGroups/permits")
-      .sendPutJson({
-        groupId: this.id,
-        permits: permits
-      })
-
-    if (ResponseUtils.isFail(response)) {
-      await ResponseUtils.throwError(`Failed to change group permits, group: ${this.id}, organization: ${this.organization.id}`, response)
-    }
-  }
-
-  async setWorkspaces(workspaces: string[]): Promise<void> {
-    if (workspaces === null || workspaces === undefined) {
-      throw new Error("Group add workspaces, workspaces is undefined or null")
-    }
-
-    // send request to the server
-    const response = await this.context
-      .resolve(RpcService)
-      ?.requestBuilder("api/v1/AccessGroups/workspaces")
-      .sendPutJson({
-        groupId: this.id,
-        actualWorkspaceIds: workspaces
-      })
-
-    if (ResponseUtils.isFail(response)) {
-      await ResponseUtils.throwError(`Failed to set workspaces for group: ${this.id}, organization: ${this.organization.id}`, response)
-    }
-
-    // reload workspaces
-    await this.reloadWorkspaces()
-  }
-
-  async removeWorkspaces(workspaces: WorkspaceId[]): Promise<void> {
-    if (workspaces === null || workspaces === undefined) {
-      throw new Error("Group removeWorkspaces, workspaces is undefined or null")
-    }
-
-    // make set of workspaces
-    const groupWorkspaces = new Set(this.workspaces.map(w => w.id))
-
-    // check argument
-    if (!workspaces.every(w => groupWorkspaces.has(w))) {
-      const notExistingWorkspaces = workspaces.filter(workspaceId => !groupWorkspaces.has(workspaceId))
-      throw new Error(`Group removeWorkspaces, workspaces contains not existing workspaces: ${notExistingWorkspaces}`)
-    }
-
-    // remove workspaces
-    for (const id of workspaces) {
-      groupWorkspaces.delete(id)
-    }
-
-    // send request to the server
-    await this.setWorkspaces(Array.from(groupWorkspaces))
-  }
-
-  async setMembersIds(members: UserId[]) {
-    if (members === null || members === undefined) {
-      throw new Error("Group setMembersIds, members is undefined or null")
-    }
-
-    // send request to the server
-    const response = await this.context
-      .resolve(RpcService)
-      ?.requestBuilder("api/v1/AccessGroups/members")
-      .sendPutJson({
-        groupId: this.id,
-        memberIds: members
-      })
-
-    if (ResponseUtils.isFail(response)) {
-      await ResponseUtils.throwError(`Failed to set members for group: ${this.id}, organization: ${this.organization.id}`, response)
-    }
-
-    // reload group
-    await this.reloadGroup(this.id)
-  }
-
-  async removeMembers(members: UserId[]): Promise<void> {
-    // check members
-    if (members === null || members === undefined) {
-      throw new Error("Group removeMembers, members is undefined or null")
-    }
-
-    // make set of members
-    const groupMembers = new Set(this.members.map(m => m.id))
-
-    // check argument
-    if (!members.every(m => groupMembers.has(m))) {
-      const notExistingMembers = members.filter(memberId => !groupMembers.has(memberId))
-      throw new Error(`Group removeMembers, members contains not existing members: ${notExistingMembers}`)
-    }
-
-    // remove members
-    for (const id of members) {
-      groupMembers.delete(id)
-    }
-
-    // send request to the server
-    await this.setMembersIds(Array.from(groupMembers))
-  }
-
-  get isDisposed(): boolean {
-    return this._isDisposed
-  }
-
-  dispose(): void {
-    this._isDisposed = true
-  }
-}
+import { Group, GroupId } from "./group"
+import { GroupImpl } from "./group.impl"
 
 export class GroupsImpl extends Groups {
 
@@ -305,19 +65,24 @@ export class GroupsImpl extends Groups {
     // parse groups from the server's response
     const groups = (await response!.json()) as AccessGroupsResponse
 
+    const wait: Promise<Group>[] = []
+
     // init groups
     for (const gr of groups.groups) {
       // create group implementation
-      const group = await new GroupImpl(this.context, this.organization).initFrom(gr.id)
+      const group = new GroupImpl(this.context, this.organization).initFrom(gr.id)
+
+      // add to the wait list
+      wait.push(group)
+    }
 
+    // wait for all groups
+    const groupsResult = await Promise.all(wait)
+
+    // add groups to the collection
+    for (const group of groupsResult) {
       // add group to the collection
       this._groups.push(group)
-
-      // dispatch event
-      this.dispatch({
-        type: GroupEvent.ADDED,
-        data: group
-      })
     }
   }
 
@@ -357,7 +122,7 @@ export class GroupsImpl extends Groups {
 
     // dispatch event
     this.dispatch({
-      type: GroupEvent.ADDED,
+      type: GroupsEvent.ADDED,
       data: group
     })
 
@@ -400,7 +165,7 @@ export class GroupsImpl extends Groups {
 
     // dispatch event, group removed
     this.dispatch({
-      type: GroupEvent.REMOVED,
+      type: GroupsEvent.REMOVED,
       data: group
     })
 

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"
 
 
 /**