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

package/src/storages/chats/chat.impl.ts

@@ -1,6 +1,6 @@
 import { Chat, ChatAnswerType } from "./chat"
 import { Disposable } from "../../disposable"
-import { Answer } from "./answer"
+import { Answer, AnswerId } from "./answer"
 import { ChatDto } from "../../dto/chatResponse"
 import { Context } from "../../context"
 import { AnswerImpl } from "./answer.impl"
@@ -27,7 +27,7 @@ export class ChatImpl extends Chat implements Disposable {
     // init answers
     for (const ans of chat.answers) {
       // create answer implementation
-      const answer = await new AnswerImpl(this, this.context).initFromData(ans)
+      const answer = new AnswerImpl(this, this.context).initFromHistory(ans)
 
       // add answer to the collection
       this._answers.push(answer)
@@ -52,9 +52,9 @@ export class ChatImpl extends Chat implements Disposable {
     return this._isDisposed
   }
 
-  public getAnswer(id: string): Answer {
+  public getAnswer(id: AnswerId): Answer {
     const answer = this._answers.find(answer => answer.id === id)
-    if (answer){
+    if (answer) {
       return answer
     }
     throw new Error(`Answer with id ${id} is not found`)
@@ -80,7 +80,7 @@ export class ChatImpl extends Chat implements Disposable {
     const id = (await response!.json()).id
 
     // create answer implementation
-    const answer = await new AnswerImpl(this, this.context).initFromId(id)
+    const answer = await new AnswerImpl(this, this.context).initNew(id, message)
 
     // add answer to the collection
     this._answers.push(answer)
@@ -88,37 +88,6 @@ export class ChatImpl extends Chat implements Disposable {
     return answer
   }
 
-  async update(): Promise<void>{
-    const response = await this.context
-      .resolve(RpcService)
-      ?.requestBuilder("api/v1/Chats")
-      .searchParam("id", this.id)
-      .sendGet()
-
-    // check response status
-    if (ResponseUtils.isFail(response)) {
-      await ResponseUtils.throwError(`Failed to update chat ${this.id}`, response)
-    }
-
-    const chat = (await response!.json()).chat as ChatDto
-
-    this._content = chat
-
-    for (const ans of chat.answers) {
-      let answer = this._answers.find(answer => answer.id === ans.id)
-      if (!answer){
-        // create answer implementation
-        answer = new AnswerImpl(this, this.context).initFromData(ans)
-      }else{
-        this._answers.splice(this._answers.indexOf(answer), 1)
-
-        answer.initFromData(ans)
-      }
-      // add answer to the collection
-      this._answers.push(answer)
-    }
-  }
-
   dispose(): void {
     this._isDisposed = true
   }

package/src/storages/chats/chat.ts

@@ -41,9 +41,5 @@ export abstract class Chat {
    */
   abstract ask(message: string, answerType: ChatAnswerType): Promise<Answer>
 
-  /**
-   * Update chat
-   */
-  abstract update(): Promise<void>
 }
 

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

@@ -19,6 +19,7 @@ export class GroupImpl extends Group implements Disposable {
   private _content?: AccessGroupDto
   private _members?: UserDto[]
   private _workspaces: Workspace[] = []
+  private _id?: GroupId
 
   constructor(
     private readonly context: Context,
@@ -28,8 +29,16 @@ export class GroupImpl extends Group implements Disposable {
   }
 
   async initFrom(id: GroupId): Promise<Group> {
-    await this.reloadGroup(id)
-    await this.reloadWorkspaces()
+    // 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
   }
 
@@ -52,8 +61,8 @@ export class GroupImpl extends Group implements Disposable {
     this._members = group.members
   }
 
-  async reloadWorkspaces(): Promise<void> {
-    const groupWorkspaces = await this.loadWorkspaces(this.id)
+  async reloadWorkspaces(id: GroupId): Promise<void> {
+    const groupWorkspaces = await this.loadWorkspaces(id)
     this._workspaces.length = 0
     this._workspaces.push(...groupWorkspaces)
   }
@@ -82,8 +91,8 @@ export class GroupImpl extends Group implements Disposable {
   }
 
   get id(): GroupId {
-    if (this._content) {
-      return this._content.id
+    if (this._id) {
+      return this._id
     }
     throw new Error("Access group is not loaded.")
   }
@@ -173,7 +182,7 @@ export class GroupImpl extends Group implements Disposable {
     }
 
     // reload workspaces
-    await this.reloadWorkspaces()
+    await this.reloadWorkspaces(this.id)
 
     // dispatch event
     this.dispatch({

package/src/storages/workspaces/workspaces.impl.ts

@@ -8,6 +8,8 @@ import { RpcService } from "../../services/rpcService"
 import { OrganizationWorkspaces } from "../../dto/userInfoResponse"
 import { WorkspaceDto } from "../../dto/workspacesResponse"
 import { ResponseUtils } from "../../services/responseUtils"
+import { UserProfileService } from "../../services/userProfileService"
+import { UserProfile } from "../user/userProfile"
 
 export class WorkspacesImpl extends Workspaces {
   private readonly _workspaces: WorkspaceImpl[] = []
@@ -184,7 +186,8 @@ export class WorkspacesImpl extends Workspaces {
 
     // check response status
     if (ResponseUtils.isFail(response)) {
-      await ResponseUtils.throwError(`Failed to fetch workspaces in organization: ${organizationId}`, response)
+      const userProfile = this.context.resolve(UserProfileService)?.userProfile as UserProfile
+      await ResponseUtils.throwError(`Failed to fetch workspaces in organization: ${organizationId}, userId: ${userProfile.id}, email: ${userProfile.email}`, response)
     }
 
     // parse workspaces from the server's response

package/src/unitTest.ts

@@ -3,7 +3,7 @@ export enum UnitTest {
   DO_NOT_START = 1 << 0,
   DO_NOT_PRINT_INITIALIZED_LOG = 1 << 1,
 
-  DEFAULT = DO_NOT_START | DO_NOT_PRINT_INITIALIZED_LOG
+  DO_NOT_START_SDK = DO_NOT_START | DO_NOT_PRINT_INITIALIZED_LOG
 }
 
 export type UnitTestProfileSyncAction = () => void
@@ -17,7 +17,7 @@ class AppSdkUnitTest {
   }
 
   public static async test(
-    unitTest: UnitTest = UnitTest.DEFAULT,
+    unitTest: UnitTest = UnitTest.DO_NOT_START_SDK,
     func: UnitTestProfileSyncAction | UnitTestProfileAsyncAction
   ): Promise<void> {
     this._stack.push(unitTest)
@@ -38,7 +38,7 @@ class AppSdkUnitTest {
 }
 
 export const appTest = async (
-  unitTest: UnitTest = UnitTest.DEFAULT,
+  unitTest: UnitTest = UnitTest.DO_NOT_START_SDK,
   func: UnitTestProfileSyncAction | UnitTestProfileAsyncAction
 ): Promise<void> => {
   await AppSdkUnitTest.test(unitTest, func)