-
Notifications
You must be signed in to change notification settings - Fork 9
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into kira/single-deposition-info-panel
* main: (21 commits) feat: add filter panel to single deposition page (#1030) chore(main): release web 1.21.0 (#1032) feat: Update Tomogram Processing field format and query (#1031) chore(main): release web 1.20.0 (#1028) feat: Implement collapsing Annotated Objects list (#1024) chore: Add e2e test for errors on Neuroglancer site (#1027) chore(main): release web 1.19.1 (#1023) fix: Fix Neuroglancer URL bug (#1026) fix: Dedupe authors (#1018) chore(main): release web 1.19.0 (#1019) refactor: download dialog tests (#1011) feat: Add Tomograms table (#988) feat: Enable pagination of Annotations table with temporary hacky query (#992) chore(main): release web 1.18.0 (#984) feat: Add Tomograms tab to Run page (#983) chore: remove extra GHA concurrency lock from prod-deploy.yml (#982) feat: add user agent to client requests (#966) chore: Add additional test case to TestGetDestinationPath (#955) chore(main): release web 1.17.0 (#971) ci: update frontend release pr filter (#977) ...
- Loading branch information
Showing
79 changed files
with
2,543 additions
and
1,965 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
11 changes: 11 additions & 0 deletions
11
client/python/cryoet_data_portal/src/cryoet_data_portal/_constants.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
import sys | ||
|
||
from ._version import version | ||
|
||
# added to all http requests to identify the client for analytics | ||
USER_AGENT = ";".join( | ||
[ | ||
f"python={sys.version_info.major}.{sys.version_info.minor}", | ||
f"cryoet_data_portal_client={version}", | ||
], | ||
) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
11 changes: 11 additions & 0 deletions
11
client/python/cryoet_data_portal/src/cryoet_data_portal/_version.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
try: | ||
from importlib import metadata | ||
except ImportError: | ||
# for python <=3.7 | ||
import importlib_metadata as metadata # type: ignore[no-redef] | ||
|
||
try: | ||
version = metadata.version("cryoet_data_portal") | ||
except metadata.PackageNotFoundError: | ||
# package is not installed | ||
version = "0.0.0-unknown" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
35 changes: 35 additions & 0 deletions
35
frontend/packages/data-portal/_templates/e2e/new/pageActor.cjs.t
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
--- | ||
to: e2e/pageObjects/<%= name %>/<%= name %>Actor.ts | ||
--- | ||
/** | ||
* This file contains combinations of page interactions or data fetching. Remove if not needed. | ||
*/ | ||
import { <%= h.changeCase.pascal(name) %>Page } from 'e2e/pageObjects/<%= name %>/<%= name %>Page' | ||
|
||
export class <%= h.changeCase.pascal(name) %>Actor { | ||
private <%= name %>Page: <%= h.changeCase.pascal(name) %>Page | ||
|
||
constructor(<%= name %>Page: <%= h.changeCase.pascal(name) %>Page) { | ||
this.<%= name %>Page = <%= name %>Page | ||
} | ||
// #region Navigate | ||
// #endregion Navigate | ||
|
||
// #region Click | ||
// #endregion Click | ||
|
||
// #region Hover | ||
// #endregion Hover | ||
|
||
// #region Get | ||
// #endregion Get | ||
|
||
// #region Macro | ||
// #endregion Macro | ||
|
||
// #region Validation | ||
// #endregion Validation | ||
|
||
// #region Bool | ||
// #endregion Bool | ||
} |
1 change: 1 addition & 0 deletions
1
frontend/packages/data-portal/_templates/e2e/new/pageObject.cjs.t
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
11 changes: 9 additions & 2 deletions
11
frontend/packages/data-portal/_templates/e2e/new/testFile.cjs.t
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,12 +1,19 @@ | ||
--- | ||
to: e2e/<%= name %>.test.ts | ||
--- | ||
import { ApolloClient, NormalizedCacheObject } from '@apollo/client' | ||
import { test } from '@playwright/test' | ||
import { <%= h.changeCase.pascal(name) %>Page } from 'e2e/pageObjects/<%= name %>/<%= name %>Page' | ||
|
||
test.describe('<%= name %>', () => { | ||
test('should work', async ({ page }) => { | ||
const <%= name %>Page = new <%= h.changeCase.pascal(name) %>Page(page) | ||
let client: ApolloClient<NormalizedCacheObject> | ||
let <%= name %>Page: <%= h.changeCase.pascal(name) %>Page | ||
|
||
test.beforeEach(({page}) => { | ||
<%= name %>Page = new <%= h.changeCase.pascal(name) %>Page(page) | ||
}) | ||
|
||
test('should work', async () => { | ||
await <%= name %>Page.goTo('https://playwright.dev/') | ||
}) | ||
}) |
Oops, something went wrong.