Merge remote-tracking branch 'origin/develop' into fb_crossSampleTypeWarnings

Author: cnathe

packages/components/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@labkey/components",
-  "version": "7.13.0-fb-crossSampleTypeWarnings.0",
+  "version": "7.13.1",
   "description": "Components, models, actions, and utility functions for LabKey applications and pages",
   "sideEffects": false,
   "files": [

packages/components/package.json

@@ -7,6 +7,11 @@ Components, models, actions, and utility functions for LabKey applications and p
   - InferDomain API call and response to include distinctValues for specified column keys
   - EntityIdCreationModel.getSchemaQuery to include optional targetQueryName param
 
+### version 7.13.1
+*Released*: 26 January 2026
+- Merge from release26.1-SNAPSHOT to develop
+    - includes changes from 7.7.5 #1926
+
 ### version 7.13.0
 *Released*: 20 January 2026
 - Multi value text choices
@@ -56,6 +61,10 @@ Components, models, actions, and utility functions for LabKey applications and p
   - Added hasMixedValue prop support across all input components (TextInput, SelectInput, CheckboxInput, DatePickerInput, FileInput, TextAreaInput, AmountUnitInput)
   - Updated BulkUpdateForm and BulkAddUpdateForm to pass conflicting fields information to form inputs
 
+### version 7.7.5
+*Released*: 22 January 2026
+- [GitHub Issue #798](https://github.com/LabKey/internal-issues/issues/798) - add product feature flag for advanced workflow
+
 ### version 7.7.4
 *Released*: 8 January 2026
 - [GitHub Issue #723](https://github.com/LabKey/internal-issues/issues/723)

packages/components/releaseNotes/components.md

@@ -738,6 +738,7 @@ import {
     isSharedContainer,
     isSourceTypeEnabled,
     isWorkflowEnabled,
+    isAdvancedWorkflowEnabled,
     setFolderDataExclusion,
     setProductFolders,
     useMenuSectionConfigs,
@@ -853,6 +854,7 @@ import {
     TEST_BIO_LIMS_ENTERPRISE_MODULE_CONTEXT,
     TEST_BIO_LIMS_STARTER_MODULE_CONTEXT,
     TEST_LKS_STARTER_MODULE_CONTEXT,
+    TEST_LK_LIMS_MODULE_CONTEXT,
     TEST_LKSM_PROFESSIONAL_MODULE_CONTEXT,
     TEST_LKSM_STARTER_AND_WORKFLOW_MODULE_CONTEXT,
     TEST_LKSM_STARTER_MODULE_CONTEXT,
@@ -931,6 +933,7 @@ const App = {
     isConditionalFormattingEnabled,
     isMediaEnabled,
     isWorkflowEnabled,
+    isAdvancedWorkflowEnabled,
     isELNEnabled,
     isFreezerManagementEnabled,
     isPlatesEnabled,
@@ -1055,6 +1058,7 @@ const App = {
     TEST_LKSM_STARTER_MODULE_CONTEXT,
     TEST_LKSM_STARTER_AND_WORKFLOW_MODULE_CONTEXT,
     TEST_LKSM_PROFESSIONAL_MODULE_CONTEXT,
+    TEST_LK_LIMS_MODULE_CONTEXT,
     TEST_PROJECT,
     TEST_PROJECT_CONTAINER,
     TEST_PROJECT_CONTAINER_ADMIN,

packages/components/src/index.ts

@@ -120,6 +120,7 @@ export const BASE_APP_HELP_LINK = 'https://www.labkey.org/SampleManagerHelp/wiki
 
 // The enum values here should align with the ProductFeature.java enum values (some not currently used but included for completeness)
 export enum ProductFeature {
+    AdvancedWorkflow = 'AdvancedWorkflow',
     ApiKeys = 'ApiKeys',
     Assay = 'Assay',
     AssayQC = 'AssayQC',

packages/components/src/internal/app/constants.ts

@@ -384,6 +384,13 @@ export function isWorkflowEnabled(moduleContext?: ModuleContext): boolean {
     );
 }
 
+export function isAdvancedWorkflowEnabled(moduleContext?: ModuleContext): boolean {
+    return (
+        hasModule(SAMPLE_MANAGER_APP_PROPERTIES.moduleName, moduleContext) &&
+        isFeatureEnabled(ProductFeature.AdvancedWorkflow, moduleContext)
+    );
+}
+
 export function isDataChangeCommentRequirementFeatureEnabled(moduleContext?: ModuleContext): boolean {
     return isFeatureEnabled(ProductFeature.DataChangeCommentRequirement, moduleContext);
 }

packages/components/src/internal/app/utils.ts

@@ -1,17 +1,36 @@
 import {
     BIOLOGICS_APP_PROPERTIES,
     FREEZER_MANAGER_APP_PROPERTIES,
+    LIMS_APP_PROPERTIES,
     ProductFeature,
     SAMPLE_MANAGER_APP_PROPERTIES,
 } from './app/constants';
-import {
-    BIOLOGICS_ENTERPRISE_PRODUCT_KEY,
-    BIOLOGICS_PRODUCT_ID,
-    BIOLOGICS_STARTER_PRODUCT_KEY,
-    SAMPLE_MANAGER_PRODUCT_ID,
-    SAMPLE_MANAGER_PROFESSIONAL_PRODUCT_KEY,
-    SAMPLE_MANAGER_STARTER_PRODUCT_KEY
-} from './app/products';
+import { BIOLOGICS_PRODUCT_ID, LIMS_PRODUCT_ID, SAMPLE_MANAGER_PRODUCT_ID } from './app/products';
+
+export const TEST_LK_LIMS_MODULE_CONTEXT = {
+    api: {
+        moduleNames: ['samplemanagement', 'inventory', 'assay', 'labbook'],
+    },
+    samplemanagement: {
+        productId: LIMS_APP_PROPERTIES.productId,
+    },
+    inventory: {
+        productId: FREEZER_MANAGER_APP_PROPERTIES.productId,
+    },
+    core: {
+        productFeatures: [
+            ProductFeature.Workflow,
+            ProductFeature.ELN,
+            ProductFeature.Assay,
+            ProductFeature.ApiKeys,
+            ProductFeature.CalculatedFields,
+            ProductFeature.DataChangeCommentRequirement,
+            ProductFeature.CustomImportTemplates,
+            ProductFeature.AdvancedWorkflow,
+        ],
+        primaryApplicationId: LIMS_PRODUCT_ID,
+    }
+};
 
 export const TEST_LKSM_PROFESSIONAL_MODULE_CONTEXT = {
     api: {