Skip to content

Commit

Permalink
feat: updated access facet position in category group (#4133)
Browse files Browse the repository at this point in the history
  • Loading branch information
Fran McDade authored and Fran McDade committed Nov 5, 2024
1 parent a97be95 commit 60129b4
Show file tree
Hide file tree
Showing 5 changed files with 215 additions and 144 deletions.
32 changes: 32 additions & 0 deletions explorer/site-config/hca-dcp/cc-ma-dev/index/common/category.ts
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
import {
CategoryConfig,
CategoryGroup,
} from "@databiosphere/findable-ui/lib/config/entities";
import { mapSelectCategoryValue } from "../../../../../app/config/utils";
import {
HCA_DCP_CATEGORY_KEY,
HCA_DCP_CATEGORY_LABEL,
} from "../../../category";
import { CATEGORY_GROUP } from "../../../dev/index/common/category";
import { mapAccessibleValue } from "./utils";

export const ACCESSIBLE: CategoryConfig = {
key: HCA_DCP_CATEGORY_KEY.ACCESSIBLE,
label: HCA_DCP_CATEGORY_LABEL.ACCESSIBLE,
mapSelectCategoryValue: mapSelectCategoryValue(mapAccessibleValue),
};

export const MA_CATEGORY_GROUP: Record<string, CategoryGroup> = {
PROJECT: {
...CATEGORY_GROUP.PROJECT,
categoryConfigs: [...CATEGORY_GROUP.PROJECT.categoryConfigs, ACCESSIBLE],
},
};

export const CATEGORY_GROUPS: CategoryGroup[] = [
MA_CATEGORY_GROUP.PROJECT,
CATEGORY_GROUP.DONOR,
CATEGORY_GROUP.SAMPLE,
CATEGORY_GROUP.PROTOCOL,
CATEGORY_GROUP.FILE,
];
19 changes: 0 additions & 19 deletions explorer/site-config/hca-dcp/cc-ma-dev/index/common/constants.ts
View file
Original file line number Diff line number Diff line change
@@ -1,34 +1,15 @@
import {
CategoryGroup,
ColumnConfig,
ComponentConfig,
} from "@databiosphere/findable-ui/lib/config/entities";
import { ProjectsResponse } from "../../../../../app/apis/azul/hca-dcp/common/responses";
import { PickSome } from "../../../../../app/common/types";
import * as C from "../../../../../app/components";
import { mapSelectCategoryValue } from "../../../../../app/config/utils";
import * as V from "../../../../../app/viewModelBuilders/azul/hca-dcp/common/viewModelBuilders";
import {
HCA_DCP_CATEGORY_KEY,
HCA_DCP_CATEGORY_LABEL,
} from "../../../category";
import { mapAccessibleValue } from "./utils";

export const CATEGORY_GROUP: PickSome<
Record<keyof typeof HCA_DCP_CATEGORY_KEY, CategoryGroup>,
"ACCESSIBLE"
> = {
ACCESSIBLE: {
categoryConfigs: [
{
key: HCA_DCP_CATEGORY_KEY.ACCESSIBLE,
label: HCA_DCP_CATEGORY_LABEL.ACCESSIBLE,
mapSelectCategoryValue: mapSelectCategoryValue(mapAccessibleValue),
},
],
label: "Access",
},
};

export const COLUMN: PickSome<
Record<keyof typeof HCA_DCP_CATEGORY_KEY, ColumnConfig>,
Expand Down
8 changes: 3 additions & 5 deletions explorer/site-config/hca-dcp/cc-ma-dev/index/projectsEntityConfig.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ import {
import { getMAProjectDetailTabs } from "../detail/project/mainColumn";
import { getMAProjectDetailTop } from "../detail/project/top";
import { listHero } from "../listView/projectsListHero";
import { CATEGORY_GROUP, COLUMN } from "./common/constants";
import { CATEGORY_GROUPS } from "./common/category";
import { COLUMN } from "./common/constants";

/**
* Returns managed access category group config.
Expand All @@ -18,10 +19,7 @@ export function getMACategoryGroupConfig(
if (categoryGroupConfig) {
return {
...categoryGroupConfig,
categoryGroups: [
CATEGORY_GROUP.ACCESSIBLE,
...categoryGroupConfig.categoryGroups,
],
categoryGroups: CATEGORY_GROUPS,
};
}
}
Expand Down
122 changes: 2 additions & 120 deletions explorer/site-config/hca-dcp/dev/config.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ import * as C from "../../../app/components/index";
import { bindSystemStatusResponse } from "../../../app/viewModelBuilders/azul/common/systemStatusMapper/systemStatusMapper";
import { FLATTEN } from "../../common/constants";
import { SiteConfig } from "../../common/entities";
import { HCA_DCP_CATEGORY_KEY, HCA_DCP_CATEGORY_LABEL } from "../category";
import { announcements } from "./announcements/announcements";
import { exportConfig } from "./export/export";
import { CATEGORY_GROUPS } from "./index/common/category";
import { filesEntityConfig } from "./index/filesEntityConfig";
import { projectsEntityConfig } from "./index/projectsEntityConfig";
import { samplesEntityConfig } from "./index/samplesEntityConfig";
Expand Down Expand Up @@ -50,125 +50,7 @@ export function makeConfig(
authentication: undefined,
browserURL: browserUrl,
categoryGroupConfig: {
categoryGroups: [
{
categoryConfigs: [
{
key: HCA_DCP_CATEGORY_KEY.PROJECT_TITLE,
label: HCA_DCP_CATEGORY_LABEL.PROJECT_TITLE,
},
{
key: HCA_DCP_CATEGORY_KEY.CONTACT_NAME,
label: HCA_DCP_CATEGORY_LABEL.CONTACT_NAME,
},
{
key: HCA_DCP_CATEGORY_KEY.INSTITUTION,
label: HCA_DCP_CATEGORY_LABEL.INSTITUTION,
},
{
key: HCA_DCP_CATEGORY_KEY.BIONETWORK_NAME,
label: HCA_DCP_CATEGORY_LABEL.BIONETWORK_NAME,
},
],
label: "Project",
},
{
categoryConfigs: [
{
key: HCA_DCP_CATEGORY_KEY.BIOLOGICAL_SEX,
label: HCA_DCP_CATEGORY_LABEL.BIOLOGICAL_SEX,
},
{
key: HCA_DCP_CATEGORY_KEY.DEVELOPMENT_STAGE,
label: HCA_DCP_CATEGORY_LABEL.DEVELOPMENT_STAGE,
},
{
key: HCA_DCP_CATEGORY_KEY.DONOR_DISEASE,
label: HCA_DCP_CATEGORY_LABEL.DONOR_DISEASE,
},
{
key: HCA_DCP_CATEGORY_KEY.GENUS_SPECIES,
label: HCA_DCP_CATEGORY_LABEL.GENUS_SPECIES,
},
],
label: "Donor",
},
{
categoryConfigs: [
{
key: HCA_DCP_CATEGORY_KEY.ANATOMICAL_ENTITY, // specimenOrgan
label: HCA_DCP_CATEGORY_LABEL.ANATOMICAL_ENTITY,
},
{
key: HCA_DCP_CATEGORY_KEY.ORGAN_PART,
label: HCA_DCP_CATEGORY_LABEL.ORGAN_PART,
},
{
key: HCA_DCP_CATEGORY_KEY.PRESERVATION_METHOD,
label: HCA_DCP_CATEGORY_LABEL.PRESERVATION_METHOD,
},
{
key: HCA_DCP_CATEGORY_KEY.MODEL_ORGAN,
label: HCA_DCP_CATEGORY_LABEL.MODEL_ORGAN,
},
{
key: HCA_DCP_CATEGORY_KEY.SAMPLE_ENTITY_TYPE,
label: HCA_DCP_CATEGORY_LABEL.SAMPLE_ENTITY_TYPE,
},
{
key: HCA_DCP_CATEGORY_KEY.SELECTED_CELL_TYPE,
label: HCA_DCP_CATEGORY_LABEL.SELECTED_CELL_TYPE,
},
{
key: HCA_DCP_CATEGORY_KEY.SPECIMEN_DISEASE,
label: HCA_DCP_CATEGORY_LABEL.SPECIMEN_DISEASE,
},
],
label: "Sample",
},
{
categoryConfigs: [
{
key: HCA_DCP_CATEGORY_KEY.ANALYSIS_PROTOCOL, // workflow
label: HCA_DCP_CATEGORY_LABEL.ANALYSIS_PROTOCOL,
},
{
key: HCA_DCP_CATEGORY_KEY.INSTRUMENT_MANUFACTURER_MODEL,
label: HCA_DCP_CATEGORY_LABEL.INSTRUMENT_MANUFACTURER_MODEL,
},
{
key: HCA_DCP_CATEGORY_KEY.LIBRARY_CONSTRUCTION_METHOD,
label: HCA_DCP_CATEGORY_LABEL.LIBRARY_CONSTRUCTION_METHOD,
},
{
key: HCA_DCP_CATEGORY_KEY.NUCLEIC_ACID_SOURCE,
label: HCA_DCP_CATEGORY_LABEL.NUCLEIC_ACID_SOURCE,
},
{
key: HCA_DCP_CATEGORY_KEY.PAIRED_END,
label: HCA_DCP_CATEGORY_LABEL.PAIRED_END,
},
],
label: "Protocol",
},
{
categoryConfigs: [
{
key: HCA_DCP_CATEGORY_KEY.CONTENT_DESCRIPTION,
label: HCA_DCP_CATEGORY_LABEL.CONTENT_DESCRIPTION,
},
{
key: HCA_DCP_CATEGORY_KEY.FILE_FORMAT,
label: HCA_DCP_CATEGORY_LABEL.FILE_FORMAT,
},
{
key: HCA_DCP_CATEGORY_KEY.FILE_SOURCE,
label: HCA_DCP_CATEGORY_LABEL.FILE_SOURCE,
},
],
label: "File",
},
],
categoryGroups: CATEGORY_GROUPS,
key: "hca-dcp",
},
dataSource: {
Expand Down
Loading

0 comments on commit 60129b4

Please sign in to comment.