@hedia/recommendation-screen 2.1.34-alpha.1 → 2.1.34-alpha.10

package/dist/App.d.ts

@@ -0,0 +1,27 @@
+import { BolusCalculator, UserSettings } from "@hedia/types";
+import React from "react";
+import { IActivityDisplayProps } from "./src/types/types";
+import { RecommendationError } from "./src/utils/RecommendationError";
+interface IState {
+    params: BolusCalculator.Types.IRecommendationParams & IActivityDisplayProps;
+    carbs: number | null;
+    injectionMethod: UserSettings.Enums.InjectionMethod;
+    activityDisplayProps: IActivityDisplayProps;
+}
+export default class App extends React.Component<{}, IState> {
+    constructor(props: {});
+    exitCallback: () => void;
+    closeCalculationCallback: () => void;
+    removeCarbs: () => void;
+    changeCarbs: (carbs: number) => void;
+    onYes: () => void;
+    updatedRecommendedInsulin: (val: number) => void;
+    transferToLogbook: (...params: any) => void;
+    updateRemeasureTime: (remeasureTime: number) => void;
+    recommendationAnswer: (carbRecommendationAnswer: boolean) => void;
+    showBolusBar: (showBolusBar: boolean) => void;
+    restartCalculation: () => void;
+    handleError: (error: RecommendationError) => never;
+    render(): JSX.Element;
+}
+export {};

package/dist/App.js

