Issue 53742: Sample Manager: Unable to perform actions from various pages on sample type with a '/' (#1848)

Author: XingY

packages/components/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@labkey/components",
-  "version": "6.60.0",
+  "version": "6.60.1",
   "description": "Components, models, actions, and utility functions for LabKey applications and pages",
   "sideEffects": false,
   "files": [

packages/components/package.json

@@ -1,6 +1,11 @@
 # @labkey/components
 Components, models, actions, and utility functions for LabKey applications and pages
 
+### version 6.60.1
+*Released*: 3 September 2025
+- Issue 53742: Sample Manager: Unable to perform actions from various pages on sample type with a '/'
+  - Update `createQueryModelId` to use encode schema/query
+
 ### version 6.60.0
 *Released*: 3 September 2025
 - Issue 53801: Filter out columns for validation where `isAncestorInput()` is true

packages/components/releaseNotes/components.md

@@ -0,0 +1,21 @@
+import { SchemaQuery } from '../public/SchemaQuery';
+import { createGridModelId } from './models';
+
+describe('createGridModelId', () => {
+    test('schemaQuery encoding', () => {
+        expect(createGridModelId('g', new SchemaQuery('g', 'g'))).toEqual('g|g/g');
+        expect(createGridModelId('g', new SchemaQuery('g', 'ABC', null))).toEqual('g|g/abc');
+        expect(createGridModelId('g', new SchemaQuery('g', 'DEF', ''))).toEqual('g|g/def');
+        expect(createGridModelId('g', new SchemaQuery('/s', '/with/SLASH/', 'sl/asH'))).toEqual(
+            'g|$ss/$swith$sslash$s/sl$sash'
+        );
+
+        const decoded = '\\$\\/&}~,\\.';
+        const encoded = '\\$d\\$s$a$b$t$c\\$p';
+        expect(createGridModelId('g', new SchemaQuery(decoded, decoded))).toEqual(`g|${encoded}/${encoded}`);
+        expect(createGridModelId('g', new SchemaQuery(decoded, decoded), 'kEy')).toEqual(`g|${encoded}/${encoded}|key`);
+        expect(createGridModelId('g', new SchemaQuery(decoded, decoded), decoded)).toEqual(
+            `g|${encoded}/${encoded}|${decoded}`
+        );
+    });
+});

packages/components/src/internal/models.test.ts

@@ -1,20 +1,10 @@
-import { List, Map } from 'immutable';
 import { SchemaQuery } from '../public/SchemaQuery';
 
 export function createGridModelId(gridId: string, schemaQuery: SchemaQuery, keyValue?: any): string {
     const parts = [gridId, schemaQuery.getKey()];
-
-    if (schemaQuery && schemaQuery.viewName) {
-        parts.push(schemaQuery.viewName);
-    }
     if (keyValue !== undefined) {
         parts.push(keyValue);
     }
 
     return parts.join('|').toLowerCase();
 }
-
-export interface GridData {
-    data: Map<any, Map<string, any>>;
-    dataKeys: List<any>;
-}

packages/components/src/internal/models.ts

@@ -15,6 +15,7 @@ import { ViewInfo } from '../../internal/ViewInfo';
 import { getQueryParams } from '../../internal/util/URL';
 
 import {
+    createQueryModelId,
     DEFAULT_MAX_ROWS,
     DEFAULT_OFFSET,
     flattenValuesFromRow,
@@ -56,7 +57,7 @@ describe('QueryModel', () => {
         expect(model.queryName).toEqual('mixtures');
         expect(model.viewName).toEqual(undefined);
         // Auto-generated model ids are based off of the SchemaQuery in the QueryConfig
-        expect(model.id).toEqual('exp.data.mixtures');
+        expect(model.id).toEqual('exp$Pdata.mixtures');
         const schemaQuery = new SchemaQuery('exp.data', 'mixtures', 'someViewName');
         model = new QueryModel({ schemaQuery });
         expect(model.viewName).toEqual('someViewName');
@@ -316,6 +317,16 @@ describe('QueryModel', () => {
     });
 });
 
+describe('createQueryModelId', () => {
+    test('with/without special characters in schema/query', () => {
+        expect(createQueryModelId(new SchemaQuery("samples", "Blood"))).toBe('samples.Blood');
+        expect(createQueryModelId(new SchemaQuery("exp.data", "participant"))).toBe('exp$Pdata.participant');
+        expect(createQueryModelId(new SchemaQuery("samples", "Blood Plasma"))).toBe('samples.Blood Plasma');
+        expect(createQueryModelId(new SchemaQuery("samples", "Blood/Plasma"))).toBe('samples.Blood$SPlasma');
+        expect(createQueryModelId(new SchemaQuery("exp.data", "Blood/Plasma"))).toBe('exp$Pdata.Blood$SPlasma');
+    });
+});
+
 describe('flattenValuesFromRow', () => {
     test('missing params', () => {
         expect(JSON.stringify(flattenValuesFromRow(undefined, undefined))).toBe('{}');

packages/components/src/public/QueryModel/QueryModel.test.ts

@@ -85,14 +85,14 @@ export function locationHasQueryParamSettings(prefix: string, searchParams?: URL
 }
 
 /**
- * Creates a QueryModel ID for a given SchemaQuery. The id is just the SchemaQuery snake-cased as
+ * Creates a QueryModel ID for a given SchemaQuery. The id is just the SchemaQuery snake-cased as encoded
  * schemaName.queryName.
  *
  * @param schemaQuery: SchemaQuery
  */
 export function createQueryModelId(schemaQuery: SchemaQuery): string {
     const { schemaName, queryName } = schemaQuery;
-    return `${schemaName}.${queryName}`;
+    return `${encodePart(schemaName)}.${encodePart(queryName)}`;
 }
 
 const sortStringMapper = (s: QuerySort): string => s.toRequestString();