@vived/app 2.31.0 → 2.33.0

package/lib/Entities/AppDispatcher.d.ts

@@ -4,6 +4,20 @@ export interface AssetMetaDTO {
     name: string;
     description: string;
 }
+export interface ShowAlertDTO {
+    title: string;
+    message: string;
+    closeButtonLabel: string;
+    closeCallback: () => void;
+}
+export interface ShowConfirmDTO {
+    title: string;
+    message: string;
+    confirmButtonLabel: string;
+    cancelButtonLabel: string;
+    confirmCallback: () => void;
+    cancelCallback: () => void;
+}
 export declare abstract class AppDispatcher {
     abstract registerHostHandler: (hostHandler: Handler) => void;
     abstract dispatch: (request: Request) => void;
@@ -21,6 +35,7 @@ export declare abstract class AppDispatcher {
     abstract logError: (sender: string, message: string) => void;
     abstract logFatalError: (sender: string, message: string) => void;
     abstract submitHitResult: (success: boolean, description: string) => void;
+    abstract submitProgressResult: (progress: number, description: string) => void;
     abstract submitMultiHitResult: (hits: number, misses: number, unanswered: number, description: string) => void;
     abstract submitQualityResult: (stars: number, maxStars: number, description: string) => void;
     abstract submitScoreResult: (score: number, maxScore: number, description: string) => void;
@@ -29,5 +44,7 @@ export declare abstract class AppDispatcher {
     abstract getAssetsForOwner: (ownerID: string) => Promise<AssetMetaDTO[]>;
     abstract submitNewActivityAsset: (file: File) => Promise<string>;
     abstract stopZSpace: () => void;
+    abstract showAlert: (data: ShowAlertDTO) => void;
+    abstract showConfirm: (data: ShowConfirmDTO) => void;
 }
 export declare function makeAppDispatcher(): AppDispatcher;

package/lib/Entities/AppDispatcher.js

@@ -111,6 +111,16 @@ class AppDistpatcherImp extends AppDispatcher {
             };
             this.formRequestAndDispatch("SUBMIT_RESULTS", 3, payload);
         };
+        this.submitProgressResult = (progress, description) => {
+            const payload = {
+                resultType: "PROGRESS_V1",
+                description,
+                result: {
+                    progress,
+                },
+            };
+            this.formRequestAndDispatch("SUBMIT_RESULTS", 3, payload);
+        };
         this.submitMultiHitResult = (hits, misses, unanswered, description) => {
             const payload = {
                 resultType: "MULTIHIT_V1",
@@ -269,6 +279,26 @@ class AppDistpatcherImp extends AppDispatcher {
                 }
             });
         };
+        this.showAlert = (data) => {
+            const payload = {
+                title: data.title,
+                message: data.message,
+                closeButtonLabel: data.closeButtonLabel,
+                closeCallback: data.closeCallback,
+            };
+            this.formRequestAndDispatch("SHOW_ALERT", 1, payload);
+        };
+        this.showConfirm = (data) => {
+            const payload = {
+                title: data.title,
+                message: data.message,
+                confirmCallback: data.confirmCallback,
+                cancelButtonLabel: data.cancelButtonLabel,
+                cancelCallback: data.cancelCallback,
+                confirmButtonLabel: data.confirmButtonLabel,
+            };
+            this.formRequestAndDispatch("SHOW_CONFIRM", 1, payload);
+        };
     }
     formRequestAndDispatch(type, version, payload) {
         const request = {

package/lib/Entities/MessageSystem.d.ts

@@ -1,14 +1,8 @@
-import { Result } from "../ValueObjects";
 export declare type MessageDataFile = {
     [key: string]: string;
 };
 export interface MessageSystem {
     setMessages: (messages: MessageDataFile) => void;
-    getMessage: (keyword: string) => Result<string, Error>;
-}
-export declare class MessageSystemImp implements MessageSystem {
-    private messages;
-    setMessages: (messages: MessageDataFile) => void;
-    getMessage: (keyword: string) => Result<string, Error>;
+    getMessage: (keyword: string, fallbackMessage?: string) => string | undefined;
 }
 export declare function makeMessageSystem(): MessageSystem;

package/lib/Entities/MessageSystem.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeMessageSystem = exports.MessageSystemImp = void 0;
-const ValueObjects_1 = require("../ValueObjects");
+exports.makeMessageSystem = void 0;
 class MessageSystemImp {
     constructor() {
         this.messages = new Map();
@@ -13,19 +12,15 @@ class MessageSystemImp {
                 }
             }
         };
-        this.getMessage = (keyword) => {
-            const message = this.messages.get(keyword);
-            if (message) {
-                return new ValueObjects_1.Resolved(message);
-            }
-            else {
-                const err = new Error("Message System cant find message from keyword: " + keyword);
-                return new ValueObjects_1.Rejected(err);
+        this.getMessage = (keyword, fallbackMessage) => {
+            let msg = this.messages.get(keyword);
+            if (msg === undefined) {
+                msg = fallbackMessage;
             }
+            return msg;
         };
     }
 }
-exports.MessageSystemImp = MessageSystemImp;
 function makeMessageSystem() {
     return new MessageSystemImp();
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vived/app",
-  "version": "2.31.0",
+  "version": "2.33.0",
   "description": "Public package for the VIVED Learning App system",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",