@@ -0,0 +1,87 @@
+import { Activity, BloodGlucoseUnit, Languages, UserSettings } from "@hedia/types";
+import React from "react";
+import RecommendationScreen from "./src/RecommendationScreen";
+const ActivityEnum = Activity.Enums.ActivityEnum;
+const { Cycling } = ActivityEnum;
+const { Pump } = UserSettings.Enums.InjectionMethod;
+export default class App extends React.Component {
+    constructor(props) {
+        super(props);
+        this.exitCallback = () => {
+            console.log(`exitcallback...`);
+        };
+        this.closeCalculationCallback = () => {
+            console.log(`closeCalculationCallback...`);
+        };
+        this.removeCarbs = () => {
+            this.setState({
+                carbs: null,
+            });
+        };
+        this.changeCarbs = (carbs) => {
+            this.setState({
+                carbs,
+            });
+        };
+        this.onYes = () => {
+            console.log(`Navigate to recent bolus screen`);
+        };
+        this.updatedRecommendedInsulin = (val) => {
+            console.log(`Updated recommended insulin: `, val);
+        };
+        this.transferToLogbook = (...params) => {
+            console.log(`Transfered:`, params);
+        };
+        this.updateRemeasureTime = (remeasureTime) => {
+            console.log(`updateRemeasureTime:`, remeasureTime);
+        };
+        this.recommendationAnswer = (carbRecommendationAnswer) => {
+            console.log("carbRecommendationAnswer", carbRecommendationAnswer);
+        };
+        this.showBolusBar = (showBolusBar) => {
+            console.log("showBolusBar", showBolusBar);
+        };
+        this.restartCalculation = () => {
+            console.log("restart calculation");
+        };
+        this.handleError = (error) => {
+            console.log(JSON.stringify(error));
+            switch (error.type) {
+                default:
+                    throw error;
+            }
+        };
+        const params = {
+            carbohydrateRatio: 20,
+            currentBGL: 4,
+            carbohydrates: 1,
+            insulinSensitivity: 4,
+            targetBGL: 8,
+            recentBoluses: [
+                {
+                    insulinDose: 2,
+                    secondsPassed: 1000,
+                },
+                {
+                    insulinDose: 1.7,
+                    secondsPassed: 10000,
+                },
+            ],
+            activityTitle: `Moderate Activity Test Title`,
+            activityType: Cycling,
+            activity: null,
+        };
+        this.state = {
+            params,
+            carbs: 25,
+            injectionMethod: Pump,
+            activityDisplayProps: {
+                activityType: params.activityType,
+                activityTitle: params.activityTitle,
+            },
+        };
+    }
+    render() {
+        return (<RecommendationScreen latestLogbookFrom6Hours={null} language={Languages.en} injectionMethod={this.state.injectionMethod} calculatorParams={this.state.params} userReminder={5} bloodGlucoseUnit={BloodGlucoseUnit.MMOL_L} bloodKetoneUnit={null} currentBKL={null} 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/{src → dist/src}/RecommendationScreen.d.ts

@@ -284,8 +284,8 @@ export default class RecommendationScreen extends React.Component<IRecommendatio
      *
      * Steps:
      * 1. Set the isRecommendationDisplayed state variable to be true.
-     * 2. As a callback to the setState() method, define a new anonymous function that calls  the scrollToEnd() method
-     * 	  of the scrollView member, with the animated argument set to true.
+     * 2. As a callback to the setState() method, define a new anonymous function that calls setTimeout() with a duration of 0 milliseconds.
+     *    When the time expires, call the scrollToEnd() method of the scrollView member, with the animated argument set to true.
      *    This ensures that the scroll event happens after all other events that get queued to happen at the same time,
      *    so all relevant elements are visible on the screen and the scroll happens reliably.
      */

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

@@ -191,13 +191,17 @@ export default class RecommendationScreen extends React.Component {
          *
          * Steps:
          * 1. Set the isRecommendationDisplayed state variable to be true.
-         * 2. As a callback to the setState() method, define a new anonymous function that calls  the scrollToEnd() method
-         * 	  of the scrollView member, with the animated argument set to true.
+         * 2. As a callback to the setState() method, define a new anonymous function that calls setTimeout() with a duration of 0 milliseconds.
+         *    When the time expires, call the scrollToEnd() method of the scrollView member, with the animated argument set to true.
          *    This ensures that the scroll event happens after all other events that get queued to happen at the same time,
          *    so all relevant elements are visible on the screen and the scroll happens reliably.
          */
         this.handleNoRecentInsulin = () => {
-            this.setState({ isRecommendationDisplayed: true }, () => this.scrollView?.scrollToEnd({ animated: true }));
+            this.setState({ isRecommendationDisplayed: true }, () => {
+                setTimeout(() => {
+                    this.scrollView?.scrollToEnd({ animated: true });
+                }, 0);
+            });
         };
         /**
          * Handle what happens when the user changes the content of the additional carbohydrates input field.
@@ -307,7 +311,7 @@ export default class RecommendationScreen extends React.Component {
          * 	- Set the recommendationDate argument to the recommendationDate member variable.
          */
         this.handleTransfer = () => {
-            const { enteredCarbs, enteredInsulin, insulinRecommendation, remeasureTime, showExitModal, selectedMood, } = this.state;
+            const { enteredCarbs, enteredInsulin, insulinRecommendation, remeasureTime, showExitModal, selectedMood } = this.state;
             const carbs = { suggested: this.suggestedCarbs, entered: enteredCarbs };
             const insulin = { suggested: insulinRecommendation, entered: enteredInsulin };
             showExitModal ? this.hideExitModal() : this.hideTimeoutModal();
@@ -364,7 +368,7 @@ export default class RecommendationScreen extends React.Component {
             this.recommendationDate = new Date(global.Date.now());
             changeLanguage(props.language);
             const { recentBoluses } = props.calculatorParams;
-            const { bolus, carbRecommendation, activityReduction, wasLimited, activeInsulin, } = Calculator.calculateRecommendation(props.calculatorParams);
+            const { bolus, carbRecommendation, activityReduction, wasLimited, activeInsulin } = Calculator.calculateRecommendation(props.calculatorParams);
             this.suggestedCarbs = carbRecommendation;
             this.state = {
                 remeasureTime: this.getBGLevelRemeasurementReminder(),

package/package.json

@@ -1,20 +1,29 @@
 {
   "name": "@hedia/recommendation-screen",
-  "version": "2.1.34-alpha.1",
+  "version": "2.1.34-alpha.10",
   "description": "Hedia Recommendation Screen for Bolus and Carbohydrates",
   "main": "index.js",
+  "files": [
+    "dist/"
+  ],
   "scripts": {
+    "test": "jest",
+    "test-coverage": "jest --coverage",
+    "tsc": "tsc --noEmit",
+    "build": "tsc --build",
+    "clean": "tsc --build --clean && rm -rf dist/",
+    "build-guards": "ts-auto-guard src/**/[!index]*.ts",
+    "lint": "tslint --project .",
+    "lint-fix": "tslint --fix --project .",
+    "prettier": "prettier --check \"**/*.{ts,tsx}\"",
+    "prettier-fix": "prettier --write \"**/*.{ts,tsx}\"",
+    "pkg-json-lint": "npmPkgJsonLint .",
+    "package-audit": "npm-audit --critical",
+    "prepublishOnly": "npm ci --ignore-scripts && npm run build",
+    "postpublish": "npm run clean",
     "a": "index-git.sh && cd android && gradlew clean && cd .. && react-native run-android",
     "start": "react-native start",
     "la": "./index-git.sh && cd ./android && ./gradlew clean && cd .. && gnome-terminal -- /bin/bash -c \"wmctrl -c 'Terminal';react-native start $SHELL\" && react-native run-android",
-    "lint": "tslint --project .",
-    "lint-fix": "tslint --fix --project .",
-    "lint-pkg": "npmPkgJsonLint .",
-    "prettier": "prettier --check \"src/**/*.{ts,tsx}\"",
-    "test": "npm run tsc-clean && jest",
-    "test-coverage": "npm run tsc-clean && jest --coverage",
-    "tsc": "tsc",
-    "tsc-clean": "tsc --build --clean",
     "add-locale": "lingui add-locale",
     "extract": "lingui extract",
     "extract-clean": "lingui extract --clean",
@@ -39,6 +48,7 @@
     "@babel/preset-react": "7.10.1",
     "@babel/preset-typescript": "7.10.1",
     "@babel/runtime": "7.12.5",
+    "@hedia/npm-audit-pipeline": "0.5.0",
     "@hedia/recommendation-calculator": "2.0.11",
     "@react-native-community/slider": "3.0.0",
     "@testing-library/jest-native": "3.1.0",
@@ -55,15 +65,15 @@
     "babel-plugin-macros": "2.8.0",
     "jest": "26.6.3",
     "metro-react-native-babel-preset": "0.66.2",
-    "npm-package-json-lint": "5.1.0",
-    "prettier": "2.2.1",
+    "npm-package-json-lint": "5.4.1",
+    "prettier": "2.5.1",
     "react": "17.0.2",
     "react-native": "0.66.3",
     "react-native-linear-gradient": "2.5.6",
     "react-native-testing-library": "2.1.0",
     "react-native-vector-icons": "6.6.0",
     "react-test-renderer": "17.0.2",
-    "tslint": "6.1.2",
+    "tslint": "6.1.3",
     "tslint-config-prettier": "1.18.0",
     "typedoc": "0.21.4",
     "typedoc-plugin-no-inherit": "1.3.0",
@@ -80,9 +90,9 @@
   },
   "peerDependencies": {
     "@hedia/recommendation-calculator": "*",
+    "@lingui/macro": "2.9.1",
     "@react-native-community/slider": "*",
     "react-native-linear-gradient": "*",
-    "react-native-vector-icons": "*",
-    "@lingui/macro": "2.9.1"
+    "react-native-vector-icons": "*"
   }
 }

package/.flowconfig

@@ -1,65 +0,0 @@
-[ignore]
-; We fork some components by platform
-.*/*[.]android.js
-
-; Ignore "BUCK" generated dirs
-<PROJECT_ROOT>/\.buckd/
-
-; Ignore polyfills
-node_modules/react-native/Libraries/polyfills/.*
-
-; Flow doesn't support platforms
-.*/Libraries/Utilities/LoadingView.js
-
-[untyped]
-.*/node_modules/@react-native-community/cli/.*/.*
-
-[include]
-
-[libs]
-node_modules/react-native/interface.js
-node_modules/react-native/flow/
-
-[options]
-emoji=true
-
-exact_by_default=true
-
-format.bracket_spacing=false
-
-module.file_ext=.js
-module.file_ext=.json
-module.file_ext=.ios.js
-
-munge_underscores=true
-
-module.name_mapper='^react-native/\(.*\)$' -> '<PROJECT_ROOT>/node_modules/react-native/\1'
-module.name_mapper='^@?[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> '<PROJECT_ROOT>/node_modules/react-native/Libraries/Image/RelativeImageStub'
-
-suppress_type=$FlowIssue
-suppress_type=$FlowFixMe
-suppress_type=$FlowFixMeProps
-suppress_type=$FlowFixMeState
-
-[lints]
-sketchy-null-number=warn
-sketchy-null-mixed=warn
-sketchy-number=warn
-untyped-type-import=warn
-nonstrict-import=warn
-deprecated-type=warn
-unsafe-getters-setters=warn
-unnecessary-invariant=warn
-signature-verification-failure=warn
-
-[strict]
-deprecated-type
-nonstrict-import
-sketchy-null
-unclear-type
-unsafe-getters-setters
-untyped-import
-untyped-type-import
-
-[version]
-^0.158.0

package/.github/pull_request_template.md

@@ -1,6 +0,0 @@
-<!--
-⚠️⚠️ If pointing to master ⚠️⚠️
------------------------------
-- Remember to include HDA on the PR title
-- Remember to set the Label
---!>

package/.github/workflows/on-post-merge-publish-package.yaml

@@ -1,35 +0,0 @@
-name: On post-merge - Publish package
-
-on:
-  pull_request:
-    branches:
-      - master
-    types: [closed]
-
-env:
-  NPM_TOKEN: ${{ secrets.HEDIA_BOT_NPM_TOKEN }}
-
-jobs:
-  on-post-merge-publish-package:
-    if: github.event.pull_request.merged == true
-
-    runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        node-version: [14.15]
-
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: ${{ matrix.node-version }}
-
-      - name: Publish
-        uses: hedia-team/autobump-and-publish@master
-        with:
-          npm-token: ${{ env.NPM_TOKEN }}
-          issue-number: ${{ github.event.number }}
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          is-post-merge: true
-          run-script: npm ci && npm run tsc

package/.github/workflows/validate-pr-title.yaml

@@ -1,20 +0,0 @@
-name: Validate PR title
-
-on:
-  pull_request:
-    branches:
-      - master
-    types: [opened, reopened, edited]
-
-permissions:
-  pull-requests: read
-
-jobs:
-  validate-pr-title:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Validate PR title
-        uses: deepakputhraya/action-pr-title@master
-        with:
-          regex: "^(((\\[\\d+\\.\\d+\\.\\d+\\])|(\\[Anytime\\]))\\s-\\s)?HDA-\\d+.*"

package/.github/workflows/version-bump-publish-alpha.yaml

@@ -1,49 +0,0 @@
-name: Version Bump & Publish Alpha
-
-on:
-  pull_request:
-    branches:
-      - master
-    types: [opened, reopened, synchronize]
-
-env:
-  NPM_TOKEN: ${{ secrets.HEDIA_BOT_NPM_TOKEN }}
-
-jobs:
-  validate-pr-labels:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Validate PR labels
-        uses: docker://agilepathway/pull-request-label-checker:v1.0.102
-        with:
-          one_of: major,minor,patch
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-
-  version-bump-publish-alpha:
-    needs: [validate-pr-labels]
-    runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        node-version: [14.15]
-
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          ref: ${{ github.event.pull_request.head.ref }}
-          token: ${{ secrets.HEDIA_BOT_GITHUB_PAT }}
-
-      - uses: mstachniuk/ci-skip@v1
-        with:
-          commit-filter: "autobump"
-
-      - name: Autobump & Publish
-        if: ${{ env.CI_SKIP == 'false' }}
-        uses: hedia-team/autobump-and-publish@master
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          label: ${{ toJson(github.event.pull_request.labels.*.name) }}
-          npm-token: ${{ env.NPM_TOKEN }}
-          issue-number: ${{ github.event.number }}
-          run-script: npm ci && npm run lint-pkg && npm run lint && npm run prettier && npm run test-coverage && npm run tsc

package/.linguirc

@@ -1,6 +0,0 @@
-{
-   "localeDir": "src/locale/",
-   "srcPathDirs": ["src/"],
-   "format": "po",
-   "sourceLocale": "en"
-}

package/.npmpackagejsonlintrc.json

@@ -1,12 +0,0 @@
-{
-  "rules": {
-    "no-caret-version-dependencies": "error",
-    "no-caret-version-devDependencies": "error",
-    "no-duplicate-properties": "error",
-    "no-repeated-dependencies": "error",
-    "no-tilde-version-dependencies": "error",
-    "no-tilde-version-devDependencies": "error",
-    "prefer-alphabetical-dependencies": "error",
-    "prefer-alphabetical-devDependencies": "error"
-  }
-}

package/.prettierignore

@@ -1,2 +0,0 @@
-**/*.js
-**/*.d.ts

package/.prettierrc

@@ -1,25 +0,0 @@
-{
-    "arrowParens": "always",
-    "bracketSpacing": true,
-    "cursorOffset": 2,
-    "endOfLine": "lf",
-    "filepath": "none",
-    "htmlWhitespaceSensitivity": "ignore",
-    "insertPragma": false,
-    "jsxBracketSameLine": false,
-    "jsxSingleQuote": false,
-    "overrides": [],
-    "parser": "typescript",
-    "plugins": [],
-    "pluginSearchDirs": [],
-    "printWidth": 120,
-    "proseWrap": "preserve",
-    "quoteProps": "preserve",
-    "requirePragma": false,
-    "semi": true,
-    "singleQuote": false,
-    "tabWidth": 4,
-    "trailingComma": "all",
-    "useTabs": true,
-    "vueIndentScriptAndStyle": false
-}

package/Changelog.md

@@ -1,9 +0,0 @@
-# Changelog
-
-### V1.0.1
-
-- Fixed Lingui by removing @lingui/macro
-
-### V1.0.0
-
-- Initial release

package/android/app/BUCK

@@ -1,55 +0,0 @@
-# To learn about Buck see [Docs](https://buckbuild.com/).
-# To run your application with Buck:
-# - install Buck
-# - `npm start` - to start the packager
-# - `cd android`
-# - `keytool -genkey -v -keystore keystores/debug.keystore -storepass android -alias androiddebugkey -keypass android -dname "CN=Android Debug,O=Android,C=US"`
-# - `./gradlew :app:copyDownloadableDepsToLibs` - make all Gradle compile dependencies available to Buck
-# - `buck install -r android/app` - compile, install and run application
-#
-
-load(":build_defs.bzl", "create_aar_targets", "create_jar_targets")
-
-lib_deps = []
-
-create_aar_targets(glob(["libs/*.aar"]))
-
-create_jar_targets(glob(["libs/*.jar"]))
-
-android_library(
-    name = "all-libs",
-    exported_deps = lib_deps,
-)
-
-android_library(
-    name = "app-code",
-    srcs = glob([
-        "src/main/java/**/*.java",
-    ]),
-    deps = [
-        ":all-libs",
-        ":build_config",
-        ":res",
-    ],
-)
-
-android_build_config(
-    name = "build_config",
-    package = "com.hediarecommendationscreen",
-)
-
-android_resource(
-    name = "res",
-    package = "com.hediarecommendationscreen",
-    res = "src/main/res",
-)
-
-android_binary(
-    name = "app",
-    keystore = "//android/keystores:debug",
-    manifest = "src/main/AndroidManifest.xml",
-    package_type = "debug",
-    deps = [
-        ":app-code",
-    ],
-)