@hedia/recommendation-screen 2.1.1 → 2.1.3-beta.0

package/ios/Podfile.lock

@@ -471,4 +471,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 3215c12293cb7ac3f4e9ab5a94a4f0e6bc248a46
 
-COCOAPODS: 1.9.3
+COCOAPODS: 1.10.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hedia/recommendation-screen",
-  "version": "2.1.1",
+  "version": "2.1.3-beta.0",
   "description": "Hedia Recommendation Screen for Bolus and Carbohydrates",
   "main": "index.js",
   "scripts": {
@@ -18,9 +18,9 @@
     "prepublish": "npm run lint && npm run lint-pkg && npm run test-coverage && npm run tsc",
     "add-locale": "lingui add-locale",
     "extract": "lingui extract",
+    "extract-clean": "lingui extract --clean",
     "compile": "npm run cleanLanguage && lingui compile",
-    "cleanLanguage": "node ./src/locale/CleanLanguage.ts",
-    "upgrade": "npm i --save-exact @hedia/types@latest @hedia/recommendation-calculator@latest"
+    "cleanLanguage": "node ./src/locale/CleanLanguage.ts"
   },
   "keywords": [
     "Hedia",
@@ -35,11 +35,11 @@
   "devDependencies": {
     "@babel/core": "7.10.3",
     "@babel/plugin-proposal-decorators": "7.8.3",
+    "@babel/plugin-transform-typescript": "7.13.0",
     "@babel/preset-env": "7.10.2",
     "@babel/preset-react": "7.10.1",
     "@babel/preset-typescript": "7.10.1",
-    "@hedia/recommendation-calculator": "2.0.1",
-    "@hedia/types": "2.1.9",
+    "@hedia/recommendation-calculator": "2.0.3",
     "@lingui/babel-preset-react": "2.9.1",
     "@lingui/cli": "2.9.1",
     "@lingui/macro": "2.9.1",
@@ -71,6 +71,7 @@
     "typescript": "4.1.5"
   },
   "dependencies": {
+    "@hedia/types": "2.1.14",
     "moment": "2.27.0",
     "react-native-modal": "11.5.6"
   }

package/src/RecommendationScreen.d.ts

@@ -13,8 +13,8 @@ export interface IRecommendationProps {
     userReminder: number;
     calculatorParams: IRecommendationParams;
     injectionMethod: UserSettings.Enums.InjectionMethod;
-    currentBKL: number;
-    bloodKetoneUnit: BloodKetonesUnit;
+    currentBKL: number | null;
+    bloodKetoneUnit: BloodKetonesUnit | null;
     latestLogbookFrom6Hours: logbookEntry | null;
     activityDisplayProps: IActivityDisplayProps | null;
     carbRecommendationAnswer(carbRecommendationAnswer: boolean): void;

package/src/{RecommendationScreen.jsx → RecommendationScreen.js}

@@ -42,6 +42,7 @@ const LimitationMessage_1 = __importDefault(require("./components/LimitationMess
 const RecommendationModal_1 = __importDefault(require("./components/RecommendationModal"));
 const TwoOptionModal_1 = __importStar(require("./components/TwoOptionModal"));
 const i18nUtils_1 = require("./locale/i18nUtils");
+const enum_1 = require("./types/enum");
 const AttentionMessages_1 = require("./utils/AttentionMessages");
 const RecommendationUtils_1 = require("./utils/RecommendationUtils");
 const Utils_1 = require("./utils/Utils");
@@ -199,50 +200,46 @@ class RecommendationScreen extends react_1.default.Component {
     }
     render() {
         if (this.hasError) {
-            return <react_native_1.View style={containerStyles.container}/>;
+            return react_1.default.createElement(react_native_1.View, { style: containerStyles.container });
         }
         const { activeInsulin, recommendationModal, carbRecommendation: carbRecommendationProp, enteredCarbs, enteredInsulin, insulinRecommendation, activityReduction, isRecommendationDisplayed, } = this.state;
+        const { BloodGlucose: BGValueTestID, BloodKetone: BKValueTestID, ActiveInsulin: ActiveInsulinValueTestID, } = enum_1.InfoBarTestIds.Value;
+        const { ActiveInsulin: ActiveInsulinUnitTestID, BloodGlucose: BGUnitTestID, BloodKetone: BKUnitTestID, } = enum_1.InfoBarTestIds.Unit;
         const carbRecommendation = carbRecommendationProp !== null ? Math.round(carbRecommendationProp) : null;
         const recommendedCarbs = enteredCarbs ?? carbRecommendation;
         const { calculatorParams, bloodGlucoseUnit, currentBKL, bloodKetoneUnit } = this.props;
         const { currentBGL, carbohydrates: providedCarbs } = calculatorParams;
-        const displayedBGL = Utils_1.Utils.displayedBGLValue(currentBGL, bloodGlucoseUnit);
-        const displayedBKL = Utils_1.Utils.displayedBKLValue(currentBKL, bloodKetoneUnit);
-        return (<react_2.I18nProvider language={this.props.language} i18n={i18nUtils_1.i18n}>
-				<react_native_1.ScrollView style={containerStyles.container} ref={(view) => {
-            if (view !== null) {
-                this.scrollView = view;
-            }
-        }}>
-					<Header_1.default exitCallback={this.onExit}/>
-					<InfoBars_1.default label={i18nUtils_1.i18n._(macro_1.t `Active Insulin`)} value={activeInsulin ? `${activeInsulin.toFixed(1)}` : null} unit={i18nUtils_1.i18n._(macro_1.t `units`)} showNullAsDash={false}/>
-					<InfoBars_1.default label={i18nUtils_1.i18n._(macro_1.t `Blood Glucose Level`)} value={currentBGL ? `${displayedBGL}` : null} unit={this.props.bloodGlucoseUnit} showNullAsDash={true}/>
-					<InfoBars_1.default label={i18nUtils_1.i18n._(macro_1.t `Blood Ketone Level`)} value={currentBKL !== null ? `${displayedBKL}` : null} unit={this.props.bloodKetoneUnit} showNullAsDash={true}/>
-					<react_native_1.View style={containerStyles.calcContainer}>
-						<react_native_1.View style={containerStyles.calcMargin}>
-							<react_native_1.View style={[
-            containerStyles.calcBorder,
-            {
-                borderColor: recommendedCarbs ? Constants_1.BORDER_COLOUR_TEAL : Constants_1.BORDER_COLOUR_GREY,
-            },
-        ]}>
-								<RecommendedCarbs_1.default enteredCarbs={`${providedCarbs}`} changedRecommendedCarbs={this.updateCarbRecommendation} recommendedCarbs={`${recommendedCarbs}`} removeRecommendedCarbs={this.removeCarbRecommendation}/>
-							</react_native_1.View>
-						</react_native_1.View>
-					</react_native_1.View>
-					{this.props.calculatorParams.activity && this.props.activityDisplayProps ? (<Activity_1.default activity={this.props.calculatorParams.activity} activityType={this.props.activityDisplayProps.activityType} activityTitle={this.props.activityDisplayProps.activityTitle} activityReduction={this.state.activityReduction}/>) : null}
-					<Remeasure_1.default onSliderChange={this.updateRemeasureTime} remeasureTime={this.state.remeasureTime}/>
-					{!this.state.isRecommendationDisplayed ? (<RecentInsulin_1.default onRecentInsulinYes={this.props.onRecentInsulinYes} onRecentInsulinNo={this.handleNoRecentInsulin}/>) : (<RecommendedInsulin_1.default injectionMethod={this.props.injectionMethod} insulinRecommendation={insulinRecommendation} enteredInsulin={enteredInsulin} activityReduction={activityReduction} updateRecommendedInsulin={this.updateInsulinRecommendation}/>)}
-					<Emotion_1.default moodSelected={this.handleMoodSelected} currentMood={this.state.selectedMood}/>
-					<TransferToLogbook_1.default visible={isRecommendationDisplayed} transfer={this.handleTransfer}/>
-					<RecommendationModal_1.default isVisible={recommendationModal} suggestedCarbohydrates={carbRecommendationProp} attentionMessage={this.getBGLevelAttentionMessage()} limitationMessage={this.getLimitationAttentionMessage()} onClickOkButton={this.hideAttentionModal} onAcceptCarbohydrates={this.acceptCarbRecommendation} onDeclineCarbohydrates={this.declineCarbRecommendation}/>
-				</react_native_1.ScrollView>
-				{this.state.showExitModal ? (<TwoOptionModal_1.default title={i18nUtils_1.i18n._(macro_1.t `Save data before closing?`)} message={i18nUtils_1.i18n._(macro_1.t `Your saved data will be used for future calculations.`)} textFirstOption={i18nUtils_1.i18n._(macro_1.t `Save to logbook`)} textSecondOption={i18nUtils_1.i18n._(macro_1.t `Close calculation`)} isCancelable={true} rowAsButtonLayout={true} firstOption={this.handleTransfer} secondOption={this.closeCalculation} onClose={this.hideExitModal}/>) : null}
-				{this.state.showLimitationMessage ? (<react_native_1.View style={TwoOptionModal_1.modalStyle.container}>
-						<LimitationMessage_1.default limitationMessage={this.getLimitationAttentionMessage()} onPressNextButton={this.hideLimitationMessage}/>
-					</react_native_1.View>) : null}
-				{this.state.showTimeoutModal ? (this.state.isRecommendationDisplayed ? (<TwoOptionModal_1.default title={AttentionMessages_1.Messages.TimeoutPrompTitle()} message={AttentionMessages_1.Messages.TimeoutRecommendationVisible(this.recommendationDate)} textFirstOption={i18nUtils_1.i18n._(macro_1.t `Yes, save to logbook`)} textSecondOption={i18nUtils_1.i18n._(macro_1.t `No, return to dashboard`)} rowAsButtonLayout={false} firstOption={this.handleTransfer} secondOption={this.closeCalculation}/>) : (<TwoOptionModal_1.default title={AttentionMessages_1.Messages.TimeoutPrompTitle()} message={AttentionMessages_1.Messages.TimeoutRecommendationNotVisible()} textFirstOption={i18nUtils_1.i18n._(macro_1.t `Start new calculation`)} textSecondOption={i18nUtils_1.i18n._(macro_1.t `Return to dashboard`)} rowAsButtonLayout={false} firstOption={this.restartCalculation} secondOption={this.closeCalculation}/>)) : null}
-			</react_2.I18nProvider>);
+        const displayedBGL = currentBGL ? Utils_1.Utils.displayedBGLValue(currentBGL, bloodGlucoseUnit) : null;
+        const displayedBKL = currentBKL !== null && bloodKetoneUnit ? Utils_1.Utils.displayedBKLValue(currentBKL, bloodKetoneUnit) : null;
+        return (react_1.default.createElement(react_2.I18nProvider, { language: this.props.language, i18n: i18nUtils_1.i18n },
+            react_1.default.createElement(react_native_1.ScrollView, { style: containerStyles.container, ref: (view) => {
+                    if (view !== null) {
+                        this.scrollView = view;
+                    }
+                } },
+                react_1.default.createElement(Header_1.default, { exitCallback: this.onExit }),
+                react_1.default.createElement(InfoBars_1.default, { label: i18nUtils_1.i18n._(macro_1.t `Active Insulin`), value: activeInsulin ? `${activeInsulin.toFixed(1)}` : null, unit: i18nUtils_1.i18n._(macro_1.t `units`), showNullAsDash: false, testID: { unitID: ActiveInsulinUnitTestID, valueID: ActiveInsulinValueTestID } }),
+                react_1.default.createElement(InfoBars_1.default, { label: i18nUtils_1.i18n._(macro_1.t `Blood Glucose Level`), value: displayedBGL, unit: this.props.bloodGlucoseUnit, showNullAsDash: true, testID: { unitID: BGUnitTestID, valueID: BGValueTestID } }),
+                react_1.default.createElement(InfoBars_1.default, { label: i18nUtils_1.i18n._(macro_1.t `Blood Ketone Level`), value: displayedBKL, unit: this.props.bloodKetoneUnit, showNullAsDash: true, testID: { unitID: BKUnitTestID, valueID: BKValueTestID } }),
+                react_1.default.createElement(react_native_1.View, { style: containerStyles.calcContainer },
+                    react_1.default.createElement(react_native_1.View, { style: containerStyles.calcMargin },
+                        react_1.default.createElement(react_native_1.View, { style: [
+                                containerStyles.calcBorder,
+                                {
+                                    borderColor: recommendedCarbs ? Constants_1.BORDER_COLOUR_TEAL : Constants_1.BORDER_COLOUR_GREY,
+                                },
+                            ] },
+                            react_1.default.createElement(RecommendedCarbs_1.default, { enteredCarbs: `${providedCarbs}`, changedRecommendedCarbs: this.updateCarbRecommendation, recommendedCarbs: `${recommendedCarbs}`, removeRecommendedCarbs: this.removeCarbRecommendation })))),
+                this.props.calculatorParams.activity && this.props.activityDisplayProps ? (react_1.default.createElement(Activity_1.default, { activity: this.props.calculatorParams.activity, activityType: this.props.activityDisplayProps.activityType, activityTitle: this.props.activityDisplayProps.activityTitle, activityReduction: this.state.activityReduction })) : null,
+                react_1.default.createElement(Remeasure_1.default, { onSliderChange: this.updateRemeasureTime, remeasureTime: this.state.remeasureTime }),
+                !this.state.isRecommendationDisplayed ? (react_1.default.createElement(RecentInsulin_1.default, { onRecentInsulinYes: this.props.onRecentInsulinYes, onRecentInsulinNo: this.handleNoRecentInsulin })) : (react_1.default.createElement(RecommendedInsulin_1.default, { injectionMethod: this.props.injectionMethod, insulinRecommendation: insulinRecommendation, enteredInsulin: enteredInsulin, activityReduction: activityReduction, updateRecommendedInsulin: this.updateInsulinRecommendation })),
+                react_1.default.createElement(Emotion_1.default, { moodSelected: this.handleMoodSelected, currentMood: this.state.selectedMood }),
+                react_1.default.createElement(TransferToLogbook_1.default, { visible: isRecommendationDisplayed, transfer: this.handleTransfer }),
+                react_1.default.createElement(RecommendationModal_1.default, { isVisible: recommendationModal, suggestedCarbohydrates: carbRecommendationProp, attentionMessage: this.getBGLevelAttentionMessage(), limitationMessage: this.getLimitationAttentionMessage(), onClickOkButton: this.hideAttentionModal, onAcceptCarbohydrates: this.acceptCarbRecommendation, onDeclineCarbohydrates: this.declineCarbRecommendation })),
+            this.state.showExitModal ? (react_1.default.createElement(TwoOptionModal_1.default, { title: i18nUtils_1.i18n._(macro_1.t `Save data before closing?`), message: i18nUtils_1.i18n._(macro_1.t `Your saved data will be used for future calculations.`), textFirstOption: i18nUtils_1.i18n._(macro_1.t `Save to logbook`), textSecondOption: i18nUtils_1.i18n._(macro_1.t `Close calculation`), isCancelable: true, rowAsButtonLayout: true, firstOption: this.handleTransfer, secondOption: this.closeCalculation, onClose: this.hideExitModal })) : null,
+            this.state.showLimitationMessage ? (react_1.default.createElement(react_native_1.View, { style: TwoOptionModal_1.modalStyle.container },
+                react_1.default.createElement(LimitationMessage_1.default, { limitationMessage: this.getLimitationAttentionMessage(), onPressNextButton: this.hideLimitationMessage }))) : null,
+            this.state.showTimeoutModal ? (this.state.isRecommendationDisplayed ? (react_1.default.createElement(TwoOptionModal_1.default, { title: AttentionMessages_1.Messages.TimeoutPrompTitle(), message: AttentionMessages_1.Messages.TimeoutRecommendationVisible(this.recommendationDate), textFirstOption: i18nUtils_1.i18n._(macro_1.t `Yes, save to logbook`), textSecondOption: i18nUtils_1.i18n._(macro_1.t `No, return to dashboard`), rowAsButtonLayout: false, firstOption: this.handleTransfer, secondOption: this.closeCalculation })) : (react_1.default.createElement(TwoOptionModal_1.default, { title: AttentionMessages_1.Messages.TimeoutPrompTitle(), message: AttentionMessages_1.Messages.TimeoutRecommendationNotVisible(), textFirstOption: i18nUtils_1.i18n._(macro_1.t `Start new calculation`), textSecondOption: i18nUtils_1.i18n._(macro_1.t `Return to dashboard`), rowAsButtonLayout: false, firstOption: this.restartCalculation, secondOption: this.closeCalculation }))) : null));
     }
 }
 exports.default = RecommendationScreen;