diff --git a/packages/components/package-lock.json b/packages/components/package-lock.json index 78d72b1d2d..b1ffdffe52 100644 --- a/packages/components/package-lock.json +++ b/packages/components/package-lock.json @@ -1,12 +1,12 @@ { "name": "@labkey/components", - "version": "7.7.0", + "version": "7.7.1-smallFixes261seh.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@labkey/components", - "version": "7.7.0", + "version": "7.7.1-smallFixes261seh.0", "license": "SEE LICENSE IN LICENSE.txt", "dependencies": { "@hello-pangea/dnd": "18.0.1", diff --git a/packages/components/package.json b/packages/components/package.json index 56ab04dc9a..19af2de17b 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -1,6 +1,6 @@ { "name": "@labkey/components", - "version": "7.7.0", + "version": "7.7.1-smallFixes261seh.0", "description": "Components, models, actions, and utility functions for LabKey applications and pages", "sideEffects": false, "files": [ diff --git a/packages/components/releaseNotes/components.md b/packages/components/releaseNotes/components.md index 6e6ae577c2..84c3185895 100644 --- a/packages/components/releaseNotes/components.md +++ b/packages/components/releaseNotes/components.md @@ -1,6 +1,11 @@ # @labkey/components Components, models, actions, and utility functions for LabKey applications and pages +### version TBD +*Released*: TBD +- [GitHub Issue 734](https://github.com/LabKey/internal-issues/issues/734) Update sizing of comment input box for better display in narrow screens +- [GitHub Issue 457](https://github.com/LabKey/internal-issues/issues/457) Update messaging for deleting samples linked to studies + ### version 7.7.0 *Released*: 29 December 2025 - Workflow Automation: Task action to filter samples for selected task diff --git a/packages/components/src/internal/util/messaging.tsx b/packages/components/src/internal/util/messaging.tsx index 9eba022156..4c4710c325 100644 --- a/packages/components/src/internal/util/messaging.tsx +++ b/packages/components/src/internal/util/messaging.tsx @@ -24,7 +24,11 @@ export function deleteSuccessMessage(noun: string, count?: number, additionalInf return 'Successfully deleted ' + countStr.toLocaleString() + ' ' + noun + '. ' + (additionalInfo || ''); } -export function deleteErrorMessage(noun: string): ReactNode { +export function deleteErrorMessage(noun: string, error?: any): ReactNode { + const errorMsg = extractMessageFromError(error); + if (errorMsg && errorMsg.indexOf('Cannot delete rows from dataset') >= 0) { + return `There was a problem deleting the ${noun.toLowerCase()} because of references from a study dataset. Recall or remove the ${noun.toLowerCase()} from the study and try again.`; + } return getActionErrorMessage('There was a problem deleting the ' + noun + '. ', noun); } @@ -87,6 +91,25 @@ export function makePresentParticiple(verb: string): string { } } +function extractMessageFromError(error: any) { + let errorMsg; + if (!error) { + return undefined; + } + if (typeof error === 'string') { + errorMsg = error; + } else if (error.message) { + errorMsg = error.message; + } else if (error.msg) { + errorMsg = error.msg; + } else if (error.exception) { + errorMsg = error.exception; + } else if (error.error) { + errorMsg = error.error.exception; + } + return errorMsg; +} + export function resolveErrorMessage( error: any, noun = 'data', @@ -101,19 +124,8 @@ export function resolveErrorMessage( returnInitialMsg = false ): string { const verbPresParticiple = makePresentParticiple(verbPresent); - let errorMsg; - if (!error) { - return undefined; - } - if (typeof error === 'string') { - errorMsg = error; - } else if (error.message) { - errorMsg = error.message; - } else if (error.msg) { - errorMsg = error.msg; - } else if (error.exception) { - errorMsg = error.exception; - } + const errorMsg = extractMessageFromError(error); + if (returnInitialMsg) { return errorMsg; } else if (errorMsg) { diff --git a/packages/components/src/theme/form.scss b/packages/components/src/theme/form.scss index 2d14c19308..b0cef0890f 100644 --- a/packages/components/src/theme/form.scss +++ b/packages/components/src/theme/form.scss @@ -427,7 +427,12 @@ textarea.form-control { margin-bottom: 0; textarea { min-height: 20px; - min-width: 450px; + @media (max-width: 924px) { + min-width: 300px; + } + @media (min-width: 925px) { + min-width: 450px; + } resize: none; overflow-y: hidden; }