Skip to content

GitHub Issue 1470: Manage Templates end up with sample type not usable in Apps #2067

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
XingY wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

GitHub Issue 1470: Manage Templates end up with sample type not usable in Apps #2067

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6820a16
GitHub Issue 1470: Manage Templates end up with sample type not usabl…
XingY Aug 26, 2026
379776b
merge from develop
XingY Aug 27, 2026
5fc9237
merge from develop
XingY Aug 28, 2026
308ba0f
code review
XingY Aug 28, 2026
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
View file
Open in desktop

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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@labkey/components",
"version": "7.60.0",
"version": "7.60.1-fb-issue1470.1",
"description": "Components, models, actions, and utility functions for LabKey applications and pages",
"sideEffects": false,
"files": [
Expand Down
10 changes: 5 additions & 5 deletions packages/components/src/internal/actions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -607,7 +607,7 @@ export function saveGridView(
containerPath,
views: [{ ...ViewInfo.serialize(viewInfo), replace, session, inherit, shared, hidden }],
success: () => {
invalidateQueryDetailsCache(schemaQuery, containerPath);
invalidateQueryDetailsCache(schemaQuery);
resolve();
},
failure: response => {
Expand Down Expand Up @@ -640,7 +640,7 @@ export function saveSessionView(
hidden: false,
replace,
success: () => {
invalidateQueryDetailsCache(schemaQuery, containerPath);
invalidateQueryDetailsCache(schemaQuery);
resolve();
},
failure: response => {
Expand Down Expand Up @@ -720,12 +720,12 @@ export function deleteView(
containerPath,
revert,
success: () => {
invalidateQueryDetailsCache(schemaQuery, containerPath);
invalidateQueryDetailsCache(schemaQuery);
resolve();
},
failure: response => {
if (response.exceptionClass === VIEW_NOT_FOUND_EXCEPTION_CLASS) {
invalidateQueryDetailsCache(schemaQuery, containerPath);
invalidateQueryDetailsCache(schemaQuery);
resolve(); // view has already been deleted
} else {
console.error(response);
Expand Down Expand Up @@ -760,7 +760,7 @@ export function renameGridView(
newName,
},
success: Utils.getCallbackWrapper(response => {
invalidateQueryDetailsCache(schemaQuery, containerPath);
invalidateQueryDetailsCache(schemaQuery);
resolve();
}),
failure: Utils.getCallbackWrapper(error => {
Expand Down
25 changes: 8 additions & 17 deletions packages/components/src/internal/query/api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,22 +64,13 @@ function getQueryDetailsCacheKey(

export function invalidateQueryDetailsCache(
schemaQuery: SchemaQuery,
containerPath?: string,
fk?: string,
fields?: string | string[],
exactKeyMatch = false
): void {
if (exactKeyMatch) {
const key = getQueryDetailsCacheKey(schemaQuery, containerPath, fk, fields);
delete queryDetailsCache[key];
} else {
const prefix = getQueryDetailsCacheKey(schemaQuery);
Object.keys(queryDetailsCache).forEach(cacheKey => {
if (cacheKey.startsWith(prefix)) {
delete queryDetailsCache[cacheKey];
}
});
}
const prefix = getQueryDetailsCacheKey(schemaQuery);
Object.keys(queryDetailsCache).forEach(cacheKey => {
if (cacheKey.toLowerCase().startsWith(prefix.toLowerCase())) {
delete queryDetailsCache[cacheKey];
}
});
}

interface GetQueryDetailsBasic extends Omit<
Expand Down Expand Up @@ -127,7 +118,7 @@ export function getQueryDetails(options: GetQueryDetailsOptions): Promise<QueryI
// where it is unable to resolve the tableInfo. This is deemed a 'success'
// by the request standards but here we reject as an outright failure
if (queryDetails.exception) {
invalidateQueryDetailsCache(schemaQuery, containerPath, fk, fields);
invalidateQueryDetailsCache(schemaQuery);
reject({
schemaQuery,
message: queryDetails.exception,
Expand All @@ -141,7 +132,7 @@ export function getQueryDetails(options: GetQueryDetailsOptions): Promise<QueryI
},
failure: (error, request) => {
console.error(error);
invalidateQueryDetailsCache(schemaQuery, containerPath, fk, fields);
invalidateQueryDetailsCache(schemaQuery);
reject({
message: error.exception,
exceptionClass: error.exceptionClass,
Expand Down
4 changes: 2 additions & 2 deletions packages/components/src/public/QueryModel/QueryModel.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -540,11 +540,11 @@ export class QueryModel {
}

get schemaName(): string {
return this.schemaQuery.schemaName;
return (this.queryInfo?.schemaQuery ?? this.schemaQuery).schemaName;
}

get queryName(): string {
return this.schemaQuery.queryName;
return (this.queryInfo?.schemaQuery ?? this.schemaQuery).queryName;
}

get viewName(): string {
Expand Down