PR Feedback

Author: labkey-alan

packages/components/src/internal/actions.ts

@@ -37,7 +37,6 @@ import {
     VIEW_NOT_FOUND_EXCEPTION_CLASS,
 } from './constants';
 import { DataViewInfo } from './DataViewInfo';
-import { getQueryParams } from './util/URL';
 
 import { handleRequestFailure } from './request';
 import { resolveErrorMessage } from './util/messaging';

packages/components/src/internal/components/entities/EntityMoveModal.tsx

@@ -1,4 +1,4 @@
-import React, { FC, memo, useCallback, useEffect, useState } from 'react';
+import React, { FC, memo, ReactNode, useCallback, useEffect, useState } from 'react';
 import { AuditBehaviorTypes } from '@labkey/api';
 
 import { Progress } from '../base/Progress';
@@ -220,7 +220,7 @@ export const getMoveConfirmationProperties = (
     confirmationData: OperationConfirmationData,
     nounSingular: string,
     nounPlural: string
-): { canMove: boolean; message: any; title: string } => {
+): { canMove: boolean; message: ReactNode; title: string } => {
     if (!confirmationData) return undefined;
 
     const capNounSingular = capitalizeFirstChar(nounSingular);

packages/components/src/internal/components/entities/actions.ts

@@ -1,7 +1,7 @@
 import { ActionURL, Ajax, Filter, getServerContext, PermissionTypes, Query, Security, Utils } from '@labkey/api';
 import { List, Map, OrderedMap } from 'immutable';
 
-import { getSelected, getSelectedDataDeprecated, setSnapshotSelections } from '../../actions';
+import { getSelected, getSelectedDataDeprecated } from '../../actions';
 
 import { SampleOperation } from '../samples/constants';
 import { SchemaQuery } from '../../../public/SchemaQuery';
@@ -259,12 +259,6 @@ async function getSelectedParents(
     return resolveEntityParentTypeFromIds(schemaQuery, response, isAliquotParent, orderedRowIds);
 }
 
-export async function getSelectedItemSamples(selectedItemIds: string[]): Promise<number[]> {
-    const { queryName, schemaName } = SCHEMAS.INVENTORY.ITEMS;
-    const { data } = await getSelectedDataDeprecated(schemaName, queryName, selectedItemIds, 'RowId, MaterialId');
-    return data.map(row => row.getIn(['MaterialId', 'value'])).toArray();
-}
-
 function resolveSampleParentTypes(
     response: SelectRowsResponse,
     isAliquotParent?: boolean,
@@ -752,6 +746,7 @@ export function getDataOperationConfirmationData(
     );
 }
 
+// TODO: I believe we can drop the dataRegionSelectionKey arg and make rowIds required.
 export function getCrossFolderSelectionResult(
     dataRegionSelectionKey: string,
     dataType: string, // 'samples' | 'exp.data' | 'assay',

packages/components/src/internal/components/picklist/ChoosePicklistModal.tsx

@@ -24,7 +24,7 @@ import { PICKLIST_KEY } from '../../app/constants';
 
 import { addSamplesToPicklist, getPicklistsForInsert, SampleTypeCount } from './actions';
 import { Picklist } from './models';
-import { useSampleSelections } from './usePIcklistSelections';
+import { usePicklistSampleSelections } from './usePicklistSampleSelections';
 import { SchemaQuery } from '../../../public/SchemaQuery';
 import { useLoadableState } from '../../useLoadableState';
 
@@ -411,7 +411,7 @@ export const ChoosePicklistModal: FC<ChoosePicklistModalProps> = memo(props => {
         error: sampleIdsError,
         loadingState: sampleIdsLoadingState,
         value: sampleIds,
-    } = useSampleSelections(selectedRowIds, sampleFieldKey, schemaQuery);
+    } = usePicklistSampleSelections(selectedRowIds, sampleFieldKey, schemaQuery);
     const {
         error: picklistError,
         loadingState: picklistLoadingState,

packages/components/src/internal/components/picklist/PicklistEditModal.test.tsx

@@ -1,9 +1,5 @@
 import React from 'react';
 
-import { makeTestQueryModel } from '../../../public/QueryModel/testUtils';
-
-import { SchemaQuery } from '../../../public/SchemaQuery';
-
 import { renderWithAppContext } from '../../test/reactTestLibraryHelpers';
 
 import { PRIVATE_PICKLIST_CATEGORY, PUBLIC_PICKLIST_CATEGORY } from './constants';

packages/components/src/internal/components/picklist/PicklistEditModal.tsx

@@ -14,7 +14,7 @@ import { Picklist } from './models';
 import { createPicklist, updatePicklist } from './actions';
 import { PRIVATE_PICKLIST_CATEGORY, PUBLIC_PICKLIST_CATEGORY } from './constants';
 import { SchemaQuery } from '../../../public/SchemaQuery';
-import { useSampleSelections } from './usePIcklistSelections';
+import { usePicklistSampleSelections } from './usePicklistSampleSelections';
 import { isLoading } from '../../../public/LoadingState';
 import { LoadingSpinner } from '../base/LoadingSpinner';
 
@@ -190,7 +190,7 @@ export const PicklistEditModal: FC<PicklistEditModalProps> = memo(props => {
         showNotification,
     } = props;
 
-    const { error, loadingState, value: sampleIds } = useSampleSelections(selectedRowIds, sampleFieldKey, schemaQuery);
+    const { error, loadingState, value: sampleIds } = usePicklistSampleSelections(selectedRowIds, sampleFieldKey, schemaQuery);
     const loading = isLoading(loadingState);
 
     if (loading || error !== undefined) {

packages/components/src/internal/components/picklist/actions.ts

@@ -1,4 +1,4 @@
-import { Ajax, Domain, Filter, Query, Utils } from '@labkey/api';
+import { Domain, Filter, Query } from '@labkey/api';
 
 import { List } from 'immutable';
 
@@ -22,23 +22,18 @@ import { getOrderedSelectedMappedKeys } from '../entities/actions';
 import { Picklist, PICKLIST_KEY_COLUMN, PICKLIST_SAMPLE_ID_COLUMN } from './models';
 import { PRIVATE_PICKLIST_CATEGORY, PUBLIC_PICKLIST_CATEGORY } from './constants';
 import { executeSql } from '../../query/executeSql';
-import { getSelectedRows, Row, selectRows } from '../../query/selectRows';
+import { getSelectedRows, selectRows } from '../../query/selectRows';
 import { request } from '../../request';
 
 export async function getPicklistsForInsert(): Promise<Picklist[]> {
-    try {
-        const { rows } = await selectRows({
-            containerFilter: isProductFoldersEnabled() ? Query.ContainerFilter.current : undefined,
-            schemaQuery: SCHEMAS.LIST_METADATA_TABLES.PICKLISTS,
-            sort: 'Name',
-            filterArray: [Filter.create('Category', null, Filter.Types.NONBLANK)],
-        });
+    const { rows } = await selectRows({
+        containerFilter: isProductFoldersEnabled() ? Query.ContainerFilter.current : undefined,
+        schemaQuery: SCHEMAS.LIST_METADATA_TABLES.PICKLISTS,
+        sort: 'Name',
+        filterArray: [Filter.create('Category', null, Filter.Types.NONBLANK)],
+    });
 
-        return rows.map(row => Picklist.create(row));
-    } catch (error) {
-        console.error(error);
-        throw error;
-    }
+    return rows.map(row => Picklist.create(row));
 }
 
 export function createPicklist(
@@ -195,28 +190,23 @@ export async function getSelectedPicklistSamples(
     queryParameters?: Record<string, any>,
     viewName?: string
 ): Promise<number[]> {
-    try {
-        const result = await getOrderedSelectedMappedKeys(
-            PICKLIST_KEY_COLUMN,
-            PICKLIST_SAMPLE_ID_COLUMN,
-            SCHEMAS.PICKLIST_TABLES.SCHEMA,
-            picklistName,
-            selectedIds,
-            sorts,
-            queryParameters,
-            viewName
-        );
-
-        if (saveSnapshot) {
-            const rowIds = result.mapFromValues;
-            setSnapshotSelections(selectionKey, rowIds);
-        }
-
-        return result.mapToValues;
-    } catch (error) {
-        console.error(error);
-        throw error;
+    const result = await getOrderedSelectedMappedKeys(
+        PICKLIST_KEY_COLUMN,
+        PICKLIST_SAMPLE_ID_COLUMN,
+        SCHEMAS.PICKLIST_TABLES.SCHEMA,
+        picklistName,
+        selectedIds,
+        sorts,
+        queryParameters,
+        viewName
+    );
+
+    if (saveSnapshot) {
+        const rowIds = result.mapFromValues;
+        setSnapshotSelections(selectionKey, rowIds);
     }
+
+    return result.mapToValues;
 }
 
 export async function getSamplesNotInList(listName: string, sampleIds: number[]): Promise<number[]> {
@@ -227,7 +217,7 @@ export async function getSamplesNotInList(listName: string, sampleIds: number[])
 export async function addSamplesToPicklist(listName: string, sampleIds: number[]): Promise<QueryCommandResponse> {
     const sampleIdsToAdd = await getSamplesNotInList(listName, sampleIds);
     const rows = List(sampleIdsToAdd.map(id => ({ SampleId: id })));
-    const schemaQuery = new SchemaQuery('lists', listName);
+    const schemaQuery = new SchemaQuery(SCHEMAS.PICKLIST_TABLES.SCHEMA, listName);
 
     if (rows.size > 0) {
         return await insertRows({ schemaQuery, rows });
@@ -249,21 +239,14 @@ export interface PicklistDeletionData {
 }
 
 export async function getPicklistDeleteData(model: QueryModel, user: User): Promise<PicklistDeletionData> {
-    let rows: Row[];
-    try {
-        const result = await getSelectedRows({
-            columns: ['Name', 'listId', 'category', 'createdBy'],
-            keyColumn: 'listId',
-            schemaQuery: model.schemaQuery,
-            selections: model.selections,
-        });
-        rows = result.rows;
-    } catch (error) {
-        console.error(error);
-        throw error;
-    }
+    const result = await getSelectedRows({
+        columns: ['Name', 'listId', 'category', 'createdBy'],
+        keyColumn: 'listId',
+        schemaQuery: model.schemaQuery,
+        selections: model.selections,
+    });
 
-    return rows.reduce(
+    return result.rows.reduce(
         (result, row) => {
             const picklist = Picklist.create(row);
             if (picklist.isDeletable(user)) {

…onents/picklist/usePIcklistSelections.ts …/picklist/usePicklistSampleSelections.tspackages/components/src/internal/components/picklist/usePIcklistSelections.ts renamed to packages/components/src/internal/components/picklist/usePicklistSampleSelections.ts packages/components/src/internal/components/picklist/usePIcklistSelections.ts renamed to packages/components/src/internal/components/picklist/usePicklistSampleSelections.ts

@@ -13,7 +13,7 @@ type PicklistSelectionState = LoadableState<number[]>;
  * @param sampleFieldKey the sampleFieldKey if the selectedRowIds aren't sample rowIds
  * @param schemaQuery the schemaQuery needed to fetch the SampleIds, required if you pass sampleFieldKey.
  */
-export function useSampleSelections(
+export function usePicklistSampleSelections(
     selectedRowIds: number[] | string[] | undefined,
     sampleFieldKey: string | undefined,
     schemaQuery: SchemaQuery | undefined