@hedia/recommendation-screen 1.8.2 → 2.0.2

package/.github/workflows/publish.yml

@@ -0,0 +1,48 @@
+name: NPM Publish Bot
+
+on:
+  push:
+    branches:
+      - main
+      - master
+
+env:
+  SSH_PRIVATE_KEY: ${{ secrets.HEDIA_BOT_PRIVATE_SSH_KEY }}
+  NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [14.15] #[8.x, 10.x, 12.x]
+
+    steps:
+      - uses: actions/checkout@v2
+      
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v1.4.4
+        with:
+          node-version: ${{ matrix.node-version }}
+
+      - name: Register ssh keys
+        uses: webfactory/ssh-agent@v0.4.1
+        with:
+          ssh-private-key: ${{ env.SSH_PRIVATE_KEY }}
+
+      - name: Register NPM access token and in
+        run:  npm config set '//registry.npmjs.org/:_authToken' "${NPM_TOKEN}"
+              
+      - name: Installing dependencies
+        run: npm ci
+
+      - id: publish
+        uses: JS-DevTools/npm-publish@v1
+        with:
+          token: ${{ env.NPM_TOKEN }}
+
+      - if: steps.publish.outputs.type == 'none'
+        run: |
+          echo "Failed to publish on npm, version already exists"
+          exit 1

package/.github/workflows/version-check.yml

@@ -0,0 +1,45 @@
+name: NPM Version Check
+
+on:
+  pull_request:
+
+env:
+  SSH_PRIVATE_KEY: ${{ secrets.HEDIA_BOT_PRIVATE_SSH_KEY }}
+  NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [14.15] #[8.x, 10.x, 12.x]
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v1.4.4
+        with:
+          node-version: ${{ matrix.node-version }}
+      - name: Register ssh keys
+        uses: webfactory/ssh-agent@v0.4.1
+        with:
+          ssh-private-key: |
+            ${{ secrets.HEDIA_BOT_PRIVATE_SSH_KEY }}
+      - name: Register NPM access token
+        run: | 
+              npm config set '//registry.npmjs.org/:_authToken' "${NPM_TOKEN}"
+              npm ci --ignore-scripts
+        env:
+          NPM_TOKEN: ${{ env.NPM_TOKEN }}
+      - run: npm run prettier
+      - id: publish
+        uses: JS-DevTools/npm-publish@v1
+        with:
+          token: ${{ env.NPM_TOKEN }}
+          dry-run: true
+
+      - if: steps.publish.outputs.type == 'none'
+        run: |
+          echo "Package JSON version is already published, please bump the version!"
+          exit 1

package/App.d.ts

@@ -1,12 +1,11 @@
-import { IRecommendationParams } from "@hedia/recommendation-calculator";
+import { UserSettings } from "@hedia/types";
 import React from "react";
