Merge pull request #419 from bcgsc/release/v6.26.0

v6.26.0

Author: kttkjl

.eslintrc.js

@@ -1,39 +1,45 @@
 module.exports = {
-  "extends": [
-    "airbnb",
-    "airbnb-typescript",
-    "airbnb/hooks",
-    "plugin:@typescript-eslint/recommended"
+  extends: [
+    'airbnb',
+    'airbnb-typescript',
+    'airbnb/hooks',
+    'plugin:@typescript-eslint/recommended',
   ],
-  "env": {
-    "browser": true,
-    "es6": true,
-    "node": true
+  env: {
+    browser: true,
+    es6: true,
+    node: true,
   },
-  "parser": "@typescript-eslint/parser",
-  "parserOptions": {
-    "project": "./tsconfig.json"
+  parser: '@typescript-eslint/parser',
+  parserOptions: {
+    project: './tsconfig.json',
   },
-  "rules": {
-    "react/function-component-definition": "off",
-    "import/extensions": "off",
-    "react/jsx-props-no-spreading": "off",
-    "react/require-default-props": "off",
-    "import/prefer-default-export": "warn",
-    "max-len": "off",
-    "no-param-reassign": "warn",
-    "no-underscore-dangle": ["warn", { "allow": ["_env_"] }],
-    "no-restricted-syntax": [
-      "error",
-      "ForInStatement",
-      "LabeledStatement",
-      "WithStatement"
+  rules: {
+    'react/function-component-definition': 'off',
+    'import/extensions': 'off',
+    'react/jsx-props-no-spreading': 'off',
+    'react/require-default-props': 'off',
+    'import/prefer-default-export': 'warn',
+    'max-len': 'off',
+    'no-param-reassign': 'warn',
+    'no-underscore-dangle': ['warn', { allow: ['_env_'] }],
+    'no-restricted-syntax': [
+      'error',
+      'ForInStatement',
+      'LabeledStatement',
+      'WithStatement',
     ],
-    "prefer-destructuring": ["error", { "object": true, "array": true }],
+    'prefer-destructuring': ['error', { object: true, array: true }],
   },
-  "settings": {
-    "import/resolver": {
-      typescript: {}
+  settings: {
+    'import/resolver': {
+      typescript: {},
     },
   },
-}
+  overrides: [
+    {
+      extends: ['plugin:@typescript-eslint/disable-type-checked'],
+      files: ['./*.js'],
+    },
+  ],
+};

.github/workflows/clininfoonrelease.yml

@@ -0,0 +1,31 @@
+name: Create JIRA ticket on release PR creation
+
+on:
+  pull_request:
+    types: [opened]
+    branches:
+      - master
+
+jobs:
+  create_ticket:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v4
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: 20
+
+      - name: Run script
+        run: node ./create-jira-ticket.js
+        env:
+          JIRA_PROJECT_NAME: ${{ vars.JIRA_PROJECT_NAME }}
+          JIRA_ISSUE_TYPE: ${{ vars.JIRA_ISSUE_TYPE }}
+          JIRA_BASE_URL: ${{ vars.JIRA_BASE_URL }}
+          JIRA_PORT: ${{ vars.JIRA_PORT }}
+          JIRA_API_TOKEN: ${{ secrets.JACLI_JIRA_TOKEN }}
+          PR_TITLE: ${{ github.event.pull_request.title }}
+          PR_DESCRIPTION: ${{ github.event.pull_request.body }}

app/components/AuthenticatedRoute/index.jsx

@@ -1,12 +1,12 @@
 /* eslint-disable react/display-name */
 import { PropTypes } from 'prop-types';
-import React, { useContext, useMemo } from 'react';
+import React, { useMemo } from 'react';
 import {
   Redirect,
   Route,
 } from 'react-router-dom';
 
-import SecurityContext from '@/context/SecurityContext';
+import useSecurity from '@/hooks/useSecurity';
 import useResource from '@/hooks/useResource';
 import { isAuthorized } from '@/services/management/auth';
 
@@ -16,7 +16,7 @@ import { isAuthorized } from '@/services/management/auth';
 const AuthenticatedRoute = ({
   component: Component, adminRequired, showNav, onToggleNav, ...rest
 }) => {
-  const { authorizationToken } = useContext(SecurityContext);
+  const { authorizationToken } = useSecurity();
   const { adminAccess } = useResource();
   const authOk = isAuthorized(authorizationToken);
 

app/components/IPRWYSIWYGEditor/index.tsx

@@ -186,7 +186,7 @@ const IPRWYSIWYGEditor = ({
 
   const handleOnSave = useCallback(() => {
     if (editor) {
-      onClose(editor.getHTML());
+      onClose(editor.isEmpty ? '' : editor.getHTML());
     }
   }, [editor, onClose]);
 

app/components/NavBar/index.tsx

@@ -12,14 +12,14 @@ import MenuIcon from '@mui/icons-material/Menu';
 import PersonIcon from '@mui/icons-material/Person';
 
 import { logout } from '@/services/management/auth';
-import SecurityContext from '@/context/SecurityContext';
+import useSecurity from '@/hooks/useSecurity';
 import SidebarContext from '@/context/SidebarContext';
 import FeedbackDialog from './components/FeedbackDialog';
 
 import './index.scss';
 
 const NavBar = (): JSX.Element => {
-  const { userDetails } = useContext(SecurityContext);
+  const { userDetails } = useSecurity();
   const { sidebarMaximized, setSidebarMaximized } = useContext(SidebarContext);
 
   const [anchorEl, setAnchorEl] = useState<HTMLElement | null>();

app/components/ReportAutocomplete/index.tsx

@@ -6,9 +6,11 @@ import {
   Button,
 } from '@mui/material';
 import { ReportType } from '@/context/ReportContext';
-import api from '../../services/api';
 
 import './index.scss';
+import { useDebounce } from 'use-debounce';
+import { useSnackbar } from 'notistack';
+import api from '../../services/api';
 
 type ReportAutocompleteProps = {
   defaultValue?: ReportType;
@@ -24,20 +26,44 @@ const ReportAutocomplete = ({
   const [options, setOptions] = useState([]);
   const [loading, setLoading] = useState(false);
   const [value, setValue] = useState<ReportType>(null);
+  const [text, setText] = useState<string>(defaultValue?.patientId || '');
+  const [debouncedText] = useDebounce(text, 500);
+  const snackbar = useSnackbar();
 
   useEffect(() => {
     if (defaultValue) {
       setValue(defaultValue);
     }
   }, [defaultValue]);
 
-  const handleInputChange = async ({ target: { value: queryValue } }) => {
-    setLoading(true);
-    const autocompleted = await api.get(`/reports?searchText=${queryValue}`, {}).request();
+  useEffect(() => {
+    setText((prevVal) => {
+      if (!value?.patientId) { return ''; }
+      if (prevVal !== value?.patientId) { return value?.patientId; }
+      return prevVal;
+    });
+  }, [value?.patientId]);
+
+  useEffect(() => {
+    const getData = async () => {
+      try {
+        setLoading(true);
+        const reportsResp = await api.get(`/reports?searchText=${debouncedText}`).request();
+        setOptions(reportsResp.reports);
+      } catch (e) {
+        snackbar.enqueueSnackbar('Error getting report autocomplete data');
+      } finally {
+        setLoading(false);
+      }
+    };
+    if (debouncedText) {
+      getData();
+    }
+  }, [snackbar, debouncedText]);
 
-    setOptions(autocompleted.reports);
-    setLoading(false);
-  };
+  const handleTextChange = useCallback(({ target: { value: nextText } }) => {
+    setText((prevText) => (prevText === nextText ? prevText : nextText));
+  }, []);
 
   const handleSubmit = useCallback(async () => {
     onSubmit(value);
@@ -58,7 +84,7 @@ const ReportAutocomplete = ({
           label={label || 'Report'}
           variant="outlined"
           margin="normal"
-          onChange={handleInputChange}
+          onChange={handleTextChange}
           InputProps={{
             ...params.InputProps,
             endAdornment: (