From b531ddcde638209956ecb5e25728d1a871f44522 Mon Sep 17 00:00:00 2001 From: Kirstien Kroeger Date: Wed, 5 Jun 2024 10:49:43 -0500 Subject: [PATCH 1/4] back button fix --- .../src/navigations/stack/AccountStackNavigator.js | 2 ++ .../src/navigations/stack/BrowseStackNavigator.js | 7 +++++-- code/aspen_app/src/navigations/stack/MoreStackNavigator.js | 2 ++ .../src/navigations/stack/SearchStackNavigator.js | 2 ++ code/aspen_app/src/themes/theme.js | 7 ++++++- 5 files changed, 17 insertions(+), 3 deletions(-) diff --git a/code/aspen_app/src/navigations/stack/AccountStackNavigator.js b/code/aspen_app/src/navigations/stack/AccountStackNavigator.js index c721394204..f16bbe0334 100644 --- a/code/aspen_app/src/navigations/stack/AccountStackNavigator.js +++ b/code/aspen_app/src/navigations/stack/AccountStackNavigator.js @@ -21,6 +21,7 @@ import { MyLinkedAccounts } from '../../screens/MyAccount/LinkedAccounts/LinkedA import { Settings_NotificationOptions } from '../../screens/MyAccount/Settings/NotificationOptions'; import { PreferencesScreen } from '../../screens/MyAccount/Settings/Preferences'; import { MyHolds } from '../../screens/MyAccount/TitlesOnHold/MyHolds'; +import { BackIcon } from '../../themes/theme'; import { getTermFromDictionary } from '../../translations/TranslationService'; import { EditionsModal } from './BrowseStackNavigator'; @@ -33,6 +34,7 @@ const AccountStackNavigator = () => { screenOptions={{ headerShown: true, headerBackTitleVisible: false, + headerBackImage: () => , }}> diff --git a/code/aspen_app/src/navigations/stack/BrowseStackNavigator.js b/code/aspen_app/src/navigations/stack/BrowseStackNavigator.js index 8277b0fca1..fdb79a1175 100644 --- a/code/aspen_app/src/navigations/stack/BrowseStackNavigator.js +++ b/code/aspen_app/src/navigations/stack/BrowseStackNavigator.js @@ -1,9 +1,10 @@ import { createNativeStackNavigator } from '@react-navigation/native-stack'; import { createStackNavigator } from '@react-navigation/stack'; -import { ChevronLeftIcon, CloseIcon, Pressable } from 'native-base'; +import { ChevronLeftIcon, CloseIcon, Pressable, Icon } from 'native-base'; import React from 'react'; import Scanner from '../../components/Scanner'; -import { LanguageContext } from '../../context/initialContext'; +import { LanguageContext, ThemeContext } from '../../context/initialContext'; +import { navigate } from '../../helpers/RootNavigator'; import { DiscoverHomeScreen } from '../../screens/BrowseCategory/Home'; import { EventScreen } from '../../screens/Event/Event'; @@ -19,6 +20,7 @@ import { SearchResultsForBrowseCategory } from '../../screens/Search/SearchByCat import { SearchResultsForList } from '../../screens/Search/SearchByList'; import { SearchResultsForSavedSearch } from '../../screens/Search/SearchBySavedSearch'; import { SearchResults } from '../../screens/Search/SearchResults'; +import { BackIcon } from '../../themes/theme'; import { getTermFromDictionary } from '../../translations/TranslationService'; const BrowseStackNavigator = () => { @@ -31,6 +33,7 @@ const BrowseStackNavigator = () => { screenOptions={({ navigation, route }) => ({ headerShown: true, headerBackTitleVisible: false, + headerBackImage: () => , })}> { @@ -28,6 +29,7 @@ const MoreStackNavigator = () => { screenOptions={{ headerShown: true, headerBackTitleVisible: false, + headerBackImage: () => , }}> { screenOptions={({ navigation, route }) => ({ headerShown: true, headerBackTitleVisible: false, + headerBackImage: () => , })}> { + const { theme } = React.useContext(ThemeContext); + return ; +}; + export async function getThemeData() { let theme = []; const discovery = create({ From 9778a4b3dc5545f27dbacbab8fb0f9741d408d7e Mon Sep 17 00:00:00 2001 From: Kirstien Kroeger Date: Wed, 5 Jun 2024 11:09:38 -0500 Subject: [PATCH 2/4] Update 24.06.00.MD --- code/web/release_notes/24.06.00.MD | 1 + 1 file changed, 1 insertion(+) diff --git a/code/web/release_notes/24.06.00.MD b/code/web/release_notes/24.06.00.MD index be0f599f19..e846683045 100644 --- a/code/web/release_notes/24.06.00.MD +++ b/code/web/release_notes/24.06.00.MD @@ -4,6 +4,7 @@ - Fixed a bug where some devices were not displaying a back button when necessary. (Ticket 132122) (*KK*) - On Grouped Work screen for side loads, the Access Online button will again properly open the content. (Ticket 132246) (*KK*) - Fixed a bug preventing a user from switching languages and automatically re-rendering with updated translations. (Ticket 132494) (*KK*) +- Fixed a bug where certain devices would not display a visible back button in the header. (Tickets 133133 132122, 132707) (*KK*) - On the Checkouts screen, the Access Online action for Libby items will now use the library's preferred reader name. (*KK*) - On the Checkouts screen, the Access Online action for Libby items will now properly again open the content in the in-app browser. (*KK*) - Added an alert to warn Android 11 or older users that they will no longer receive app updates. (*KK*) From 97362749acdfe74889755a3ab75ba0a7e718aa9f Mon Sep 17 00:00:00 2001 From: Kirstien Kroeger Date: Wed, 5 Jun 2024 17:53:29 -0500 Subject: [PATCH 3/4] break out examples into url fields, add file size limit --- .../themes/responsive/Admin/submitTicket.tpl | 29 ++++++----- code/web/services/Admin/SubmitTicket.php | 48 +++++++++++++++++-- 2 files changed, 62 insertions(+), 15 deletions(-) diff --git a/code/web/interface/themes/responsive/Admin/submitTicket.tpl b/code/web/interface/themes/responsive/Admin/submitTicket.tpl index a5ba8172ba..631594b152 100644 --- a/code/web/interface/themes/responsive/Admin/submitTicket.tpl +++ b/code/web/interface/themes/responsive/Admin/submitTicket.tpl @@ -19,45 +19,50 @@
{translate text="Please use descriptive keywords, i.e. Creating lists in LiDA" isAdminFacing=true} - +
{translate text="Include detailed steps to replicate the problem, account number for impacted user(s), device information, etc. Please do not include sensitive information like login credentials." isAdminFacing=true} - +
{if $supportingCompany == 'ByWater Solutions'}
{translate text="Use Sharepass to send sensitive information to us such as login credentials we can use to replicate the behavior reported." isAdminFacing=true} {translate text="Learn how to use Sharepass." isAdminFacing=true} - +
{/if}
- - + +
+ + + +
{translate text="Attach any screenshots or recordings that display the reported behavior or to help us replicate it. To select multiple files, hold down the CTRL or SHIFT key while selecting." isAdminFacing=true} + {translate text="10MB size limit per attachment." isAdminFacing=true}
diff --git a/code/web/services/Admin/SubmitTicket.php b/code/web/services/Admin/SubmitTicket.php index 2a1d14c2c4..eb2e06e048 100644 --- a/code/web/services/Admin/SubmitTicket.php +++ b/code/web/services/Admin/SubmitTicket.php @@ -16,7 +16,9 @@ function launch() { $reason = $_REQUEST['reason']; $product = $_REQUEST['product']; $sharepass = $_REQUEST['sharepass'] ?? null; - $examples = $_REQUEST['examples']; + $example1 = $_REQUEST['example1']; + $example2 = $_REQUEST['example2']; + $example3 = $_REQUEST['example3']; $attachments = $_FILES['attachments'] ?? []; global $serverName; @@ -28,14 +30,54 @@ function launch() { $description .= 'Reason: ' . $reason . "\n"; $description .= 'Product: ' . $product . "\n"; - if($examples) { - $description .= 'Examples: ' . $examples . "\n"; + if($example1) { + $description .= 'Example 1: ' . $example1 . "\n"; + } + + if($example2) { + $description .= 'Example 2: ' . $example2 . "\n"; + } + + if($example3) { + $description .= 'Example 3: ' . $example3 . "\n"; } if($sharepass) { $description .= 'Sharepass: ' . $sharepass . "\n"; } + $fileTooBig = false; + if($_FILES) { + $i = 0; + foreach ($_FILES as $file) { + $fileSize = $file['size'][$i]; + $maxFileSize = 10 * 1048576; // 10MB for RT limitations + if($fileSize > $maxFileSize) { + $fileTooBig = true; + } + $i++; + + } + } + + // don't lose already entered in data if something goes wrong on the form + $interface->assign('name', $name); + $interface->assign('email', $email); + $interface->assign('subject', $subject); + $interface->assign('description', $_REQUEST['description']); + $interface->assign('reason', $reason); + $interface->assign('product', $product); + $interface->assign('sharepass', $sharepass); + $interface->assign('example1', $example1); + $interface->assign('example2', $example2); + $interface->assign('example3', $example3); + + if($fileTooBig) { + $interface->assign('error', 'One or more of your files was larger than the 10MB file size limit.'); + $this->display('submitTicket.tpl', 'Submit Ticket'); + return; + } + $message = ''; try { From 47979a3e30749d0bd74d3f51d9b38d2786e38d18 Mon Sep 17 00:00:00 2001 From: Kirstien Kroeger Date: Wed, 5 Jun 2024 17:56:07 -0500 Subject: [PATCH 4/4] Update updateConfig.js --- code/aspen_app/app-configs/updateConfig.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/code/aspen_app/app-configs/updateConfig.js b/code/aspen_app/app-configs/updateConfig.js index e5eb85c43a..b3ce895071 100644 --- a/code/aspen_app/app-configs/updateConfig.js +++ b/code/aspen_app/app-configs/updateConfig.js @@ -204,6 +204,14 @@ const app_config = { project: app['sentryProject'], }, ], + [ + 'expo-build-properties', + { + ios: { + deploymentTarget: '16.0', + }, + }, + ], ], };