Skip to content

Commit 5c30045

Browse files
committed
Removed ENABLE_INTERACTIVE_FILTERS environment variable
1 parent 75d5480 commit 5c30045

File tree

10 files changed

+2
-28
lines changed

10 files changed

+2
-28
lines changed

.env

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,5 @@ LOG_LEVEL_CONSOLE=warn
2020

2121
FRACTAL_RUNNER_BACKEND=local
2222
#WARNING_BANNER_PATH=/path/to/banner.txt
23-
ENABLE_INTERACTIVE_FILTERS=false
2423

2524
BODY_SIZE_LIMIT=5000000

.env.development

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,3 @@ LOG_LEVEL_CONSOLE=info
1919

2020
FRACTAL_RUNNER_BACKEND=local
2121
#WARNING_BANNER_PATH=/path/to/banner.txt
22-
ENABLE_INTERACTIVE_FILTERS=false

.github/workflows/end_to_end_tests.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ jobs:
1919
OAUTH_DEXIDP_OIDC_CONFIGURATION_ENDPOINT: "http://127.0.0.1:5556/dex/.well-known/openid-configuration"
2020
PUBLIC_OAUTH_CLIENT_NAME: dexidp
2121
PUBLIC_FRACTAL_VIZARR_VIEWER_URL: http://localhost:3000/vizarr
22-
ENABLE_INTERACTIVE_FILTERS: true
2322

2423
strategy:
2524
matrix:

__tests__/v2/RunWorkflowModal.test.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,7 @@ describe('RunWorkflowModal', () => {
6767
num_failed_images: 5,
6868
num_available_images: 5
6969
}
70-
},
71-
filtersEnabled: false
70+
}
7271
});
7372

7473
result.component.open('continue');

docs/environment-variables.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ The following environment variables can be used to configure fractal-web.
1919
* `FRACTAL_RUNNER_BACKEND`: specifies which runner backend is used; supported values are: `local`, `slurm`, `slurm_ssh`; setting this variable is mandatory;
2020
* `PUBLIC_FRACTAL_VIZARR_VIEWER_URL`: URL to [fractal-vizarr-viewer](https://github.com/fractal-analytics-platform/fractal-vizarr-viewer) service (e.g. http://localhost:3000/vizarr for testing);
2121
* `WARNING_BANNER_PATH`: specifies the path to a text file containing the warning banner message displayed on the site; the banner is used to inform users about important issues, such as external resources downtime or maintenance alerts; if the variable is empty or unset no banner is displayed;
22-
* `ENABLE_INTERACTIVE_FILTERS`: enable attribute and type filters interactive editing from the job-submission modal; supported values are `true` or `false`; default value is `false`.
2322

2423
When running directly using `node` command these extra variables can also be configured:
2524

docs/quickstart.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ export FRACTAL_RUNNER_BACKEND=local
6666
#export AUTH_COOKIE_PATH=/
6767
#export AUTH_COOKIE_SAME_SITE=lax
6868
#export PUBLIC_UPDATE_JOBS_INTERVAL=3000
69-
#export ENABLE_INTERACTIVE_FILTERS=false
7069

7170
node build/
7271
```

src/lib/components/v2/projects/datasets/DatasetImagesTable.svelte

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
* @type {boolean}
2121
*/
2222
export let runWorkflowModal;
23-
export let filtersEnabled = true;
2423
/** @type {{ attribute_filters: { [key: string]: Array<string | number | boolean> | null }, type_filters: { [key: string]: boolean | null }} | null} */
2524
export let initialFilterValues = null;
2625
@@ -208,17 +207,6 @@
208207
)
209208
])
210209
);
211-
212-
if (runWorkflowModal && !filtersEnabled) {
213-
// disable attribute filters selection
214-
for (const attributeSelector of Object.values(attributesSelectors)) {
215-
attributeSelector.disable();
216-
}
217-
// disable type filters selection
218-
for (const typeSelector of Object.values(typesSelectors)) {
219-
typeSelector.disable();
220-
}
221-
}
222210
}
223211
224212
/**

src/lib/components/v2/workflow/RunWorkflowModal.svelte

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
export let onDatasetsUpdated;
2424
/** @type {{[key: number]: import('fractal-components/types/api').ImagesStatus}} */
2525
export let statuses;
26-
export let filtersEnabled;
2726
2827
/** @type {Modal} */
2928
let modal;
@@ -611,7 +610,6 @@
611610
dataset={selectedDataset}
612611
bind:imagePage
613612
{initialFilterValues}
614-
{filtersEnabled}
615613
vizarrViewerUrl={null}
616614
runWorkflowModal={true}
617615
/>

src/routes/v2/projects/[projectId]/workflows/[workflowId]/+page.server.js

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import { getProjectDatasets } from '$lib/server/api/v2/project_api';
33
import { getDefaultWorkflowDataset } from '$lib/common/workflow_utilities';
44
import { getLogger } from '$lib/server/logger.js';
55
import { getCurrentUser } from '$lib/server/api/auth_api';
6-
import { env } from '$env/dynamic/private';
76

87
const logger = getLogger('workflow page [v2]');
98

@@ -22,13 +21,10 @@ export async function load({ fetch, params }) {
2221

2322
const defaultDatasetId = getDefaultWorkflowDataset(datasets, jobs);
2423

25-
const filtersEnabled = env.ENABLE_INTERACTIVE_FILTERS === 'true';
26-
2724
return {
2825
workflow,
2926
datasets,
3027
defaultDatasetId,
31-
user,
32-
filtersEnabled
28+
user
3329
};
3430
}

src/routes/v2/projects/[projectId]/workflows/[workflowId]/+page.svelte

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
$: project = workflow.project;
3535
/** @type {import('fractal-components/types/api').DatasetV2[]} */
3636
let datasets = $page.data.datasets;
37-
let filtersEnabled = $page.data.filtersEnabled;
3837
3938
/** @type {number|undefined} */
4039
let selectedDatasetId = undefined;
@@ -1142,7 +1141,6 @@
11421141
{selectedDatasetId}
11431142
{onJobSubmitted}
11441143
{statuses}
1145-
{filtersEnabled}
11461144
onDatasetsUpdated={(updatedDatasets, newSelectedDatasetId) => {
11471145
datasets = updatedDatasets;
11481146
selectedDatasetId = newSelectedDatasetId;

0 commit comments

Comments
 (0)