Skip to content

Commit

Permalink
feat: side by side embeddings
Browse files Browse the repository at this point in the history
  • Loading branch information
tihuan committed Jun 18, 2024
1 parent 34824b9 commit c5f9dd7
Show file tree
Hide file tree
Showing 87 changed files with 1,964 additions and 1,908 deletions.
36 changes: 15 additions & 21 deletions client/__tests__/e2e/cellxgeneActions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -605,37 +605,34 @@ export async function requestGeneInfo(gene: string, page: Page): Promise<void> {
await expect(page.getByTestId(`${gene}:gene-info`)).toBeTruthy();
}

export async function assertGeneInfoCardExists(
export async function assertInfoPanelExists(
gene: string,
page: Page
): Promise<void> {
await expect(page.getByTestId(`${gene}:gene-info`)).toBeTruthy();
await expect(page.getByTestId(`gene-info-header`)).toBeTruthy();
await expect(page.getByTestId(`min-gene-info`)).toBeTruthy();
await expect(page.getByTestId(`info-panel-header`)).toBeTruthy();
await expect(page.getByTestId(`min-info-panel`)).toBeTruthy();

await expect(page.getByTestId(`clear-info-summary`).innerText).not.toEqual(
""
);
await expect(page.getByTestId(`gene-info-synonyms`).innerText).not.toEqual(
""
);

await expect(page.getByTestId(`gene-info-link`)).toBeTruthy();
}

export async function minimizeGeneInfo(page: Page): Promise<void> {
await page.getByTestId("min-gene-info").click();
export async function minimizeInfoPanel(page: Page): Promise<void> {
await page.getByTestId("min-info-panel").click();
}

export async function assertGeneInfoCardIsMinimized(
export async function assertInfoPanelIsMinimized(
gene: string,
page: Page
): Promise<void> {
const testIds = [
`${gene}:gene-info`,
"gene-info-header",
"min-gene-info",
"clear-gene-info",
"info-panel-header",
"max-info-panel",
"close-info-panel",
];

await tryUntil(
Expand All @@ -644,27 +641,24 @@ export async function assertGeneInfoCardIsMinimized(
const result = await page.getByTestId(id).isVisible();
await expect(result).toBe(true);
}

const result = await page.getByTestId("gene-info-symbol").isVisible();
await expect(result).toBe(false);
},
{ page }
);
}

export async function removeGeneInfo(page: Page): Promise<void> {
await page.getByTestId("clear-gene-info").click();
export async function closeInfoPanel(page: Page): Promise<void> {
await page.getByTestId("close-info-panel").click();
}

export async function assertGeneInfoDoesNotExist(
export async function assertInfoPanelClosed(
gene: string,
page: Page
): Promise<void> {
const testIds = [
`${gene}:gene-info`,
"gene-info-header",
"min-gene-info",
"clear-gene-info",
"info-panel-header",
"min-info-panel",
"close-info-panel",
];
await tryUntil(
async () => {
Expand Down
24 changes: 11 additions & 13 deletions client/__tests__/e2e/e2e.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,12 @@ import {
selectCategory,
addGeneToSetAndExpand,
requestGeneInfo,
assertGeneInfoCardExists,
assertGeneInfoCardIsMinimized,
minimizeGeneInfo,
removeGeneInfo,
assertInfoPanelExists,
assertInfoPanelIsMinimized,
minimizeInfoPanel,
closeInfoPanel,
addGeneToSearch,
assertGeneInfoDoesNotExist,
assertInfoPanelClosed,
waitUntilNoSkeletonDetected,
checkGenesetDescription,
assertUndoRedo,
Expand Down Expand Up @@ -1215,9 +1215,7 @@ for (const testDataset of testDatasets) {
);
});

test("open gene info card and hide/remove", async ({
page,
}, testInfo) => {
test("open info panel and hide/remove", async ({ page }, testInfo) => {
await setup({ option, page, url, testInfo });
await addGeneToSearch(geneToRequestInfo, page);

Expand All @@ -1226,7 +1224,7 @@ for (const testDataset of testDatasets) {
await tryUntil(
async () => {
await requestGeneInfo(geneToRequestInfo, page);
await assertGeneInfoCardExists(geneToRequestInfo, page);
await assertInfoPanelExists(geneToRequestInfo, page);
},
{ page }
);
Expand All @@ -1235,8 +1233,8 @@ for (const testDataset of testDatasets) {

await tryUntil(
async () => {
await minimizeGeneInfo(page);
await assertGeneInfoCardIsMinimized(geneToRequestInfo, page);
await minimizeInfoPanel(page);
await assertInfoPanelIsMinimized(geneToRequestInfo, page);
},
{ page }
);
Expand All @@ -1245,8 +1243,8 @@ for (const testDataset of testDatasets) {

await tryUntil(
async () => {
await removeGeneInfo(page);
await assertGeneInfoDoesNotExist(geneToRequestInfo, page);
await closeInfoPanel(page);
await assertInfoPanelClosed(geneToRequestInfo, page);
},
{ page }
);
Expand Down
3 changes: 3 additions & 0 deletions client/__tests__/reducers/cascade.test.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// eslint-disable-next-line @typescript-eslint/ban-ts-comment -- okay to disable for tests
// @ts-nocheck -- Typing getting in way of unit test

import { expect, test } from "@playwright/test";

import cascadeReducers from "../../src/reducers/cascade";
Expand Down
1 change: 1 addition & 0 deletions client/configuration/babel/babel.dev.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,6 @@ module.exports = {
"@babel/plugin-proposal-export-namespace-from",
"@babel/plugin-proposal-optional-chaining",
"@babel/plugin-proposal-nullish-coalescing-operator",
"@emotion/babel-plugin",
],
};
1 change: 1 addition & 0 deletions client/configuration/babel/babel.prod.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,6 @@ module.exports = {
"@babel/plugin-transform-runtime",
"@babel/plugin-proposal-optional-chaining",
"@babel/plugin-proposal-nullish-coalescing-operator",
"@emotion/babel-plugin",
],
};
Loading

0 comments on commit c5f9dd7

Please sign in to comment.