Merge pull request #32 from xpert-ai/develop

fix: ocap dependency for chat webapp
xpert-ai · Jan 24, 2025 · 7d665a4 · 7d665a4
2 parents a3c8098 + 5a0758a
commit 7d665a4
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/apps/cloud/src/app/xpert/home.service.ts b/apps/cloud/src/app/xpert/home.service.ts
@@ -26,7 +26,7 @@ export class XpertHomeService {
   readonly conversationService = inject(ChatConversationService)
   readonly semanticModelService = inject(SemanticModelServerService)
   readonly #dsCoreService = inject(NgmDSCoreService)
-  readonly #wasmAgent = inject(WasmAgentService)
+  readonly #wasmAgent? = inject(WasmAgentService, {optional: true})
   readonly #toastr = injectToastr()
   readonly lang = this.appService.lang
 

diff --git a/apps/cloud/src/app/xpert/home/home.component.html b/apps/cloud/src/app/xpert/home/home.component.html
@@ -17,7 +17,7 @@
   </div>
 
   <div class="relative group w-full flex-1">
-    <div class="grow px-2 md:px-4 w-full py-2 overflow-y-auto rounded-md border border-solid border-transparent
+    <div class="grow h-full px-2 md:px-4 w-full py-2 overflow-y-auto rounded-md border border-solid border-transparent
         group-hover:absolute group-hover:w-80 group-hover:shadow-sm left-0 top-0 z-20
         bg-components-card-bg group-hover:border-divider-regular"
       waIntersectionObserver

diff --git a/apps/cloud/src/app/xpert/home/home.component.ts b/apps/cloud/src/app/xpert/home/home.component.ts
@@ -8,12 +8,12 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms'
 import { MatTooltipModule } from '@angular/material/tooltip'
 import { RouterModule } from '@angular/router'
 import { NgmSpinComponent } from '@metad/ocap-angular/common'
-import { effectAction, provideOcapCore } from '@metad/ocap-angular/core'
+import { effectAction, OCAP_AGENT_TOKEN, provideOcapCore } from '@metad/ocap-angular/core'
 import { WaIntersectionObserver } from '@ng-web-apis/intersection-observer'
 import { TranslateModule } from '@ngx-translate/core'
 import { provideMarkdown } from 'ngx-markdown'
 import { switchMap, tap } from 'rxjs/operators'
-import { ChatConversationService, OrderTypeEnum, routeAnimations, XpertService, injectToastr, getErrorMessage, IChatConversation } from '../../@core'
+import { ChatConversationService, OrderTypeEnum, routeAnimations, XpertService, injectToastr, getErrorMessage, IChatConversation, ServerSocketAgent } from '../../@core'
 import { EmojiAvatarComponent } from '../../@shared/avatar/'
 import { ChatAppService } from '../chat-app.service'
 import { ChatInputComponent } from '../chat-input/chat-input.component'
@@ -50,6 +50,12 @@ import { XpertHomeService } from '../home.service'
   animations: [routeAnimations],
   changeDetection: ChangeDetectionStrategy.OnPush,
   providers: [
+    ServerSocketAgent,
+    {
+      provide: OCAP_AGENT_TOKEN,
+      useExisting: ServerSocketAgent,
+      multi: true
+    },
     provideMarkdown({}),
     provideOcapCore(),
     XpertHomeService,