Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into 3685_pin_tracks
Browse files Browse the repository at this point in the history
  • Loading branch information
@garrettjstevens
garrettjstevens committed Mar 6, 2024
2 parents 635b2fd + 7c0a96d commit 7987065
Show file tree
Hide file tree
Showing 78 changed files with 6,427 additions and 5,623 deletions.
1 change: 1 addition & 0 deletions component_tests/cgv/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
"@jbrowse/plugin-data-management": "file:./packed/jbrowse-plugin-data-management.tgz",
"@jbrowse/plugin-gccontent": "file:./packed/jbrowse-plugin-gccontent.tgz",
"@jbrowse/plugin-gff3": "file:./packed/jbrowse-plugin-gff3.tgz",
"@jbrowse/plugin-legacy-jbrowse": "file:./packed/jbrowse-plugin-legacy-jbrowse.tgz",
"@jbrowse/plugin-linear-genome-view": "file:./packed/jbrowse-plugin-linear-genome-view.tgz",
"@jbrowse/plugin-sequence": "file:./packed/jbrowse-plugin-sequence.tgz",
"@jbrowse/plugin-svg": "file:./packed/jbrowse-plugin-svg.tgz",
Expand Down
12 changes: 6 additions & 6 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"@mui/system": "^5.14.4",
"@mui/x-data-grid": "^6.0.1",
"@node-oauth/express-oauth-server": "^4.0.0",
"@oclif/test": "^2.4.8",
"@oclif/test": "^3.2.1",
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.3",
"@r2wc/react-to-web-component": "^2.0.3",
"@storybook/addon-essentials": "^7.0.0",
Expand Down Expand Up @@ -100,9 +100,9 @@
"css-minimizer-webpack-plugin": "^6.0.0",
"dependency-graph": "^0.11.0",
"dotenv": "^16.3.1",
"dotenv-expand": "^10.0.0",
"electron": "28.2.1",
"electron-builder": "^24.8.0",
"dotenv-expand": "^11.0.3",
"electron": "29.1.0",
"electron-builder": "^24.9.0",
"electron-mock-ipc": "^0.3.8",
"eslint": "^8.0.0",
"eslint-config-prettier": "^9.0.0",
Expand All @@ -111,7 +111,7 @@
"eslint-plugin-react-hooks": "^4.3.0",
"eslint-plugin-react-refresh": "^0.4.3",
"eslint-plugin-tsdoc": "^0.2.4",
"eslint-plugin-unicorn": "^50.0.1",
"eslint-plugin-unicorn": "^51.0.1",
"express": "^4.18.2",
"express-basic-auth": "^1.2.1",
"file-loader": "^6.2.0",
Expand Down Expand Up @@ -155,7 +155,7 @@
"web-encoding": "^1.1.5",
"webpack": "^5.64.4",
"webpack-cli": "^5.1.4",
"webpack-dev-server": "^4.6.0",
"webpack-dev-server": "^5.0.0",
"webpack-manifest-plugin": "^5.0.0"
},
"version": "0.0.0",
Expand Down
220 changes: 111 additions & 109 deletions packages/core/BaseFeatureWidget/__snapshots__/index.test.tsx.snap
View file
Original file line number Diff line number Diff line change
@@ -1,153 +1,155 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`open up a widget 1`] = `
<div
class="MuiPaper-root MuiPaper-elevation MuiPaper-rounded MuiPaper-elevation1 MuiAccordion-root MuiAccordion-rounded Mui-expanded MuiAccordion-gutters css-1c35hjw-MuiPaper-root-MuiAccordion-root"
>
<div>
<div
aria-expanded="true"
class="MuiButtonBase-root MuiAccordionSummary-root Mui-expanded MuiAccordionSummary-gutters css-sh22l5-MuiButtonBase-root-MuiAccordionSummary-root"
role="button"
tabindex="0"
class="MuiPaper-root MuiPaper-elevation MuiPaper-rounded MuiPaper-elevation1 MuiAccordion-root MuiAccordion-rounded Mui-expanded MuiAccordion-gutters css-1c35hjw-MuiPaper-root-MuiAccordion-root"
>
<div
class="MuiAccordionSummary-content Mui-expanded MuiAccordionSummary-contentGutters css-o4b71y-MuiAccordionSummary-content"
aria-expanded="true"
class="MuiButtonBase-root MuiAccordionSummary-root Mui-expanded MuiAccordionSummary-gutters css-sh22l5-MuiButtonBase-root-MuiAccordionSummary-root"
role="button"
tabindex="0"
>
<span
class="MuiTypography-root MuiTypography-button css-1f0on15-MuiTypography-root"
<div
class="MuiAccordionSummary-content Mui-expanded MuiAccordionSummary-contentGutters css-o4b71y-MuiAccordionSummary-content"
>
</span>
</div>
<div
class="MuiAccordionSummary-expandIconWrapper Mui-expanded css-yw020d-MuiAccordionSummary-expandIconWrapper"
>
<svg
aria-hidden="true"
class="MuiSvgIcon-root MuiSvgIcon-fontSizeMedium css-ymsoo8-MuiSvgIcon-root-expandIcon"
data-testid="ExpandMoreIcon"
focusable="false"
viewBox="0 0 24 24"
<span
class="MuiTypography-root MuiTypography-button css-1f0on15-MuiTypography-root"
>
</span>
</div>
<div
class="MuiAccordionSummary-expandIconWrapper Mui-expanded css-yw020d-MuiAccordionSummary-expandIconWrapper"
>
<path
d="M16.59 8.59 12 13.17 7.41 8.59 6 10l6 6 6-6z"
/>
</svg>
<svg
aria-hidden="true"
class="MuiSvgIcon-root MuiSvgIcon-fontSizeMedium css-ymsoo8-MuiSvgIcon-root-expandIcon"
data-testid="ExpandMoreIcon"
focusable="false"
viewBox="0 0 24 24"
>
<path
d="M16.59 8.59 12 13.17 7.41 8.59 6 10l6 6 6-6z"
/>
</svg>
</div>
</div>
</div>
<div
class="MuiCollapse-root MuiCollapse-vertical MuiCollapse-entered css-pwcg7p-MuiCollapse-root"
style="min-height: 0px;"
>
<div
class="MuiCollapse-wrapper MuiCollapse-vertical css-smkl36-MuiCollapse-wrapper"
class="MuiCollapse-root MuiCollapse-vertical MuiCollapse-entered css-pwcg7p-MuiCollapse-root"
style="min-height: 0px;"
>
<div
class="MuiCollapse-wrapperInner MuiCollapse-vertical css-9l5vo-MuiCollapse-wrapperInner"
class="MuiCollapse-wrapper MuiCollapse-vertical css-smkl36-MuiCollapse-wrapper"
>
<div
class="MuiAccordion-region"
role="region"
class="MuiCollapse-wrapperInner MuiCollapse-vertical css-9l5vo-MuiCollapse-wrapperInner"
>
<div
class="MuiAccordionDetails-root css-rqrb7m-MuiAccordionDetails-root-expansionPanelDetails"
class="MuiAccordion-region"
role="region"
>
<p
class="MuiTypography-root MuiTypography-body1 css-ahj2mt-MuiTypography-root"
>
Core details
</p>
<div
class="css-1m8nxnb-field"
class="MuiAccordionDetails-root css-rqrb7m-MuiAccordionDetails-root-expansionPanelDetails"
>
<div
class="css-1q83rf3-fieldName"
>
Position
</div>
<div
class="css-1omt041-fieldValue"
<p
class="MuiTypography-root MuiTypography-body1 css-ahj2mt-MuiTypography-root"
>
ctgA:3..102 (+)
</div>
</div>
<div
class="css-1m8nxnb-field"
>
Core details
</p>
<div
class="css-1q83rf3-fieldName"
class="css-1m8nxnb-field"
>
Length
<div
class="css-1q83rf3-fieldName"
>
Position
</div>
<div
class="css-1omt041-fieldValue"
>
ctgA:3..102 (+)
</div>
</div>
<div
class="css-1omt041-fieldValue"
class="css-1m8nxnb-field"
>
<span>
100
</span>
<div
class="css-1q83rf3-fieldName"
>
Length
</div>
<div
class="css-1omt041-fieldValue"
>
<span>
100
</span>
</div>
</div>
</div>
<hr
class="MuiDivider-root MuiDivider-fullWidth css-9mgopn-MuiDivider-root"
/>
<p
class="MuiTypography-root MuiTypography-body1 css-ahj2mt-MuiTypography-root"
>
Attributes
</p>
<div
class="css-1m8nxnb-field"
>
<div
class="css-1q83rf3-fieldName"
style="width: 40px;"
<hr
class="MuiDivider-root MuiDivider-fullWidth css-9mgopn-MuiDivider-root"
/>
<p
class="MuiTypography-root MuiTypography-body1 css-ahj2mt-MuiTypography-root"
>
score
</div>
Attributes
</p>
<div
class="css-1omt041-fieldValue"
class="css-1m8nxnb-field"
>
<span>
37
</span>
<div
class="css-1q83rf3-fieldName"
style="width: 40px;"
>
score
</div>
<div
class="css-1omt041-fieldValue"
>
<span>
37
</span>
</div>
</div>
</div>
<div
class="css-1lttu3w-container"
>
<button
class="MuiButtonBase-root MuiButton-root MuiButton-contained MuiButton-containedPrimary MuiButton-sizeMedium MuiButton-containedSizeMedium MuiButton-root MuiButton-contained MuiButton-containedPrimary MuiButton-sizeMedium MuiButton-containedSizeMedium css-sghohy-MuiButtonBase-root-MuiButton-root"
tabindex="0"
type="button"
>
Show feature sequence
<span
class="MuiTouchRipple-root css-8je8zh-MuiTouchRipple-root"
/>
</button>
<div
class="MuiFormControl-root css-147opmv-MuiFormControl-root-formControl"
class="css-1lttu3w-container"
>
<button
class="MuiButtonBase-root MuiIconButton-root MuiIconButton-sizeMedium css-78trlr-MuiButtonBase-root-MuiIconButton-root"
class="MuiButtonBase-root MuiButton-root MuiButton-contained MuiButton-containedPrimary MuiButton-sizeMedium MuiButton-containedSizeMedium MuiButton-colorPrimary MuiButton-root MuiButton-contained MuiButton-containedPrimary MuiButton-sizeMedium MuiButton-containedSizeMedium MuiButton-colorPrimary css-sghohy-MuiButtonBase-root-MuiButton-root"
tabindex="0"
type="button"
>
<svg
aria-hidden="true"
class="MuiSvgIcon-root MuiSvgIcon-fontSizeMedium css-i4bv87-MuiSvgIcon-root"
data-testid="HelpIcon"
focusable="false"
viewBox="0 0 24 24"
>
<path
d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2m1 17h-2v-2h2zm2.07-7.75-.9.92C13.45 12.9 13 13.5 13 15h-2v-.5c0-1.1.45-2.1 1.17-2.83l1.24-1.26c.37-.36.59-.86.59-1.41 0-1.1-.9-2-2-2s-2 .9-2 2H8c0-2.21 1.79-4 4-4s4 1.79 4 4c0 .88-.36 1.68-.93 2.25"
/>
</svg>
Show feature sequence
<span
class="MuiTouchRipple-root css-8je8zh-MuiTouchRipple-root"
/>
</button>
<div
class="MuiFormControl-root css-147opmv-MuiFormControl-root-formControl"
>
<button
class="MuiButtonBase-root MuiIconButton-root MuiIconButton-sizeMedium css-78trlr-MuiButtonBase-root-MuiIconButton-root"
tabindex="0"
type="button"
>
<svg
aria-hidden="true"
class="MuiSvgIcon-root MuiSvgIcon-fontSizeMedium css-i4bv87-MuiSvgIcon-root"
data-testid="HelpIcon"
focusable="false"
viewBox="0 0 24 24"
>
<path
d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2m1 17h-2v-2h2zm2.07-7.75-.9.92C13.45 12.9 13 13.5 13 15h-2v-.5c0-1.1.45-2.1 1.17-2.83l1.24-1.26c.37-.36.59-.86.59-1.41 0-1.1-.9-2-2-2s-2 .9-2 2H8c0-2.21 1.79-4 4-4s4 1.79 4 4c0 .88-.36 1.68-.93 2.25"
/>
</svg>
<span
class="MuiTouchRipple-root css-8je8zh-MuiTouchRipple-root"
/>
</button>
</div>
</div>
</div>
</div>
Expand Down
4 changes: 4 additions & 0 deletions packages/core/BaseFeatureWidget/configSchema.ts
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
import { ConfigurationSchema } from '../configuration'

const configSchema = ConfigurationSchema('BaseFeatureWidget', {})
export { configSchema }
6 changes: 4 additions & 2 deletions packages/core/BaseFeatureWidget/index.test.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@ test('open up a widget', async () => {
})
const model = Session.create(
{
widget: { type: 'BaseFeatureWidget' },
widget: {
type: 'BaseFeatureWidget',
},
},
{ pluginManager },
)
Expand All @@ -33,5 +35,5 @@ test('open up a widget', async () => {
refName: 'ctgA',
})
expect(await findByText('ctgA:3..102 (+)')).toBeTruthy()
expect(container.firstChild).toMatchSnapshot()
expect(container).toMatchSnapshot()
})
Loading

0 comments on commit 7987065

Please sign in to comment.