diff --git a/CHANGELOG.md b/CHANGELOG.md index f06073d6..85d4c053 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ *Note: Numbers like (\#123) point to closed Pull Requests on the fractal-web repository.* +# Unreleased + +* Added fractal logo (\#626); +* Removed usage of pip extras when installing fractal-server for testing (\#626); +* Removed usage of verbose query parameter in task collection (\#626); + # 1.9.0 * Alignment with fractal-server 2.7 (\#583, \#601, \#605, \#612, \#616, \#620): diff --git a/playwright.config.js b/playwright.config.js index dba4ba4e..77f9aab9 100644 --- a/playwright.config.js +++ b/playwright.config.js @@ -107,7 +107,7 @@ export default defineConfig({ webServer: [ { - command: './tests/start-test-server.sh 2.7.0', + command: './tests/start-test-server.sh 2.7.1', port: 8000, waitForPort: true, stdout: 'pipe', diff --git a/src/lib/assets/fractal-logo-medium.png b/src/lib/assets/fractal-logo-medium.png new file mode 100644 index 00000000..4a12fe6f Binary files /dev/null and b/src/lib/assets/fractal-logo-medium.png differ diff --git a/src/lib/assets/fractal-logo-small.png b/src/lib/assets/fractal-logo-small.png new file mode 100644 index 00000000..079f5a93 Binary files /dev/null and b/src/lib/assets/fractal-logo-small.png differ diff --git a/src/lib/components/v2/tasks/TaskCollection.svelte b/src/lib/components/v2/tasks/TaskCollection.svelte index 2fb1b397..7b80b82b 100644 --- a/src/lib/components/v2/tasks/TaskCollection.svelte +++ b/src/lib/components/v2/tasks/TaskCollection.svelte @@ -186,7 +186,7 @@ * @returns {Promise} */ async function getTaskCollection(taskCollectionId) { - const response = await fetch(`/api/v2/task/collect/${taskCollectionId}?verbose=True`, { + const response = await fetch(`/api/v2/task/collect/${taskCollectionId}`, { method: 'GET', credentials: 'include' }); diff --git a/src/lib/components/v2/tasks/TaskCollectionLogsModal.svelte b/src/lib/components/v2/tasks/TaskCollectionLogsModal.svelte index f57f9f95..c97aecb4 100644 --- a/src/lib/components/v2/tasks/TaskCollectionLogsModal.svelte +++ b/src/lib/components/v2/tasks/TaskCollectionLogsModal.svelte @@ -15,7 +15,7 @@ } logs = ''; - const response = await fetch(`/api/v2/task/collect/${taskCollectionId}?verbose=True`, { + const response = await fetch(`/api/v2/task/collect/${taskCollectionId}`, { method: 'GET', credentials: 'include' }); diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index 9aa3b165..8ae2512a 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -1,4 +1,5 @@ +Fractal logo +

Welcome to Fractal web client.

- Welcome to the web client of Fractal, a framework to process high-content imaging data at scale - and prepare it for interactive visualization. + Fractal is a framework developed at the + BioVisionCenter + to process bioimaging data at scale in the OME-Zarr format and prepare the images for interactive + visualization.

To access Fractal features, you should first log-in as a registered user. Navigate to the @@ -67,3 +72,17 @@

+ + diff --git a/static/favicon.png b/static/favicon.png index 825b9e65..06474167 100644 Binary files a/static/favicon.png and b/static/favicon.png differ diff --git a/tests/start-test-server.sh b/tests/start-test-server.sh index ebcbe37c..6f612c59 100755 --- a/tests/start-test-server.sh +++ b/tests/start-test-server.sh @@ -20,12 +20,10 @@ if [ ! -d "$fractal_server_test_path" ]; then cp "$(pwd)/lib/fractal-server/config_local.json" "$fractal_server_test_path" cp "$(pwd)/tests/.fractal_server.env" "$fractal_server_test_path" - if [ "$SKIP_OAUTH_TEST" != "true" ]; then - echo "\nOAUTH_DEXIDP_CLIENT_ID=client_test_web_id" >> "${fractal_server_test_path}/.fractal_server.env" - echo "OAUTH_DEXIDP_CLIENT_SECRET=client_test_web_secret" >> "${fractal_server_test_path}/.fractal_server.env" - echo "OAUTH_DEXIDP_REDIRECT_URL=http://localhost:5173/auth/login/oauth2/" >> "${fractal_server_test_path}/.fractal_server.env" - echo "OAUTH_DEXIDP_OIDC_CONFIGURATION_ENDPOINT=http://127.0.0.1:5556/dex/.well-known/openid-configuration" >> "${fractal_server_test_path}/.fractal_server.env" - fi + echo "\nOAUTH_DEXIDP_CLIENT_ID=client_test_web_id" >> "${fractal_server_test_path}/.fractal_server.env" + echo "OAUTH_DEXIDP_CLIENT_SECRET=client_test_web_secret" >> "${fractal_server_test_path}/.fractal_server.env" + echo "OAUTH_DEXIDP_REDIRECT_URL=http://localhost:5173/auth/login/oauth2/" >> "${fractal_server_test_path}/.fractal_server.env" + echo "OAUTH_DEXIDP_OIDC_CONFIGURATION_ENDPOINT=http://127.0.0.1:5556/dex/.well-known/openid-configuration" >> "${fractal_server_test_path}/.fractal_server.env" cd "$fractal_server_test_path" @@ -33,7 +31,6 @@ if [ ! -d "$fractal_server_test_path" ]; then python3 -m venv myenv . myenv/bin/activate pip install "fractal-server==$1" - pip install fractal-server[postgres-psycopg-binary] fractalctl set-db else cd "$fractal_server_test_path"