@neuralinnovations/dataisland-sdk 0.0.1-dev6 → 0.0.1-dev61

package/src/storages/{files.impl.ts → files/files.impl.ts}

@@ -1,34 +1,14 @@
-import { Context } from "../context"
-import { Disposable } from "../disposable"
-import { FileDto, FileListResponse } from "../dto/workspacesResponse"
-import { RpcService } from "../services/rpcService"
+import { Context } from "../../context"
+import { FileDto, FileListResponse } from "../../dto/workspacesResponse"
+import { RpcService } from "../../services/rpcService"
 import { FileImpl } from "./file.impl"
 import { Files, FilesEvent, UploadFile } from "./files"
-import { WorkspaceImpl } from "./workspace.impl"
-import { ResponseUtils } from "../services/responseUtils"
+import { WorkspaceImpl } from "../workspaces/workspace.impl"
+import { ResponseUtils } from "../../services/responseUtils"
 import { File } from "./file"
 import { FilesPage } from "./filesPage"
-
-export class FilesPageImpl extends FilesPage implements Disposable {
-  private _isDisposed: boolean = false
-
-  public files: File[] = []
-  public total: number = 0
-  public filesPerPage: number = 0
-  public page: number = 0
-
-  get pages(): number {
-    return Math.ceil(Math.max(this.total / this.filesPerPage, 1.0))
-  }
-
-  get isDisposed(): boolean {
-    return this._isDisposed
-  }
-
-  dispose(): void {
-    this._isDisposed = true
-  }
-}
+import { FilesPageImpl } from "./filesPage.impl"
+// import { FormData } from "../../utils/request"
 
 export class FilesImpl extends Files {
   constructor(
@@ -41,12 +21,23 @@ export class FilesImpl extends Files {
   // Object used as files page data, returned by "query"
   public filesList?: FilesPage
 
-  async upload(file: any): Promise<File> {
-    return await this.internalUpload(file)
+  async upload(files: UploadFile[]): Promise<File[]> {
+    const loaded_files = []
+    for (const file of files) {
+      const loaded_file = await this.internalUpload(file)
+      if (loaded_file != undefined){
+        loaded_files.push(loaded_file)
+      }
+    }
+    return loaded_files
+  }
+
+  async get(fileId: string): Promise<File>{
+    return await this.internalGetFile(fileId)
   }
 
-  async delete(id: string): Promise<void> {
-    return await this.internalDeleteFile(id)
+  async delete(ids: string[]): Promise<void> {
+    await this.internalDeleteFiles(ids)
   }
 
   async query(query: string, page: number, limit: number): Promise<FilesPage> {
@@ -57,43 +48,77 @@ export class FilesImpl extends Files {
   // INTERNALS
   //----------------------------------------------------------------------------
 
-  /**
-   * Delete organization.
-   * @param id
-   */
-  async internalDeleteFile(id: string): Promise<void> {
+
+  async internalGetFile(id: string): Promise<File>{
     if (id === undefined || id === null) {
-      throw new Error("File delete, id is undefined or null")
+      throw new Error("File get, id is undefined or null")
     }
     if (id.length === 0 || id.trim().length === 0) {
-      throw new Error("File delete, id is empty")
+      throw new Error("File get, id is empty")
     }
 
     const response = await this.context
       .resolve(RpcService)
-      ?.requestBuilder("/api/v1/Files")
+      ?.requestBuilder("api/v1/Files")
       .searchParam("id", id)
-      .sendDelete()
+      .sendGet()
+
     if (ResponseUtils.isFail(response)) {
-      await ResponseUtils.throwError(`File ${id} delete, failed`, response)
+      await ResponseUtils.throwError(
+        `Failed to get file ${id}`,
+        response
+      )
+    }
+
+    // parse file from the server's response
+    const result = (await response!.json() as { file: FileDto }).file as FileDto
+
+    // create file implementation
+    const fileImpl = new FileImpl(this.context)
+
+    return await fileImpl.initFrom(result)
+  }
+
+  /**
+   * Delete file.
+   * @param ids array of file ids
+   */
+  async internalDeleteFiles(ids: string[]): Promise<void> {
+    if (ids === undefined || ids === null) {
+      throw new Error("File delete, ids array is undefined or null")
     }
-    const file = <FileImpl>this.filesList!.files.find(f => f.id === id)
-    const index = this.filesList!.files.indexOf(file)
-    if (index < 0) {
-      throw new Error("Organization delete, index is not found")
+    if (ids.length === 0) {
+      throw new Error("File delete, array of ids is empty")
     }
 
-    // remove file from collection
-    this.filesList!.files.splice(index, 1)
+    const response = await this.context
+      .resolve(RpcService)
+      ?.requestBuilder("/api/v1/Files")
+      .sendDeleteJson(ids)
+      
+    if (ResponseUtils.isFail(response)) {
+      await ResponseUtils.throwError(`Files ${ids} delete, failed`, response)
+    }
 
-    // dispatch event, file removed
-    this.dispatch({
-      type: FilesEvent.REMOVED,
-      data: file
-    })
+    for (const id of ids) {
+      const file = <FileImpl>this.filesList!.files.find(f => f.id === id)
+      const index = this.filesList!.files.indexOf(file)
+      if (index < 0) {
+        throw new Error("File delete, index is not found")
+      }
+
+      // remove file from collection
+      this.filesList!.files.splice(index, 1)
+
+      // dispatch event, file removed
+      this.dispatch({
+        type: FilesEvent.REMOVED,
+        data: file
+      })
 
-    // dispose file
-    file.dispose()
+      // dispose file
+      file.dispose()
+    }
   }
 
   async internalQuery(
@@ -122,7 +147,6 @@ export class FilesImpl extends Files {
     const response = await this.context
       .resolve(RpcService)
       ?.requestBuilder("api/v1/Files/list")
-
       .searchParam("workspaceId", this.workspace.id)
       .searchParam("organizationId", this.workspace.organization.id)
       .searchParam("query", query)
@@ -151,16 +175,10 @@ export class FilesImpl extends Files {
     for (const fl of files.files) {
 
       // create file implementation
-      const file = new FileImpl(this.context).initFrom(fl)
+      const file = await new FileImpl(this.context).initFrom(fl)
 
       // add file to the collection
       filesList.files.push(file)
-
-      // dispatch event, file added
-      this.dispatch({
-        type: FilesEvent.ADDED,
-        data: file
-      })
     }
 
     // set files list
@@ -169,7 +187,7 @@ export class FilesImpl extends Files {
     return filesList
   }
 
-  async internalUpload(file: UploadFile): Promise<File> {
+  async internalUpload(file: UploadFile): Promise<File | undefined> {
     // check file
     if (file === undefined || file === null) {
       throw new Error("File upload, file is undefined or null")
@@ -190,17 +208,20 @@ export class FilesImpl extends Files {
 
     // check response status
     if (ResponseUtils.isFail(response)) {
+      if (await ResponseUtils.isLimitReached()){
+        return undefined
+      }
+      
       await ResponseUtils.throwError(`File upload ${file.name}`, response)
     }
 
     // parse file from the server's response
-    const result = (await response!.json()).file as FileDto
+    const result = (await response!.json() as { file: FileDto }).file as FileDto
 
     // create file implementation
-    const fileImpl = new FileImpl(this.context).initFrom(result)
+    const fileImpl = new FileImpl(this.context)
 
-    // TODO: why is this here?
-    this.filesList?.files.push(fileImpl)
+    await fileImpl.initFrom(result)
 
     // dispatch event, file added
     this.dispatch({

package/src/storages/{files.ts → files/files.ts}

@@ -1,4 +1,4 @@
-import { EventDispatcher } from "../events"
+import { EventDispatcher } from "../../events"
 import { File, FileId } from "./file"
 import { FilesPage } from "./filesPage"
 
@@ -7,7 +7,8 @@ import { FilesPage } from "./filesPage"
  */
 export enum FilesEvent {
   ADDED = "added",
-  REMOVED = "removed"
+  REMOVED = "removed",
+  UPDATED = "updated"
 }
 
 /**
@@ -20,15 +21,21 @@ export type UploadFile = globalThis.File
  */
 export abstract class Files extends EventDispatcher<FilesEvent, File> {
   /**
-   * Get file by id.
+   * Upload file.
    */
-  abstract upload(file: UploadFile): Promise<File>
+  abstract upload(files: UploadFile[]): Promise<File[]>
 
   /**
-   * Delete file.
-   * @param id
+   * Get file by ID
+   * @param fileId 
    */
-  abstract delete(id: FileId): Promise<void>
+  abstract get(fileId: FileId): Promise<File>
+
+  /**
+   * Delete files.
+   * @param ids
+   */
+  abstract delete(ids: FileId[]): Promise<void>
 
   /**
    * Query files.

package/src/storages/files/filesPage.impl.ts

@@ -0,0 +1,37 @@
+import { FilesPage } from "./filesPage"
+import { Disposable } from "../../disposable"
+import { File } from "./file"
+
+export class FilesPageImpl extends FilesPage implements Disposable {
+  private _isDisposed: boolean = false
+
+  public files: File[] = []
+  public total: number = 0
+  public filesPerPage: number = 0
+  public page: number = 0
+
+  get pages(): number {
+    return Math.ceil(Math.max(this.total / this.filesPerPage, 1.0))
+  }
+
+  get isDisposed(): boolean {
+    return this._isDisposed
+  }
+
+  dispose(): void {
+    this._isDisposed = true
+  }
+
+  equals(other?: FilesPage | null): boolean {
+    if (other === undefined) return false
+    if (other === null) return false
+    if (other === this) return true
+    return (
+      other.pages === this.pages &&
+      other.total === this.total &&
+      other.page === this.page &&
+      (other.files === this.files ||
+        other.files.every((file, index) => file.id === this.files[index].id))
+    )
+  }
+}

package/src/storages/{filesPage.ts → files/filesPage.ts}

@@ -24,4 +24,10 @@ export abstract class FilesPage {
    * Get current page.
    */
   abstract get page(): number
+
+  /**
+   * Equals.
+   * @param other
+   */
+  abstract equals(other?: FilesPage | null): boolean
 }

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

@@ -0,0 +1,276 @@
+import { Group, GroupEvent, GroupId } from "./group"
+import { Disposable } from "../../disposable"
+import {
+  AccessGroupDto,
+  AccessGroupResponse
+} from "../../dto/accessGroupResponse"
+import { UserDto } from "../../dto/userInfoResponse"
+import { Workspace } from "../workspaces/workspace"
+import { Context } from "../../context"
+import { Organization } from "../organizations/organization"
+import { RpcService } from "../../services/rpcService"
+import { ResponseUtils } from "../../services/responseUtils"
+import { WorkspacesResponse } from "../../dto/workspacesResponse"
+import { WorkspaceId } from "../workspaces/workspaces"
+import { UserId } from "../user/userProfile"
+
+export class GroupImpl extends Group implements Disposable {
+  private _isDisposed: boolean = false
+  private _content?: AccessGroupDto
+  private _members?: UserDto[]
+  private _workspaces: Workspace[] = []
+  private _id?: GroupId
+
+  constructor(
+    private readonly context: Context,
+    public readonly organization: Organization
+  ) {
+    super()
+  }
+
+  async initFrom(id: GroupId): Promise<Group> {
+    // set id
+    this._id = id
+
+    // reload group and workspaces
+    const groupPromise = this.reloadGroup(id)
+    const workspacePromise = this.reloadWorkspaces(id)
+
+    // wait for all promises
+    await Promise.all([groupPromise, workspacePromise])
+
+    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(id: GroupId): Promise<void> {
+    const groupWorkspaces = await this.loadWorkspaces(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._id) {
+      return this._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
+    }
+
+    // dispatch event
+    this.dispatch({
+      type: GroupEvent.UPDATED,
+      data: this
+    })
+  }
+
+  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(this.id)
+
+    // dispatch event
+    this.dispatch({
+      type: GroupEvent.UPDATED,
+      data: this
+    })
+  }
+
+  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)
+
+    // dispatch event
+    this.dispatch({
+      type: GroupEvent.UPDATED,
+      data: this
+    })
+  }
+
+  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
+  }
+}

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>
+}