From a1fed85f30e43196663190176429cebd57ca4d03 Mon Sep 17 00:00:00 2001 From: Caroline D <108160931+CarolineDenis@users.noreply.github.com> Date: Mon, 5 Jun 2023 07:40:32 -0700 Subject: [PATCH 1/7] Delete extra space in export file name --- .../js_src/lib/components/QueryBuilder/Export.tsx | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/specifyweb/frontend/js_src/lib/components/QueryBuilder/Export.tsx b/specifyweb/frontend/js_src/lib/components/QueryBuilder/Export.tsx index 8a9806c5961..1b5c2bdd325 100644 --- a/specifyweb/frontend/js_src/lib/components/QueryBuilder/Export.tsx +++ b/specifyweb/frontend/js_src/lib/components/QueryBuilder/Export.tsx @@ -105,6 +105,10 @@ export function QueryExportButtons({ fields.some(({ mappingPath }) => mappingPath.includes('locality'))) && hasPermission('/querybuilder/query', 'export_kml'); + console.log( + `${queryText.newQueryName()} - ${schema.models[baseTableName].label}` + ); + return ( <> {state === 'creating' ? ( @@ -134,8 +138,9 @@ export function QueryExportButtons({ : downloadFile( `${ queryResource.isNew() - ? `${queryText.newQueryName()} - - ${schema.models[baseTableName].label}` + ? `${queryText.newQueryName()} ${ + schema.models[baseTableName].label + }` : queryResource.get('name') } - ${new Date().toDateString()}.csv`, handleSelectedResults() From a2d351cc8fa91decd4f3797e7efc895bcc3045c9 Mon Sep 17 00:00:00 2001 From: Caroline D <108160931+CarolineDenis@users.noreply.github.com> Date: Mon, 5 Jun 2023 07:42:38 -0700 Subject: [PATCH 2/7] Delete console log --- .../frontend/js_src/lib/components/QueryBuilder/Export.tsx | 4 ---- 1 file changed, 4 deletions(-) diff --git a/specifyweb/frontend/js_src/lib/components/QueryBuilder/Export.tsx b/specifyweb/frontend/js_src/lib/components/QueryBuilder/Export.tsx index 1b5c2bdd325..0b4953ac03d 100644 --- a/specifyweb/frontend/js_src/lib/components/QueryBuilder/Export.tsx +++ b/specifyweb/frontend/js_src/lib/components/QueryBuilder/Export.tsx @@ -105,10 +105,6 @@ export function QueryExportButtons({ fields.some(({ mappingPath }) => mappingPath.includes('locality'))) && hasPermission('/querybuilder/query', 'export_kml'); - console.log( - `${queryText.newQueryName()} - ${schema.models[baseTableName].label}` - ); - return ( <> {state === 'creating' ? ( From 8d11df7968f0dbc3e90be541bb5aad7f9db49e9d Mon Sep 17 00:00:00 2001 From: Grant Fitzsimmons <37256050+grantfitzsimmons@users.noreply.github.com> Date: Mon, 5 Jun 2023 11:20:10 -0500 Subject: [PATCH 3/7] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a9558bc51fe..7a20c84a07c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,7 +12,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ## Unreleased - + Coming in the next few months: From b7b1b83687d5e826ba49ecaa31137630cf2c48c1 Mon Sep 17 00:00:00 2001 From: Grant Fitzsimmons <37256050+grantfitzsimmons@users.noreply.github.com> Date: Mon, 5 Jun 2023 11:39:47 -0500 Subject: [PATCH 4/7] Update CHANGELOG.md --- CHANGELOG.md | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7a20c84a07c..89dea99811f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,31 @@ Coming in the next few months: - [And many more features](https://github.com/specify/specify7/pulls) +## [7.8.12](https://github.com/specify/specify7/compare/v7.8.11...v7.8.12) (7 June 2023) + +### Added +- Collection Object Relationships can now be uploaded in the WorkBench ([#3089](https://github.com/specify/specify7/issues/3089) *- Requested by CSIRO and others*) +- The language picker on the login screen now has a "Language" subheading above, consistent with username and password ([#3530](https://github.com/specify/specify7/issues/3530)) +- The new `[intert]` attribute has been added to dialogs to help with accessibility and focusability in browsers for dialogs ([#2618](https://github.com/specify/specify7/issues/2618)) +- Specify Network is now integrated into Specify 7! ([#2265](https://github.com/specify/specify7/issues/2265), [#3064](https://github.com/specify/specify7/issues/3064)) +- Button colors in the interface can now be customized application-wide ([#2091](https://github.com/specify/specify7/issues/2091) *- Requested by CSIRO and others*) +- The Spanish localization has been improved thanks to Iñigo Granzow de la Cerda at CSIC! ([#3469](https://github.com/specify/specify7/pull/3469)) +- "Skeleton loaders" have been added to improve the user experience when waiting for items to load in place of dialogs ([#2998](https://github.com/specify/specify7/issues/2998)) +- Institutions can now be added to the navigation menu ([#2100](https://github.com/specify/specify7/issues/2100)) + +### Changed +- Small buttons now are darker when hovered over in light mode and lighter when hovered over in dark mode. These buttons were previously orange. ([#3543](https://github.com/specify/specify7/pull/3543)) +- When using the attachment viewer, the hide form button now has a different value based on whether the form is displayed or not. ([#3479](https://github.com/specify/specify7/issues/3479)) +- The paginator now uses proper icons for the navigation arrows. ([#3536](https://github.com/specify/specify7/issues/3536)) +- "Express Search" is now known as "Simple Search" to be consistent with Specify 6. + +### Fixed +- Console errors caused by exiting query builder have been removed ([#3523](https://github.com/specify/specify7/issues/3523)) +- Auto-generated tree queries are no longer missing the second quote when using the English language ([#3126](https://github.com/specify/specify7/issues/3126)) +- Export to CSV now respects the selected rows ([#2348](https://github.com/specify/specify7/issues/2348) *– Reported by CSIRO*) +- App resources can now be edited on narrow screens ([#3437](https://github.com/specify/specify7/issues/3437)) +- When viewing interaction-based data forms, Interactions is now highlighted in the navigation menu ([#3459](https://github.com/specify/specify7/issues/3459)) + ## [7.8.11](https://github.com/specify/specify7/compare/v7.8.10...v7.8.11) (17 May 2023) ### Added From b190b1eb1c286b211141803e3446ad8af7aba412 Mon Sep 17 00:00:00 2001 From: melton-jason Date: Tue, 6 Jun 2023 21:56:36 -0500 Subject: [PATCH 5/7] Don't trigger unload protect when setting lat/long Fixes #3584 The resource.set() function was setting an unload protect when intially loading lats and longs that were very precise. The intial value (string), was being set to a number which was not equal to the inital value. This led records to need saving even when they were just loaded (from QueryBuilder or other means) --- .../js_src/lib/components/FormPlugins/LatLongUi.tsx | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/specifyweb/frontend/js_src/lib/components/FormPlugins/LatLongUi.tsx b/specifyweb/frontend/js_src/lib/components/FormPlugins/LatLongUi.tsx index ecde0bddad1..ec0e75a7b94 100644 --- a/specifyweb/frontend/js_src/lib/components/FormPlugins/LatLongUi.tsx +++ b/specifyweb/frontend/js_src/lib/components/FormPlugins/LatLongUi.tsx @@ -98,8 +98,15 @@ function Coordinate({ ); isChanging.current = true; - resource.set(coordinateField, parsed?.asFloat() ?? null); - resource.set(coordinateTextField, trimmedValue || null); + + /** + * Do not set unload protect because very precise coodinateFields + * may experience a change of precision during the conversion from + * string to float + */ + resource.set(coordinateField, parsed?.asFloat() ?? null, { silent: true }); + + resource.set(coordinateTextField, trimmedValue); // Since these fields are no used by sp7, they shouldn't trigger unload protect resource.set( 'srcLatLongUnit', From b49a0cccf8bccddae1869b770fb7c3459d726fa5 Mon Sep 17 00:00:00 2001 From: Caroline D <108160931+CarolineDenis@users.noreply.github.com> Date: Thu, 8 Jun 2023 09:59:35 -0700 Subject: [PATCH 6/7] Allow to change from dark to light mode without refresh Fixes #3544 --- .../js_src/lib/components/Preferences/ApplyPreferences.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specifyweb/frontend/js_src/lib/components/Preferences/ApplyPreferences.tsx b/specifyweb/frontend/js_src/lib/components/Preferences/ApplyPreferences.tsx index e4422d2ad8b..223d86369a6 100644 --- a/specifyweb/frontend/js_src/lib/components/Preferences/ApplyPreferences.tsx +++ b/specifyweb/frontend/js_src/lib/components/Preferences/ApplyPreferences.tsx @@ -169,7 +169,7 @@ export function SetCssVariables(): null { ), }), // eslint-disable-next-line react-hooks/exhaustive-deps - [version] + [version, darkMode] ); const scaleTarget = prefs.scaleUi ? document.documentElement : document.body; From 32a8c56dedd4ebafc4f91a8d09933087724302d7 Mon Sep 17 00:00:00 2001 From: realVinayak Date: Tue, 13 Jun 2023 17:01:25 +0530 Subject: [PATCH 7/7] Fix mariadb being a total jerk --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b818ddea48c..e73843f4487 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -64,7 +64,7 @@ jobs: MYSQL_PASSWORD: MasterPassword MYSQL_DATABASE: test_SpecifyDB MYSQL_ROOT_PASSWORD: password - options: --health-cmd="mysqladmin ping" --health-interval=5s --health-timeout=2s --health-retries=3 + options: --health-cmd="mariadb-admin ping" --health-interval=5s --health-timeout=2s --health-retries=3 steps: - uses: actions/checkout@v3