-import { InjectionMethod } from "./src/types/enum";
-import { IActivityDisplayProps } from "./src/types/types";
+import { IActivityDisplayProps, IRecommendationParams } from "./src/types/types";
 import { RecommendationError } from "./src/utils/RecommendationError";
 interface IState {
     params: IRecommendationParams & IActivityDisplayProps;
-    carbs: number;
-    injectionMethod: InjectionMethod;
+    carbs: number | null;
+    injectionMethod: UserSettings.Enums.InjectionMethod;
     activityDisplayProps: IActivityDisplayProps;
 }
 export default class App extends React.Component<{}, IState> {

package/App.jsx

@@ -3,11 +3,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const RecommendationCalculator_1 = require("@hedia/recommendation-calculator/src/RecommendationCalculator");
 const types_1 = require("@hedia/types");
 const react_1 = __importDefault(require("react"));
 const RecommendationScreen_1 = __importDefault(require("./src/RecommendationScreen"));
-const enum_1 = require("./src/types/enum");
+const utils_1 = require("./src/__tests__/utils");
+const ActivityEnum = types_1.Activity.Enums.ActivityEnum;
+const { Cycling } = ActivityEnum;
+const { Pump } = types_1.UserSettings.Enums.InjectionMethod;
 class App extends react_1.default.Component {
     constructor(props) {
         super(props);
@@ -56,31 +58,29 @@ class App extends react_1.default.Component {
             }
         };
         const params = {
-            currentBGL: 1.1,
-            carbohydrates: 23,
-            carbohydrateRatio: 50,
-            insulinSensitivity: 0.3,
-            targetBGL: 7,
-            recentBoluses: [],
-            activity: {
-                activityDate: new Date(Date.now() - enum_1.Milliseconds.Minute * 2),
-                activityDuration: 5,
-                activityIntensity: RecommendationCalculator_1.ActivityIntensity.Moderate,
-                activitySettings: {
-                    hard: { fromZero: 0.25, fromThirty: 0.55, fromFortysix: 0 },
-                    light: { fromZero: 0.25, fromThirty: 0.55, fromFortysix: 0.25 },
-                    post: { fromZero: 1, fromThirty: 0, fromFortysix: 0.25 },
-                    moderate: { fromZero: 0.25, fromThirty: 0.5, fromFortysix: 0.75 },
-                    target: 8.5,
+            carbohydrateRatio: 10,
+            currentBGL: 33,
+            carbohydrates: 1,
+            insulinSensitivity: 4,
+            targetBGL: 6,
+            recentBoluses: [
+                {
+                    insulinDose: 2,
+                    secondsPassed: 1000,
                 },
-            },
+                {
+                    insulinDose: 1.7,
+                    secondsPassed: 10000,
+                },
+            ],
             activityTitle: `Moderate Activity Test Title`,
-            activityType: enum_1.ActivityEnum.Cycling,
+            activityType: Cycling,
+            activity: utils_1.generateActivityProps(),
         };
         this.state = {
             params,
             carbs: 25,
-            injectionMethod: enum_1.InjectionMethod.Pump,
+            injectionMethod: Pump,
             activityDisplayProps: {
                 activityType: params.activityType,
                 activityTitle: params.activityTitle,
@@ -89,21 +89,10 @@ class App extends react_1.default.Component {
     }
     render() {
         const logbook1 = {
+            ...utils_1.generateDefaultLogbook(),
             blood_glucose_millimolar: 16,
-            carbohydrates_entered_grams: 25,
-            carbohydrates_suggested_grams: 25,
-            client_timestamp: `25`,
-            client_version: 25,
-            entry_timestamp: `25`,
-            event_uuid: null,
-            insulin_entered_units: 25,
-            insulin_suggested_units: 25,
-            is_deleted: null,
-            mood: 2,
-            settings_uuid: `25`,
-            uuid: `aaa`,
         };
-        return (<RecommendationScreen_1.default latestLogbookFrom6Hours={logbook1} language={enum_1.Language.fr} injectionMethod={this.state.injectionMethod} calculatorParams={this.state.params} userReminder={5} bloodGlucoseUnit={types_1.BloodGlucoseUnit.MG_DL} bloodKetoneUnit={types_1.BloodKetonesUnit.MG_DL} currentBKL={5} 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}/>);
+        return (<RecommendationScreen_1.default latestLogbookFrom6Hours={logbook1} language={types_1.Languages.en} injectionMethod={this.state.injectionMethod} calculatorParams={this.state.params} userReminder={5} bloodGlucoseUnit={types_1.BloodGlucoseUnit.MMOL_L} bloodKetoneUnit={types_1.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}/>);
     }
 }
 exports.default = App;

package/App.tsx

@@ -1,50 +1,51 @@
-import { IRecommendationParams } from "@hedia/recommendation-calculator";
-import { ActivityIntensity } from "@hedia/recommendation-calculator/src/RecommendationCalculator";
-import { BloodGlucoseUnit, BloodKetonesUnit } from "@hedia/types";
+import { Activity, BloodGlucoseUnit, BloodKetonesUnit, Languages, UserSettings } from "@hedia/types";
 import React from "react";
 import RecommendationScreen from "./src/RecommendationScreen";
-import { ActivityEnum, InjectionMethod, Language, Milliseconds } from "./src/types/enum";
-import { IActivityDisplayProps, logbookEntry } from "./src/types/types";
+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;
-	injectionMethod: InjectionMethod;
+	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"] = {
-			currentBGL: 1.1,
-			carbohydrates: 23,
-			carbohydrateRatio: 50,
-			insulinSensitivity: 0.3,
-			targetBGL: 7,
-			recentBoluses: [],
-			activity: {
-				activityDate: new Date(Date.now() - Milliseconds.Minute * 2),
-				activityDuration: 5,
-				activityIntensity: ActivityIntensity.Moderate,
-				activitySettings: {
-					hard: { fromZero: 0.25, fromThirty: 0.55, fromFortysix: 0 },
-					light: { fromZero: 0.25, fromThirty: 0.55, fromFortysix: 0.25 },
-					post: { fromZero: 1, fromThirty: 0, fromFortysix: 0.25 },
-					moderate: { fromZero: 0.25, fromThirty: 0.5, fromFortysix: 0.75 },
-					target: 8.5,
+			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: ActivityEnum.Cycling,
+			activityType: Cycling,
+			activity: generateActivityProps(),
 		};
 
 		this.state = {
 			params,
 			carbs: 25,
-			injectionMethod: InjectionMethod.Pump,
+			injectionMethod: Pump,
 			activityDisplayProps: {
 				activityType: params.activityType,
 				activityTitle: params.activityTitle,
@@ -55,6 +56,7 @@ export default class App extends React.Component<{}, IState> {
 	public exitCallback = () => {
 		console.log(`exitcallback...`);
 	};
+
 	public closeCalculationCallback = () => {
 		console.log(`closeCalculationCallback...`);
 	};
@@ -82,15 +84,19 @@ export default class App extends React.Component<{}, IState> {
 	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");
 	};
@@ -106,30 +112,19 @@ export default class App extends React.Component<{}, IState> {
 
 	public render(): JSX.Element {
 		const logbook1: logbookEntry = {
+			...generateDefaultLogbook(),
 			blood_glucose_millimolar: 16,
-			carbohydrates_entered_grams: 25,
-			carbohydrates_suggested_grams: 25,
-			client_timestamp: `25`,
-			client_version: 25,
-			entry_timestamp: `25`,
-			event_uuid: null,
-			insulin_entered_units: 25,
-			insulin_suggested_units: 25,
-			is_deleted: null,
-			mood: 2,
-			settings_uuid: `25`,
-			uuid: `aaa`,
 		};
 		return (
 			<RecommendationScreen
 				latestLogbookFrom6Hours={logbook1}
-				language={Language.fr}
+				language={Languages.en}
 				injectionMethod={this.state.injectionMethod}
 				calculatorParams={this.state.params}
 				userReminder={5}
-				bloodGlucoseUnit={BloodGlucoseUnit.MG_DL}
+				bloodGlucoseUnit={BloodGlucoseUnit.MMOL_L}
 				bloodKetoneUnit={BloodKetonesUnit.MG_DL}
-				currentBKL={5}
+				currentBKL={0}
 				closeCalculationCallback={this.closeCalculationCallback}
 				exitCallback={this.exitCallback}
 				showBolusBar={this.showBolusBar}

package/ignore-git.sh

@@ -36,7 +36,7 @@ DerivedData
 project.xcworkspace
 ios/Pods/
 
-
+.vscode/
 coverage/
 package-lock.json
 **/*.hprof

package/ignore-publish.sh

@@ -28,4 +28,5 @@ android/app/build
 src/locale/_build/
 index-git.sh
 .prettierignore
-src/locale/CleanLanguage.ts" > .gitignore
+src/locale/CleanLanguage.ts
+.vscode/" > .gitignore

package/index.d.ts

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

package/index.js

@@ -14,7 +14,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 var __importStar = (this && this.__importStar) || function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
     __setModuleDefault(result, mod);
     return result;
 };
@@ -22,10 +22,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RecommendationErrorEnum = exports.Errors = exports.ActivityEnum = void 0;
+exports.RecommendationErrorEnum = exports.Errors = void 0;
 const RecommendationScreen_1 = __importDefault(require("./src/RecommendationScreen"));
 const enum_1 = require("./src/types/enum");
-Object.defineProperty(exports, "ActivityEnum", { enumerable: true, get: function () { return enum_1.ActivityEnum; } });
 Object.defineProperty(exports, "RecommendationErrorEnum", { enumerable: true, get: function () { return enum_1.RecommendationErrorEnum; } });
 const Errors = __importStar(require("./src/utils/RecommendationError"));
 exports.Errors = Errors;

package/index.ts

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