@hedia/recommendation-screen 2.0.2 → 2.1.0

package/jest.config.js

@@ -24,7 +24,8 @@ module.exports = {
 		"!src/types/**.*",
 		"!src/App.tsx",
         "!src/locale/CleanLanguage.ts",
-        "!src/utils/RecommendationError.ts"
+        "!src/utils/RecommendationError.ts",
+		"!src/components/Icon.tsx"
 	],
 	// The directory where Jest should output its coverage files
 	coverageDirectory: "coverage",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hedia/recommendation-screen",
-  "version": "2.0.2",
+  "version": "2.1.0",
   "description": "Hedia Recommendation Screen for Bolus and Carbohydrates",
   "main": "index.js",
   "scripts": {
@@ -68,7 +68,7 @@
     "react-test-renderer": "16.13.1",
     "tslint": "6.1.2",
     "tslint-config-prettier": "1.18.0",
-    "typescript": "4.1.3"
+    "typescript": "4.1.5"
   },
   "dependencies": {
     "moment": "2.27.0",

package/src/RecommendationScreen.d.ts

@@ -3,7 +3,6 @@ import { AppStateStatus } from "react-native";
 import { BloodGlucoseUnit, BloodKetonesUnit, Languages, Logbook, UserSettings } from "@hedia/types";
 import { RecommendationError } from "./utils/RecommendationError";
 import { IActivityDisplayProps, IRecommendationParams, logbookEntry } from "./types/types";
-import { AttentionMessage } from "./utils/AttentionMessages";
 interface IResult {
     suggested: number;
     entered: number | null;
@@ -71,9 +70,9 @@ export default class RecommendationScreen extends React.Component<IRecommendatio
     handleMoodSelected: (selectedMood: IState["selectedMood"]) => void;
     updateInsulinRecommendation: (enteredInsulin: number) => void;
     handleTransfer: () => void;
-    getBGLevelAttentionMessage: () => AttentionMessage | null;
+    getBGLevelAttentionMessage: () => string | null;
     getBGLevelRemeasurementReminder: () => number;
-    getLimitationAttentionMessage: () => AttentionMessage | null;
+    getLimitationAttentionMessage: () => string | null;
     render(): JSX.Element;
 }
 export {};

package/src/__tests__/components/Emotion.test.jsx

@@ -43,16 +43,15 @@ describe(`Emotion - Component`, () => {
         react_native_testing_library_1.fireEvent(newIcon, `onPress`);
         expect(mockedStateMood).toBe(mood);
         wrapper.update(<Emotion_1.default moodSelected={mockSelected} currentMood={mockedStateMood}/>);
-        Object.keys(MoodEnum)
-            .filter((key) => /[0-9]/.test(key))
-            .forEach((key) => {
-            if (moodName === MoodEnum[key]) {
-                expect(utils_1.getIcon(wrapper, MoodEnum[key], true)).not.toBeNull();
-                expect(utils_1.getIcon(wrapper, MoodEnum[key], false)).toBeNull();
+        const moodValues = Object.values(MoodEnum).filter((value) => typeof value === `string`);
+        moodValues.forEach((value) => {
+            if (moodName === value) {
+                expect(utils_1.getIcon(wrapper, value, true)).not.toBeNull();
+                expect(utils_1.getIcon(wrapper, value, false)).toBeNull();
             }
             else {
-                expect(utils_1.getIcon(wrapper, MoodEnum[key], false)).not.toBeNull();
-                expect(utils_1.getIcon(wrapper, MoodEnum[key], true)).toBeNull();
+                expect(utils_1.getIcon(wrapper, value, false)).not.toBeNull();
+                expect(utils_1.getIcon(wrapper, value, true)).toBeNull();
             }
         });
     });

package/src/components/Icon.d.ts

@@ -0,0 +1,13 @@
+import React from "react";
+import { StyleSheet } from "react-native";
+interface IProps {
+    iconIdentifier: string;
+    iconStyle: StyleSheet.NamedStyles<any>;
+}
+export default class Icon extends React.Component<IProps> {
+    static defaultProps: any;
+    _root: any;
+    setNativeProps(nativeProps: any): void;
+    render(): JSX.Element;
+}
+export {};

package/src/components/Icon.jsx

@@ -0,0 +1,42 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+// @ts-nocheck
+/* tslint:disable */
+const react_1 = __importDefault(require("react"));
+const IconSets = {
+    AntDesign: require(`react-native-vector-icons/AntDesign`),
+    Feather: require(`react-native-vector-icons/Feather`),
+    EvilIcons: require(`react-native-vector-icons/EvilIcons`),
+    Ionicons: require(`react-native-vector-icons/Ionicons`),
+    FontAwesome: require(`react-native-vector-icons/FontAwesome`),
+    Entypo: require(`react-native-vector-icons/Entypo`),
+};
+class Icon extends react_1.default.Component {
+    setNativeProps(nativeProps) {
+        this._root.setNativeProps(nativeProps);
+    }
+    render() {
+        const iconParts = this.props.iconIdentifier.split(`/`);
+        let iconPackageName = iconParts[0];
+        let iconName = iconParts[1];
+        if (!IconSets[iconPackageName]) {
+            iconPackageName = `FontAwesome`;
+            iconName = `question`;
+        }
+        const clonedProps = {
+            ...this.props,
+            name: iconName,
+            iconIdentifier: undefined,
+            ref: (component) => (this._root = component),
+        };
+        const IconClass = IconSets[iconPackageName].default;
+        return <IconClass {...clonedProps}/>;
+    }
+}
+exports.default = Icon;
+Icon.defaultProps = {
+    iconIdentifier: `FontAwesome/question`,
+};

package/src/components/LimitationMessage.d.ts

@@ -1,7 +1,6 @@
 import * as React from "react";
-import { AttentionMessage } from "../utils/AttentionMessages";
 export interface ILimitationMessageProps {
-    limitationMessage: AttentionMessage | null;
+    limitationMessage: string | null;
     onPressNextButton(): void;
 }
 export default class LimitationMessage extends React.Component<ILimitationMessageProps> {

package/src/components/RecommendationModal.d.ts

@@ -1,10 +1,9 @@
 import * as React from "react";
-import { AttentionMessage } from "../utils/AttentionMessages";
 interface IModalProps {
     isVisible: boolean;
     suggestedCarbohydrates: number | null;
-    attentionMessage: AttentionMessage | null;
-    limitationMessage: AttentionMessage | null;
+    attentionMessage: string | null;
+    limitationMessage: string | null;
     onClickOkButton(): void;
     onAcceptCarbohydrates(): void;
     onDeclineCarbohydrates(): void;

package/src/components/RecommendationModal.jsx

@@ -95,7 +95,8 @@ class RecommendationModal extends React.Component {
 			</React.Fragment>);
         };
         this.firstPage = () => {
-            return (<LimitationMessage_1.default limitationMessage={this.props.limitationMessage} onPressNextButton={this.onPressNextButton}/>);
+            const { limitationMessage } = this.props;
+            return <LimitationMessage_1.default limitationMessage={limitationMessage} onPressNextButton={this.onPressNextButton}/>;
         };
         this.state = {
             firstPageVisible: !!this.props.limitationMessage,

package/src/components/activity/ActivityIntensity.jsx

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const types_1 = require("@hedia/types");
 const react_1 = __importDefault(require("react"));
 const react_native_1 = require("react-native");
 const Translations_1 = require("../../utils/Translations");
@@ -35,13 +36,13 @@ const activityIntensityStyles = react_native_1.StyleSheet.create({
         padding: `5%`,
         borderRadius: 5,
     },
-    Light: {
+    [types_1.Activity.Enums.ActivityIntensity.light]: {
         backgroundColor: `#A5D871`,
     },
-    Moderate: {
+    [types_1.Activity.Enums.ActivityIntensity.moderate]: {
         backgroundColor: `#F9BD5A`,
     },
-    Hard: {
+    [types_1.Activity.Enums.ActivityIntensity.hard]: {
         backgroundColor: `#EC5466`,
     },
     intensityContainer: {

package/src/utils/AttentionMessages.d.ts

@@ -1,13 +1,19 @@
-export declare class AttentionMessage {
-    static SevereHypoglycemia: () => string;
-    static Hypoglycemia: () => string;
-    static MildHypoglycemia: () => string;
-    static NormoglycemiaActivityUnder5MMOL: () => string;
-    static HyperglycemiaActivity: () => string;
-    static SevereHyperglycemia: () => string;
-    static SevereHyperglycemiaActivity: () => string;
-}
-export declare function addPostponeActivityMessageUnder5MMOL(message: AttentionMessage): string;
+export declare const AttentionMessage: {
+    SevereHypoglycemia: () => string;
+    Hypoglycemia: () => string;
+    MildHypoglycemia: () => string;
+    NormoglycemiaActivityUnder5MMOL: () => string;
+    HyperglycemiaActivity: () => string;
+    SevereHyperglycemia: () => string;
+    SevereHyperglycemiaActivity: () => string;
+    BGLevelNotProvided: null;
+    Hyperglycemia: null;
+    MildHyperglycemia: null;
+    Normoglycemia: null;
+    NormoglycemiaUnder5MMOL: null;
+    UnsupportedBGLevel: null;
+};
+export declare function addPostponeActivityMessageUnder5MMOL(message: string): string;
 export declare class Messages {
     static VeryLowBGL: () => string;
     static LowBGL: () => string;

package/src/utils/AttentionMessages.jsx

@@ -8,16 +8,21 @@ const types_1 = require("@hedia/types");
 const macro_1 = require("@lingui/macro");
 const moment_1 = __importDefault(require("moment"));
 const i18nUtils_1 = require("../locale/i18nUtils");
-class AttentionMessage {
-}
-exports.AttentionMessage = AttentionMessage;
-AttentionMessage.SevereHypoglycemia = () => `${Messages.VeryLowBGL()}${`\n`}${Messages.Reminder15Minutes()}`;
-AttentionMessage.Hypoglycemia = () => `${Messages.LowBGL()}${`\n`}${Messages.Reminder15Minutes()}`;
-AttentionMessage.MildHypoglycemia = () => Messages.Reminder15Minutes();
-AttentionMessage.NormoglycemiaActivityUnder5MMOL = () => Messages.PostponePhysicalActivityUnder5MMOL();
-AttentionMessage.HyperglycemiaActivity = () => `${Messages.HighBGL()}${`\n`}${Messages.InsulinKetones()}${`\n`}${Messages.Reminder15Minutes()}${`\n`}${Messages.PostponePhysicalActivity()}`;
-AttentionMessage.SevereHyperglycemia = () => `${Messages.HighBGL()}${`\n`}${Messages.InsulinKetones()}${`\n`}`;
-AttentionMessage.SevereHyperglycemiaActivity = () => AttentionMessage.HyperglycemiaActivity();
+exports.AttentionMessage = {
+    SevereHypoglycemia: () => `${Messages.VeryLowBGL()}${`\n`}${Messages.Reminder15Minutes()}`,
+    Hypoglycemia: () => `${Messages.LowBGL()}${`\n`}${Messages.Reminder15Minutes()}`,
+    MildHypoglycemia: () => Messages.Reminder15Minutes(),
+    NormoglycemiaActivityUnder5MMOL: () => Messages.PostponePhysicalActivityUnder5MMOL(),
+    HyperglycemiaActivity: () => `${Messages.HighBGL()}${`\n`}${Messages.InsulinKetones()}${`\n`}${Messages.Reminder15Minutes()}${`\n`}${Messages.PostponePhysicalActivity()}`,
+    SevereHyperglycemia: () => `${Messages.HighBGL()}${`\n`}${Messages.InsulinKetones()}${`\n`}`,
+    SevereHyperglycemiaActivity: () => `${Messages.HighBGL()}${`\n`}${Messages.InsulinKetones()}${`\n`}${Messages.Reminder15Minutes()}${`\n`}${Messages.PostponePhysicalActivity()}`,
+    BGLevelNotProvided: null,
+    Hyperglycemia: null,
+    MildHyperglycemia: null,
+    Normoglycemia: null,
+    NormoglycemiaUnder5MMOL: null,
+    UnsupportedBGLevel: null,
+};
 function addPostponeActivityMessageUnder5MMOL(message) {
     return `${message}${`\n`}${Messages.PostponePhysicalActivityUnder5MMOL()}`;
 }

package/src/utils/RecommendationUtils.d.ts

@@ -1,9 +1,8 @@
 import { BgLevel } from "../types/enum";
 import { IActivityParams, logbookEntry } from "../types/types";
-import { AttentionMessage, Messages } from "./AttentionMessages";
 export declare function getBGLevel(currentBGL: number, latestLogbookFrom6Hours: logbookEntry | null): BgLevel;
 export declare function getReminder(bgLevel: BgLevel, carbohydrates: number, userReminder: number, activity: IActivityParams | null): number;
-export declare function getAttentionMessage(bgLevel: BgLevel, activity: IActivityParams | null): AttentionMessage | null;
+export declare function getAttentionMessage(bgLevel: BgLevel, activity: IActivityParams | null): string | null;
 export declare function isSevereHyperglycemia(logbook?: logbookEntry | null): boolean;
 export declare function isActivityWithin15Minutes(activity: IActivityParams | null): boolean;
-export declare function getLimitationMessage(wasLimited: boolean, activityReduction: number | null): Messages | null;
+export declare function getLimitationMessage(wasLimited: boolean, activityReduction: number | null): string | null;

package/src/utils/RecommendationUtils.js

@@ -9,6 +9,7 @@ const enum_1 = require("../types/enum");
 const AttentionMessages_1 = require("./AttentionMessages");
 const Constants_1 = require("./Constants");
 const RecommendationError_1 = require("./RecommendationError");
+const Utils_1 = require("./Utils");
 function getBGLevel(currentBGL, latestLogbookFrom6Hours) {
     if (currentBGL === null) {
         return enum_1.BgLevel.BGLevelNotProvided;
@@ -65,23 +66,26 @@ function getReminder(bgLevel, carbohydrates, userReminder, activity) {
 }
 exports.getReminder = getReminder;
 function getAttentionMessage(bgLevel, activity) {
+    const key = Utils_1.Utils.getKeyFromValue(enum_1.BgLevel, bgLevel);
+    const isAttentionMessageNull = AttentionMessages_1.AttentionMessage[key] === null;
+    const isWithin15Minutes = isActivityWithin15Minutes(activity);
     switch (bgLevel) {
         case enum_1.BgLevel.BGLevelNotProvided:
         case enum_1.BgLevel.Normoglycemia:
         case enum_1.BgLevel.MildHyperglycemia:
             return null;
         case enum_1.BgLevel.NormoglycemiaUnder5MMOL:
-            return isActivityWithin15Minutes(activity) ? AttentionMessages_1.AttentionMessage.NormoglycemiaActivityUnder5MMOL() : null;
+            return isWithin15Minutes ? AttentionMessages_1.AttentionMessage.NormoglycemiaActivityUnder5MMOL() : null;
         case enum_1.BgLevel.SevereHypoglycemia:
         case enum_1.BgLevel.Hypoglycemia:
         case enum_1.BgLevel.MildHypoglycemia:
-            return isActivityWithin15Minutes(activity)
-                ? AttentionMessages_1.addPostponeActivityMessageUnder5MMOL(AttentionMessages_1.AttentionMessage[enum_1.BgLevel[bgLevel]]())
-                : AttentionMessages_1.AttentionMessage[enum_1.BgLevel[bgLevel]]();
+            return isWithin15Minutes && !isAttentionMessageNull
+                ? AttentionMessages_1.addPostponeActivityMessageUnder5MMOL(AttentionMessages_1.AttentionMessage[key]())
+                : AttentionMessages_1.AttentionMessage[key]();
         case enum_1.BgLevel.Hyperglycemia:
-            return isActivityWithin15Minutes(activity) ? AttentionMessages_1.AttentionMessage.HyperglycemiaActivity() : null;
+            return isWithin15Minutes ? AttentionMessages_1.AttentionMessage.HyperglycemiaActivity() : null;
         case enum_1.BgLevel.SevereHyperglycemia:
-            return isActivityWithin15Minutes(activity)
+            return isWithin15Minutes
                 ? AttentionMessages_1.AttentionMessage.SevereHyperglycemiaActivity()
                 : AttentionMessages_1.AttentionMessage.SevereHyperglycemia();
         default:

package/src/utils/Utils.d.ts

@@ -9,4 +9,5 @@ export declare class Utils {
     static convertBKLToMGDL(value: number): number;
     static displayedBKLValue(value: number, unit: BloodKetonesUnit): number;
     static formatUnit: (unit: BloodGlucoseUnit | BloodKetonesUnit) => string;
+    static getKeyFromValue<T>(keys: T, value: T[keyof T]): keyof T;
 }

package/src/utils/Utils.js

@@ -40,6 +40,10 @@ class Utils {
     static displayedBKLValue(value, unit) {
         return unit === types_1.BloodKetonesUnit.MMOL_L ? value : Utils.convertBKLToMGDL(value);
     }
+    static getKeyFromValue(keys, value) {
+        const values = Object.values(keys);
+        return Object.keys(keys)[values.indexOf(value)];
+    }
 }
 exports.Utils = Utils;
 Utils.formatUnit = (unit) => {

package/tsconfig.json

@@ -28,12 +28,13 @@
 
         /* Strict Type-Checking Options */
         //"strict": true,                           /* Enable all strict type-checking options. */
-        // "noImplicitAny": true,                 /* Raise error on expressions and declarations with an implied 'any' type. */
+        "noImplicitAny": true,                 /* Raise error on expressions and declarations with an implied 'any' type. */
         "strictNullChecks": true,              /* Enable strict null checks. */
-        // "strictFunctionTypes": true,           /* Enable strict checking of function types. */
+        "strictFunctionTypes": true,           /* Enable strict checking of function types. */
         "strictPropertyInitialization": true,  /* Enable strict checking of property initialization in classes. */
-        // "noImplicitThis": true,                /* Raise error on 'this' expressions with an implied 'any' type. */
-        // "alwaysStrict": true,                  /* Parse in strict mode and emit "use strict" for each source file. */
+        "noImplicitThis": true,                /* Raise error on 'this' expressions with an implied 'any' type. */
+        "alwaysStrict": true,                  /* Parse in strict mode and emit "use strict" for each source file. */
+        "noStrictGenericChecks": true,
 
         /* Additional Checks */
         "noUnusedLocals": true,                /* Report errors on unused locals. */
@@ -61,7 +62,8 @@
         /* Experimental Options */
         "experimentalDecorators": true /* Enables experimental support for ES7 decorators. */,
         "emitDecoratorMetadata": true /* Enables experimental support for emitting type metadata for decorators. */,
-        "skipLibCheck": true
+        "skipLibCheck": true,
+        "noErrorTruncation": true
     },
     "exclude": [
         "src/locale/CleanLanguage.ts",

package/App.tsx

@@ -1,140 +0,0 @@
-import { Activity, BloodGlucoseUnit, BloodKetonesUnit, Languages, UserSettings } from "@hedia/types";
-import React from "react";
-import RecommendationScreen from "./src/RecommendationScreen";
-import { IActivityDisplayProps, IRecommendationParams, logbookEntry } from "./src/types/types";
-import { RecommendationError } from "./src/utils/RecommendationError";
-import { generateActivityProps, generateDefaultLogbook } from "./src/__tests__/utils";
-
-interface IState {
-	params: IRecommendationParams & IActivityDisplayProps;
-	carbs: number | null;
-	injectionMethod: UserSettings.Enums.InjectionMethod;
-	activityDisplayProps: IActivityDisplayProps;
-}
-
-const ActivityEnum = Activity.Enums.ActivityEnum;
-
-const { Cycling } = ActivityEnum;
-const { Pump } = UserSettings.Enums.InjectionMethod;
-
-export default class App extends React.Component<{}, IState> {
-	constructor(props) {
-		super(props);
-
-		const params: IState["params"] = {
-			carbohydrateRatio: 10,
-			currentBGL: 33, // in order to recommend insulin
-			carbohydrates: 1, // in order not to have entered carbs = 0
-			insulinSensitivity: 4,
-			targetBGL: 6,
-			recentBoluses: [
-				{
-					insulinDose: 2,
-					secondsPassed: 1000,
-				},
-				{
-					insulinDose: 1.7,
-					secondsPassed: 10000,
-				},
-			],
-			activityTitle: `Moderate Activity Test Title`,
-			activityType: Cycling,
-			activity: generateActivityProps(),
-		};
-
-		this.state = {
-			params,
-			carbs: 25,
-			injectionMethod: Pump,
-			activityDisplayProps: {
-				activityType: params.activityType,
-				activityTitle: params.activityTitle,
-			},
-		};
-	}
-
-	public exitCallback = () => {
-		console.log(`exitcallback...`);
-	};
-
-	public closeCalculationCallback = () => {
-		console.log(`closeCalculationCallback...`);
-	};
-
-	public removeCarbs = () => {
-		this.setState({
-			carbs: null,
-		});
-	};
-
-	public changeCarbs = (carbs: number) => {
-		this.setState({
-			carbs,
-		});
-	};
-
-	public onYes = () => {
-		console.log(`Navigate to recent bolus screen`);
-	};
-
-	public updatedRecommendedInsulin = (val: number) => {
-		console.log(`Updated recommended insulin: `, val);
-	};
-
-	public transferToLogbook = (...params) => {
-		console.log(`Transfered:`, params);
-	};
-
-	public updateRemeasureTime = (remeasureTime: number) => {
-		console.log(`updateRemeasureTime:`, remeasureTime);
-	};
-
-	public recommendationAnswer = (carbRecommendationAnswer: boolean) => {
-		console.log("carbRecommendationAnswer", carbRecommendationAnswer);
-	};
-
-	public showBolusBar = (showBolusBar: boolean) => {
-		console.log("showBolusBar", showBolusBar);
-	};
-
-	public restartCalculation = () => {
-		console.log("restart calculation");
-	};
-
-	public handleError = (error: RecommendationError) => {
-		console.log(JSON.stringify(error));
-
-		switch (error.type) {
-			default:
-				throw error;
-		}
-	};
-
-	public render(): JSX.Element {
-		const logbook1: logbookEntry = {
-			...generateDefaultLogbook(),
-			blood_glucose_millimolar: 16,
-		};
-		return (
-			<RecommendationScreen
-				latestLogbookFrom6Hours={logbook1}
-				language={Languages.en}
-				injectionMethod={this.state.injectionMethod}
-				calculatorParams={this.state.params}
-				userReminder={5}
-				bloodGlucoseUnit={BloodGlucoseUnit.MMOL_L}
-				bloodKetoneUnit={BloodKetonesUnit.MG_DL}
-				currentBKL={0}
-				closeCalculationCallback={this.closeCalculationCallback}
-				exitCallback={this.exitCallback}
-				showBolusBar={this.showBolusBar}
-				onRecentInsulinYes={this.onYes}
-				transferToLogbook={this.transferToLogbook}
-				onError={this.handleError}
-				carbRecommendationAnswer={this.recommendationAnswer}
-				restartCalculation={this.restartCalculation}
-				activityDisplayProps={this.state.activityDisplayProps}
-			/>
-		);
-	}
-}

package/index.ts

@@ -1,6 +0,0 @@
-import RecommendationScreen from "./src/RecommendationScreen";
-import { RecommendationErrorEnum } from "./src/types/enum";
-import * as Errors from "./src/utils/RecommendationError";
-
-export default RecommendationScreen;
-export { Errors, RecommendationErrorEnum };