@3cr/viewer-browser 0.0.196 → 0.0.220

package/src/{dataLayer/__tests__/viewer3cr.spec.ts → services/__tests__/viewer-3cr.service.spec.ts}

@@ -1,20 +1,23 @@
-import {beforeEach, describe, expect, it, MockInstance, vi} from "vitest";
-import {emptyPayload, Viewer3cr} from "@/dataLayer/viewer3cr";
-import {unref} from "vue";
+import { emptyPayload, Viewer3crService } from '@/services/viewer-3cr.service';
+import { unref } from 'vue';
 import {
   AnchorPoint,
-  DataOverlayActions,
-  FrontEndInterfaces, InteractivityActions,
-  LayoutActions, NavigationCubeActions,
+  DataOverlaysActions,
+  FrontEndInterfaces,
+  InteractivityActions,
+  LayoutActions,
+  MarkupsActions,
+  McadActions,
+  NavigationCubeActions,
   PresetsActions,
   ScanMovementActions,
   ScanOrientationActions,
   ScanView,
-  SlidersActions,
-} from "@3cr/types-ts";
-import {toNumber} from "@/helpers/utils";
-import {currentColourPreset, previousLayout, transactionStarted,} from "@/dataLayer/scanState";
-import {useViewer3cr} from "@/dataLayer/useViewer3cr";
+  SlidersActions
+} from '@3cr/types-ts';
+import { currentColourPreset, previousLayout, transactionStarted } from '@/models/scanState';
+import { useViewer3cr } from '@/composables/useViewer3cr';
+import { MockInstance } from 'vitest';
 
 describe('Viewer3cr tests', () => {
   const viewer3cr = useViewer3cr();
@@ -22,7 +25,7 @@ describe('Viewer3cr tests', () => {
   let sendPayload: MockInstance;
 
   beforeEach(() => {
-    sendPayload = vi.spyOn(Viewer3cr.prototype, 'sendPayload').mockResolvedValue();
+    sendPayload = vi.spyOn(Viewer3crService.prototype, 'sendPayload').mockResolvedValue();
   });
 
   it('should create instance', () => {
@@ -31,8 +34,9 @@ describe('Viewer3cr tests', () => {
 
   describe('data overlay actions', () => {
     it('should toggle 2d annotation', async () => {
-      await viewer3cr.toggle2dAnnotation('test', true);
-      expect(sendPayload).toHaveBeenCalledWith(FrontEndInterfaces.data_overlay, DataOverlayActions.do03, {
+      const value = { Id: 'test', Visibility: true };
+      await viewer3cr.toggle2dAnnotation(value);
+      expect(sendPayload).toHaveBeenCalledWith(FrontEndInterfaces.data_overlay, DataOverlaysActions.do03, {
         Version: expect.any(String),
         Id: 'test',
         Visibility: true
@@ -40,8 +44,9 @@ describe('Viewer3cr tests', () => {
     });
 
     it('should toggle 3d annotation', async () => {
-      await viewer3cr.toggle3dAnnotation('test', true);
-      expect(sendPayload).toHaveBeenCalledWith(FrontEndInterfaces.data_overlay, DataOverlayActions.do11, {
+      const value = { Id: 'test', Visibility: true };
+      await viewer3cr.toggle3dAnnotation(value);
+      expect(sendPayload).toHaveBeenCalledWith(FrontEndInterfaces.data_overlay, DataOverlaysActions.do11, {
         Version: expect.any(String),
         Id: 'test',
         Visibility: true
@@ -85,6 +90,62 @@ describe('Viewer3cr tests', () => {
     });
   });
 
+  describe('mcad actions', () => {
+    it('should set mcad object visibility', async () => {
+      const value = { Version: '1.2.0', Id: 'test', Visibility: true };
+      await viewer3cr.setMcadObjectVisibility(value);
+      expect(sendPayload).toHaveBeenCalledWith(FrontEndInterfaces.mcad, McadActions.mc03, value);
+    });
+
+    it('should set mcad object colour', async () => {
+      const value = { Version: '1.2.0', Id: 'test', Colour: { Version: '1.2.0', R: 0, G: 0, B: 0, A: 0 } };
+      await viewer3cr.setMcadObjectColour(value);
+      expect(sendPayload).toHaveBeenCalledWith(FrontEndInterfaces.mcad, McadActions.mc04, value);
+    });
+
+    it('should toggle mcad object movement', async () => {
+      const value = { Version: '1.2.0', Id: 'test', Value: true };
+      await viewer3cr.moveMcadObject(value);
+      expect(sendPayload).toHaveBeenCalledWith(FrontEndInterfaces.mcad, McadActions.mc05, value);
+    });
+
+    it('should toggle mcad inversion', async () => {
+      const value = {
+        Version: '1.2.0',
+        Id: 'test',
+        Inverted: { Version: '1.2.0', InvertedSagittal: true, InvertedCoronal: true, InvertedTransverse: true }
+      };
+      await viewer3cr.invertMcadObject(value);
+      expect(sendPayload).toHaveBeenCalledWith(FrontEndInterfaces.mcad, McadActions.mc16, value);
+    });
+  });
+
+  describe('markup actions', () => {
+    it('should set markup visibility', async () => {
+      const value = { Version: '1.2.1', Id: 'test', Visibility2d: false, Visibility3d: false };
+      await viewer3cr.setMarkupVisibility(value.Id, value.Visibility2d);
+      expect(sendPayload).toHaveBeenCalledWith(FrontEndInterfaces.markups, MarkupsActions.mu16, [value]);
+    });
+
+    it('should toggle length tool', async () => {
+      const value = { Version: '1.2.0', Value: true };
+      await viewer3cr.lengthTool(value);
+      expect(sendPayload).toHaveBeenCalledWith(FrontEndInterfaces.markups, MarkupsActions.mu20, value);
+    });
+
+    it('should toggle polygon tool', async () => {
+      const value = { Version: '1.2.0', Value: true };
+      await viewer3cr.polygonTool(value);
+      expect(sendPayload).toHaveBeenCalledWith(FrontEndInterfaces.markups, MarkupsActions.mu21, value);
+    });
+
+    it('should toggle angle tool', async () => {
+      const value = { Version: '1.2.0', Value: true };
+      await viewer3cr.angleTool(value);
+      expect(sendPayload).toHaveBeenCalledWith(FrontEndInterfaces.markups, MarkupsActions.mu22, value);
+    });
+  });
+
   describe('navigation actions', () => {
     it('should set nav cube position', async () => {
       await viewer3cr.setNavCubePositionSize(AnchorPoint.TOP_LEFT, 10, 10, 100, 100);
@@ -146,9 +207,9 @@ describe('Viewer3cr tests', () => {
   });
 
   describe('preset actions', () => {
-    it("should set setPreset", async () => {
+    it('should set setPreset', async () => {
       const action = PresetsActions.pr01;
-      const data = { asd: "123" };
+      const data = { asd: '123' };
       expect(sendPayload).not.toHaveBeenCalled();
       expect(unref(currentColourPreset)).not.toBe(data);
       await viewer3cr.setPreset(action, data);
@@ -156,9 +217,9 @@ describe('Viewer3cr tests', () => {
       expect(sendPayload).toHaveBeenCalledWith(FrontEndInterfaces.presets, action, data);
     });
 
-    it("should set setPreset change colour", async () => {
+    it('should set setPreset change colour', async () => {
       const action = PresetsActions.pr02;
-      const data = { asd: "123", };
+      const data = { asd: '123' };
       expect(sendPayload).not.toHaveBeenCalled();
       expect(unref(currentColourPreset)).not.toBe(data);
       await viewer3cr.setPreset(action, data);
@@ -168,18 +229,18 @@ describe('Viewer3cr tests', () => {
   });
 
   describe('scan movement actions', () => {
-    it("should scanMovementHandler", async () => {
+    it('should scanMovementHandler', async () => {
       const action = ScanMovementActions.sm05;
       const value = 100;
       expect(sendPayload).not.toHaveBeenCalled();
       await viewer3cr.scanMovementHandler(action, value);
       expect(sendPayload).toHaveBeenCalledWith(FrontEndInterfaces.scan_movement, action, {
         Version: expect.any(String),
-        Value: toNumber(value),
+        Value: value
       });
     });
 
-    it("should not scanMovementHandler transactionStarted", async () => {
+    it('should not scanMovementHandler transactionStarted', async () => {
       transactionStarted.value = true;
       const action = ScanMovementActions.sm05;
       const value = 100;
@@ -187,7 +248,7 @@ describe('Viewer3cr tests', () => {
       await viewer3cr.scanMovementHandler(action, value);
       expect(sendPayload).not.toHaveBeenCalledWith(FrontEndInterfaces.scan_movement, action, {
         Version: expect.any(String),
-        Value: toNumber(value),
+        Value: value
       });
     });
 
@@ -198,7 +259,7 @@ describe('Viewer3cr tests', () => {
       expect(sendPayload).toHaveBeenCalledWith(FrontEndInterfaces.scan_movement, ScanMovementActions.sm13, {
         Version: expect.any(String),
         View: view,
-        Movement: movement,
+        Movement: movement
       });
     });
 
@@ -209,7 +270,7 @@ describe('Viewer3cr tests', () => {
       expect(sendPayload).toHaveBeenCalledWith(FrontEndInterfaces.scan_movement, ScanMovementActions.sm14, {
         Version: expect.any(String),
         View: view,
-        Movement: movement,
+        Movement: movement
       });
     });
 
@@ -220,7 +281,7 @@ describe('Viewer3cr tests', () => {
       expect(sendPayload).toHaveBeenCalledWith(FrontEndInterfaces.scan_movement, ScanMovementActions.sm15, {
         Version: expect.any(String),
         View: view,
-        Movement: movement,
+        Movement: movement
       });
     });
 
@@ -231,7 +292,7 @@ describe('Viewer3cr tests', () => {
       expect(sendPayload).toHaveBeenCalledWith(FrontEndInterfaces.scan_movement, ScanMovementActions.sm16, {
         Version: expect.any(String),
         View: view,
-        Movement: movement,
+        Movement: movement
       });
     });
 
@@ -242,7 +303,7 @@ describe('Viewer3cr tests', () => {
       expect(sendPayload).toHaveBeenCalledWith(FrontEndInterfaces.scan_movement, ScanMovementActions.sm17, {
         Version: expect.any(String),
         View: view,
-        Movement: movement,
+        Movement: movement
       });
     });
 
@@ -253,13 +314,13 @@ describe('Viewer3cr tests', () => {
       expect(sendPayload).toHaveBeenCalledWith(FrontEndInterfaces.scan_movement, ScanMovementActions.sm18, {
         Version: expect.any(String),
         View: view,
-        Movement: movement,
+        Movement: movement
       });
     });
   });
 
   describe('scan orientation actions', () => {
-    it("should rotateByDeg", async () => {
+    it('should rotateByDeg', async () => {
       const view = ScanView.Coronal;
       const deg = 100;
       expect(sendPayload).not.toHaveBeenCalled();
@@ -267,7 +328,7 @@ describe('Viewer3cr tests', () => {
       expect(sendPayload).toHaveBeenCalledWith(FrontEndInterfaces.scan_orientation, ScanOrientationActions.so01, {
         Version: expect.any(String),
         View: view,
-        Angle: deg,
+        Angle: deg
       });
     });
 
@@ -305,18 +366,18 @@ describe('Viewer3cr tests', () => {
       transactionStarted.value = false;
     });
 
-    it("should sliderHandler", async () => {
+    it('should sliderHandler', async () => {
       const action = SlidersActions.sl08;
       const value = 100;
       expect(sendPayload).not.toHaveBeenCalled();
       await viewer3cr.sliderHandler(action, value);
       expect(sendPayload).toHaveBeenCalledWith(FrontEndInterfaces.sliders, action, {
         Version: expect.any(String),
-        Value: toNumber(value),
+        Value: value
       });
     });
 
-    it("should not sliderHandler transactionStarted", async () => {
+    it('should not sliderHandler transactionStarted', async () => {
       transactionStarted.value = true;
       const action = SlidersActions.sl08;
       const value = 100;
@@ -324,7 +385,7 @@ describe('Viewer3cr tests', () => {
       await viewer3cr.sliderHandler(action, value);
       expect(sendPayload).not.toHaveBeenCalledWith(FrontEndInterfaces.sliders, action, {
         Version: expect.any(String),
-        Value: toNumber(value),
+        Value: value
       });
     });
   });

package/src/services/gpt.service.ts

@@ -0,0 +1,17 @@
+import axios, { AxiosInstance, AxiosResponse } from 'axios';
+import { GptResponsePayload } from '@/types/gpt-response-payload';
+
+export class GptService {
+  static Instantiate() {
+    return new GptService();
+  }
+
+  client: AxiosInstance = axios.create();
+
+  async GenerateAnnotations(title: string, question: number = 0): Promise<AxiosResponse<GptResponsePayload>> {
+    const testVersion = window.location.href.includes('test.') || window.location.href.includes('localhost');
+    return this.client.post(`https://${testVersion ? 'test.' : ''}api.singular.health/api/GPT/Smart/Annotation`, null, {
+      params: { annotationTitle: title, question }
+    });
+  }
+}

package/src/services/service-worker.service.ts

@@ -0,0 +1,16 @@
+export class ServiceWorkerService {
+  static Instantiate() {
+    return new ServiceWorkerService();
+  }
+
+  async getRegistration(): Promise<ServiceWorkerRegistration | undefined> {
+    if (ServiceWorkerService.canServiceWork()) {
+      return await navigator.serviceWorker.getRegistration('/app');
+    }
+    return undefined;
+  }
+
+  private static canServiceWork(): boolean {
+    return 'serviceWorker' in navigator;
+  }
+}