diff --git a/packages/components/package-lock.json b/packages/components/package-lock.json
index 38b86638ce..d8cb7dee95 100644
--- a/packages/components/package-lock.json
+++ b/packages/components/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@labkey/components",
-  "version": "2.398.0",
+  "version": "2.399.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@labkey/components",
-      "version": "2.398.0",
+      "version": "2.399.0",
       "license": "SEE LICENSE IN LICENSE.txt",
       "dependencies": {
         "@labkey/api": "1.27.0",
diff --git a/packages/components/package.json b/packages/components/package.json
index 7179663212..e9d3de104f 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@labkey/components",
-  "version": "2.398.0",
+  "version": "2.399.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 bb703ffb41..7b2229795d 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 2.399.0
+*Released*: 15 December 2023
+- Consolidate move entities to MoveRowsAction in query controller
+  - update API call controller and actions and update params to match new moveRows API format
+
 ### version 2.398.0
 *Released*: 14 December 2023
 - In-app messaging for product updates
diff --git a/packages/components/src/internal/components/base/Grid.test.tsx b/packages/components/src/internal/components/base/Grid.test.tsx
index 84f68307fd..8c3527afb2 100644
--- a/packages/components/src/internal/components/base/Grid.test.tsx
+++ b/packages/components/src/internal/components/base/Grid.test.tsx
@@ -280,6 +280,10 @@ describe('Grid', () => {
 });
 
 describe('GridHeader', () => {
+    beforeAll(() => {
+        global.console.error = jest.fn();
+    });
+
     const DEFAULT_PROPS = {
         showHeader: true,
         columns: List.of(
diff --git a/packages/components/src/internal/components/domainproperties/assay/__snapshots__/AssayDesignerPanels.spec.tsx.snap b/packages/components/src/internal/components/domainproperties/assay/__snapshots__/AssayDesignerPanels.spec.tsx.snap
index 401700aed6..6e09581ce0 100644
--- a/packages/components/src/internal/components/domainproperties/assay/__snapshots__/AssayDesignerPanels.spec.tsx.snap
+++ b/packages/components/src/internal/components/domainproperties/assay/__snapshots__/AssayDesignerPanels.spec.tsx.snap
@@ -727,8 +727,6 @@ exports[`AssayDesignerPanels appPropertiesOnly for new assay 1`] = `
           "schemaName": "exp",
           "viewName": undefined,
         },
-        "moveActionName": "moveAssayRuns",
-        "moveControllerName": "assay",
         "nounAsParentPlural": "Assay Runs",
         "nounAsParentSingular": "Assay Run",
         "nounPlural": "runs",
@@ -2564,8 +2562,6 @@ exports[`AssayDesignerPanels appPropertiesOnly with initModel 1`] = `
           "schemaName": "exp",
           "viewName": undefined,
         },
-        "moveActionName": "moveAssayRuns",
-        "moveControllerName": "assay",
         "nounAsParentPlural": "Assay Runs",
         "nounAsParentSingular": "Assay Run",
         "nounPlural": "runs",
diff --git a/packages/components/src/internal/components/domainproperties/dataclasses/DataClassDesigner.spec.tsx b/packages/components/src/internal/components/domainproperties/dataclasses/DataClassDesigner.spec.tsx
deleted file mode 100644
index 3795914ea4..0000000000
--- a/packages/components/src/internal/components/domainproperties/dataclasses/DataClassDesigner.spec.tsx
+++ /dev/null
@@ -1,126 +0,0 @@
-import React from 'react';
-import { mount, shallow } from 'enzyme';
-
-import { List } from 'immutable';
-import { getTestAPIWrapper } from '../../../APIWrapper';
-
-import { PROPERTIES_PANEL_ERROR_MSG } from '../constants';
-import getDomainDetailsJSON from '../../../../test/data/dataclass-getDomainDetails.json';
-import DomainForm from '../DomainForm';
-
-import { waitForLifecycle } from '../../../test/enzymeTestHelpers';
-
-import { FileAttachmentForm } from '../../../../public/files/FileAttachmentForm';
-
-import { Alert } from '../../base/Alert';
-
-import { SystemFields } from '../SystemFields';
-
-import { DataClassPropertiesPanel } from './DataClassPropertiesPanel';
-import { DataClassModel } from './models';
-import { DataClassDesigner, DataClassDesignerImpl } from './DataClassDesigner';
-
-const BASE_PROPS = {
-    api: getTestAPIWrapper(jest.fn),
-    onComplete: jest.fn(),
-    onCancel: jest.fn(),
-    loadNameExpressionOptions: jest.fn(async () => ({ prefix: '', allowUserSpecifiedNames: true })),
-    testMode: true,
-};
-
-describe('DataClassDesigner', () => {
-    test('default properties', async () => {
-        const form = (
-            <DataClassDesignerImpl
-                {...BASE_PROPS}
-                currentPanelIndex={0}
-                firstState={true}
-                onFinish={jest.fn()}
-                onTogglePanel={jest.fn()}
-                setSubmitting={jest.fn()}
-                submitting={false}
-                validatePanel={0}
-                visitedPanels={List()}
-            />
-        );
-
-        const tree = shallow(form);
-
-        await waitForLifecycle(tree);
-
-        expect(tree).toMatchSnapshot();
-    });
-
-    test('custom properties', async () => {
-        const form = (
-            <DataClassDesignerImpl
-                {...BASE_PROPS}
-                nounSingular="Source"
-                nounPlural="Sources"
-                nameExpressionInfoUrl="https://www.labkey.org/Documentation"
-                nameExpressionPlaceholder="name expression placeholder test"
-                headerText="header text test"
-                appPropertiesOnly={true}
-                saveBtnText="Finish it up"
-                currentPanelIndex={0}
-                firstState={true}
-                onFinish={jest.fn()}
-                onTogglePanel={jest.fn()}
-                setSubmitting={jest.fn()}
-                submitting={false}
-                validatePanel={0}
-                visitedPanels={List()}
-            />
-        );
-
-        const tree = shallow(form);
-
-        await waitForLifecycle(tree);
-
-        expect(tree).toMatchSnapshot();
-    });
-
-    test('initModel', async () => {
-        const form = (
-            <DataClassDesignerImpl
-                {...BASE_PROPS}
-                initModel={DataClassModel.create(getDomainDetailsJSON)}
-                currentPanelIndex={0}
-                firstState={true}
-                onFinish={jest.fn()}
-                onTogglePanel={jest.fn()}
-                setSubmitting={jest.fn()}
-                submitting={false}
-                validatePanel={0}
-                visitedPanels={List()}
-            />
-        );
-        const wrapped = shallow(form);
-        await waitForLifecycle(wrapped);
-
-        expect(wrapped.find(DataClassPropertiesPanel)).toHaveLength(1);
-        expect(wrapped.find(DomainForm)).toHaveLength(1);
-        expect(wrapped.find(FileAttachmentForm)).toHaveLength(0);
-        expect(wrapped).toMatchSnapshot();
-        wrapped.unmount();
-    });
-
-    test('open fields panel', async () => {
-        const wrapped = mount(<DataClassDesigner {...BASE_PROPS} />);
-        await waitForLifecycle(wrapped);
-
-        const panelHeader = wrapped.find('div#domain-header');
-        expect(wrapped.find('#domain-header').at(1).hasClass('domain-panel-header-collapsed')).toBeTruthy();
-        panelHeader.simulate('click');
-        expect(wrapped.find('#domain-header').at(1).hasClass('domain-panel-header-expanded')).toBeTruthy();
-        expect(wrapped.find(FileAttachmentForm)).toHaveLength(1);
-        expect(wrapped.find(SystemFields)).toHaveLength(1);
-
-        expect(wrapped.find(Alert)).toHaveLength(2);
-        expect(wrapped.find(Alert).at(0).text()).toEqual(PROPERTIES_PANEL_ERROR_MSG);
-        expect(wrapped.find(Alert).at(1).text()).toEqual(
-            'Please correct errors in the properties panel before saving.'
-        );
-        wrapped.unmount();
-    });
-});
diff --git a/packages/components/src/internal/components/domainproperties/dataclasses/DataClassDesigner.test.tsx b/packages/components/src/internal/components/domainproperties/dataclasses/DataClassDesigner.test.tsx
new file mode 100644
index 0000000000..90fdb2ff12
--- /dev/null
+++ b/packages/components/src/internal/components/domainproperties/dataclasses/DataClassDesigner.test.tsx
@@ -0,0 +1,129 @@
+import React from 'react';
+import { act, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import { List } from 'immutable';
+
+import { getTestAPIWrapper } from '../../../APIWrapper';
+import { renderWithAppContext } from '../../../test/reactTestLibraryHelpers';
+
+import { PROPERTIES_PANEL_ERROR_MSG } from '../constants';
+import getDomainDetailsJSON from '../../../../test/data/dataclass-getDomainDetails.json';
+
+import { DataClassModel } from './models';
+import { DataClassDesigner, DataClassDesignerImpl } from './DataClassDesigner';
+
+const BASE_PROPS = {
+    api: getTestAPIWrapper(jest.fn),
+    onComplete: jest.fn(),
+    onCancel: jest.fn(),
+    loadNameExpressionOptions: jest.fn(async () => ({ prefix: '', allowUserSpecifiedNames: true })),
+    testMode: true,
+};
+
+describe('DataClassDesigner', () => {
+    beforeAll(() => {
+        global.console.error = jest.fn();
+    });
+
+    test('default properties', async () => {
+        const component = (
+            <DataClassDesignerImpl
+                {...BASE_PROPS}
+                currentPanelIndex={0}
+                firstState={true}
+                onFinish={jest.fn()}
+                onTogglePanel={jest.fn()}
+                setSubmitting={jest.fn()}
+                submitting={false}
+                validatePanel={0}
+                visitedPanels={List()}
+            />
+        );
+        await act(async () => {
+            const { container } = renderWithAppContext(component);
+            expect(container).toMatchSnapshot();
+        });
+
+        expect(document.querySelectorAll('#dataclass-properties-hdr').length).toBe(1);
+        expect(document.querySelectorAll('.domain-form-panel').length).toBe(2);
+        expect(screen.getByText('Import or infer fields from file')).toBeInTheDocument();
+    });
+
+    test('custom properties', async () => {
+        const component = (
+            <DataClassDesignerImpl
+                {...BASE_PROPS}
+                nounSingular="Source"
+                nounPlural="Sources"
+                nameExpressionInfoUrl="https://www.labkey.org/Documentation"
+                nameExpressionPlaceholder="name expression placeholder test"
+                headerText="header text test"
+                appPropertiesOnly={true}
+                saveBtnText="Finish it up"
+                currentPanelIndex={0}
+                firstState={true}
+                onFinish={jest.fn()}
+                onTogglePanel={jest.fn()}
+                setSubmitting={jest.fn()}
+                submitting={false}
+                validatePanel={0}
+                visitedPanels={List()}
+            />
+        );
+        await act(async () => {
+            const { container } = renderWithAppContext(component);
+            expect(container).toMatchSnapshot();
+        });
+
+        expect(document.querySelectorAll('#dataclass-properties-hdr').length).toBe(1);
+        expect(document.querySelectorAll('.domain-form-panel').length).toBe(2);
+        expect(screen.getByText('Import or infer fields from file')).toBeInTheDocument();
+    });
+
+    test('initModel', async () => {
+        const component = (
+            <DataClassDesignerImpl
+                {...BASE_PROPS}
+                initModel={DataClassModel.create(getDomainDetailsJSON)}
+                currentPanelIndex={0}
+                firstState={true}
+                onFinish={jest.fn()}
+                onTogglePanel={jest.fn()}
+                setSubmitting={jest.fn()}
+                submitting={false}
+                validatePanel={0}
+                visitedPanels={List()}
+            />
+        );
+        await act(async () => {
+            const { container } = renderWithAppContext(component);
+            expect(container).toMatchSnapshot();
+        });
+
+        expect(document.querySelectorAll('#dataclass-properties-hdr').length).toBe(1);
+        expect(document.querySelectorAll('.domain-form-panel').length).toBe(2);
+        expect(screen.queryByText('Import or infer fields from file')).not.toBeInTheDocument();
+    });
+
+    test('open fields panel', async () => {
+        const component = <DataClassDesigner {...BASE_PROPS} />;
+        await act(async () => {
+            renderWithAppContext(component);
+        });
+
+        let panelHeader = document.querySelector('div#domain-header');
+        expect(panelHeader?.classList.contains('domain-panel-header-collapsed')).toBeTruthy();
+        expect(panelHeader?.classList.contains('domain-panel-header-expanded')).toBeFalsy();
+        userEvent.click(panelHeader);
+
+        panelHeader = document.querySelector('div#domain-header');
+        expect(panelHeader?.classList.contains('domain-panel-header-collapsed')).toBeFalsy();
+        expect(panelHeader?.classList.contains('domain-panel-header-expanded')).toBeTruthy();
+        expect(screen.queryByText('Import or infer fields from file')).toBeInTheDocument();
+        expect(document.querySelectorAll('.domain-system-fields').length).toBe(1);
+
+        expect(document.querySelectorAll('.alert').length).toBe(2);
+        expect(screen.queryByText(PROPERTIES_PANEL_ERROR_MSG)).toBeInTheDocument();
+        expect(screen.queryByText('Please correct errors in the properties panel before saving.')).toBeInTheDocument();
+    });
+});
diff --git a/packages/components/src/internal/components/domainproperties/dataclasses/__snapshots__/DataClassDesigner.spec.tsx.snap b/packages/components/src/internal/components/domainproperties/dataclasses/__snapshots__/DataClassDesigner.spec.tsx.snap
deleted file mode 100644
index 45d8f689ab..0000000000
--- a/packages/components/src/internal/components/domainproperties/dataclasses/__snapshots__/DataClassDesigner.spec.tsx.snap
+++ /dev/null
@@ -1,1558 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`DataClassDesigner custom properties 1`] = `
-<BaseDomainDesigner
-  domains={
-    Immutable.List [
-      Immutable.Record {
-        "name": undefined,
-        "container": undefined,
-        "description": undefined,
-        "domainURI": undefined,
-        "domainId": null,
-        "allowFileLinkProperties": false,
-        "allowAttachmentProperties": false,
-        "allowFlagProperties": true,
-        "allowSampleSubjectProperties": true,
-        "allowTextChoiceProperties": true,
-        "allowTimepointProperties": false,
-        "allowUniqueConstraintProperties": false,
-        "allowUserProperties": true,
-        "showDefaultValueSettings": false,
-        "defaultDefaultValueType": undefined,
-        "defaultValueOptions": Immutable.List [],
-        "fields": Immutable.List [],
-        "indices": Immutable.List [],
-        "domainException": undefined,
-        "mandatoryFieldNames": Immutable.List [],
-        "reservedFieldNames": Immutable.List [],
-        "newDesignFields": undefined,
-        "instructions": undefined,
-        "domainKindName": undefined,
-        "schemaName": undefined,
-        "queryName": undefined,
-        "disabledSystemFields": undefined,
-      },
-    ]
-  }
-  hasValidProperties={false}
-  onCancel={[MockFunction]}
-  onFinish={[Function]}
-  saveBtnText="Finish it up"
-  submitting={false}
-  visitedPanels={Immutable.List []}
->
-  <ComponentWithDomainPropertiesPanelCollapse
-    appPropertiesOnly={true}
-    controlledCollapse={true}
-    headerText="header text test"
-    initCollapsed={false}
-    model={
-      DataClassModel {
-        "domain": Immutable.Record {
-          "name": undefined,
-          "container": undefined,
-          "description": undefined,
-          "domainURI": undefined,
-          "domainId": null,
-          "allowFileLinkProperties": false,
-          "allowAttachmentProperties": false,
-          "allowFlagProperties": true,
-          "allowSampleSubjectProperties": true,
-          "allowTextChoiceProperties": true,
-          "allowTimepointProperties": false,
-          "allowUniqueConstraintProperties": false,
-          "allowUserProperties": true,
-          "showDefaultValueSettings": false,
-          "defaultDefaultValueType": undefined,
-          "defaultValueOptions": Immutable.List [],
-          "fields": Immutable.List [],
-          "indices": Immutable.List [],
-          "domainException": undefined,
-          "mandatoryFieldNames": Immutable.List [],
-          "reservedFieldNames": Immutable.List [],
-          "newDesignFields": undefined,
-          "instructions": undefined,
-          "domainKindName": undefined,
-          "schemaName": undefined,
-          "queryName": undefined,
-          "disabledSystemFields": undefined,
-        },
-        "importAliases": Immutable.Map {},
-        "systemFields": [
-          {
-            "DataType": "Text",
-            "Description": "Contains a short name for this data object",
-            "Disableble": false,
-            "Label": "Name",
-            "Name": "Name",
-            "Required": true,
-          },
-          {
-            "DataType": "Text",
-            "Description": "Contains a description for this data object",
-            "Disableble": true,
-            "Label": "Description",
-            "Name": "Description",
-            "Required": false,
-          },
-        ],
-        Symbol(immer-draftable): true,
-      }
-    }
-    nameExpressionInfoUrl="https://www.labkey.org/Documentation"
-    nameExpressionPlaceholder="name expression placeholder test"
-    namePreviewsLoading={false}
-    nounPlural="Sources"
-    nounSingular="Source"
-    onAddParentAlias={[Function]}
-    onChange={[Function]}
-    onNameFieldHover={[Function]}
-    onParentAliasChange={[Function]}
-    onRemoveParentAlias={[Function]}
-    onToggle={[Function]}
-    panelStatus="NONE"
-    parentAliasHelpText="Column headings used during import to set a source's parentage. The referenced type will also be added as a parent type by default when adding sources manually."
-    updateDupeParentAliases={[Function]}
-    validate={true}
-  />
-  <DomainForm
-    api={
-      {
-        "fetchDomainDetails": [MockFunction],
-        "fetchOntologies": [MockFunction],
-        "getDataClassDetails": [MockFunction],
-        "getDomainNamePreviews": [MockFunction],
-        "getGenId": [MockFunction],
-        "getMaxPhiLevel": [Function],
-        "hasExistingDomainData": [MockFunction],
-        "saveDomain": [MockFunction],
-        "setGenId": [MockFunction],
-        "validateDomainNameExpressions": [MockFunction],
-      }
-    }
-    appPropertiesOnly={true}
-    controlledCollapse={true}
-    domain={
-      Immutable.Record {
-        "name": undefined,
-        "container": undefined,
-        "description": undefined,
-        "domainURI": undefined,
-        "domainId": null,
-        "allowFileLinkProperties": false,
-        "allowAttachmentProperties": false,
-        "allowFlagProperties": true,
-        "allowSampleSubjectProperties": true,
-        "allowTextChoiceProperties": true,
-        "allowTimepointProperties": false,
-        "allowUniqueConstraintProperties": false,
-        "allowUserProperties": true,
-        "showDefaultValueSettings": false,
-        "defaultDefaultValueType": undefined,
-        "defaultValueOptions": Immutable.List [],
-        "fields": Immutable.List [],
-        "indices": Immutable.List [],
-        "domainException": undefined,
-        "mandatoryFieldNames": Immutable.List [],
-        "reservedFieldNames": Immutable.List [],
-        "newDesignFields": undefined,
-        "instructions": undefined,
-        "domainKindName": undefined,
-        "schemaName": undefined,
-        "queryName": undefined,
-        "disabledSystemFields": undefined,
-      }
-    }
-    domainFormDisplayOptions={
-      {
-        "disableMvEnabled": false,
-        "domainKindDisplayName": "data class",
-        "hideAddFieldsButton": false,
-        "hideConditionalFormatting": false,
-        "hideFilePropertyType": false,
-        "hideImportData": false,
-        "hideImportExport": false,
-        "hideRequired": false,
-        "hideStudyPropertyTypes": false,
-        "hideTextOptions": false,
-        "hideValidators": false,
-        "isDragDisabled": false,
-        "phiLevelDisabled": false,
-      }
-    }
-    domainIndex={0}
-    headerTitle="Fields"
-    helpTopic={null}
-    initCollapsed={true}
-    key="0"
-    onChange={[Function]}
-    onToggle={[Function]}
-    panelStatus="TODO"
-    systemFields={
-      [
-        {
-          "DataType": "Text",
-          "Description": "Contains a short name for this data object",
-          "Disableble": false,
-          "Label": "Name",
-          "Name": "Name",
-          "Required": true,
-        },
-        {
-          "DataType": "Text",
-          "Description": "Contains a description for this data object",
-          "Disableble": true,
-          "Label": "Description",
-          "Name": "Description",
-          "Required": false,
-        },
-      ]
-    }
-    testMode={true}
-    validate={false}
-  />
-  <ComponentWithDomainPropertiesPanelCollapse
-    controlledCollapse={true}
-    entityDataType={
-      {
-        "ancestorColumnName": "Ancestors/OtherData",
-        "deleteHelpLinkTopic": "dataClass#prevent",
-        "dependencyText": "derived data or sample dependencies",
-        "descriptionPlural": "parent types",
-        "descriptionSingular": "parent type",
-        "filterCardHeaderClass": "filter-card__header-primary",
-        "importFileAction": "importData",
-        "inputColumnName": "Inputs/Data/First",
-        "inputTypeValueField": "rowId",
-        "insertColumnNamePrefix": "DataInputs/",
-        "instanceSchemaName": "exp.data",
-        "listingSchemaQuery": SchemaQuery {
-          "queryName": "Data",
-          "schemaName": "exp",
-          "viewName": undefined,
-        },
-        "moveActionName": "moveSources.api",
-        "moveControllerName": "experiment",
-        "nounAsParentPlural": "Data Types",
-        "nounAsParentSingular": "Parent",
-        "nounPlural": "sources",
-        "nounSingular": "source",
-        "operationConfirmationActionName": "getDataOperationConfirmationData.api",
-        "operationConfirmationControllerName": "experiment",
-        "projectConfigurableDataType": "DataClass",
-        "sampleFinderCardType": "dataclassparent",
-        "typeIcon": "source_type",
-        "typeListingSchemaQuery": SchemaQuery {
-          "queryName": "DataClasses",
-          "schemaName": "exp",
-          "viewName": undefined,
-        },
-        "typeNounAsParentSingular": "Data Type",
-        "typeNounSingular": "Data Type",
-        "uniqueFieldKey": "Name",
-      }
-    }
-    initCollapsed={true}
-    onToggle={[Function]}
-    onUpdateExcludedProjects={[Function]}
-  />
-  <NameExpressionValidationModal
-    onConfirm={[Function]}
-    onHide={[Function]}
-    show={false}
-  />
-</BaseDomainDesigner>
-`;
-
-exports[`DataClassDesigner default properties 1`] = `
-<BaseDomainDesigner
-  domains={
-    Immutable.List [
-      Immutable.Record {
-        "name": undefined,
-        "container": undefined,
-        "description": undefined,
-        "domainURI": undefined,
-        "domainId": null,
-        "allowFileLinkProperties": false,
-        "allowAttachmentProperties": false,
-        "allowFlagProperties": true,
-        "allowSampleSubjectProperties": true,
-        "allowTextChoiceProperties": true,
-        "allowTimepointProperties": false,
-        "allowUniqueConstraintProperties": false,
-        "allowUserProperties": true,
-        "showDefaultValueSettings": false,
-        "defaultDefaultValueType": undefined,
-        "defaultValueOptions": Immutable.List [],
-        "fields": Immutable.List [],
-        "indices": Immutable.List [],
-        "domainException": undefined,
-        "mandatoryFieldNames": Immutable.List [],
-        "reservedFieldNames": Immutable.List [],
-        "newDesignFields": undefined,
-        "instructions": undefined,
-        "domainKindName": undefined,
-        "schemaName": undefined,
-        "queryName": undefined,
-        "disabledSystemFields": undefined,
-      },
-    ]
-  }
-  hasValidProperties={false}
-  onCancel={[MockFunction]}
-  onFinish={[Function]}
-  submitting={false}
-  visitedPanels={Immutable.List []}
->
-  <ComponentWithDomainPropertiesPanelCollapse
-    controlledCollapse={true}
-    initCollapsed={false}
-    model={
-      DataClassModel {
-        "domain": Immutable.Record {
-          "name": undefined,
-          "container": undefined,
-          "description": undefined,
-          "domainURI": undefined,
-          "domainId": null,
-          "allowFileLinkProperties": false,
-          "allowAttachmentProperties": false,
-          "allowFlagProperties": true,
-          "allowSampleSubjectProperties": true,
-          "allowTextChoiceProperties": true,
-          "allowTimepointProperties": false,
-          "allowUniqueConstraintProperties": false,
-          "allowUserProperties": true,
-          "showDefaultValueSettings": false,
-          "defaultDefaultValueType": undefined,
-          "defaultValueOptions": Immutable.List [],
-          "fields": Immutable.List [],
-          "indices": Immutable.List [],
-          "domainException": undefined,
-          "mandatoryFieldNames": Immutable.List [],
-          "reservedFieldNames": Immutable.List [],
-          "newDesignFields": undefined,
-          "instructions": undefined,
-          "domainKindName": undefined,
-          "schemaName": undefined,
-          "queryName": undefined,
-          "disabledSystemFields": undefined,
-        },
-        "importAliases": Immutable.Map {},
-        "systemFields": [
-          {
-            "DataType": "Text",
-            "Description": "Contains a short name for this data object",
-            "Disableble": false,
-            "Label": "Name",
-            "Name": "Name",
-            "Required": true,
-          },
-          {
-            "DataType": "Text",
-            "Description": "Contains a description for this data object",
-            "Disableble": true,
-            "Label": "Description",
-            "Name": "Description",
-            "Required": false,
-          },
-        ],
-        Symbol(immer-draftable): true,
-      }
-    }
-    namePreviewsLoading={false}
-    nounPlural="Data Classes"
-    nounSingular="Data Class"
-    onAddParentAlias={[Function]}
-    onChange={[Function]}
-    onNameFieldHover={[Function]}
-    onParentAliasChange={[Function]}
-    onRemoveParentAlias={[Function]}
-    onToggle={[Function]}
-    panelStatus="NONE"
-    parentAliasHelpText="Column headings used during import to set a data class's parentage. The referenced type will also be added as a parent type by default when adding data classes manually."
-    updateDupeParentAliases={[Function]}
-    validate={true}
-  />
-  <DomainForm
-    api={
-      {
-        "fetchDomainDetails": [MockFunction],
-        "fetchOntologies": [MockFunction],
-        "getDataClassDetails": [MockFunction],
-        "getDomainNamePreviews": [MockFunction],
-        "getGenId": [MockFunction],
-        "getMaxPhiLevel": [Function],
-        "hasExistingDomainData": [MockFunction],
-        "saveDomain": [MockFunction],
-        "setGenId": [MockFunction],
-        "validateDomainNameExpressions": [MockFunction],
-      }
-    }
-    controlledCollapse={true}
-    domain={
-      Immutable.Record {
-        "name": undefined,
-        "container": undefined,
-        "description": undefined,
-        "domainURI": undefined,
-        "domainId": null,
-        "allowFileLinkProperties": false,
-        "allowAttachmentProperties": false,
-        "allowFlagProperties": true,
-        "allowSampleSubjectProperties": true,
-        "allowTextChoiceProperties": true,
-        "allowTimepointProperties": false,
-        "allowUniqueConstraintProperties": false,
-        "allowUserProperties": true,
-        "showDefaultValueSettings": false,
-        "defaultDefaultValueType": undefined,
-        "defaultValueOptions": Immutable.List [],
-        "fields": Immutable.List [],
-        "indices": Immutable.List [],
-        "domainException": undefined,
-        "mandatoryFieldNames": Immutable.List [],
-        "reservedFieldNames": Immutable.List [],
-        "newDesignFields": undefined,
-        "instructions": undefined,
-        "domainKindName": undefined,
-        "schemaName": undefined,
-        "queryName": undefined,
-        "disabledSystemFields": undefined,
-      }
-    }
-    domainFormDisplayOptions={
-      {
-        "disableMvEnabled": false,
-        "domainKindDisplayName": "data class",
-        "hideAddFieldsButton": false,
-        "hideConditionalFormatting": false,
-        "hideFilePropertyType": false,
-        "hideImportData": false,
-        "hideImportExport": false,
-        "hideRequired": false,
-        "hideStudyPropertyTypes": false,
-        "hideTextOptions": false,
-        "hideValidators": false,
-        "isDragDisabled": false,
-        "phiLevelDisabled": false,
-      }
-    }
-    domainIndex={0}
-    headerTitle="Fields"
-    helpTopic={null}
-    initCollapsed={true}
-    key="0"
-    onChange={[Function]}
-    onToggle={[Function]}
-    panelStatus="TODO"
-    systemFields={
-      [
-        {
-          "DataType": "Text",
-          "Description": "Contains a short name for this data object",
-          "Disableble": false,
-          "Label": "Name",
-          "Name": "Name",
-          "Required": true,
-        },
-        {
-          "DataType": "Text",
-          "Description": "Contains a description for this data object",
-          "Disableble": true,
-          "Label": "Description",
-          "Name": "Description",
-          "Required": false,
-        },
-      ]
-    }
-    testMode={true}
-    validate={false}
-  />
-  <NameExpressionValidationModal
-    onConfirm={[Function]}
-    onHide={[Function]}
-    show={false}
-  />
-</BaseDomainDesigner>
-`;
-
-exports[`DataClassDesigner initModel 1`] = `
-<BaseDomainDesigner
-  domains={
-    Immutable.List [
-      Immutable.Record {
-        "name": "test1",
-        "container": "3E40EE5E-91B7-1036-BF18-F5B7057C168C",
-        "description": null,
-        "domainURI": "urn:lsid:labkey.com:DataClass.Folder-5398:test1",
-        "domainId": 58021,
-        "allowFileLinkProperties": false,
-        "allowAttachmentProperties": true,
-        "allowFlagProperties": true,
-        "allowSampleSubjectProperties": true,
-        "allowTextChoiceProperties": true,
-        "allowTimepointProperties": false,
-        "allowUniqueConstraintProperties": false,
-        "allowUserProperties": true,
-        "showDefaultValueSettings": false,
-        "defaultDefaultValueType": "FIXED_EDITABLE",
-        "defaultValueOptions": Immutable.List [
-          "FIXED_EDITABLE",
-          "LAST_ENTERED",
-        ],
-        "fields": Immutable.List [
-          Immutable.Record {
-            "conceptURI": null,
-            "conditionalFormats": Immutable.List [],
-            "defaultScale": "LINEAR",
-            "defaultValueType": null,
-            "defaultValue": null,
-            "defaultDisplayValue": "[none]",
-            "description": null,
-            "dimension": false,
-            "excludeFromShifting": false,
-            "format": null,
-            "hidden": false,
-            "importAliases": null,
-            "label": null,
-            "lookupContainer": undefined,
-            "lookupQuery": undefined,
-            "lookupSchema": undefined,
-            "lookupValidator": undefined,
-            "lookupIsValid": undefined,
-            "measure": false,
-            "mvEnabled": false,
-            "name": "TextField",
-            "PHI": "NotPHI",
-            "propertyId": 518195,
-            "propertyURI": "urn:lsid:labkey.com:DataClass.Folder-5398:test1#Field1",
-            "propertyValidators": [
-              {
-                "description": null,
-                "errorMessage": null,
-                "expression": "~lte=4000",
-                "name": "Text Length",
-                "new": true,
-                "properties": {},
-                "rowId": 261363,
-                "type": "Length",
-              },
-            ],
-            "rangeValidators": Immutable.List [],
-            "rangeURI": "http://www.w3.org/2001/XMLSchema#string",
-            "regexValidators": Immutable.List [],
-            "textChoiceValidator": undefined,
-            "recommendedVariable": false,
-            "uniqueConstraint": false,
-            "required": true,
-            "scale": 4000,
-            "URL": null,
-            "shownInDetailsView": true,
-            "shownInInsertView": true,
-            "shownInUpdateView": true,
-            "visible": true,
-            "dataType": Immutable.Record {
-              "conceptURI": undefined,
-              "display": "Text",
-              "name": "string",
-              "rangeURI": "http://www.w3.org/2001/XMLSchema#string",
-              "alternateRangeURI": "xsd:string",
-              "shortDisplay": "String",
-              "lookupSchema": undefined,
-              "lookupQuery": undefined,
-            },
-            "lookupQueryValue": undefined,
-            "lookupType": Immutable.Record {
-              "conceptURI": undefined,
-              "display": "Lookup",
-              "name": "lookup",
-              "rangeURI": "http://www.w3.org/2001/XMLSchema#string",
-              "alternateRangeURI": undefined,
-              "shortDisplay": undefined,
-              "lookupSchema": undefined,
-              "lookupQuery": undefined,
-            },
-            "original": {
-              "conceptURI": null,
-              "dataType": Immutable.Record {
-                "conceptURI": undefined,
-                "display": "Text",
-                "name": "string",
-                "rangeURI": "http://www.w3.org/2001/XMLSchema#string",
-                "alternateRangeURI": "xsd:string",
-                "shortDisplay": "String",
-                "lookupSchema": undefined,
-                "lookupQuery": undefined,
-              },
-              "name": "TextField",
-              "rangeURI": "http://www.w3.org/2001/XMLSchema#string",
-            },
-            "updatedField": false,
-            "isPrimaryKey": false,
-            "lockType": "NotLocked",
-            "wrappedColumnName": undefined,
-            "disablePhiLevel": false,
-            "lockExistingField": false,
-            "sourceOntology": undefined,
-            "conceptSubtree": undefined,
-            "conceptLabelColumn": undefined,
-            "conceptImportColumn": undefined,
-            "principalConceptCode": undefined,
-            "derivationDataScope": undefined,
-            "selected": false,
-            "scannable": false,
-          },
-          Immutable.Record {
-            "conceptURI": null,
-            "conditionalFormats": Immutable.List [],
-            "defaultScale": "LINEAR",
-            "defaultValueType": "FIXED_EDITABLE",
-            "defaultValue": null,
-            "defaultDisplayValue": "[none]",
-            "description": null,
-            "dimension": false,
-            "excludeFromShifting": false,
-            "format": null,
-            "hidden": false,
-            "importAliases": null,
-            "label": null,
-            "lookupContainer": undefined,
-            "lookupQuery": undefined,
-            "lookupSchema": undefined,
-            "lookupValidator": undefined,
-            "lookupIsValid": undefined,
-            "measure": true,
-            "mvEnabled": false,
-            "name": "IntField",
-            "PHI": "NotPHI",
-            "propertyId": 521044,
-            "propertyURI": "urn:lsid:labkey.com:DataClass.Folder-5398:test1#IntField",
-            "propertyValidators": [],
-            "rangeValidators": Immutable.List [],
-            "rangeURI": "http://www.w3.org/2001/XMLSchema#int",
-            "regexValidators": Immutable.List [],
-            "textChoiceValidator": undefined,
-            "recommendedVariable": false,
-            "uniqueConstraint": false,
-            "required": false,
-            "scale": 4000,
-            "URL": null,
-            "shownInDetailsView": true,
-            "shownInInsertView": true,
-            "shownInUpdateView": true,
-            "visible": true,
-            "dataType": Immutable.Record {
-              "conceptURI": undefined,
-              "display": "Integer",
-              "name": "int",
-              "rangeURI": "http://www.w3.org/2001/XMLSchema#int",
-              "alternateRangeURI": "xsd:int",
-              "shortDisplay": undefined,
-              "lookupSchema": undefined,
-              "lookupQuery": undefined,
-            },
-            "lookupQueryValue": undefined,
-            "lookupType": Immutable.Record {
-              "conceptURI": undefined,
-              "display": "Lookup",
-              "name": "lookup",
-              "rangeURI": "http://www.w3.org/2001/XMLSchema#int",
-              "alternateRangeURI": undefined,
-              "shortDisplay": undefined,
-              "lookupSchema": undefined,
-              "lookupQuery": undefined,
-            },
-            "original": {
-              "conceptURI": null,
-              "dataType": Immutable.Record {
-                "conceptURI": undefined,
-                "display": "Integer",
-                "name": "int",
-                "rangeURI": "http://www.w3.org/2001/XMLSchema#int",
-                "alternateRangeURI": "xsd:int",
-                "shortDisplay": undefined,
-                "lookupSchema": undefined,
-                "lookupQuery": undefined,
-              },
-              "name": "IntField",
-              "rangeURI": "http://www.w3.org/2001/XMLSchema#int",
-            },
-            "updatedField": false,
-            "isPrimaryKey": false,
-            "lockType": "NotLocked",
-            "wrappedColumnName": undefined,
-            "disablePhiLevel": false,
-            "lockExistingField": false,
-            "sourceOntology": undefined,
-            "conceptSubtree": undefined,
-            "conceptLabelColumn": undefined,
-            "conceptImportColumn": undefined,
-            "principalConceptCode": undefined,
-            "derivationDataScope": undefined,
-            "selected": false,
-            "scannable": false,
-          },
-          Immutable.Record {
-            "conceptURI": null,
-            "conditionalFormats": Immutable.List [],
-            "defaultScale": "LINEAR",
-            "defaultValueType": "FIXED_EDITABLE",
-            "defaultValue": null,
-            "defaultDisplayValue": "[none]",
-            "description": null,
-            "dimension": false,
-            "excludeFromShifting": false,
-            "format": null,
-            "hidden": false,
-            "importAliases": null,
-            "label": null,
-            "lookupContainer": undefined,
-            "lookupQuery": undefined,
-            "lookupSchema": undefined,
-            "lookupValidator": undefined,
-            "lookupIsValid": undefined,
-            "measure": false,
-            "mvEnabled": false,
-            "name": "DateField",
-            "PHI": "NotPHI",
-            "propertyId": 521045,
-            "propertyURI": "urn:lsid:labkey.com:DataClass.Folder-5398:test1#DateField",
-            "propertyValidators": [],
-            "rangeValidators": Immutable.List [],
-            "rangeURI": "http://www.w3.org/2001/XMLSchema#dateTime",
-            "regexValidators": Immutable.List [],
-            "textChoiceValidator": undefined,
-            "recommendedVariable": false,
-            "uniqueConstraint": false,
-            "required": false,
-            "scale": 4000,
-            "URL": null,
-            "shownInDetailsView": true,
-            "shownInInsertView": true,
-            "shownInUpdateView": true,
-            "visible": true,
-            "dataType": Immutable.Record {
-              "conceptURI": undefined,
-              "display": "Date Time",
-              "name": "dateTime",
-              "rangeURI": "http://www.w3.org/2001/XMLSchema#dateTime",
-              "alternateRangeURI": "xsd:dateTime",
-              "shortDisplay": undefined,
-              "lookupSchema": undefined,
-              "lookupQuery": undefined,
-            },
-            "lookupQueryValue": undefined,
-            "lookupType": Immutable.Record {
-              "conceptURI": undefined,
-              "display": "Lookup",
-              "name": "lookup",
-              "rangeURI": "http://www.w3.org/2001/XMLSchema#dateTime",
-              "alternateRangeURI": undefined,
-              "shortDisplay": undefined,
-              "lookupSchema": undefined,
-              "lookupQuery": undefined,
-            },
-            "original": {
-              "conceptURI": null,
-              "dataType": Immutable.Record {
-                "conceptURI": undefined,
-                "display": "Date Time",
-                "name": "dateTime",
-                "rangeURI": "http://www.w3.org/2001/XMLSchema#dateTime",
-                "alternateRangeURI": "xsd:dateTime",
-                "shortDisplay": undefined,
-                "lookupSchema": undefined,
-                "lookupQuery": undefined,
-              },
-              "name": "DateField",
-              "rangeURI": "http://www.w3.org/2001/XMLSchema#dateTime",
-            },
-            "updatedField": false,
-            "isPrimaryKey": false,
-            "lockType": "NotLocked",
-            "wrappedColumnName": undefined,
-            "disablePhiLevel": false,
-            "lockExistingField": false,
-            "sourceOntology": undefined,
-            "conceptSubtree": undefined,
-            "conceptLabelColumn": undefined,
-            "conceptImportColumn": undefined,
-            "principalConceptCode": undefined,
-            "derivationDataScope": undefined,
-            "selected": false,
-            "scannable": false,
-          },
-        ],
-        "indices": Immutable.List [],
-        "domainException": undefined,
-        "mandatoryFieldNames": Immutable.List [],
-        "reservedFieldNames": Immutable.List [],
-        "newDesignFields": undefined,
-        "instructions": null,
-        "domainKindName": undefined,
-        "schemaName": null,
-        "queryName": null,
-        "disabledSystemFields": undefined,
-      },
-    ]
-  }
-  hasValidProperties={true}
-  name="test1"
-  onCancel={[MockFunction]}
-  onFinish={[Function]}
-  submitting={false}
-  visitedPanels={Immutable.List []}
->
-  <ComponentWithDomainPropertiesPanelCollapse
-    controlledCollapse={true}
-    initCollapsed={false}
-    model={
-      DataClassModel {
-        "category": "sources",
-        "description": "with a description",
-        "domain": Immutable.Record {
-          "name": "test1",
-          "container": "3E40EE5E-91B7-1036-BF18-F5B7057C168C",
-          "description": null,
-          "domainURI": "urn:lsid:labkey.com:DataClass.Folder-5398:test1",
-          "domainId": 58021,
-          "allowFileLinkProperties": false,
-          "allowAttachmentProperties": true,
-          "allowFlagProperties": true,
-          "allowSampleSubjectProperties": true,
-          "allowTextChoiceProperties": true,
-          "allowTimepointProperties": false,
-          "allowUniqueConstraintProperties": false,
-          "allowUserProperties": true,
-          "showDefaultValueSettings": false,
-          "defaultDefaultValueType": "FIXED_EDITABLE",
-          "defaultValueOptions": Immutable.List [
-            "FIXED_EDITABLE",
-            "LAST_ENTERED",
-          ],
-          "fields": Immutable.List [
-            Immutable.Record {
-              "conceptURI": null,
-              "conditionalFormats": Immutable.List [],
-              "defaultScale": "LINEAR",
-              "defaultValueType": null,
-              "defaultValue": null,
-              "defaultDisplayValue": "[none]",
-              "description": null,
-              "dimension": false,
-              "excludeFromShifting": false,
-              "format": null,
-              "hidden": false,
-              "importAliases": null,
-              "label": null,
-              "lookupContainer": undefined,
-              "lookupQuery": undefined,
-              "lookupSchema": undefined,
-              "lookupValidator": undefined,
-              "lookupIsValid": undefined,
-              "measure": false,
-              "mvEnabled": false,
-              "name": "TextField",
-              "PHI": "NotPHI",
-              "propertyId": 518195,
-              "propertyURI": "urn:lsid:labkey.com:DataClass.Folder-5398:test1#Field1",
-              "propertyValidators": [
-                {
-                  "description": null,
-                  "errorMessage": null,
-                  "expression": "~lte=4000",
-                  "name": "Text Length",
-                  "new": true,
-                  "properties": {},
-                  "rowId": 261363,
-                  "type": "Length",
-                },
-              ],
-              "rangeValidators": Immutable.List [],
-              "rangeURI": "http://www.w3.org/2001/XMLSchema#string",
-              "regexValidators": Immutable.List [],
-              "textChoiceValidator": undefined,
-              "recommendedVariable": false,
-              "uniqueConstraint": false,
-              "required": true,
-              "scale": 4000,
-              "URL": null,
-              "shownInDetailsView": true,
-              "shownInInsertView": true,
-              "shownInUpdateView": true,
-              "visible": true,
-              "dataType": Immutable.Record {
-                "conceptURI": undefined,
-                "display": "Text",
-                "name": "string",
-                "rangeURI": "http://www.w3.org/2001/XMLSchema#string",
-                "alternateRangeURI": "xsd:string",
-                "shortDisplay": "String",
-                "lookupSchema": undefined,
-                "lookupQuery": undefined,
-              },
-              "lookupQueryValue": undefined,
-              "lookupType": Immutable.Record {
-                "conceptURI": undefined,
-                "display": "Lookup",
-                "name": "lookup",
-                "rangeURI": "http://www.w3.org/2001/XMLSchema#string",
-                "alternateRangeURI": undefined,
-                "shortDisplay": undefined,
-                "lookupSchema": undefined,
-                "lookupQuery": undefined,
-              },
-              "original": {
-                "conceptURI": null,
-                "dataType": Immutable.Record {
-                  "conceptURI": undefined,
-                  "display": "Text",
-                  "name": "string",
-                  "rangeURI": "http://www.w3.org/2001/XMLSchema#string",
-                  "alternateRangeURI": "xsd:string",
-                  "shortDisplay": "String",
-                  "lookupSchema": undefined,
-                  "lookupQuery": undefined,
-                },
-                "name": "TextField",
-                "rangeURI": "http://www.w3.org/2001/XMLSchema#string",
-              },
-              "updatedField": false,
-              "isPrimaryKey": false,
-              "lockType": "NotLocked",
-              "wrappedColumnName": undefined,
-              "disablePhiLevel": false,
-              "lockExistingField": false,
-              "sourceOntology": undefined,
-              "conceptSubtree": undefined,
-              "conceptLabelColumn": undefined,
-              "conceptImportColumn": undefined,
-              "principalConceptCode": undefined,
-              "derivationDataScope": undefined,
-              "selected": false,
-              "scannable": false,
-            },
-            Immutable.Record {
-              "conceptURI": null,
-              "conditionalFormats": Immutable.List [],
-              "defaultScale": "LINEAR",
-              "defaultValueType": "FIXED_EDITABLE",
-              "defaultValue": null,
-              "defaultDisplayValue": "[none]",
-              "description": null,
-              "dimension": false,
-              "excludeFromShifting": false,
-              "format": null,
-              "hidden": false,
-              "importAliases": null,
-              "label": null,
-              "lookupContainer": undefined,
-              "lookupQuery": undefined,
-              "lookupSchema": undefined,
-              "lookupValidator": undefined,
-              "lookupIsValid": undefined,
-              "measure": true,
-              "mvEnabled": false,
-              "name": "IntField",
-              "PHI": "NotPHI",
-              "propertyId": 521044,
-              "propertyURI": "urn:lsid:labkey.com:DataClass.Folder-5398:test1#IntField",
-              "propertyValidators": [],
-              "rangeValidators": Immutable.List [],
-              "rangeURI": "http://www.w3.org/2001/XMLSchema#int",
-              "regexValidators": Immutable.List [],
-              "textChoiceValidator": undefined,
-              "recommendedVariable": false,
-              "uniqueConstraint": false,
-              "required": false,
-              "scale": 4000,
-              "URL": null,
-              "shownInDetailsView": true,
-              "shownInInsertView": true,
-              "shownInUpdateView": true,
-              "visible": true,
-              "dataType": Immutable.Record {
-                "conceptURI": undefined,
-                "display": "Integer",
-                "name": "int",
-                "rangeURI": "http://www.w3.org/2001/XMLSchema#int",
-                "alternateRangeURI": "xsd:int",
-                "shortDisplay": undefined,
-                "lookupSchema": undefined,
-                "lookupQuery": undefined,
-              },
-              "lookupQueryValue": undefined,
-              "lookupType": Immutable.Record {
-                "conceptURI": undefined,
-                "display": "Lookup",
-                "name": "lookup",
-                "rangeURI": "http://www.w3.org/2001/XMLSchema#int",
-                "alternateRangeURI": undefined,
-                "shortDisplay": undefined,
-                "lookupSchema": undefined,
-                "lookupQuery": undefined,
-              },
-              "original": {
-                "conceptURI": null,
-                "dataType": Immutable.Record {
-                  "conceptURI": undefined,
-                  "display": "Integer",
-                  "name": "int",
-                  "rangeURI": "http://www.w3.org/2001/XMLSchema#int",
-                  "alternateRangeURI": "xsd:int",
-                  "shortDisplay": undefined,
-                  "lookupSchema": undefined,
-                  "lookupQuery": undefined,
-                },
-                "name": "IntField",
-                "rangeURI": "http://www.w3.org/2001/XMLSchema#int",
-              },
-              "updatedField": false,
-              "isPrimaryKey": false,
-              "lockType": "NotLocked",
-              "wrappedColumnName": undefined,
-              "disablePhiLevel": false,
-              "lockExistingField": false,
-              "sourceOntology": undefined,
-              "conceptSubtree": undefined,
-              "conceptLabelColumn": undefined,
-              "conceptImportColumn": undefined,
-              "principalConceptCode": undefined,
-              "derivationDataScope": undefined,
-              "selected": false,
-              "scannable": false,
-            },
-            Immutable.Record {
-              "conceptURI": null,
-              "conditionalFormats": Immutable.List [],
-              "defaultScale": "LINEAR",
-              "defaultValueType": "FIXED_EDITABLE",
-              "defaultValue": null,
-              "defaultDisplayValue": "[none]",
-              "description": null,
-              "dimension": false,
-              "excludeFromShifting": false,
-              "format": null,
-              "hidden": false,
-              "importAliases": null,
-              "label": null,
-              "lookupContainer": undefined,
-              "lookupQuery": undefined,
-              "lookupSchema": undefined,
-              "lookupValidator": undefined,
-              "lookupIsValid": undefined,
-              "measure": false,
-              "mvEnabled": false,
-              "name": "DateField",
-              "PHI": "NotPHI",
-              "propertyId": 521045,
-              "propertyURI": "urn:lsid:labkey.com:DataClass.Folder-5398:test1#DateField",
-              "propertyValidators": [],
-              "rangeValidators": Immutable.List [],
-              "rangeURI": "http://www.w3.org/2001/XMLSchema#dateTime",
-              "regexValidators": Immutable.List [],
-              "textChoiceValidator": undefined,
-              "recommendedVariable": false,
-              "uniqueConstraint": false,
-              "required": false,
-              "scale": 4000,
-              "URL": null,
-              "shownInDetailsView": true,
-              "shownInInsertView": true,
-              "shownInUpdateView": true,
-              "visible": true,
-              "dataType": Immutable.Record {
-                "conceptURI": undefined,
-                "display": "Date Time",
-                "name": "dateTime",
-                "rangeURI": "http://www.w3.org/2001/XMLSchema#dateTime",
-                "alternateRangeURI": "xsd:dateTime",
-                "shortDisplay": undefined,
-                "lookupSchema": undefined,
-                "lookupQuery": undefined,
-              },
-              "lookupQueryValue": undefined,
-              "lookupType": Immutable.Record {
-                "conceptURI": undefined,
-                "display": "Lookup",
-                "name": "lookup",
-                "rangeURI": "http://www.w3.org/2001/XMLSchema#dateTime",
-                "alternateRangeURI": undefined,
-                "shortDisplay": undefined,
-                "lookupSchema": undefined,
-                "lookupQuery": undefined,
-              },
-              "original": {
-                "conceptURI": null,
-                "dataType": Immutable.Record {
-                  "conceptURI": undefined,
-                  "display": "Date Time",
-                  "name": "dateTime",
-                  "rangeURI": "http://www.w3.org/2001/XMLSchema#dateTime",
-                  "alternateRangeURI": "xsd:dateTime",
-                  "shortDisplay": undefined,
-                  "lookupSchema": undefined,
-                  "lookupQuery": undefined,
-                },
-                "name": "DateField",
-                "rangeURI": "http://www.w3.org/2001/XMLSchema#dateTime",
-              },
-              "updatedField": false,
-              "isPrimaryKey": false,
-              "lockType": "NotLocked",
-              "wrappedColumnName": undefined,
-              "disablePhiLevel": false,
-              "lockExistingField": false,
-              "sourceOntology": undefined,
-              "conceptSubtree": undefined,
-              "conceptLabelColumn": undefined,
-              "conceptImportColumn": undefined,
-              "principalConceptCode": undefined,
-              "derivationDataScope": undefined,
-              "selected": false,
-              "scannable": false,
-            },
-          ],
-          "indices": Immutable.List [],
-          "domainException": undefined,
-          "mandatoryFieldNames": Immutable.List [],
-          "reservedFieldNames": Immutable.List [],
-          "newDesignFields": undefined,
-          "instructions": null,
-          "domainKindName": undefined,
-          "schemaName": null,
-          "queryName": null,
-          "disabledSystemFields": undefined,
-        },
-        "domainId": 0,
-        "importAliases": Immutable.Map {},
-        "lsid": "urn:lsid:labkey.com:DataClass.Folder-5398:test1",
-        "name": "test1",
-        "nameExpression": "Source-\${genId}",
-        "rowId": 802,
-        "sampleSet": 1085,
-        "systemFields": [
-          {
-            "DataType": "Text",
-            "Description": "Contains a short name for this data object",
-            "Disableble": false,
-            "Label": "Source ID",
-            "Name": "Name",
-            "Required": true,
-          },
-          {
-            "DataType": "Text",
-            "Description": "Contains a description for this data object",
-            "Disableble": true,
-            "Label": "Description",
-            "Name": "Description",
-            "Required": false,
-          },
-        ],
-        Symbol(immer-draftable): true,
-      }
-    }
-    namePreviewsLoading={false}
-    nounPlural="Data Classes"
-    nounSingular="Data Class"
-    onAddParentAlias={[Function]}
-    onChange={[Function]}
-    onNameFieldHover={[Function]}
-    onParentAliasChange={[Function]}
-    onRemoveParentAlias={[Function]}
-    onToggle={[Function]}
-    panelStatus="COMPLETE"
-    parentAliasHelpText="Column headings used during import to set a data class's parentage. The referenced type will also be added as a parent type by default when adding data classes manually."
-    updateDupeParentAliases={[Function]}
-    validate={true}
-  />
-  <DomainForm
-    api={
-      {
-        "fetchDomainDetails": [MockFunction],
-        "fetchOntologies": [MockFunction],
-        "getDataClassDetails": [MockFunction],
-        "getDomainNamePreviews": [MockFunction],
-        "getGenId": [MockFunction],
-        "getMaxPhiLevel": [Function],
-        "hasExistingDomainData": [MockFunction],
-        "saveDomain": [MockFunction],
-        "setGenId": [MockFunction],
-        "validateDomainNameExpressions": [MockFunction],
-      }
-    }
-    controlledCollapse={true}
-    domain={
-      Immutable.Record {
-        "name": "test1",
-        "container": "3E40EE5E-91B7-1036-BF18-F5B7057C168C",
-        "description": null,
-        "domainURI": "urn:lsid:labkey.com:DataClass.Folder-5398:test1",
-        "domainId": 58021,
-        "allowFileLinkProperties": false,
-        "allowAttachmentProperties": true,
-        "allowFlagProperties": true,
-        "allowSampleSubjectProperties": true,
-        "allowTextChoiceProperties": true,
-        "allowTimepointProperties": false,
-        "allowUniqueConstraintProperties": false,
-        "allowUserProperties": true,
-        "showDefaultValueSettings": false,
-        "defaultDefaultValueType": "FIXED_EDITABLE",
-        "defaultValueOptions": Immutable.List [
-          "FIXED_EDITABLE",
-          "LAST_ENTERED",
-        ],
-        "fields": Immutable.List [
-          Immutable.Record {
-            "conceptURI": null,
-            "conditionalFormats": Immutable.List [],
-            "defaultScale": "LINEAR",
-            "defaultValueType": null,
-            "defaultValue": null,
-            "defaultDisplayValue": "[none]",
-            "description": null,
-            "dimension": false,
-            "excludeFromShifting": false,
-            "format": null,
-            "hidden": false,
-            "importAliases": null,
-            "label": null,
-            "lookupContainer": undefined,
-            "lookupQuery": undefined,
-            "lookupSchema": undefined,
-            "lookupValidator": undefined,
-            "lookupIsValid": undefined,
-            "measure": false,
-            "mvEnabled": false,
-            "name": "TextField",
-            "PHI": "NotPHI",
-            "propertyId": 518195,
-            "propertyURI": "urn:lsid:labkey.com:DataClass.Folder-5398:test1#Field1",
-            "propertyValidators": [
-              {
-                "description": null,
-                "errorMessage": null,
-                "expression": "~lte=4000",
-                "name": "Text Length",
-                "new": true,
-                "properties": {},
-                "rowId": 261363,
-                "type": "Length",
-              },
-            ],
-            "rangeValidators": Immutable.List [],
-            "rangeURI": "http://www.w3.org/2001/XMLSchema#string",
-            "regexValidators": Immutable.List [],
-            "textChoiceValidator": undefined,
-            "recommendedVariable": false,
-            "uniqueConstraint": false,
-            "required": true,
-            "scale": 4000,
-            "URL": null,
-            "shownInDetailsView": true,
-            "shownInInsertView": true,
-            "shownInUpdateView": true,
-            "visible": true,
-            "dataType": Immutable.Record {
-              "conceptURI": undefined,
-              "display": "Text",
-              "name": "string",
-              "rangeURI": "http://www.w3.org/2001/XMLSchema#string",
-              "alternateRangeURI": "xsd:string",
-              "shortDisplay": "String",
-              "lookupSchema": undefined,
-              "lookupQuery": undefined,
-            },
-            "lookupQueryValue": undefined,
-            "lookupType": Immutable.Record {
-              "conceptURI": undefined,
-              "display": "Lookup",
-              "name": "lookup",
-              "rangeURI": "http://www.w3.org/2001/XMLSchema#string",
-              "alternateRangeURI": undefined,
-              "shortDisplay": undefined,
-              "lookupSchema": undefined,
-              "lookupQuery": undefined,
-            },
-            "original": {
-              "conceptURI": null,
-              "dataType": Immutable.Record {
-                "conceptURI": undefined,
-                "display": "Text",
-                "name": "string",
-                "rangeURI": "http://www.w3.org/2001/XMLSchema#string",
-                "alternateRangeURI": "xsd:string",
-                "shortDisplay": "String",
-                "lookupSchema": undefined,
-                "lookupQuery": undefined,
-              },
-              "name": "TextField",
-              "rangeURI": "http://www.w3.org/2001/XMLSchema#string",
-            },
-            "updatedField": false,
-            "isPrimaryKey": false,
-            "lockType": "NotLocked",
-            "wrappedColumnName": undefined,
-            "disablePhiLevel": false,
-            "lockExistingField": false,
-            "sourceOntology": undefined,
-            "conceptSubtree": undefined,
-            "conceptLabelColumn": undefined,
-            "conceptImportColumn": undefined,
-            "principalConceptCode": undefined,
-            "derivationDataScope": undefined,
-            "selected": false,
-            "scannable": false,
-          },
-          Immutable.Record {
-            "conceptURI": null,
-            "conditionalFormats": Immutable.List [],
-            "defaultScale": "LINEAR",
-            "defaultValueType": "FIXED_EDITABLE",
-            "defaultValue": null,
-            "defaultDisplayValue": "[none]",
-            "description": null,
-            "dimension": false,
-            "excludeFromShifting": false,
-            "format": null,
-            "hidden": false,
-            "importAliases": null,
-            "label": null,
-            "lookupContainer": undefined,
-            "lookupQuery": undefined,
-            "lookupSchema": undefined,
-            "lookupValidator": undefined,
-            "lookupIsValid": undefined,
-            "measure": true,
-            "mvEnabled": false,
-            "name": "IntField",
-            "PHI": "NotPHI",
-            "propertyId": 521044,
-            "propertyURI": "urn:lsid:labkey.com:DataClass.Folder-5398:test1#IntField",
-            "propertyValidators": [],
-            "rangeValidators": Immutable.List [],
-            "rangeURI": "http://www.w3.org/2001/XMLSchema#int",
-            "regexValidators": Immutable.List [],
-            "textChoiceValidator": undefined,
-            "recommendedVariable": false,
-            "uniqueConstraint": false,
-            "required": false,
-            "scale": 4000,
-            "URL": null,
-            "shownInDetailsView": true,
-            "shownInInsertView": true,
-            "shownInUpdateView": true,
-            "visible": true,
-            "dataType": Immutable.Record {
-              "conceptURI": undefined,
-              "display": "Integer",
-              "name": "int",
-              "rangeURI": "http://www.w3.org/2001/XMLSchema#int",
-              "alternateRangeURI": "xsd:int",
-              "shortDisplay": undefined,
-              "lookupSchema": undefined,
-              "lookupQuery": undefined,
-            },
-            "lookupQueryValue": undefined,
-            "lookupType": Immutable.Record {
-              "conceptURI": undefined,
-              "display": "Lookup",
-              "name": "lookup",
-              "rangeURI": "http://www.w3.org/2001/XMLSchema#int",
-              "alternateRangeURI": undefined,
-              "shortDisplay": undefined,
-              "lookupSchema": undefined,
-              "lookupQuery": undefined,
-            },
-            "original": {
-              "conceptURI": null,
-              "dataType": Immutable.Record {
-                "conceptURI": undefined,
-                "display": "Integer",
-                "name": "int",
-                "rangeURI": "http://www.w3.org/2001/XMLSchema#int",
-                "alternateRangeURI": "xsd:int",
-                "shortDisplay": undefined,
-                "lookupSchema": undefined,
-                "lookupQuery": undefined,
-              },
-              "name": "IntField",
-              "rangeURI": "http://www.w3.org/2001/XMLSchema#int",
-            },
-            "updatedField": false,
-            "isPrimaryKey": false,
-            "lockType": "NotLocked",
-            "wrappedColumnName": undefined,
-            "disablePhiLevel": false,
-            "lockExistingField": false,
-            "sourceOntology": undefined,
-            "conceptSubtree": undefined,
-            "conceptLabelColumn": undefined,
-            "conceptImportColumn": undefined,
-            "principalConceptCode": undefined,
-            "derivationDataScope": undefined,
-            "selected": false,
-            "scannable": false,
-          },
-          Immutable.Record {
-            "conceptURI": null,
-            "conditionalFormats": Immutable.List [],
-            "defaultScale": "LINEAR",
-            "defaultValueType": "FIXED_EDITABLE",
-            "defaultValue": null,
-            "defaultDisplayValue": "[none]",
-            "description": null,
-            "dimension": false,
-            "excludeFromShifting": false,
-            "format": null,
-            "hidden": false,
-            "importAliases": null,
-            "label": null,
-            "lookupContainer": undefined,
-            "lookupQuery": undefined,
-            "lookupSchema": undefined,
-            "lookupValidator": undefined,
-            "lookupIsValid": undefined,
-            "measure": false,
-            "mvEnabled": false,
-            "name": "DateField",
-            "PHI": "NotPHI",
-            "propertyId": 521045,
-            "propertyURI": "urn:lsid:labkey.com:DataClass.Folder-5398:test1#DateField",
-            "propertyValidators": [],
-            "rangeValidators": Immutable.List [],
-            "rangeURI": "http://www.w3.org/2001/XMLSchema#dateTime",
-            "regexValidators": Immutable.List [],
-            "textChoiceValidator": undefined,
-            "recommendedVariable": false,
-            "uniqueConstraint": false,
-            "required": false,
-            "scale": 4000,
-            "URL": null,
-            "shownInDetailsView": true,
-            "shownInInsertView": true,
-            "shownInUpdateView": true,
-            "visible": true,
-            "dataType": Immutable.Record {
-              "conceptURI": undefined,
-              "display": "Date Time",
-              "name": "dateTime",
-              "rangeURI": "http://www.w3.org/2001/XMLSchema#dateTime",
-              "alternateRangeURI": "xsd:dateTime",
-              "shortDisplay": undefined,
-              "lookupSchema": undefined,
-              "lookupQuery": undefined,
-            },
-            "lookupQueryValue": undefined,
-            "lookupType": Immutable.Record {
-              "conceptURI": undefined,
-              "display": "Lookup",
-              "name": "lookup",
-              "rangeURI": "http://www.w3.org/2001/XMLSchema#dateTime",
-              "alternateRangeURI": undefined,
-              "shortDisplay": undefined,
-              "lookupSchema": undefined,
-              "lookupQuery": undefined,
-            },
-            "original": {
-              "conceptURI": null,
-              "dataType": Immutable.Record {
-                "conceptURI": undefined,
-                "display": "Date Time",
-                "name": "dateTime",
-                "rangeURI": "http://www.w3.org/2001/XMLSchema#dateTime",
-                "alternateRangeURI": "xsd:dateTime",
-                "shortDisplay": undefined,
-                "lookupSchema": undefined,
-                "lookupQuery": undefined,
-              },
-              "name": "DateField",
-              "rangeURI": "http://www.w3.org/2001/XMLSchema#dateTime",
-            },
-            "updatedField": false,
-            "isPrimaryKey": false,
-            "lockType": "NotLocked",
-            "wrappedColumnName": undefined,
-            "disablePhiLevel": false,
-            "lockExistingField": false,
-            "sourceOntology": undefined,
-            "conceptSubtree": undefined,
-            "conceptLabelColumn": undefined,
-            "conceptImportColumn": undefined,
-            "principalConceptCode": undefined,
-            "derivationDataScope": undefined,
-            "selected": false,
-            "scannable": false,
-          },
-        ],
-        "indices": Immutable.List [],
-        "domainException": undefined,
-        "mandatoryFieldNames": Immutable.List [],
-        "reservedFieldNames": Immutable.List [],
-        "newDesignFields": undefined,
-        "instructions": null,
-        "domainKindName": undefined,
-        "schemaName": null,
-        "queryName": null,
-        "disabledSystemFields": undefined,
-      }
-    }
-    domainFormDisplayOptions={
-      {
-        "disableMvEnabled": false,
-        "domainKindDisplayName": "data class",
-        "hideAddFieldsButton": false,
-        "hideConditionalFormatting": false,
-        "hideFilePropertyType": false,
-        "hideImportData": false,
-        "hideImportExport": false,
-        "hideRequired": false,
-        "hideStudyPropertyTypes": false,
-        "hideTextOptions": false,
-        "hideValidators": false,
-        "isDragDisabled": false,
-        "phiLevelDisabled": false,
-      }
-    }
-    domainIndex={0}
-    headerTitle="Fields"
-    helpTopic={null}
-    initCollapsed={true}
-    key="58021"
-    onChange={[Function]}
-    onToggle={[Function]}
-    panelStatus="COMPLETE"
-    systemFields={
-      [
-        {
-          "DataType": "Text",
-          "Description": "Contains a short name for this data object",
-          "Disableble": false,
-          "Label": "Source ID",
-          "Name": "Name",
-          "Required": true,
-        },
-        {
-          "DataType": "Text",
-          "Description": "Contains a description for this data object",
-          "Disableble": true,
-          "Label": "Description",
-          "Name": "Description",
-          "Required": false,
-        },
-      ]
-    }
-    testMode={true}
-    validate={false}
-  />
-  <NameExpressionValidationModal
-    onConfirm={[Function]}
-    onHide={[Function]}
-    show={false}
-  />
-</BaseDomainDesigner>
-`;
diff --git a/packages/components/src/internal/components/domainproperties/dataclasses/__snapshots__/DataClassDesigner.test.tsx.snap b/packages/components/src/internal/components/domainproperties/dataclasses/__snapshots__/DataClassDesigner.test.tsx.snap
new file mode 100644
index 0000000000..08f9d633db
--- /dev/null
+++ b/packages/components/src/internal/components/domainproperties/dataclasses/__snapshots__/DataClassDesigner.test.tsx.snap
@@ -0,0 +1,3427 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`DataClassDesigner custom properties 1`] = `
+<div>
+  <div
+    class="domain-designer"
+  >
+    <div
+      class="domain-form-panel lk-border-theme-light panel panel-default"
+    >
+      <div
+        class="domain-panel-header domain-heading-collapsible domain-panel-header-expanded labkey-page-nav"
+        id="dataclass-properties-hdr"
+      >
+        <span
+          class="domain-panel-title"
+        >
+          Source Properties
+        </span>
+        <span
+          class="pull-right"
+        >
+          <span
+            class="fa fa-lg fa-minus-square domain-form-collapse-btn"
+          />
+        </span>
+      </div>
+      <div
+        class="panel-collapse collapse in"
+      >
+        <div
+          class="panel-body"
+        >
+          <div
+            class="margin-bottom row"
+          >
+            <div
+              class="col-xs-9"
+            >
+              <div
+                class="entity-form--headerhelp"
+              >
+                header text test
+              </div>
+            </div>
+            <div
+              class="col-xs-3"
+            >
+              <div
+                class="row"
+              >
+                <div
+                  class="col-xs-12"
+                >
+                  <a
+                    class="domain-field-float-right"
+                    href="https://www.labkey.org/Documentation/wiki-page.view?referrer=inPage&name=createDataClass"
+                    rel="noopener noreferrer"
+                    target="_blank"
+                  >
+                    Learn more about designing sources
+                  </a>
+                </div>
+              </div>
+            </div>
+          </div>
+          <form
+            class=""
+          >
+            <div
+              class="margin-bottom margin-top row"
+            >
+              <div
+                class="col-xs-2"
+              >
+                <span
+                  class="domain-no-wrap"
+                >
+                  Name
+                   *
+                </span>
+              </div>
+              <div
+                class="col-xs-10"
+              >
+                <input
+                  class="form-control"
+                  id="entity-name"
+                  placeholder="Enter a name for this source"
+                  type="text"
+                  value=""
+                />
+              </div>
+            </div>
+            <div
+              class="margin-bottom row"
+            >
+              <div
+                class="col-xs-2"
+              >
+                <span
+                  class="domain-no-wrap"
+                >
+                  Description
+                  <span
+                    class="label-help-target"
+                  >
+                    <span
+                      class="label-help-icon fa fa-question-circle"
+                    />
+                  </span>
+                  
+                </span>
+              </div>
+              <div
+                class="col-xs-10"
+              >
+                <textarea
+                  class="form-control"
+                  id="entity-description"
+                />
+              </div>
+            </div>
+            <div
+              class="margin-bottom row"
+            >
+              <div
+                class="col-xs-2"
+              >
+                <div
+                  class="name-expression-label-div"
+                >
+                  Naming 
+                  <span
+                    class="domain-no-wrap"
+                  >
+                    Pattern
+                    <span
+                      class="label-help-target"
+                    >
+                      <span
+                        class="label-help-icon fa fa-question-circle"
+                      />
+                    </span>
+                    
+                  </span>
+                </div>
+              </div>
+              <div
+                class="col-xs-10"
+              >
+                <input
+                  class="form-control"
+                  id="entity-nameExpression"
+                  placeholder="name expression placeholder test"
+                  type="text"
+                  value=""
+                />
+              </div>
+            </div>
+          </form>
+        </div>
+      </div>
+    </div>
+    <div
+      class="domain-form-panel panel panel-default"
+    >
+      <div
+        class="domain-panel-header domain-heading-collapsible domain-panel-header-collapsed"
+        id="domain-header"
+      >
+        <span
+          class="label-help-target"
+        >
+          <span
+            class="domain-panel-status-icon domain-panel-status-icon-blue"
+          >
+            <span
+              class="fa fa-exclamation-circle"
+            />
+          </span>
+        </span>
+        <span
+          class="domain-panel-title"
+        >
+          Fields
+        </span>
+        <span
+          class="pull-right"
+        >
+          <span
+            class="fa fa-lg fa-plus-square domain-form-expand-btn"
+          />
+        </span>
+      </div>
+      <div
+        class="panel-collapse collapse"
+      >
+        <div
+          class="domain-field-top-noBuffer panel-body"
+        >
+          <div
+            class="domain-system-fields"
+          >
+            <div
+              class="domain-system-fields-header"
+            >
+              <div
+                class="domain-system-fields-header__icon"
+              >
+                <i
+                  class="fa fa-lg fa-minus-square"
+                />
+              </div>
+              <div
+                class="domain-system-fields-header__text"
+              >
+                Default System Fields
+              </div>
+            </div>
+          </div>
+          <div
+            class="domain-system-fields__grid collapse in"
+          >
+            <div
+              class="table-responsive"
+            >
+              <div
+                class="grid-messages"
+              />
+              <table
+                class="table table-striped table-bordered table-condensed"
+              >
+                <thead>
+                  <tr>
+                    <th
+                      class="grid-header-cell"
+                      draggable="false"
+                      id="Enabled"
+                    >
+                      Enabled
+                    </th>
+                    <th
+                      class="grid-header-cell"
+                      draggable="false"
+                      id="Name"
+                    >
+                      Name
+                    </th>
+                    <th
+                      class="grid-header-cell"
+                      draggable="false"
+                      id="Label"
+                    >
+                      Label
+                    </th>
+                    <th
+                      class="grid-header-cell"
+                      draggable="false"
+                      id="DataType"
+                    >
+                      Data Type
+                    </th>
+                    <th
+                      class="grid-header-cell"
+                      draggable="false"
+                      id="Required"
+                    >
+                      Required
+                    </th>
+                    <th
+                      class="grid-header-cell"
+                      draggable="false"
+                      id="Description"
+                    >
+                      Description
+                    </th>
+                  </tr>
+                </thead>
+                <tbody>
+                  <tr
+                    class="grid-row-alternate"
+                  >
+                    <td
+                      style="text-align: left;"
+                    >
+                      <input
+                        checked=""
+                        class="grid-panel__row-checkbox"
+                        disabled=""
+                        type="checkbox"
+                      />
+                    </td>
+                    <td
+                      style="text-align: left;"
+                    >
+                      Name
+                    </td>
+                    <td
+                      style="text-align: left;"
+                    >
+                      Name
+                    </td>
+                    <td
+                      style="text-align: left;"
+                    >
+                      Text
+                    </td>
+                    <td
+                      style="text-align: left;"
+                    >
+                      <input
+                        checked=""
+                        class="grid-panel__row-checkbox"
+                        disabled=""
+                        type="checkbox"
+                      />
+                    </td>
+                    <td
+                      style="text-align: left;"
+                    >
+                      Contains a short name for this data object
+                    </td>
+                  </tr>
+                  <tr
+                    class="grid-row"
+                  >
+                    <td
+                      style="text-align: left;"
+                    >
+                      <input
+                        checked=""
+                        class="grid-panel__row-checkbox"
+                        type="checkbox"
+                      />
+                    </td>
+                    <td
+                      style="text-align: left;"
+                    >
+                      Description
+                    </td>
+                    <td
+                      style="text-align: left;"
+                    >
+                      Description
+                    </td>
+                    <td
+                      style="text-align: left;"
+                    >
+                      Text
+                    </td>
+                    <td
+                      style="text-align: left;"
+                    >
+                      <input
+                        class="grid-panel__row-checkbox"
+                        disabled=""
+                        type="checkbox"
+                      />
+                    </td>
+                    <td
+                      style="text-align: left;"
+                    >
+                      Contains a description for this data object
+                    </td>
+                  </tr>
+                </tbody>
+              </table>
+            </div>
+          </div>
+          <div
+            class="domain-custom-fields-header__text"
+          >
+             Custom Fields 
+          </div>
+          <div
+            class="row"
+          >
+            <div
+              class="col-xs-12"
+            />
+          </div>
+          <span
+            class="translator--toggle__wizard"
+          >
+            <div
+              class="row"
+            >
+              <div
+                class="col-sm-12"
+              >
+                <label
+                  class="control-label text-left"
+                >
+                  <strong>
+                    Import or infer fields from file
+                  </strong>
+                </label>
+              </div>
+            </div>
+            <div
+              class="row"
+            >
+              <div
+                class="col-sm-12"
+              >
+                <div
+                  class="wizard-row--container"
+                >
+                  <div
+                    class=""
+                  >
+                    <div
+                      class="file-upload--container block"
+                    >
+                      <label
+                        class="file-upload--label"
+                        for="fileUpload"
+                      >
+                        <i
+                          aria-hidden="true"
+                          class="fa fa-cloud-upload fa-2x cloud-logo"
+                        />
+                        Select file or drag and drop here.
+                      </label>
+                      <input
+                        accept=".csv, .tsv, .txt, .xls, .xlsx, .json"
+                        class="file-upload--input"
+                        id="fileUpload"
+                        name="fileUpload"
+                        type="file"
+                      />
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </span>
+          <div
+            class="row"
+          >
+            <div
+              class="col-md-9"
+            >
+              <div
+                class="file-form-formats"
+              >
+                <strong>
+                  Supported formats include: 
+                </strong>
+                .csv, .tsv, .txt, .xls, .xlsx, .json
+              </div>
+            </div>
+            <div
+              class="col-md-3"
+            >
+              <div
+                class="pull-right"
+              />
+            </div>
+          </div>
+          <div
+            class="margin-top domain-form-manual-section"
+          >
+            <p>
+              Or
+            </p>
+            <div
+              class="form-group"
+            >
+              <div
+                class="domain-form-manual-btn"
+              >
+                <span
+                  class="container--action-button btn btn-default"
+                >
+                  Manually Define Fields
+                </span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div
+      class="form-buttons"
+    >
+      <div
+        class="form-buttons__left"
+      >
+        <button
+          class="cancel-button btn btn-default"
+          type="button"
+        >
+          Cancel
+        </button>
+      </div>
+      <div
+        class="form-buttons__right"
+      >
+        <button
+          class="save-button btn btn-primary"
+          type="button"
+        >
+          Finish it up
+        </button>
+      </div>
+    </div>
+  </div>
+</div>
+`;
+
+exports[`DataClassDesigner default properties 1`] = `
+<div>
+  <div
+    class="domain-designer"
+  >
+    <div
+      class="domain-form-panel lk-border-theme-light panel panel-default"
+    >
+      <div
+        class="domain-panel-header domain-heading-collapsible domain-panel-header-expanded labkey-page-nav"
+        id="dataclass-properties-hdr"
+      >
+        <span
+          class="domain-panel-title"
+        >
+          Data Class Properties
+        </span>
+        <span
+          class="pull-right"
+        >
+          <span
+            class="fa fa-lg fa-minus-square domain-form-collapse-btn"
+          />
+        </span>
+      </div>
+      <div
+        class="panel-collapse collapse in"
+      >
+        <div
+          class="panel-body"
+        >
+          <div
+            class="margin-bottom row"
+          >
+            <div
+              class="col-xs-12"
+            >
+              <div
+                class="row"
+              >
+                <div
+                  class="col-xs-12"
+                >
+                  <a
+                    class="domain-field-float-right"
+                    href="https://www.labkey.org/Documentation/wiki-page.view?referrer=inPage&name=createDataClass"
+                    rel="noopener noreferrer"
+                    target="_blank"
+                  >
+                    Learn more about designing data classes
+                  </a>
+                </div>
+              </div>
+            </div>
+          </div>
+          <form
+            class=""
+          >
+            <div
+              class="margin-bottom margin-top row"
+            >
+              <div
+                class="col-xs-2"
+              >
+                <span
+                  class="domain-no-wrap"
+                >
+                  Name
+                   *
+                </span>
+              </div>
+              <div
+                class="col-xs-10"
+              >
+                <input
+                  class="form-control"
+                  id="entity-name"
+                  placeholder="Enter a name for this data class"
+                  type="text"
+                  value=""
+                />
+              </div>
+            </div>
+            <div
+              class="margin-bottom row"
+            >
+              <div
+                class="col-xs-2"
+              >
+                <span
+                  class="domain-no-wrap"
+                >
+                  Description
+                  <span
+                    class="label-help-target"
+                  >
+                    <span
+                      class="label-help-icon fa fa-question-circle"
+                    />
+                  </span>
+                  
+                </span>
+              </div>
+              <div
+                class="col-xs-10"
+              >
+                <textarea
+                  class="form-control"
+                  id="entity-description"
+                />
+              </div>
+            </div>
+            <div
+              class="margin-bottom row"
+            >
+              <div
+                class="col-xs-2"
+              >
+                <div
+                  class="name-expression-label-div"
+                >
+                  Naming 
+                  <span
+                    class="domain-no-wrap"
+                  >
+                    Pattern
+                    <span
+                      class="label-help-target"
+                    >
+                      <span
+                        class="label-help-icon fa fa-question-circle"
+                      />
+                    </span>
+                    
+                  </span>
+                </div>
+              </div>
+              <div
+                class="col-xs-10"
+              >
+                <input
+                  class="form-control"
+                  id="entity-nameExpression"
+                  placeholder="Enter a naming pattern (e.g., DC-\${now:date}-\${genId})"
+                  type="text"
+                  value=""
+                />
+              </div>
+            </div>
+          </form>
+          <div
+            class="row"
+          >
+            <div
+              class="col-xs-2"
+            >
+              <span
+                class="domain-no-wrap"
+              >
+                Category
+                
+              </span>
+            </div>
+            <div
+              class="col-xs-10"
+            >
+              <div
+                class="select-input-container form-group row"
+              >
+                <div
+                  class="col-sm-9 col-xs-12"
+                >
+                  <div
+                    class="select-input select-input--is-disabled css-3iigni-container"
+                    id="selectinput-0"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-2-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
+                    <div
+                      class="select-input__control select-input__control--is-disabled css-1mgq1wa-control"
+                    >
+                      <div
+                        class="select-input__value-container css-1fdsijx-ValueContainer"
+                      >
+                        <div
+                          class="select-input__placeholder css-pxd85q-placeholder"
+                          id="react-select-2-placeholder"
+                        >
+                          Loading...
+                        </div>
+                        <div
+                          class="select-input__input-container css-1h01tm3-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-describedby="react-select-2-placeholder"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="select-input__input"
+                            disabled=""
+                            id="react-select-2-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
+                          />
+                        </div>
+                      </div>
+                      <div
+                        class="select-input__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="select-input__indicator-separator css-894a34-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="select-input__indicator select-input__dropdown-indicator css-1xc3v61-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div
+            class="row"
+          >
+            <div
+              class="col-xs-2"
+            >
+              Sample 
+              <span
+                class="domain-no-wrap"
+              >
+                Type
+                <span
+                  class="label-help-target"
+                >
+                  <span
+                    class="label-help-icon fa fa-question-circle"
+                  />
+                </span>
+                
+              </span>
+            </div>
+            <div
+              class="col-xs-10"
+            >
+              <div
+                class="select-input-container form-group row"
+              >
+                <div
+                  class="col-sm-9 col-xs-12"
+                >
+                  <div
+                    class="select-input select-input--is-disabled css-3iigni-container"
+                    id="selectinput-1"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-3-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
+                    <div
+                      class="select-input__control select-input__control--is-disabled css-1mgq1wa-control"
+                    >
+                      <div
+                        class="select-input__value-container css-1fdsijx-ValueContainer"
+                      >
+                        <div
+                          class="select-input__placeholder css-pxd85q-placeholder"
+                          id="react-select-3-placeholder"
+                        >
+                          Loading...
+                        </div>
+                        <div
+                          class="select-input__input-container css-1h01tm3-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-describedby="react-select-3-placeholder"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="select-input__input"
+                            disabled=""
+                            id="react-select-3-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
+                          />
+                        </div>
+                      </div>
+                      <div
+                        class="select-input__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="select-input__indicator-separator css-894a34-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="select-input__indicator select-input__dropdown-indicator css-1xc3v61-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div
+      class="domain-form-panel panel panel-default"
+    >
+      <div
+        class="domain-panel-header domain-heading-collapsible domain-panel-header-collapsed"
+        id="domain-header"
+      >
+        <span
+          class="label-help-target"
+        >
+          <span
+            class="domain-panel-status-icon domain-panel-status-icon-blue"
+          >
+            <span
+              class="fa fa-exclamation-circle"
+            />
+          </span>
+        </span>
+        <span
+          class="domain-panel-title"
+        >
+          Fields
+        </span>
+        <span
+          class="pull-right"
+        >
+          <span
+            class="fa fa-lg fa-plus-square domain-form-expand-btn"
+          />
+        </span>
+      </div>
+      <div
+        class="panel-collapse collapse"
+      >
+        <div
+          class="domain-field-top-noBuffer panel-body"
+        >
+          <div
+            class="domain-system-fields"
+          >
+            <div
+              class="domain-system-fields-header"
+            >
+              <div
+                class="domain-system-fields-header__icon"
+              >
+                <i
+                  class="fa fa-lg fa-minus-square"
+                />
+              </div>
+              <div
+                class="domain-system-fields-header__text"
+              >
+                Default System Fields
+              </div>
+            </div>
+          </div>
+          <div
+            class="domain-system-fields__grid collapse in"
+          >
+            <div
+              class="table-responsive"
+            >
+              <div
+                class="grid-messages"
+              />
+              <table
+                class="table table-striped table-bordered table-condensed"
+              >
+                <thead>
+                  <tr>
+                    <th
+                      class="grid-header-cell"
+                      draggable="false"
+                      id="Enabled"
+                    >
+                      Enabled
+                    </th>
+                    <th
+                      class="grid-header-cell"
+                      draggable="false"
+                      id="Name"
+                    >
+                      Name
+                    </th>
+                    <th
+                      class="grid-header-cell"
+                      draggable="false"
+                      id="Label"
+                    >
+                      Label
+                    </th>
+                    <th
+                      class="grid-header-cell"
+                      draggable="false"
+                      id="DataType"
+                    >
+                      Data Type
+                    </th>
+                    <th
+                      class="grid-header-cell"
+                      draggable="false"
+                      id="Required"
+                    >
+                      Required
+                    </th>
+                    <th
+                      class="grid-header-cell"
+                      draggable="false"
+                      id="Description"
+                    >
+                      Description
+                    </th>
+                  </tr>
+                </thead>
+                <tbody>
+                  <tr
+                    class="grid-row-alternate"
+                  >
+                    <td
+                      style="text-align: left;"
+                    >
+                      <input
+                        checked=""
+                        class="grid-panel__row-checkbox"
+                        disabled=""
+                        type="checkbox"
+                      />
+                    </td>
+                    <td
+                      style="text-align: left;"
+                    >
+                      Name
+                    </td>
+                    <td
+                      style="text-align: left;"
+                    >
+                      Name
+                    </td>
+                    <td
+                      style="text-align: left;"
+                    >
+                      Text
+                    </td>
+                    <td
+                      style="text-align: left;"
+                    >
+                      <input
+                        checked=""
+                        class="grid-panel__row-checkbox"
+                        disabled=""
+                        type="checkbox"
+                      />
+                    </td>
+                    <td
+                      style="text-align: left;"
+                    >
+                      Contains a short name for this data object
+                    </td>
+                  </tr>
+                  <tr
+                    class="grid-row"
+                  >
+                    <td
+                      style="text-align: left;"
+                    >
+                      <input
+                        checked=""
+                        class="grid-panel__row-checkbox"
+                        type="checkbox"
+                      />
+                    </td>
+                    <td
+                      style="text-align: left;"
+                    >
+                      Description
+                    </td>
+                    <td
+                      style="text-align: left;"
+                    >
+                      Description
+                    </td>
+                    <td
+                      style="text-align: left;"
+                    >
+                      Text
+                    </td>
+                    <td
+                      style="text-align: left;"
+                    >
+                      <input
+                        class="grid-panel__row-checkbox"
+                        disabled=""
+                        type="checkbox"
+                      />
+                    </td>
+                    <td
+                      style="text-align: left;"
+                    >
+                      Contains a description for this data object
+                    </td>
+                  </tr>
+                </tbody>
+              </table>
+            </div>
+          </div>
+          <div
+            class="domain-custom-fields-header__text"
+          >
+             Custom Fields 
+          </div>
+          <div
+            class="row"
+          >
+            <div
+              class="col-xs-12"
+            />
+          </div>
+          <span
+            class="translator--toggle__wizard"
+          >
+            <div
+              class="row"
+            >
+              <div
+                class="col-sm-12"
+              >
+                <label
+                  class="control-label text-left"
+                >
+                  <strong>
+                    Import or infer fields from file
+                  </strong>
+                </label>
+              </div>
+            </div>
+            <div
+              class="row"
+            >
+              <div
+                class="col-sm-12"
+              >
+                <div
+                  class="wizard-row--container"
+                >
+                  <div
+                    class=""
+                  >
+                    <div
+                      class="file-upload--container block"
+                    >
+                      <label
+                        class="file-upload--label"
+                        for="fileUpload"
+                      >
+                        <i
+                          aria-hidden="true"
+                          class="fa fa-cloud-upload fa-2x cloud-logo"
+                        />
+                        Select file or drag and drop here.
+                      </label>
+                      <input
+                        accept=".csv, .tsv, .txt, .xls, .xlsx, .json"
+                        class="file-upload--input"
+                        id="fileUpload"
+                        name="fileUpload"
+                        type="file"
+                      />
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </span>
+          <div
+            class="row"
+          >
+            <div
+              class="col-md-9"
+            >
+              <div
+                class="file-form-formats"
+              >
+                <strong>
+                  Supported formats include: 
+                </strong>
+                .csv, .tsv, .txt, .xls, .xlsx, .json
+              </div>
+            </div>
+            <div
+              class="col-md-3"
+            >
+              <div
+                class="pull-right"
+              />
+            </div>
+          </div>
+          <div
+            class="margin-top domain-form-manual-section"
+          >
+            <p>
+              Or
+            </p>
+            <div
+              class="form-group"
+            >
+              <div
+                class="domain-form-manual-btn"
+              >
+                <span
+                  class="container--action-button btn btn-default"
+                >
+                  Manually Define Fields
+                </span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div
+      class="form-buttons"
+    >
+      <div
+        class="form-buttons__left"
+      >
+        <button
+          class="cancel-button btn btn-default"
+          type="button"
+        >
+          Cancel
+        </button>
+      </div>
+      <div
+        class="form-buttons__right"
+      >
+        <button
+          class="save-button btn btn-primary"
+          type="button"
+        >
+          Save
+        </button>
+      </div>
+    </div>
+  </div>
+</div>
+`;
+
+exports[`DataClassDesigner initModel 1`] = `
+<div>
+  <div
+    class="domain-designer"
+  >
+    <div
+      class="domain-form-panel lk-border-theme-light panel panel-default"
+    >
+      <div
+        class="domain-panel-header domain-heading-collapsible domain-panel-header-expanded labkey-page-nav"
+        id="dataclass-properties-hdr"
+      >
+        <span
+          class="domain-panel-status-icon"
+        >
+          <span
+            class="fa fa-check-circle"
+          />
+        </span>
+        <span
+          class="domain-panel-title"
+        >
+          Data Class Properties
+        </span>
+        <span
+          class="pull-right"
+        >
+          <span
+            class="fa fa-lg fa-minus-square domain-form-collapse-btn"
+          />
+        </span>
+      </div>
+      <div
+        class="panel-collapse collapse in"
+      >
+        <div
+          class="panel-body"
+        >
+          <div
+            class="margin-bottom row"
+          >
+            <div
+              class="col-xs-12"
+            >
+              <div
+                class="row"
+              >
+                <div
+                  class="col-xs-12"
+                >
+                  <a
+                    class="domain-field-float-right"
+                    href="https://www.labkey.org/Documentation/wiki-page.view?referrer=inPage&name=createDataClass"
+                    rel="noopener noreferrer"
+                    target="_blank"
+                  >
+                    Learn more about designing data classes
+                  </a>
+                </div>
+              </div>
+            </div>
+          </div>
+          <form
+            class=""
+          >
+            <div
+              class="margin-bottom margin-top row"
+            >
+              <div
+                class="col-xs-2"
+              >
+                <span
+                  class="domain-no-wrap"
+                >
+                  Name
+                   *
+                </span>
+              </div>
+              <div
+                class="col-xs-10"
+              >
+                <input
+                  class="form-control"
+                  id="entity-name"
+                  placeholder="Enter a name for this data class"
+                  type="text"
+                  value="test1"
+                />
+              </div>
+            </div>
+            <div
+              class="margin-bottom row"
+            >
+              <div
+                class="col-xs-2"
+              >
+                <span
+                  class="domain-no-wrap"
+                >
+                  Description
+                  <span
+                    class="label-help-target"
+                  >
+                    <span
+                      class="label-help-icon fa fa-question-circle"
+                    />
+                  </span>
+                  
+                </span>
+              </div>
+              <div
+                class="col-xs-10"
+              >
+                <textarea
+                  class="form-control"
+                  id="entity-description"
+                >
+                  with a description
+                </textarea>
+              </div>
+            </div>
+            <div
+              class="margin-bottom row"
+            >
+              <div
+                class="col-xs-2"
+              >
+                <div
+                  class="name-expression-label-div"
+                >
+                  Naming 
+                  <span
+                    class="domain-no-wrap"
+                  >
+                    Pattern
+                    <span
+                      class="label-help-target"
+                    >
+                      <span
+                        class="label-help-icon fa fa-question-circle"
+                      />
+                    </span>
+                    
+                  </span>
+                </div>
+              </div>
+              <div
+                class="col-xs-10"
+              >
+                <input
+                  class="form-control"
+                  id="entity-nameExpression"
+                  placeholder="Enter a naming pattern (e.g., DC-\${now:date}-\${genId})"
+                  type="text"
+                  value="Source-\${genId}"
+                />
+              </div>
+            </div>
+          </form>
+          <div
+            class="row"
+          >
+            <div
+              class="col-xs-2"
+            >
+              <span
+                class="domain-no-wrap"
+              >
+                Category
+                
+              </span>
+            </div>
+            <div
+              class="col-xs-10"
+            >
+              <div
+                class="select-input-container form-group row"
+              >
+                <div
+                  class="col-sm-9 col-xs-12"
+                >
+                  <div
+                    class="select-input select-input--is-disabled css-3iigni-container"
+                    id="selectinput-2"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-4-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
+                    <div
+                      class="select-input__control select-input__control--is-disabled css-1mgq1wa-control"
+                    >
+                      <div
+                        class="select-input__value-container css-1fdsijx-ValueContainer"
+                      >
+                        <div
+                          class="select-input__placeholder css-pxd85q-placeholder"
+                          id="react-select-4-placeholder"
+                        >
+                          Loading...
+                        </div>
+                        <div
+                          class="select-input__input-container css-1h01tm3-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-describedby="react-select-4-placeholder"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="select-input__input"
+                            disabled=""
+                            id="react-select-4-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
+                          />
+                        </div>
+                      </div>
+                      <div
+                        class="select-input__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="select-input__indicator-separator css-894a34-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="select-input__indicator select-input__dropdown-indicator css-1xc3v61-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div
+            class="row"
+          >
+            <div
+              class="col-xs-2"
+            >
+              Sample 
+              <span
+                class="domain-no-wrap"
+              >
+                Type
+                <span
+                  class="label-help-target"
+                >
+                  <span
+                    class="label-help-icon fa fa-question-circle"
+                  />
+                </span>
+                
+              </span>
+            </div>
+            <div
+              class="col-xs-10"
+            >
+              <div
+                class="select-input-container form-group row"
+              >
+                <div
+                  class="col-sm-9 col-xs-12"
+                >
+                  <div
+                    class="select-input select-input--is-disabled css-3iigni-container"
+                    id="selectinput-3"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-5-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
+                    <div
+                      class="select-input__control select-input__control--is-disabled css-1mgq1wa-control"
+                    >
+                      <div
+                        class="select-input__value-container css-1fdsijx-ValueContainer"
+                      >
+                        <div
+                          class="select-input__placeholder css-pxd85q-placeholder"
+                          id="react-select-5-placeholder"
+                        >
+                          Loading...
+                        </div>
+                        <div
+                          class="select-input__input-container css-1h01tm3-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-describedby="react-select-5-placeholder"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="select-input__input"
+                            disabled=""
+                            id="react-select-5-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
+                          />
+                        </div>
+                      </div>
+                      <div
+                        class="select-input__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="select-input__indicator-separator css-894a34-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="select-input__indicator select-input__dropdown-indicator css-1xc3v61-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div
+      class="domain-form-panel panel panel-default"
+    >
+      <div
+        class="domain-panel-header domain-heading-collapsible domain-panel-header-collapsed"
+        id="domainpropertiesrow-test1-hdr"
+      >
+        <span
+          class="domain-panel-status-icon domain-panel-status-icon-green"
+        >
+          <span
+            class="fa fa-check-circle"
+          />
+        </span>
+        <span
+          class="domain-panel-title"
+        >
+          Fields
+        </span>
+        <span
+          class="pull-right"
+        >
+          <span
+            class="fa fa-lg fa-plus-square domain-form-expand-btn"
+          />
+        </span>
+        <span
+          class="domain-panel-header-fields-defined"
+        >
+          3 Fields Defined
+        </span>
+      </div>
+      <div
+        class="panel-collapse collapse"
+      >
+        <div
+          class="domain-field-top-noBuffer panel-body"
+        >
+          <div
+            class="domain-system-fields"
+          >
+            <div
+              class="domain-system-fields-header"
+            >
+              <div
+                class="domain-system-fields-header__icon"
+              >
+                <i
+                  class="fa fa-lg fa-minus-square"
+                />
+              </div>
+              <div
+                class="domain-system-fields-header__text"
+              >
+                Default System Fields
+              </div>
+            </div>
+          </div>
+          <div
+            class="domain-system-fields__grid collapse in"
+          >
+            <div
+              class="table-responsive"
+            >
+              <div
+                class="grid-messages"
+              />
+              <table
+                class="table table-striped table-bordered table-condensed"
+              >
+                <thead>
+                  <tr>
+                    <th
+                      class="grid-header-cell"
+                      draggable="false"
+                      id="Enabled"
+                    >
+                      Enabled
+                    </th>
+                    <th
+                      class="grid-header-cell"
+                      draggable="false"
+                      id="Name"
+                    >
+                      Name
+                    </th>
+                    <th
+                      class="grid-header-cell"
+                      draggable="false"
+                      id="Label"
+                    >
+                      Label
+                    </th>
+                    <th
+                      class="grid-header-cell"
+                      draggable="false"
+                      id="DataType"
+                    >
+                      Data Type
+                    </th>
+                    <th
+                      class="grid-header-cell"
+                      draggable="false"
+                      id="Required"
+                    >
+                      Required
+                    </th>
+                    <th
+                      class="grid-header-cell"
+                      draggable="false"
+                      id="Description"
+                    >
+                      Description
+                    </th>
+                  </tr>
+                </thead>
+                <tbody>
+                  <tr
+                    class="grid-row-alternate"
+                  >
+                    <td
+                      style="text-align: left;"
+                    >
+                      <input
+                        checked=""
+                        class="grid-panel__row-checkbox"
+                        disabled=""
+                        type="checkbox"
+                      />
+                    </td>
+                    <td
+                      style="text-align: left;"
+                    >
+                      Name
+                    </td>
+                    <td
+                      style="text-align: left;"
+                    >
+                      Source ID
+                    </td>
+                    <td
+                      style="text-align: left;"
+                    >
+                      Text
+                    </td>
+                    <td
+                      style="text-align: left;"
+                    >
+                      <input
+                        checked=""
+                        class="grid-panel__row-checkbox"
+                        disabled=""
+                        type="checkbox"
+                      />
+                    </td>
+                    <td
+                      style="text-align: left;"
+                    >
+                      Contains a short name for this data object
+                    </td>
+                  </tr>
+                  <tr
+                    class="grid-row"
+                  >
+                    <td
+                      style="text-align: left;"
+                    >
+                      <input
+                        checked=""
+                        class="grid-panel__row-checkbox"
+                        type="checkbox"
+                      />
+                    </td>
+                    <td
+                      style="text-align: left;"
+                    >
+                      Description
+                    </td>
+                    <td
+                      style="text-align: left;"
+                    >
+                      Description
+                    </td>
+                    <td
+                      style="text-align: left;"
+                    >
+                      Text
+                    </td>
+                    <td
+                      style="text-align: left;"
+                    >
+                      <input
+                        class="grid-panel__row-checkbox"
+                        disabled=""
+                        type="checkbox"
+                      />
+                    </td>
+                    <td
+                      style="text-align: left;"
+                    >
+                      Contains a description for this data object
+                    </td>
+                  </tr>
+                </tbody>
+              </table>
+            </div>
+          </div>
+          <div
+            class="domain-custom-fields-header__text"
+          >
+             Custom Fields 
+          </div>
+          <div
+            class="domain-field-toolbar row"
+          >
+            <div
+              class="col-xs-4"
+            >
+              <div
+                class="container--toolbar-button"
+              >
+                <div
+                  class="domain-toolbar-add-btn"
+                >
+                  <span
+                    class="container--action-button btn btn-default"
+                  >
+                    <i
+                      class="fa fa-plus-circle container--addition-icon"
+                    />
+                     Add 
+                    Field
+                  </span>
+                </div>
+              </div>
+              <div
+                class="container--toolbar-button"
+              >
+                <div
+                  class="domain-toolbar-delete-btn"
+                >
+                  <span
+                    class="container--action-button btn btn-default disabled"
+                  >
+                    <i
+                      class="fa fa-trash domain-toolbar-export-btn-icon"
+                    />
+                     Delete
+                  </span>
+                </div>
+              </div>
+              <div
+                class="container--toolbar-button"
+              >
+                <div
+                  class="domain-toolbar-export-btn"
+                >
+                  <span
+                    class="container--action-button btn btn-default"
+                  >
+                    <i
+                      class="fa fa-download domain-toolbar-export-btn-icon"
+                    />
+                     
+                    Export
+                  </span>
+                </div>
+              </div>
+            </div>
+            <div
+              class="col-xs-8"
+            >
+              <div
+                class="pull-right domain-field-toolbar-right-aligned"
+              >
+                <input
+                  class="domain-search-input form-control"
+                  id="domain-search-name-0"
+                  placeholder="Search Fields"
+                  type="text"
+                />
+              </div>
+            </div>
+          </div>
+          <div
+            class="row"
+          >
+            <div
+              class="col-xs-12"
+            />
+          </div>
+          <div
+            class="domain-field-row domain-row-border-default domain-floating-hdr"
+          >
+            <div
+              class="row"
+            >
+              <div
+                class="domain-field-header"
+              >
+                0
+                 
+                fields
+                 selected
+                <button
+                  class="domain-panel-header-clear-all btn btn-default"
+                  disabled=""
+                  type="button"
+                >
+                  Clear
+                </button>
+              </div>
+            </div>
+            <div
+              class="domain-row-container row"
+            >
+              <div
+                class="domain-row-handle"
+              />
+              <div
+                class="domain-row-action-section"
+              >
+                <div
+                  class="domain-field-check-icon checkbox"
+                >
+                  <label
+                    title=""
+                  >
+                    <input
+                      id="domain-select-all-checkbox"
+                      name="domain-select-all-checkbox"
+                      type="checkbox"
+                    />
+                  </label>
+                </div>
+              </div>
+              <div>
+                <div
+                  class="domain-row-base-fields col-xs-6"
+                >
+                  <div
+                    class="col-xs-6"
+                  >
+                    <b>
+                      Name *
+                    </b>
+                  </div>
+                  <div
+                    class="col-xs-4"
+                  >
+                    <b>
+                      Data Type *
+                    </b>
+                  </div>
+                  <div
+                    class="col-xs-2"
+                  >
+                    <b>
+                      Required
+                    </b>
+                  </div>
+                </div>
+                <div
+                  class="col-xs-6"
+                >
+                  <b>
+                    Details
+                  </b>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div
+            data-rbd-droppable-context-id="0"
+            data-rbd-droppable-id="domain-form-droppable"
+          >
+            <form
+              class="domain-form"
+            >
+              <div
+                class="domain-field-row domain-row-border-default"
+                data-rbd-draggable-context-id="0"
+                data-rbd-draggable-id="domainpropertiesrow-domaindrag-0-0"
+                tabindex="0"
+              >
+                <div
+                  class="domain-row-container row"
+                >
+                  <div
+                    aria-describedby="rbd-hidden-text-0-hidden-text-0"
+                    class="domain-row-handle"
+                    data-rbd-drag-handle-context-id="0"
+                    data-rbd-drag-handle-draggable-id="domainpropertiesrow-domaindrag-0-0"
+                    draggable="false"
+                    role="button"
+                    tabindex="0"
+                  >
+                    <div
+                      class="drag-drop-handle"
+                    >
+                      <span
+                        class="fa fa-ellipsis-v"
+                      />
+                      <span
+                        class="fa fa-ellipsis-v"
+                      />
+                    </div>
+                  </div>
+                  <div
+                    class="domain-row-action-section"
+                  >
+                    <div
+                      class="domain-field-check-icon checkbox"
+                    >
+                      <label
+                        title=""
+                      >
+                        <input
+                          id="domainpropertiesrow-selected-0-0"
+                          name="domainpropertiesrow-selected"
+                          type="checkbox"
+                        />
+                      </label>
+                    </div>
+                    <div
+                      class="field-icon domain-field-expand-icon"
+                      id="domainpropertiesrow-expand-0-0"
+                      title="Show additional field properties"
+                    >
+                      <span
+                        class="fa fa-lg fa-plus-square"
+                      />
+                    </div>
+                  </div>
+                  <div
+                    class="domain-row-main"
+                  >
+                    <div
+                      class="domain-row-base-fields domain-row-base-fields-position col-xs-6"
+                    >
+                      <div
+                        id="domainpropertiesrow-row-0-0"
+                      >
+                        <div
+                          class="col-xs-6"
+                        >
+                          <input
+                            class="form-control"
+                            id="domainpropertiesrow-name-0-0"
+                            name="domainpropertiesrow-name"
+                            type="text"
+                            value="TextField"
+                          />
+                        </div>
+                        <div
+                          class="col-xs-4"
+                        >
+                          <select
+                            class="form-control"
+                            id="domainpropertiesrow-type-0-0"
+                            name="domainpropertiesrow-type"
+                          >
+                            <option
+                              value="flag"
+                            >
+                              Flag
+                            </option>
+                            <option
+                              value="lookup"
+                            >
+                              Lookup
+                            </option>
+                            <option
+                              value="multiLine"
+                            >
+                              Multi-Line Text
+                            </option>
+                            <option
+                              value="ParticipantId"
+                            >
+                              Subject/Participant
+                            </option>
+                            <option
+                              value="string"
+                            >
+                              Text
+                            </option>
+                            <option
+                              value="textChoice"
+                            >
+                              Text Choice
+                            </option>
+                          </select>
+                        </div>
+                        <div
+                          class="col-xs-2"
+                        >
+                          <div
+                            class="domain-field-checkbox-container"
+                          >
+                            <div
+                              class="domain-field-checkbox checkbox"
+                            >
+                              <label
+                                title=""
+                              >
+                                <input
+                                  checked=""
+                                  id="domainpropertiesrow-required-0-0"
+                                  name="domainpropertiesrow-required"
+                                  type="checkbox"
+                                />
+                              </label>
+                            </div>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                    <div
+                      class="domain-row-details-container col-xs-6"
+                    >
+                      <div
+                        class="domain-field-details"
+                        id="domainpropertiesrow-details-0-0"
+                      />
+                      <div
+                        class="domain-field-buttons"
+                      >
+                        <span
+                          class="field-icon"
+                          id="domainpropertiesrow-delete-0-0"
+                          title="Remove field"
+                        >
+                          <span
+                            class="fa fa-times-circle domain-field-delete-icon"
+                          />
+                        </span>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+                <div
+                  class="collapse"
+                >
+                  <div
+                    class="domain-row-container"
+                  >
+                    <div
+                      class="domain-row-container-expand-spacer"
+                    />
+                    <div
+                      class="domain-row-container-expanded"
+                    >
+                      <div
+                        class="col-xs-12"
+                      >
+                        <div>
+                          <div
+                            class="row"
+                          >
+                            <div
+                              class="col-xs-12"
+                            >
+                              <div
+                                class="domain-field-section-heading"
+                              >
+                                Text Options
+                              </div>
+                            </div>
+                          </div>
+                          <div
+                            class="row"
+                          >
+                            <div
+                              class="col-xs-12"
+                            >
+                              <div
+                                class="domain-field-label"
+                              >
+                                Maximum Text 
+                                <span
+                                  class="domain-no-wrap"
+                                >
+                                  Length
+                                  <span
+                                    class="label-help-target"
+                                  >
+                                    <span
+                                      class="label-help-icon fa fa-question-circle"
+                                    />
+                                  </span>
+                                  
+                                </span>
+                              </div>
+                            </div>
+                          </div>
+                          <div
+                            class="row"
+                          >
+                            <div
+                              class="domain-text-options-col col-xs-12"
+                            >
+                              <input
+                                checked=""
+                                class="domain-text-options-radio1 domain-field-float-left form-control"
+                                id="domainpropertiesrow-maxLength-0-0"
+                                type="radio"
+                                value="maxLength"
+                              />
+                              <div>
+                                Unlimited
+                              </div>
+                            </div>
+                          </div>
+                          <div
+                            class="row"
+                          >
+                            <div
+                              class="col-xs-12"
+                            >
+                              <input
+                                class="domain-text-options-radio2 domain-field-float-left form-control"
+                                id="domainpropertiesrow-customLength-0-0"
+                                type="radio"
+                                value="customLength"
+                              />
+                              <span
+                                class="domain-text-options-length domain-field-float-left"
+                              >
+                                No longer than 
+                                <input
+                                  class="domain-text-length-field form-control"
+                                  disabled=""
+                                  id="domainpropertiesrow-scale-0-0"
+                                  name="domainpropertiesrow-scale"
+                                  type="number"
+                                  value="4000"
+                                />
+                                 characters
+                              </span>
+                            </div>
+                          </div>
+                        </div>
+                      </div>
+                      <div
+                        class="col-xs-12"
+                      >
+                        <div>
+                          <div
+                            class="row"
+                          >
+                            <div
+                              class="col-xs-12"
+                            >
+                              <div
+                                class="domain-field-section-heading domain-field-section-hdr"
+                              >
+                                Name and Linking Options
+                              </div>
+                            </div>
+                          </div>
+                          <div
+                            class="row"
+                          >
+                            <div
+                              class="col-xs-5"
+                            >
+                              <div
+                                class="domain-field-label"
+                              >
+                                Description
+                              </div>
+                              <textarea
+                                class="form-control"
+                                id="domainpropertiesrow-description-0-0"
+                                name="domainpropertiesrow-description"
+                                rows="4"
+                              />
+                            </div>
+                            <div
+                              class="col-xs-3"
+                            >
+                              <div
+                                class="domain-field-label"
+                              >
+                                Label
+                              </div>
+                              <input
+                                class="form-control"
+                                id="domainpropertiesrow-label-0-0"
+                                name="domainpropertiesrow-label"
+                                type="text"
+                                value=""
+                              />
+                              <div
+                                class="domain-field-label"
+                              >
+                                Import 
+                                <span
+                                  class="domain-no-wrap"
+                                >
+                                  Aliases
+                                  <span
+                                    class="label-help-target"
+                                  >
+                                    <span
+                                      class="label-help-icon fa fa-question-circle"
+                                    />
+                                  </span>
+                                  
+                                </span>
+                              </div>
+                              <input
+                                class="form-control"
+                                id="domainpropertiesrow-importAliases-0-0"
+                                name="domainpropertiesrow-importAliases"
+                                type="text"
+                                value=""
+                              />
+                            </div>
+                            <div
+                              class="col-xs-4"
+                            >
+                              <div
+                                class="domain-field-label"
+                              >
+                                <span
+                                  class="domain-no-wrap"
+                                >
+                                  URL
+                                  <span
+                                    class="label-help-target"
+                                  >
+                                    <span
+                                      class="label-help-icon fa fa-question-circle"
+                                    />
+                                  </span>
+                                  
+                                </span>
+                              </div>
+                              <input
+                                class="form-control"
+                                id="domainpropertiesrow-URL-0-0"
+                                name="domainpropertiesrow-URL"
+                                type="text"
+                                value=""
+                              />
+                            </div>
+                          </div>
+                        </div>
+                      </div>
+                      <div
+                        class="col-xs-12"
+                      >
+                        <div>
+                          <div
+                            class="row"
+                          >
+                            <div
+                              class="col-xs-12"
+                            >
+                              <div
+                                class="domain-field-section-heading domain-field-section-hdr"
+                              >
+                                Conditional Formatting and Validation Options
+                              </div>
+                            </div>
+                          </div>
+                          <div
+                            class="row"
+                          >
+                            <div
+                              class="col-xs-12"
+                            >
+                              <div
+                                class="domain-validation-group"
+                              >
+                                <div
+                                  class="domain-field-label domain-no-wrap"
+                                >
+                                  Create Conditional Format 
+                                  <span
+                                    class="domain-no-wrap"
+                                  >
+                                    Criteria
+                                    <span
+                                      class="label-help-target"
+                                    >
+                                      <span
+                                        class="label-help-icon fa fa-question-circle"
+                                      />
+                                    </span>
+                                    
+                                  </span>
+                                </div>
+                                <div>
+                                  <button
+                                    class="domain-validation-button btn btn-default"
+                                    id="domainpropertiesrow-conditionalFormat-0-0"
+                                    name="domainpropertiesrow-conditionalFormat"
+                                    type="button"
+                                  >
+                                    Add Format
+                                  </button>
+                                  <span
+                                    class="domain-text-label"
+                                  >
+                                    None Set
+                                  </span>
+                                </div>
+                              </div>
+                              <div
+                                class="domain-validation-group"
+                              >
+                                <div
+                                  class="domain-field-label domain-no-wrap"
+                                >
+                                  Create Regular Expression 
+                                  <span
+                                    class="domain-no-wrap"
+                                  >
+                                    Validator
+                                    <span
+                                      class="label-help-target"
+                                    >
+                                      <span
+                                        class="label-help-icon fa fa-question-circle"
+                                      />
+                                    </span>
+                                    
+                                  </span>
+                                </div>
+                                <div>
+                                  <button
+                                    class="domain-validation-button btn btn-default"
+                                    id="domainpropertiesrow-regexValidator-0-0"
+                                    name="domainpropertiesrow-regexValidator"
+                                    type="button"
+                                  >
+                                    Add Regex
+                                  </button>
+                                  <span
+                                    class="domain-text-label"
+                                  >
+                                    None Set
+                                  </span>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+              <div
+                class="domain-field-row domain-row-border-default"
+                data-rbd-draggable-context-id="0"
+                data-rbd-draggable-id="domainpropertiesrow-domaindrag-0-1"
+                tabindex="1"
+              >
+                <div
+                  class="domain-row-container row"
+                >
+                  <div
+                    aria-describedby="rbd-hidden-text-0-hidden-text-0"
+                    class="domain-row-handle"
+                    data-rbd-drag-handle-context-id="0"
+                    data-rbd-drag-handle-draggable-id="domainpropertiesrow-domaindrag-0-1"
+                    draggable="false"
+                    role="button"
+                    tabindex="0"
+                  >
+                    <div
+                      class="drag-drop-handle"
+                    >
+                      <span
+                        class="fa fa-ellipsis-v"
+                      />
+                      <span
+                        class="fa fa-ellipsis-v"
+                      />
+                    </div>
+                  </div>
+                  <div
+                    class="domain-row-action-section"
+                  >
+                    <div
+                      class="domain-field-check-icon checkbox"
+                    >
+                      <label
+                        title=""
+                      >
+                        <input
+                          id="domainpropertiesrow-selected-0-1"
+                          name="domainpropertiesrow-selected"
+                          type="checkbox"
+                        />
+                      </label>
+                    </div>
+                    <div
+                      class="field-icon domain-field-expand-icon"
+                      id="domainpropertiesrow-expand-0-1"
+                      title="Show additional field properties"
+                    >
+                      <span
+                        class="fa fa-lg fa-plus-square"
+                      />
+                    </div>
+                  </div>
+                  <div
+                    class="domain-row-main"
+                  >
+                    <div
+                      class="domain-row-base-fields domain-row-base-fields-position col-xs-6"
+                    >
+                      <div
+                        id="domainpropertiesrow-row-0-1"
+                      >
+                        <div
+                          class="col-xs-6"
+                        >
+                          <input
+                            class="form-control"
+                            id="domainpropertiesrow-name-0-1"
+                            name="domainpropertiesrow-name"
+                            type="text"
+                            value="IntField"
+                          />
+                        </div>
+                        <div
+                          class="col-xs-4"
+                        >
+                          <select
+                            class="form-control"
+                            id="domainpropertiesrow-type-0-1"
+                            name="domainpropertiesrow-type"
+                          >
+                            <option
+                              value="double"
+                            >
+                              Decimal (floating point)
+                            </option>
+                            <option
+                              value="int"
+                            >
+                              Integer
+                            </option>
+                            <option
+                              value="lookup"
+                            >
+                              Lookup
+                            </option>
+                            <option
+                              value="multiLine"
+                            >
+                              Multi-Line Text
+                            </option>
+                            <option
+                              value="sample"
+                            >
+                              Sample
+                            </option>
+                            <option
+                              value="string"
+                            >
+                              Text
+                            </option>
+                            <option
+                              value="users"
+                            >
+                              User
+                            </option>
+                          </select>
+                        </div>
+                        <div
+                          class="col-xs-2"
+                        >
+                          <div
+                            class="domain-field-checkbox-container"
+                          >
+                            <div
+                              class="domain-field-checkbox checkbox"
+                            >
+                              <label
+                                title=""
+                              >
+                                <input
+                                  id="domainpropertiesrow-required-0-1"
+                                  name="domainpropertiesrow-required"
+                                  type="checkbox"
+                                />
+                              </label>
+                            </div>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                    <div
+                      class="domain-row-details-container col-xs-6"
+                    >
+                      <div
+                        class="domain-field-details"
+                        id="domainpropertiesrow-details-0-1"
+                      />
+                      <div
+                        class="domain-field-buttons"
+                      >
+                        <span
+                          class="field-icon"
+                          id="domainpropertiesrow-delete-0-1"
+                          title="Remove field"
+                        >
+                          <span
+                            class="fa fa-times-circle domain-field-delete-icon"
+                          />
+                        </span>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+                <div
+                  class="collapse"
+                >
+                  <div
+                    class="domain-row-container"
+                  >
+                    <div
+                      class="domain-row-container-expand-spacer"
+                    />
+                    <div
+                      class="domain-row-container-expanded"
+                    >
+                      <div
+                        class="col-xs-12"
+                      >
+                        <div>
+                          <div
+                            class="row"
+                          >
+                            <div
+                              class="col-xs-12"
+                            >
+                              <div
+                                class="domain-field-section-heading"
+                              >
+                                Integer Options
+                              </div>
+                            </div>
+                          </div>
+                          <div
+                            class="row"
+                          >
+                            <div
+                              class="col-xs-3"
+                            >
+                              <div
+                                class="domain-field-label"
+                              >
+                                Format for 
+                                <span
+                                  class="domain-no-wrap"
+                                >
+                                  Numbers
+                                  <span
+                                    class="label-help-target"
+                                  >
+                                    <span
+                                      class="label-help-icon fa fa-question-circle"
+                                    />
+                                  </span>
+                                  
+                                </span>
+                              </div>
+                            </div>
+                            <div
+                              class="col-xs-2"
+                            >
+                              <div
+                                class="domain-field-label"
+                              >
+                                Default Scale Type
+                              </div>
+                            </div>
+                          </div>
+                          <div
+                            class="row"
+                          >
+                            <div
+                              class="col-xs-3"
+                            >
+                              <input
+                                class="form-control"
+                                id="domainpropertiesrow-format-0-1"
+                                name="domainpropertiesrow-format"
+                                type="text"
+                                value=""
+                              />
+                            </div>
+                            <div
+                              class="col-xs-2"
+                            >
+                              <select
+                                class="form-control"
+                                id="domainpropertiesrow-defaultScale-0-1"
+                                name="domainpropertiesrow-defaultScale"
+                              >
+                                <option
+                                  value="LINEAR"
+                                >
+                                  Linear
+                                </option>
+                                <option
+                                  value="LOG"
+                                >
+                                  Log
+                                </option>
+                              </select>
+                            </div>
+                          </div>
+                        </div>
+                      </div>
+                      <div
+                        class="col-xs-12"
+                      >
+                        <div>
+                          <div
+                            class="row"
+                          >
+                            <div
+                              class="col-xs-12"
+                            >
+                              <div
+                                class="domain-field-section-heading domain-field-section-hdr"
+                              >
+                                Name and Linking Options
+                              </div>
+                            </div>
+                          </div>
+                          <div
+                            class="row"
+                          >
+                            <div
+                              class="col-xs-5"
+                            >
+                              <div
+                                class="domain-field-label"
+                              >
+                                Description
+                              </div>
+                              <textarea
+                                class="form-control"
+                                id="domainpropertiesrow-description-0-1"
+                                name="domainpropertiesrow-description"
+                                rows="4"
+                              />
+                            </div>
+                            <div
+                              class="col-xs-3"
+                            >
+                              <div
+                                class="domain-field-label"
+                              >
+                                Label
+                              </div>
+                              <input
+                                class="form-control"
+                                id="domainpropertiesrow-label-0-1"
+                                name="domainpropertiesrow-label"
+                                type="text"
+                                value=""
+                              />
+                              <div
+                                class="domain-field-label"
+                              >
+                                Import 
+                                <span
+                                  class="domain-no-wrap"
+                                >
+                                  Aliases
+                                  <span
+                                    class="label-help-target"
+                                  >
+                                    <span
+                                      class="label-help-icon fa fa-question-circle"
+                                    />
+                                  </span>
+                                  
+                                </span>
+                              </div>
+                              <input
+                                class="form-control"
+                                id="domainpropertiesrow-importAliases-0-1"
+                                name="domainpropertiesrow-importAliases"
+                                type="text"
+                                value=""
+                              />
+                            </div>
+                            <div
+                              class="col-xs-4"
+                            >
+                              <div
+                                class="domain-field-label"
+                              >
+                                <span
+                                  class="domain-no-wrap"
+                                >
+                                  URL
+                                  <span
+                                    class="label-help-target"
+                                  >
+                                    <span
+                                      class="label-help-icon fa fa-question-circle"
+                                    />
+                                  </span>
+                                  
+                                </span>
+                              </div>
+                              <input
+                                class="form-control"
+                                id="domainpropertiesrow-URL-0-1"
+                                name="domainpropertiesrow-URL"
+                                type="text"
+                                value=""
+                              />
+                            </div>
+                          </div>
+                        </div>
+                      </div>
+                      <div
+                        class="col-xs-12"
+                      >
+                        <div>
+                          <div
+                            class="row"
+                          >
+                            <div
+                              class="col-xs-12"
+                            >
+                              <div
+                                class="domain-field-section-heading domain-field-section-hdr"
+                              >
+                                Conditional Formatting and Validation Options
+                              </div>
+                            </div>
+                          </div>
+                          <div
+                            class="row"
+                          >
+                            <div
+                              class="col-xs-12"
+                            >
+                              <div
+                                class="domain-validation-group"
+                              >
+                                <div
+                                  class="domain-field-label domain-no-wrap"
+                                >
+                                  Create Conditional Format 
+                                  <span
+                                    class="domain-no-wrap"
+                                  >
+                                    Criteria
+                                    <span
+                                      class="label-help-target"
+                                    >
+                                      <span
+                                        class="label-help-icon fa fa-question-circle"
+                                      />
+                                    </span>
+                                    
+                                  </span>
+                                </div>
+                                <div>
+                                  <button
+                                    class="domain-validation-button btn btn-default"
+                                    id="domainpropertiesrow-conditionalFormat-0-1"
+                                    name="domainpropertiesrow-conditionalFormat"
+                                    type="button"
+                                  >
+                                    Add Format
+                                  </button>
+                                  <span
+                                    class="domain-text-label"
+                                  >
+                                    None Set
+                                  </span>
+                                </div>
+                              </div>
+                              <div
+                                class=""
+                              >
+                                <div
+                                  class="domain-field-label domain-no-wrap"
+                                >
+                                  Create Range 
+                                  <span
+                                    class="domain-no-wrap"
+                                  >
+                                    Validator
+                                    <span
+                                      class="label-help-target"
+                                    >
+                                      <span
+                                        class="label-help-icon fa fa-question-circle"
+                                      />
+                                    </span>
+                                    
+                                  </span>
+                                </div>
+                                <div>
+                                  <button
+                                    class="domain-validation-button btn btn-default"
+                                    id="domainpropertiesrow-rangeValidator-0-1"
+                                    name="domainpropertiesrow-rangeValidator"
+                                    type="button"
+                                  >
+                                    Add Range
+                                  </button>
+                                  <span
+                                    class="domain-text-label"
+                                  >
+                                    None Set
+                                  </span>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+              <div
+                class="domain-field-row domain-row-border-default"
+                data-rbd-draggable-context-id="0"
+                data-rbd-draggable-id="domainpropertiesrow-domaindrag-0-2"
+                tabindex="2"
+              >
+                <div
+                  class="domain-row-container row"
+                >
+                  <div
+                    aria-describedby="rbd-hidden-text-0-hidden-text-0"
+                    class="domain-row-handle"
+                    data-rbd-drag-handle-context-id="0"
+                    data-rbd-drag-handle-draggable-id="domainpropertiesrow-domaindrag-0-2"
+                    draggable="false"
+                    role="button"
+                    tabindex="0"
+                  >
+                    <div
+                      class="drag-drop-handle"
+                    >
+                      <span
+                        class="fa fa-ellipsis-v"
+                      />
+                      <span
+                        class="fa fa-ellipsis-v"
+                      />
+                    </div>
+                  </div>
+                  <div
+                    class="domain-row-action-section"
+                  >
+                    <div
+                      class="domain-field-check-icon checkbox"
+                    >
+                      <label
+                        title=""
+                      >
+                        <input
+                          id="domainpropertiesrow-selected-0-2"
+                          name="domainpropertiesrow-selected"
+                          type="checkbox"
+                        />
+                      </label>
+                    </div>
+                    <div
+                      class="field-icon domain-field-expand-icon"
+                      id="domainpropertiesrow-expand-0-2"
+                      title="Show additional field properties"
+                    >
+                      <span
+                        class="fa fa-lg fa-plus-square"
+                      />
+                    </div>
+                  </div>
+                  <div
+                    class="domain-row-main"
+                  >
+                    <div
+                      class="domain-row-base-fields domain-row-base-fields-position col-xs-6"
+                    >
+                      <div
+                        id="domainpropertiesrow-row-0-2"
+                      >
+                        <div
+                          class="col-xs-6"
+                        >
+                          <input
+                            class="form-control"
+                            id="domainpropertiesrow-name-0-2"
+                            name="domainpropertiesrow-name"
+                            type="text"
+                            value="DateField"
+                          />
+                        </div>
+                        <div
+                          class="col-xs-4"
+                        >
+                          <select
+                            class="form-control"
+                            id="domainpropertiesrow-type-0-2"
+                            name="domainpropertiesrow-type"
+                          >
+                            <option
+                              value="dateTime"
+                            >
+                              Date Time
+                            </option>
+                            <option
+                              value="multiLine"
+                            >
+                              Multi-Line Text
+                            </option>
+                            <option
+                              value="string"
+                            >
+                              Text
+                            </option>
+                          </select>
+                        </div>
+                        <div
+                          class="col-xs-2"
+                        >
+                          <div
+                            class="domain-field-checkbox-container"
+                          >
+                            <div
+                              class="domain-field-checkbox checkbox"
+                            >
+                              <label
+                                title=""
+                              >
+                                <input
+                                  id="domainpropertiesrow-required-0-2"
+                                  name="domainpropertiesrow-required"
+                                  type="checkbox"
+                                />
+                              </label>
+                            </div>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                    <div
+                      class="domain-row-details-container col-xs-6"
+                    >
+                      <div
+                        class="domain-field-details"
+                        id="domainpropertiesrow-details-0-2"
+                      />
+                      <div
+                        class="domain-field-buttons"
+                      >
+                        <span
+                          class="field-icon"
+                          id="domainpropertiesrow-delete-0-2"
+                          title="Remove field"
+                        >
+                          <span
+                            class="fa fa-times-circle domain-field-delete-icon"
+                          />
+                        </span>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+                <div
+                  class="collapse"
+                >
+                  <div
+                    class="domain-row-container"
+                  >
+                    <div
+                      class="domain-row-container-expand-spacer"
+                    />
+                    <div
+                      class="domain-row-container-expanded"
+                    >
+                      <div
+                        class="col-xs-12"
+                      >
+                        <div>
+                          <div
+                            class="row"
+                          >
+                            <div
+                              class="col-xs-12"
+                            >
+                              <div
+                                class="domain-field-section-heading"
+                              >
+                                Date and Time Options
+                              </div>
+                            </div>
+                          </div>
+                          <div
+                            class="row"
+                          >
+                            <div
+                              class="col-xs-3"
+                            >
+                              <div
+                                class="domain-field-label"
+                              >
+                                Format for 
+                                <span
+                                  class="domain-no-wrap"
+                                >
+                                  Dates
+                                  <span
+                                    class="label-help-target"
+                                  >
+                                    <span
+                                      class="label-help-icon fa fa-question-circle"
+                                    />
+                                  </span>
+                                  
+                                </span>
+                              </div>
+                            </div>
+                            <div
+                              class="col-xs-9"
+                            />
+                          </div>
+                          <div
+                            class="row"
+                          >
+                            <div
+                              class="col-xs-3"
+                            >
+                              <input
+                                class="form-control"
+                                id="domainpropertiesrow-format-0-2"
+                                name="domainpropertiesrow-format"
+                                type="text"
+                                value=""
+                              />
+                            </div>
+                            <div
+                              class="col-xs-9"
+                            />
+                          </div>
+                        </div>
+                      </div>
+                      <div
+                        class="col-xs-12"
+                      >
+                        <div>
+                          <div
+                            class="row"
+                          >
+                            <div
+                              class="col-xs-12"
+                            >
+                              <div
+                                class="domain-field-section-heading domain-field-section-hdr"
+                              >
+                                Name and Linking Options
+                              </div>
+                            </div>
+                          </div>
+                          <div
+                            class="row"
+                          >
+                            <div
+                              class="col-xs-5"
+                            >
+                              <div
+                                class="domain-field-label"
+                              >
+                                Description
+                              </div>
+                              <textarea
+                                class="form-control"
+                                id="domainpropertiesrow-description-0-2"
+                                name="domainpropertiesrow-description"
+                                rows="4"
+                              />
+                            </div>
+                            <div
+                              class="col-xs-3"
+                            >
+                              <div
+                                class="domain-field-label"
+                              >
+                                Label
+                              </div>
+                              <input
+                                class="form-control"
+                                id="domainpropertiesrow-label-0-2"
+                                name="domainpropertiesrow-label"
+                                type="text"
+                                value=""
+                              />
+                              <div
+                                class="domain-field-label"
+                              >
+                                Import 
+                                <span
+                                  class="domain-no-wrap"
+                                >
+                                  Aliases
+                                  <span
+                                    class="label-help-target"
+                                  >
+                                    <span
+                                      class="label-help-icon fa fa-question-circle"
+                                    />
+                                  </span>
+                                  
+                                </span>
+                              </div>
+                              <input
+                                class="form-control"
+                                id="domainpropertiesrow-importAliases-0-2"
+                                name="domainpropertiesrow-importAliases"
+                                type="text"
+                                value=""
+                              />
+                            </div>
+                            <div
+                              class="col-xs-4"
+                            >
+                              <div
+                                class="domain-field-label"
+                              >
+                                <span
+                                  class="domain-no-wrap"
+                                >
+                                  URL
+                                  <span
+                                    class="label-help-target"
+                                  >
+                                    <span
+                                      class="label-help-icon fa fa-question-circle"
+                                    />
+                                  </span>
+                                  
+                                </span>
+                              </div>
+                              <input
+                                class="form-control"
+                                id="domainpropertiesrow-URL-0-2"
+                                name="domainpropertiesrow-URL"
+                                type="text"
+                                value=""
+                              />
+                            </div>
+                          </div>
+                        </div>
+                      </div>
+                      <div
+                        class="col-xs-12"
+                      >
+                        <div>
+                          <div
+                            class="row"
+                          >
+                            <div
+                              class="col-xs-12"
+                            >
+                              <div
+                                class="domain-field-section-heading domain-field-section-hdr"
+                              >
+                                Conditional Formatting and Validation Options
+                              </div>
+                            </div>
+                          </div>
+                          <div
+                            class="row"
+                          >
+                            <div
+                              class="col-xs-12"
+                            >
+                              <div
+                                class="domain-validation-group"
+                              >
+                                <div
+                                  class="domain-field-label domain-no-wrap"
+                                >
+                                  Create Conditional Format 
+                                  <span
+                                    class="domain-no-wrap"
+                                  >
+                                    Criteria
+                                    <span
+                                      class="label-help-target"
+                                    >
+                                      <span
+                                        class="label-help-icon fa fa-question-circle"
+                                      />
+                                    </span>
+                                    
+                                  </span>
+                                </div>
+                                <div>
+                                  <button
+                                    class="domain-validation-button btn btn-default"
+                                    id="domainpropertiesrow-conditionalFormat-0-2"
+                                    name="domainpropertiesrow-conditionalFormat"
+                                    type="button"
+                                  >
+                                    Add Format
+                                  </button>
+                                  <span
+                                    class="domain-text-label"
+                                  >
+                                    None Set
+                                  </span>
+                                </div>
+                              </div>
+                              <div
+                                class=""
+                              >
+                                <div
+                                  class="domain-field-label domain-no-wrap"
+                                >
+                                  Create Range 
+                                  <span
+                                    class="domain-no-wrap"
+                                  >
+                                    Validator
+                                    <span
+                                      class="label-help-target"
+                                    >
+                                      <span
+                                        class="label-help-icon fa fa-question-circle"
+                                      />
+                                    </span>
+                                    
+                                  </span>
+                                </div>
+                                <div>
+                                  <button
+                                    class="domain-validation-button btn btn-default"
+                                    id="domainpropertiesrow-rangeValidator-0-2"
+                                    name="domainpropertiesrow-rangeValidator"
+                                    type="button"
+                                  >
+                                    Add Range
+                                  </button>
+                                  <span
+                                    class="domain-text-label"
+                                  >
+                                    None Set
+                                  </span>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </form>
+          </div>
+          <div
+            class="domain-add-field-row row"
+          >
+            <div
+              class="col-xs-12"
+            >
+              <div
+                class="pull-right"
+              >
+                <div
+                  class="domain-form-add-btn"
+                >
+                  <span
+                    class="container--action-button btn btn-default"
+                  >
+                    <i
+                      class="fa fa-plus-circle container--addition-icon"
+                    />
+                     Add 
+                    Field
+                  </span>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div
+      class="form-buttons"
+    >
+      <div
+        class="form-buttons__left"
+      >
+        <button
+          class="cancel-button btn btn-default"
+          type="button"
+        >
+          Cancel
+        </button>
+      </div>
+      <div
+        class="form-buttons__right"
+      >
+        <button
+          class="save-button btn btn-primary"
+          type="button"
+        >
+          Save
+        </button>
+      </div>
+    </div>
+  </div>
+</div>
+`;
diff --git a/packages/components/src/internal/components/domainproperties/samples/__snapshots__/SampleTypeDesigner.spec.tsx.snap b/packages/components/src/internal/components/domainproperties/samples/__snapshots__/SampleTypeDesigner.spec.tsx.snap
index 06376c57d0..b9a7568f76 100644
--- a/packages/components/src/internal/components/domainproperties/samples/__snapshots__/SampleTypeDesigner.spec.tsx.snap
+++ b/packages/components/src/internal/components/domainproperties/samples/__snapshots__/SampleTypeDesigner.spec.tsx.snap
@@ -540,8 +540,6 @@ exports[`SampleTypeDesigner default properties 1`] = `
           "schemaName": "exp",
           "viewName": undefined,
         },
-        "moveActionName": "moveSamples.api",
-        "moveControllerName": "experiment",
         "nounAsParentPlural": "Parents",
         "nounAsParentSingular": "Parent",
         "nounPlural": "samples",
@@ -1119,8 +1117,6 @@ exports[`SampleTypeDesigner initModel with name URL props 1`] = `
           "schemaName": "exp",
           "viewName": undefined,
         },
-        "moveActionName": "moveSamples.api",
-        "moveControllerName": "experiment",
         "nounAsParentPlural": "Parents",
         "nounAsParentSingular": "Parent",
         "nounPlural": "samples",
diff --git a/packages/components/src/internal/components/editable/actions.test.ts b/packages/components/src/internal/components/editable/actions.test.ts
index af58e03c1c..10b06db7db 100644
--- a/packages/components/src/internal/components/editable/actions.test.ts
+++ b/packages/components/src/internal/components/editable/actions.test.ts
@@ -480,6 +480,10 @@ describe('fillColumnCells', () => {
         lookup: undefined,
     });
 
+    beforeAll(() => {
+        global.console.warn = jest.fn();
+    });
+
     test('single initialSelection', async () => {
         const { cellValues } = await fillColumnCells(
             editorModel,
diff --git a/packages/components/src/internal/components/entities/APIWrapper.ts b/packages/components/src/internal/components/entities/APIWrapper.ts
index 45b3ef11f3..368233c962 100644
--- a/packages/components/src/internal/components/entities/APIWrapper.ts
+++ b/packages/components/src/internal/components/entities/APIWrapper.ts
@@ -94,6 +94,8 @@ export interface EntityAPIWrapper {
         sourceContainer: Container,
         targetContainer: string,
         entityDataType: EntityDataType,
+        schemaName: string,
+        queryName: string,
         rowIds?: number[],
         selectionKey?: string,
         useSnapshotSelection?: boolean,
diff --git a/packages/components/src/internal/components/entities/EntityMoveModal.tsx b/packages/components/src/internal/components/entities/EntityMoveModal.tsx
index 9cda652aa6..a6ac8e1168 100644
--- a/packages/components/src/internal/components/entities/EntityMoveModal.tsx
+++ b/packages/components/src/internal/components/entities/EntityMoveModal.tsx
@@ -121,6 +121,8 @@ export const EntityMoveModal: FC<EntityMoveModalProps> = memo(props => {
                     currentContainer,
                     targetContainerPath,
                     entityDataType,
+                    queryModel.schemaName,
+                    queryModel.queryName,
                     rowIds_,
                     selectionKey,
                     useSnapshotSelection,
@@ -165,6 +167,7 @@ export const EntityMoveModal: FC<EntityMoveModalProps> = memo(props => {
             confirmationData,
             entityDataType,
             useSelected,
+            queryModel.queryName,
             queryModel.filterArray.length,
             selectionKey,
             targetAppURL,
diff --git a/packages/components/src/internal/components/entities/actions.ts b/packages/components/src/internal/components/entities/actions.ts
index ad6de765b1..1759446d5e 100644
--- a/packages/components/src/internal/components/entities/actions.ts
+++ b/packages/components/src/internal/components/entities/actions.ts
@@ -123,7 +123,9 @@ export function getDeleteConfirmationData(
             ? {
                   dataOperation: DataOperation.Delete,
               }
-            : isAssayDesignEntity(dataType) ? { dataOperation: AssayRunOperation.Delete } : undefined
+            : isAssayDesignEntity(dataType)
+            ? { dataOperation: AssayRunOperation.Delete }
+            : undefined
     );
 }
 
@@ -297,9 +299,8 @@ function resolveEntityParentTypeFromIds(
     // The transformation done here makes the entities compatible with the editable grid
     let data: DisplayObject[] = response.rows
         .map(row => extractEntityTypeOptionFromRow(row))
-        .map(({ label, rowId }) => ({ displayValue: label, value: rowId }))
-    if (orderedRowIds?.length > 1)
-        data = data.sort(_getEntitySort(orderedRowIds));
+        .map(({ label, rowId }) => ({ displayValue: label, value: rowId }));
+    if (orderedRowIds?.length > 1) data = data.sort(_getEntitySort(orderedRowIds));
 
     return List<EntityParentType>([
         EntityParentType.create({
@@ -811,7 +812,9 @@ export function getMoveConfirmationData(
             ? {
                   dataOperation: DataOperation.Move,
               }
-            :  isAssayDesignEntity(dataType) ? { dataOperation: AssayRunOperation.Move } : undefined
+            : isAssayDesignEntity(dataType)
+            ? { dataOperation: AssayRunOperation.Move }
+            : undefined
     );
 }
 
@@ -819,6 +822,8 @@ export function moveEntities(
     sourceContainer: Container,
     targetContainer: string,
     entityDataType: EntityDataType,
+    schemaName: string,
+    queryName: string,
     rowIds?: number[],
     selectionKey?: string,
     useSnapshotSelection?: boolean,
@@ -827,11 +832,16 @@ export function moveEntities(
     return new Promise((resolve, reject) => {
         const params = {
             auditBehavior: AuditBehaviorTypes.DETAILED,
-            targetContainer,
-            userComment,
+            auditUserComment: userComment,
+            targetContainerPath: targetContainer,
+            schemaName,
+            queryName,
         };
         if (rowIds) {
-            params['rowIds'] = rowIds;
+            params['rows'] = rowIds.reduce((prev, curr) => {
+                prev.push({ rowId: curr });
+                return prev;
+            }, []);
         }
         if (selectionKey) {
             params['dataRegionSelectionKey'] = selectionKey;
@@ -839,11 +849,11 @@ export function moveEntities(
         }
 
         return Ajax.request({
-            url: buildURL(entityDataType.moveControllerName, entityDataType.moveActionName, undefined, {
+            url: buildURL('query', 'moveRows.api', undefined, {
                 container: sourceContainer?.path,
             }),
             method: 'POST',
-            params,
+            jsonData: params,
             success: Utils.getCallbackWrapper(response => {
                 if (response.success) {
                     resolve(response);
diff --git a/packages/components/src/internal/components/entities/constants.ts b/packages/components/src/internal/components/entities/constants.ts
index 0b1491468b..ae1194d647 100644
--- a/packages/components/src/internal/components/entities/constants.ts
+++ b/packages/components/src/internal/components/entities/constants.ts
@@ -37,8 +37,6 @@ export const AssayRunDataType: EntityDataType = {
     uniqueFieldKey: 'RowId',
     dependencyText: undefined,
     projectConfigurableDataType: 'AssayDesign',
-    moveControllerName: 'assay',
-    moveActionName: 'moveAssayRuns',
 };
 
 export const AssayResultDataType: EntityDataType = {
@@ -114,8 +112,6 @@ export const SampleTypeDataType: EntityDataType = {
     appUrlPrefixParts: ['samples'],
     operationConfirmationControllerName: 'experiment',
     operationConfirmationActionName: SAMPLE_OPERATION_CONFIRMATION_ACTION,
-    moveActionName: 'moveSamples.api',
-    moveControllerName: 'experiment',
     nounSingular: 'sample',
     nounPlural: 'samples',
     nounAsParentSingular: 'Parent',
@@ -145,8 +141,6 @@ export const DataClassDataType: EntityDataType = {
     typeListingSchemaQuery: SCHEMAS.EXP_TABLES.DATA_CLASSES,
     listingSchemaQuery: SCHEMAS.EXP_TABLES.DATA,
     instanceSchemaName: SCHEMAS.DATA_CLASSES.SCHEMA,
-    moveActionName: 'moveSources.api',
-    moveControllerName: 'experiment',
     operationConfirmationControllerName: 'experiment',
     operationConfirmationActionName: DATA_OPERATION_CONFIRMATION_ACTION,
     nounSingular: 'source',
diff --git a/packages/components/src/internal/components/entities/models.ts b/packages/components/src/internal/components/entities/models.ts
index 0d10cd456f..6f5969563c 100644
--- a/packages/components/src/internal/components/entities/models.ts
+++ b/packages/components/src/internal/components/entities/models.ts
@@ -469,7 +469,7 @@ export type ProjectConfigurableDataType = 'SampleType' | 'DataClass' | 'AssayDes
  *     instanceSchemaName: string; // (e.g., samples) Name of the schema associated with an individual instance that can be used in conjunction with a name returned from the typeListingSchemaQuery listing
  *     isFromSharedContainer?: boolean; // if the data type is defined in /Shared project
  *     listingSchemaQuery: SchemaQuery; // The schema query used to get the listing of all of the data instances (e.g., all the data class rows) available
- *     operationConfirmationActionName: string; // action in moveControllerName used to get the confirmation data for performing operations on entities
+ *     operationConfirmationActionName: string; // action in operationConfirmationControllerName used to get the confirmation data for performing operations on entities
  *     typeListingSchemaQuery: SchemaQuery; // The schema query used to get the listing of all of the data type instances (e.g., all the data classes) available
  *     projectConfigurableDataType?: string; // the DataTypeExclusion type
  */
@@ -499,8 +499,6 @@ export interface EntityDataType {
     isFromSharedContainer?: boolean;
     labelColorCol?: string;
     listingSchemaQuery: SchemaQuery;
-    moveActionName?: string;
-    moveControllerName?: string;
     nounAsParentPlural: string;
     nounAsParentSingular: string;
     nounPlural: string;
diff --git a/packages/components/src/internal/components/samples/utils.test.ts b/packages/components/src/internal/components/samples/utils.test.ts
index 809183f00a..a59b5e3db9 100644
--- a/packages/components/src/internal/components/samples/utils.test.ts
+++ b/packages/components/src/internal/components/samples/utils.test.ts
@@ -319,7 +319,7 @@ describe('getSampleStatus', () => {
 });
 
 const TEST_SQ = new SchemaQuery('schema', 'query');
-const TEST_QUERY_INFO = new QueryInfo({ schemaQuery: TEST_SQ });
+const TEST_QUERY_INFO = new QueryInfo({ schemaQuery: TEST_SQ, pkCols: ['RowId'] });
 const TEST_MODEL = makeTestQueryModel(TEST_SQ, TEST_QUERY_INFO).mutate({ id: 'model-id' });
 
 describe('getURLParamsForSampleSelectionKey', () => {
@@ -346,92 +346,130 @@ describe('getURLParamsForSampleSelectionKey', () => {
     test('keyValue', () => {
         const model = TEST_MODEL.mutate({ keyValue: 123 });
         expect(getURLParamsForSampleSelectionKey(model)).toStrictEqual({
+            'query.RowId~eq': 123,
             selectionKey: 'appkey|schema/query|123',
         });
     });
 });
 
-describe("getSampleStatusLockedMessage", () => {
-    test("no state", () => {
+describe('getSampleStatusLockedMessage', () => {
+    test('no state', () => {
         expect(getSampleStatusLockedMessage(undefined, false)).toBeUndefined();
     });
 
-   test("not locked", () => {
-       expect(getSampleStatusLockedMessage(new SampleState({
-           rowId: 1,
-           label: 'Available',
-           stateType: SampleStateType.Available,
-           inUse: false,
-           containerPath: "/Test Project",
-           isLocal: true
-       }), false)).toBeUndefined();
-   });
-
-   test("saving but not in use", () => {
-       expect(getSampleStatusLockedMessage(new SampleState({
-           rowId: 1,
-           label: 'Available',
-           stateType: SampleStateType.Available,
-           inUse: false,
-           containerPath: "/Test Project",
-           isLocal: true
-       }), true)).toBe("This sample status cannot change status type or be deleted because it is in use.");
-   });
-
-   test("in use", () => {
-       expect(getSampleStatusLockedMessage(new SampleState({
-           rowId: 1,
-           label: 'Available',
-           stateType: SampleStateType.Available,
-           inUse: true,
-           containerPath: "/Test Project",
-           isLocal: true
-       }), false)).toBe("This sample status cannot change status type or be deleted because it is in use.");
-
-   });
-
-    test("in use and saving", () => {
-        expect(getSampleStatusLockedMessage(new SampleState({
-            rowId: 1,
-            label: 'Available',
-            stateType: SampleStateType.Available,
-            inUse: true,
-            containerPath: "/Test Project",
-            isLocal: true
-        }), true)).toBe("This sample status cannot change status type or be deleted because it is in use.");
-    });
-
-   test("not in use, not local", () => {
-       expect(getSampleStatusLockedMessage(new SampleState({
-           rowId: 1,
-           label: 'Available',
-           stateType: SampleStateType.Available,
-           inUse: false,
-           containerPath: "/Test Project",
-           isLocal: false
-       }), false)).toBe("This sample status can be changed only in the Test Project project.");
-
-   });
-
-   test("in use and not local", () => {
-       expect(getSampleStatusLockedMessage(new SampleState({
-           rowId: 1,
-           label: 'Available',
-           stateType: SampleStateType.Available,
-           inUse: true,
-           containerPath: "/Test Project",
-           isLocal: false
-       }), false)).toBe("This sample status cannot change status type or be deleted because it is in use and can be changed only in the Test Project project.");
-   });
-
-    test("in use, saving, and not local", () => {
-        expect(getSampleStatusLockedMessage(new SampleState({
-            rowId: 1,
-            label: 'Available',
-            stateType: SampleStateType.Available,
-            inUse: true,
-            containerPath: "/Test Project",
-            isLocal: false
-        }), true)).toBe("This sample status cannot change status type or be deleted because it is in use and can be changed only in the Test Project project.");
+    test('not locked', () => {
+        expect(
+            getSampleStatusLockedMessage(
+                new SampleState({
+                    rowId: 1,
+                    label: 'Available',
+                    stateType: SampleStateType.Available,
+                    inUse: false,
+                    containerPath: '/Test Project',
+                    isLocal: true,
+                }),
+                false
+            )
+        ).toBeUndefined();
+    });
+
+    test('saving but not in use', () => {
+        expect(
+            getSampleStatusLockedMessage(
+                new SampleState({
+                    rowId: 1,
+                    label: 'Available',
+                    stateType: SampleStateType.Available,
+                    inUse: false,
+                    containerPath: '/Test Project',
+                    isLocal: true,
+                }),
+                true
+            )
+        ).toBe('This sample status cannot change status type or be deleted because it is in use.');
+    });
+
+    test('in use', () => {
+        expect(
+            getSampleStatusLockedMessage(
+                new SampleState({
+                    rowId: 1,
+                    label: 'Available',
+                    stateType: SampleStateType.Available,
+                    inUse: true,
+                    containerPath: '/Test Project',
+                    isLocal: true,
+                }),
+                false
+            )
+        ).toBe('This sample status cannot change status type or be deleted because it is in use.');
+    });
+
+    test('in use and saving', () => {
+        expect(
+            getSampleStatusLockedMessage(
+                new SampleState({
+                    rowId: 1,
+                    label: 'Available',
+                    stateType: SampleStateType.Available,
+                    inUse: true,
+                    containerPath: '/Test Project',
+                    isLocal: true,
+                }),
+                true
+            )
+        ).toBe('This sample status cannot change status type or be deleted because it is in use.');
+    });
+
+    test('not in use, not local', () => {
+        expect(
+            getSampleStatusLockedMessage(
+                new SampleState({
+                    rowId: 1,
+                    label: 'Available',
+                    stateType: SampleStateType.Available,
+                    inUse: false,
+                    containerPath: '/Test Project',
+                    isLocal: false,
+                }),
+                false
+            )
+        ).toBe('This sample status can be changed only in the Test Project project.');
+    });
+
+    test('in use and not local', () => {
+        expect(
+            getSampleStatusLockedMessage(
+                new SampleState({
+                    rowId: 1,
+                    label: 'Available',
+                    stateType: SampleStateType.Available,
+                    inUse: true,
+                    containerPath: '/Test Project',
+                    isLocal: false,
+                }),
+                false
+            )
+        ).toBe(
+            'This sample status cannot change status type or be deleted because it is in use and can be changed only in the Test Project project.'
+        );
+    });
+
+    test('in use, saving, and not local', () => {
+        expect(
+            getSampleStatusLockedMessage(
+                new SampleState({
+                    rowId: 1,
+                    label: 'Available',
+                    stateType: SampleStateType.Available,
+                    inUse: true,
+                    containerPath: '/Test Project',
+                    isLocal: false,
+                }),
+                true
+            )
+        ).toBe(
+            'This sample status cannot change status type or be deleted because it is in use and can be changed only in the Test Project project.'
+        );
     });
 });
diff --git a/packages/components/src/internal/util/Date.test.ts b/packages/components/src/internal/util/Date.test.ts
index 79bc68fd60..a706582dab 100644
--- a/packages/components/src/internal/util/Date.test.ts
+++ b/packages/components/src/internal/util/Date.test.ts
@@ -221,6 +221,7 @@ describe('Date Utilities', () => {
         });
 
         test('invalid date', () => {
+            global.console.warn = jest.fn();
             expect(parseDate('test')).toBe(null);
             expect(parseDate('test', 'yyyy-MM-dd')).toBe(null);
         });