Merge branch '24.07.00' of https://github.com/mdnoble73/aspen-discovery…

… into summon_facet_results

code/aspen_app/app-configs/updateConfig.js

@@ -85,7 +85,7 @@ const app_config = {
      privacy: 'public',
      platforms: ['ios', 'android'],
      version: version['version'],
-     sdkVersion: '50.0.0',
+     sdkVersion: '51.0.0',
      orientation: 'default',
      icon: app['discoveryUrl'] + 'API/SystemAPI?method=getLogoFile&themeId=' + app['themeId'] + '&type=appIcon&slug=' + app['slug'],
      updates: {
@@ -207,8 +207,13 @@ const app_config = {
           [
                'expo-build-properties',
                {
+                    android: {
+                         compileSdkVersion: 34,
+                         targetSdkVersion: 34,
+                         buildToolsVersion: '34.0.0',
+                    },
                     ios: {
-                         deploymentTarget: '16.0',
+                         deploymentTarget: '15.0',
                     },
                },
           ],

code/aspen_app/app-configs/version.json

@@ -1,5 +1,5 @@
 {
-  "version": "24.06.00",
-  "build": "245",
+  "version": "24.07.00",
+  "build": "256",
   "patch": "0"
 }

code/aspen_app/eas.json

@@ -1,6 +1,6 @@
 {
   "cli": {
-	"version": "7.6.0"
+	"version": "10.0.2"
   },
   "build": {
 	"production": {

code/aspen_app/package.json

@@ -6,22 +6,17 @@
     "android": "expo run:android",
     "ios": "expo run:ios"
   },
-  "autolinking": {
-    "exclude": [
-      "expo-file-system"
-    ]
-  },
   "dependencies": {
-    "@expo/config-plugins": "~7.9.1",
-    "@expo/prebuild-config": "~6.8.1",
+    "@expo/config-plugins": "~8.0.5",
+    "@expo/prebuild-config": "~7.0.6",
     "@expo/vector-icons": "^14.0.0",
     "@gluestack-style/react": "^1.0.48",
     "@gluestack-ui/config": "^1.1.7",
     "@gluestack-ui/themed": "^1.1.8",
     "@gluestack-ui/themed-native-base": "^0.1.107-alpha2",
     "@react-aria/ssr": "^3.9.2",
     "@react-native-async-storage/async-storage": "1.23.1",
-    "@react-native-community/datetimepicker": "7.6.3",
+    "@react-native-community/datetimepicker": "8.0.1",
     "@react-navigation/bottom-tabs": "^6.5.20",
     "@react-navigation/devtools": "^6.0.26",
     "@react-navigation/drawer": "^6.6.15",
@@ -30,91 +25,95 @@
     "@react-navigation/stack": "^6.3.29",
     "@rneui/base": "^4.0.0-rc.7",
     "@rneui/themed": "^4.0.0-rc.7",
-    "@sentry/react-native": "~5.20.0",
+    "@sentry/react-native": "~5.22.0",
     "@tanstack/react-query": "^4.33.0",
     "apisauce": "^2.1.6",
     "axios": "^1.6.0",
-    "babel-preset-expo": "^10.0.0",
+    "babel-preset-expo": "^11.0.10",
     "chroma-js": "~2.4.2",
     "compare-versions": "^6.1.0",
     "depcheck": "^1.4.7",
-    "expo": "^50.0.17",
-    "expo-application": "~5.8.4",
-    "expo-barcode-scanner": "~12.9.3",
-    "expo-brightness": "~11.8.0",
-    "expo-build-properties": "~0.11.1",
+    "expo": "^51.0.0",
+    "expo-application": "~5.9.1",
+    "expo-barcode-scanner": "~13.0.1",
+    "expo-brightness": "~12.0.1",
+    "expo-build-properties": "~0.12.3",
     "expo-cached-image": "50.0.6",
-    "expo-calendar": "~12.2.1",
-    "expo-camera": "~14.1.3",
-    "expo-constants": "~15.4.6",
-    "expo-dev-client": "~3.3.11",
-    "expo-device": "~5.9.4",
-    "expo-image": "~1.10.6",
-    "expo-insights": "~0.6.1",
-    "expo-linear-gradient": "~12.7.2",
-    "expo-linking": "~6.2.2",
-    "expo-localization": "~14.8.4",
-    "expo-location": "~16.5.5",
-    "expo-navigation-bar": "~2.8.1",
-    "expo-notifications": "~0.27.7",
-    "expo-random": "~13.6.0",
-    "expo-screen-orientation": "~6.4.1",
-    "expo-secure-store": "~12.8.1",
-    "expo-splash-screen": "~0.26.4",
-    "expo-status-bar": "~1.11.1",
-    "expo-system-ui": "~2.9.4",
-    "expo-updates": "~0.24.12",
-    "expo-web-browser": "~12.8.2",
+    "expo-calendar": "~13.0.5",
+    "expo-camera": "~15.0.11",
+    "expo-constants": "~16.0.2",
+    "expo-dev-client": "~4.0.18",
+    "expo-device": "~6.0.2",
+    "expo-file-system": "~17.0.1",
+    "expo-image": "~1.12.12",
+    "expo-insights": "~0.7.0",
+    "expo-linear-gradient": "~13.0.2",
+    "expo-linking": "~6.3.1",
+    "expo-localization": "~15.0.3",
+    "expo-location": "~17.0.1",
+    "expo-navigation-bar": "~3.0.6",
+    "expo-notifications": "~0.28.9",
+    "expo-random": "~14.0.1",
+    "expo-screen-orientation": "~7.0.5",
+    "expo-secure-store": "~13.0.1",
+    "expo-splash-screen": "~0.27.5",
+    "expo-status-bar": "~1.12.1",
+    "expo-system-ui": "~3.0.6",
+    "expo-updates": "~0.25.17",
+    "expo-web-browser": "~13.0.3",
     "html-entities": "^2.5.2",
+    "htmlparser2": "^9.1.0",
     "i18n-js": "^4.4.3",
     "lodash": "^4.17.21",
-    "lucide-react-native": "^0.373.0",
+    "lucide-react-native": "^0.396.0",
     "moment": "^2.30.1",
     "native-base": "3.4.28",
     "react": "18.2.0",
     "react-dom": "18.2.0",
-    "react-native": "0.73.6",
-    "react-native-barcode-expo": "^1.2.0",
+    "react-native": "0.74.2",
+    "react-native-barcode-expo": "^2.0.0",
     "react-native-barcode-mask": "^1.2.4",
     "react-native-base64": "^0.2.1",
     "react-native-check-version": "^1.1.1",
-    "react-native-device-info": "^10.13.2",
+    "react-native-device-info": "^11.1.0",
     "react-native-drawer-layout": "^3.3.0",
     "react-native-elements": "^4.0.0-rc.2",
-    "react-native-gesture-handler": "~2.14.0",
-    "react-native-map-link": "^3.3.1",
-    "react-native-maps": "1.10.0",
+    "react-native-gesture-handler": "~2.16.1",
+    "react-native-map-link": "^3.4.1",
+    "react-native-maps": "1.14.0",
     "react-native-modal": "^13.0.1",
     "react-native-modal-datetime-picker": "^17.1.0",
-    "react-native-reanimated": "~3.6.2",
+    "react-native-reanimated": "~3.10.1",
     "react-native-reanimated-carousel": "^3.1.5",
-    "react-native-safe-area-context": "4.8.2",
-    "react-native-screens": "~3.29.0",
+    "react-native-render-html": "^6.3.4",
+    "react-native-safe-area-context": "4.10.1",
+    "react-native-screens": "3.31.1",
     "react-native-stars": "^1.2.2",
-    "react-native-svg": "14.1.0",
+    "react-native-svg": "15.2.0",
     "react-native-toast-message": "^2.2.0",
-    "react-native-vector-icons": "^10.0.3",
-    "react-native-web": "~0.19.11",
+    "react-native-vector-icons": "^10.1.0",
+    "react-native-web": "~0.19.12",
+    "react-native-webview": "13.8.6",
     "resolve-dependency": "1.0.3"
   },
   "devDependencies": {
-    "@babel/core": "^7.20.0",
-    "@typescript-eslint/eslint-plugin": "^5.43.0",
-    "@typescript-eslint/parser": "^5.43.0",
-    "babel-plugin-module-resolver": "^4.1.0",
+    "@babel/core": "^7.24.0",
+    "@typescript-eslint/eslint-plugin": "^7.13.1",
+    "@typescript-eslint/parser": "^7.13.1",
+    "babel-plugin-module-resolver": "^5.0.2",
     "babel-plugin-transform-inline-environment-variables": "^0.4.4",
-    "eslint": "^8.28.0",
-    "eslint-config-universe": "^11.1.1",
-    "eslint-plugin-react-hooks": "^4.6.0",
+    "eslint": "^9.5.0",
+    "eslint-config-universe": "^13.0.0",
+    "eslint-plugin-react-hooks": "^4.6.2",
     "lodash": "^4.17.21",
-    "prettier": "^2.7.1",
-    "react-native-bundle-visualizer": "^3.1.1",
+    "prettier": "^3.3.2",
+    "react-native-bundle-visualizer": "^3.1.3",
     "react-native-dotenv": "^3.4.2"
   },
   "private": true,
   "name": "aspen-lida",
-  "version": "24.05.00",
-  "repository": "https://github.com/mdnoble73/aspen-discovery",
+  "version": "24.07.00",
+  "repository": "https://github.com/Aspen-Discovery/aspen-discovery",
   "author": "ByWater Solutions",
   "eslintConfig": {
     "extends": "universe/native",
@@ -128,6 +127,6 @@
   },
   "packageManager": "[email protected]",
   "resolutions": {
-    "react-native-svg": "14.1.0"
+    "react-native-svg": "15.2.0"
   }
 }

code/aspen_app/src/components/Action/CheckOut/CheckOut.js

@@ -53,7 +53,8 @@ export const CheckOut = (props) => {
           return (
                <>
                     <Button
-                         size="md"
+                         minWidth="100%"
+                         maxWidth="100%"
                          bgColor={theme['colors']['primary']['500']}
                          variant="solid"
                          onPress={async () => {

code/aspen_app/src/components/Action/CheckOut/PalaceProjectInstructions.js

@@ -0,0 +1,43 @@
+import React from 'react';
+import { Box, ScrollView } from '@gluestack-ui/themed';
+import { LanguageContext, LibrarySystemContext, ThemeContext } from '../../../context/initialContext';
+import { useWindowDimensions } from 'react-native';
+import RenderHtml from 'react-native-render-html';
+import { decodeHTML } from '../../../util/apiAuth';
+
+export const PalaceProjectInstructions = () => {
+     const { library } = React.useContext(LibrarySystemContext);
+     const { textColor } = React.useContext(ThemeContext);
+     const { width } = useWindowDimensions();
+
+     let instructions = decodeHTML(
+          '<p>The Palace Project has a wide variety of eBooks and eAudioBooks for use on your mobile device. </p><p>Palace Project titles can be read or listened using the Palace Project app which is available for both iOS and Android devices. At this time, the Palace Project app is not available on Kindle, PC, Linux, or other devices.</p><p>To use the Palace Project, follow these simple steps: </p><ol><li>Download the App on your device  </li></ol><p><a href="https://apps.apple.com/us/app/the-palace-project/id1574359693#?platform=iphone"><img src="/images/app_store_badge.png" alt="Download on the App Store" class="img-responsive" /></a></p><p><a href="https://play.google.com/store/apps/details?id=org.thepalaceproject.palace&pli=1"><img src="/images/google-play-badge.png" alt="Get it on Google Play" class="img-responsive" /></a></p><ol start="2"><li><p>Select your library<br />After downloading the app, select “Find Your Library,” and choose your library from the alphabetized selection.</p></li><li><p>Sign in<br />Select the settings icon in the lower-right hand corner of the screen, then enter your LIBRARY CARD NUMBER and LIBRARY PASSWORD and select LOG IN.</p></li></ol><p>For more information, visit <a href="https://thepalaceproject.org/information-for-library-patrons/">the Palace Project website</a>. </p>'
+     );
+
+     if (library.palaceProjectInstructions) {
+          instructions = decodeHTML(library.palaceProjectInstructions);
+     }
+
+     const source = {
+          baseUrl: library.baseUrl,
+          html: instructions,
+     };
+
+     const tagsStyles = {
+          body: {
+               color: textColor,
+          },
+          a: {
+               color: textColor,
+               textDecorationColor: textColor,
+          },
+     };
+
+     return (
+          <ScrollView>
+               <Box p="$5">
+                    <RenderHtml contentWidth={width} source={source} tagsStyles={tagsStyles} />
+               </Box>
+          </ScrollView>
+     );
+};

code/aspen_app/src/components/Action/CheckedOutToYou.js

@@ -2,12 +2,11 @@ import { Button, ButtonText } from '@gluestack-ui/themed';
 import React from 'react';
 import { ThemeContext } from '../../context/initialContext';
 
-
 // custom components and helper files
 import { navigate, navigateStack } from '../../helpers/RootNavigator';
 
 export const CheckedOutToYou = (props) => {
-    const { theme } = React.useContext(ThemeContext);
+     const { theme } = React.useContext(ThemeContext);
      const handleNavigation = () => {
           if (props.prevRoute === 'DiscoveryScreen' || props.prevRoute === 'SearchResults' || props.prevRoute === 'HomeScreen') {
                navigateStack('AccountScreenTab', 'MyCheckouts', {});
@@ -17,7 +16,7 @@ export const CheckedOutToYou = (props) => {
      };
 
      return (
-          <Button size="md" bgColor={theme['colors']['primary']['500']} variant="solid" onPress={handleNavigation}>
+          <Button minWidth="100%" maxWidth="100%" mb="$1" size="md" bgColor={theme['colors']['primary']['500']} variant="solid" onPress={handleNavigation}>
                <ButtonText textAlign="center" p="$0" color={theme['colors']['primary']['500-text']}>
                     {props.title}
                </ButtonText>

code/aspen_app/src/components/Action/Holds/HoldPrompt.js

@@ -146,7 +146,7 @@ export const HoldPrompt = (props) => {
 
      return (
           <>
-               <Button bgColor={theme['colors']['primary']['500']} onPress={() => setShowModal(true)}>
+               <Button minWidth="100%" maxWidth="100%" bgColor={theme['colors']['primary']['500']} onPress={() => setShowModal(true)}>
                     <ButtonText color={theme['colors']['primary']['500-text']}>{title}</ButtonText>
                </Button>
                <Modal isOpen={showModal} onClose={() => setShowModal(false)} closeOnOverlayClick={false} size="lg">
@@ -222,7 +222,7 @@ export const HoldPrompt = (props) => {
                               {_.isArray(accounts) && _.size(accounts) > 0 ? (
                                    <FormControl>
                                         <FormControlLabel>
-                                             <FormControlLabelText color={textColor}>{isPlacingHold ? getTermFromDictionary('en', 'linked_place_hold_for_account') : getTermFromDictionary('en', 'linked_checkout_to_account')}</FormControlLabelText>
+                                             <FormControlLabelText color={textColor}>{isPlacingHold ? getTermFromDictionary(language, 'linked_place_hold_for_account') : getTermFromDictionary(language, 'linked_checkout_to_account')}</FormControlLabelText>
                                         </FormControlLabel>
                                         <Select name="linkedAccount" selectedValue={activeAccount} minWidth={200} mt="$1" mb="$3" onValueChange={(itemValue) => setActiveAccount(itemValue)}>
                                              <SelectTrigger variant="outline" size="md">

code/aspen_app/src/components/Action/Holds/PlaceHold.js

@@ -1,6 +1,6 @@
 import { useQueryClient } from '@tanstack/react-query';
 import _ from 'lodash';
-import { Button, ButtonGroup, ButtonIcon, ButtonText, ButtonSpinner } from '@gluestack-ui/themed';
+import { Button, Box, ButtonGroup, ButtonIcon, ButtonText, ButtonSpinner } from '@gluestack-ui/themed';
 import React from 'react';
 
 // custom components and helper files
@@ -116,10 +116,8 @@ export const PlaceHold = (props) => {
                          size="md"
                          bgColor={theme['colors']['primary']['500']}
                          variant="solid"
-                         style={{
-                              flex: 1,
-                              flexWrap: 'wrap',
-                         }}
+                         minWidth="100%"
+                         maxWidth="100%"
                          onPress={async () => {
                               setLoading(true);
                               await completeAction(record, type, user.id, null, null, pickupLocation, library.baseUrl, null, 'default').then(async (ilsResponse) => {

code/aspen_app/src/components/Action/LoadOverDriveSample.js

@@ -16,7 +16,10 @@ export const LoadOverDriveSample = (props) => {
      return (
           <Button
                size="xs"
+               minWidth="100%"
+               maxWidth="100%"
                variant="link"
+               mb="$1"
                borderWidth={1}
                borderColor={theme['colors']['primary']['500']}
                onPress={() => {

code/aspen_app/src/components/Action/OnHoldForYou.js

@@ -16,7 +16,7 @@ export const OnHoldForYou = (props) => {
      };
 
      return (
-          <Button size="md" bgColor={theme['colors']['primary']['500']} variant="solid" onPress={handleNavigation}>
+          <Button minWidth="100%" maxWidth="100%" mb="$1" size="md" bgColor={theme['colors']['primary']['500']} variant="solid" onPress={handleNavigation}>
                <ButtonText textAlign="center" p="$0" color={theme['colors']['primary']['500-text']}>
                     {props.title}
                </ButtonText>

code/aspen_app/src/components/Action/OpenSideLoad.js

@@ -11,6 +11,8 @@ export const OpenSideLoad = (props) => {
 
      return (
           <Button
+               minWidth="100%"
+               maxWidth="100%"
                size="md"
                _text={{
                     padding: 0,