Fix circular dependency in unit tests

src/pages/patientView/clinicalInformation/PatientViewPageStore.ts

@@ -191,7 +191,8 @@ import {
     IMutationalSignature,
     IMutationalSignatureMeta,
 } from 'shared/model/MutationalSignature';
-import { GenericAssayTypeConstants } from 'shared/lib/GenericAssayUtils/GenericAssayCommonUtils';
+import { GenericAssayTypeConstants } from 'shared/lib/GenericAssayUtils/GenericAssayConfig';
+
 import {
     MutationalSignaturesVersion,
     MutationalSignatureStableIdKeyWord,

src/pages/resultsView/plots/PlotsTabUtils.spec.ts

@@ -40,7 +40,7 @@ import {
 import { getServerConfig } from 'config/config';
 import ServerConfigDefaults from 'config/serverConfigDefaults';
 import _ from 'lodash';
-import { GenericAssayTypeConstants } from 'shared/lib/GenericAssayUtils/GenericAssayCommonUtils';
+import { GenericAssayTypeConstants } from 'shared/lib/GenericAssayUtils/GenericAssayConfig';
 
 describe('PlotsTabUtils', () => {
     describe('makeClinicalAttributeOptions', () => {

src/pages/resultsView/plots/QuickPlots.spec.ts

@@ -1,7 +1,7 @@
 import { assert } from 'chai';
 import { PlotsTabOption, PlotsTabDataSource } from './PlotsTab';
 import { generateQuickPlots, ButtonInfo, TypeSourcePair } from './QuickPlots';
-import { GenericAssayTypeConstants } from 'shared/lib/GenericAssayUtils/GenericAssayCommonUtils';
+import { GenericAssayTypeConstants } from 'shared/lib/GenericAssayUtils/GenericAssayConfig';
 
 describe('Quick Plot Links in the Plots Tab', () => {
     describe('generateQuickplots', () => {

src/pages/resultsView/plots/QuickPlots.ts

@@ -7,7 +7,7 @@ import {
 import { AlterationTypeConstants } from '../ResultsViewPageStore';
 import { SpecialAttribute } from 'shared/cache/ClinicalDataCache';
 import { CLIN_ATTR_DATA_TYPE } from './PlotsTabUtils';
-import { GenericAssayTypeConstants } from 'shared/lib/GenericAssayUtils/GenericAssayCommonUtils';
+import { GenericAssayTypeConstants } from 'shared/lib/GenericAssayUtils/GenericAssayConfig';
 
 export type ButtonInfo = {
     selected: boolean;

src/shared/components/oncoprint/DeltaUtils.spec.ts

@@ -20,7 +20,7 @@ import {
     IHeatmapTrackSpec,
     IOncoprintProps,
 } from './Oncoprint';
-import { GenericAssayTypeConstants } from 'shared/lib/GenericAssayUtils/GenericAssayCommonUtils';
+import { GenericAssayTypeConstants } from 'shared/lib/GenericAssayUtils/GenericAssayConfig';
 
 describe('Oncoprint DeltaUtils', () => {
     describe('numTracksWhoseDataChanged', () => {

src/shared/components/oncoprint/ResultsViewOncoprintUtils.spec.ts

@@ -10,7 +10,7 @@ import {
     makeProfiledInClinicalAttributes,
 } from './ResultsViewOncoprintUtils';
 import { SpecialAttribute } from '../../cache/ClinicalDataCache';
-import { GenericAssayTypeConstants } from 'shared/lib/GenericAssayUtils/GenericAssayCommonUtils';
+import { GenericAssayTypeConstants } from 'shared/lib/GenericAssayUtils/GenericAssayConfig';
 
 describe('ResultsViewOncoprintUtils', () => {
     describe('makeProfiledInClinicalAttributes', () => {

src/shared/lib/GenericAssayUtils/GenericAssayCommonUtils.spec.ts

@@ -5,13 +5,13 @@ import {
     getGenericAssayMetaPropertyOrDefault,
     COMMON_GENERIC_ASSAY_PROPERTY,
     deriveDisplayTextFromGenericAssayType,
-    GenericAssayTypeConstants,
     formatGenericAssayCompactLabelByNameAndId,
     filterGenericAssayEntitiesByGenes,
     makeGenericAssayPlotsTabOption,
 } from './GenericAssayCommonUtils';
 import { getServerConfig } from 'config/config';
 import ServerConfigDefaults from 'config/serverConfigDefaults';
+import { GenericAssayTypeConstants } from 'shared/lib/GenericAssayUtils/GenericAssayConfig';
 
 describe('GenericAssayCommonUtils', () => {
     describe('makeGenericAssayOption()', () => {
@@ -373,8 +373,8 @@ describe('GenericAssayCommonUtils', () => {
                 filterGenericAssayEntitiesByGenes(
                     [genericAssayEntity],
                     TARGET_GENE_LIST
-                ),
-                []
+                ).length,
+                0
             );
         });
     });

src/shared/lib/GenericAssayUtils/GenericAssayCommonUtils.ts

@@ -1,4 +1,3 @@
-import { AlterationTypeConstants } from '../../../pages/resultsView/ResultsViewPageStore';
 import client from 'shared/api/cbioportalClientInstance';
 import {
     GenericAssayMetaFilter,
@@ -13,8 +12,11 @@ import {
     doesOptionMatchSearchText,
     ISelectOption,
 } from './GenericAssaySelectionUtils';
-import { GENERIC_ASSAY_CONFIG } from './GenericAssayConfig';
-import Pluralize from 'pluralize';
+import {
+    GENERIC_ASSAY_CONFIG,
+    GenericAssayTypeConstants,
+} from 'shared/lib/GenericAssayUtils/GenericAssayConfig';
+import * as Pluralize from 'pluralize';
 
 export const NOT_APPLICABLE_VALUE = 'NA';
 export const COMMON_GENERIC_ASSAY_PROPERTY = {
@@ -23,13 +25,6 @@ export const COMMON_GENERIC_ASSAY_PROPERTY = {
     URL: 'URL',
 };
 
-export const GenericAssayTypeConstants: { [s: string]: string } = {
-    TREATMENT_RESPONSE: 'TREATMENT_RESPONSE',
-    MUTATIONAL_SIGNATURE: 'MUTATIONAL_SIGNATURE',
-    ARMLEVEL_CNA: 'ARMLEVEL_CNA',
-    METHYLATION: 'METHYLATION',
-};
-
 export const RESERVED_CATEGORY_ORDER_DICT: {
     [genericAssayType: string]: string[];
 } = {
@@ -51,10 +46,10 @@ export enum GenericAssayDataType {
 export async function fetchGenericAssayMetaByMolecularProfileIdsGroupedByGenericAssayType(
     molecularProfiles: MolecularProfile[]
 ) {
+    // TODO: use AlterationTypeContants here instead of string for GENERIC_ASSAY
+    // we removed it because importing from page store was causing circular dependency
     const genericAssayProfiles = molecularProfiles.filter(
-        profile =>
-            profile.molecularAlterationType ===
-            AlterationTypeConstants.GENERIC_ASSAY
+        profile => profile.molecularAlterationType === 'GENERIC_ASSAY'
     );
 
     const genericAssayProfilesGroupedByGenericAssayType = _.groupBy(
@@ -92,10 +87,7 @@ export async function fetchGenericAssayMetaByMolecularProfileIdsGroupByMolecular
     molecularProfiles: MolecularProfile[]
 ) {
     const genericAssayProfiles = molecularProfiles.filter(profile => {
-        return (
-            profile.molecularAlterationType ===
-            AlterationTypeConstants.GENERIC_ASSAY
-        );
+        return profile.molecularAlterationType === 'GENERIC_ASSAY';
     });
 
     const genericAssayMetaGroupByMolecularProfileId: {

src/shared/lib/GenericAssayUtils/GenericAssayConfig.ts

@@ -1,6 +1,5 @@
 import { getServerConfig } from 'config/config';
 import _ from 'lodash';
-import { GenericAssayTypeConstants } from './GenericAssayCommonUtils';
 
 export type GenericAssayConfig = {
     genericAssayConfigByType: {
@@ -9,6 +8,13 @@ export type GenericAssayConfig = {
     // Add more Generic Assay global config from here
 };
 
+export const GenericAssayTypeConstants: { [s: string]: string } = {
+    TREATMENT_RESPONSE: 'TREATMENT_RESPONSE',
+    MUTATIONAL_SIGNATURE: 'MUTATIONAL_SIGNATURE',
+    ARMLEVEL_CNA: 'ARMLEVEL_CNA',
+    METHYLATION: 'METHYLATION',
+};
+
 export type GenericAssayTypeConfig = {
     // Add more Generic Assay type specific config at here
     displayTitleText?: string;

src/shared/lib/GenericAssayUtils/MutationalSignaturesUtils.tsx

@@ -1,11 +1,9 @@
 import * as React from 'react';
 import _ from 'lodash';
 import { IMutationalSignature } from '../../model/MutationalSignature';
-import {
-    deriveDisplayTextFromGenericAssayType,
-    GenericAssayTypeConstants,
-} from './GenericAssayCommonUtils';
+import { deriveDisplayTextFromGenericAssayType } from './GenericAssayCommonUtils';
 import { GenericAssayData } from 'cbioportal-ts-api-client';
+import { GenericAssayTypeConstants } from 'shared/lib/GenericAssayUtils/GenericAssayConfig';
 
 export enum MutationalSignaturesVersion {
     V2 = 'v2',