Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/components/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/components/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@labkey/components",
"version": "7.5.0",
"version": "7.5.1-smallFixes261seh.0",
"description": "Components, models, actions, and utility functions for LabKey applications and pages",
"sideEffects": false,
"files": [
Expand Down
5 changes: 5 additions & 0 deletions packages/components/releaseNotes/components.md
Original file line number Diff line number Diff line change
@@ -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.5.0
*Released*: 22 December 2025
- Chart builder updates for per-series line type option
Expand Down
40 changes: 26 additions & 14 deletions packages/components/src/internal/util/messaging.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down Expand Up @@ -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',
Expand All @@ -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) {
Expand Down
7 changes: 6 additions & 1 deletion packages/components/src/theme/form.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down