Skip to content

Commit 77afe5f

Browse files
authored
Merge pull request #684 from fractal-analytics-platform/remove-v1
Removed v1 support
2 parents 2a85ec5 + b1fff07 commit 77afe5f

File tree

89 files changed

+149
-10658
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+149
-10658
lines changed

.env

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,5 @@ LOG_FILE=/tmp/fractal-web.log
1818
LOG_LEVEL_FILE=info
1919
LOG_LEVEL_CONSOLE=warn
2020

21-
FRACTAL_API_V1_MODE=include
2221
FRACTAL_RUNNER_BACKEND=local
2322
#WARNING_BANNER_PATH=/path/to/banner.txt

.env.development

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,5 @@ LOG_FILE=./fractal-web.log
1717
LOG_LEVEL_FILE=debug
1818
LOG_LEVEL_CONSOLE=info
1919

20-
FRACTAL_API_V1_MODE=include
2120
FRACTAL_RUNNER_BACKEND=local
2221
#WARNING_BANNER_PATH=/path/to/banner.txt

.github/workflows/end_to_end_tests.yaml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -65,15 +65,9 @@ jobs:
6565
if: matrix.node-version == '18'
6666
run: echo "FRACTAL_SERVER_HOST=http://127.0.0.1:8000" >> $GITHUB_ENV
6767

68-
- name: Run Playwright tests [v1]
68+
- name: Run Playwright tests
6969
run: npx playwright test
7070
env:
71-
TEST_VERSION: v1
72-
73-
- name: Run Playwright tests [v2]
74-
run: npx playwright test
75-
env:
76-
TEST_VERSION: v2
7771
FRACTAL_RUNNER_BACKEND: local_experimental
7872

7973
- name: Archive test results

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
*Note: Numbers like (\#123) point to closed Pull Requests on the fractal-web repository.*
22

3+
# Unreleased
4+
5+
* Removed legacy version support (\#684);
6+
* Removed the environment variables `FRACTAL_API_V1_MODE` and `TEST_VERSION`;
7+
38
# 1.13.1
49

510
* Tasks table improvements (\#677):

__tests__/mock/jobs-list.js

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -37,43 +37,37 @@ export const data = {
3737
id: 1,
3838
project_id: 1,
3939
workflow_id: 1,
40-
input_dataset_id: 1,
41-
output_dataset_id: 2,
40+
dataset_id: 1,
41+
dataset_dump: { id: 1, name: 'dataset1' },
4242
start_timestamp: '2023-10-30T09:00:38.442196+00:00',
4343
end_timestamp: '2023-10-30T09:10:38.442196+00:00',
4444
project_dump: { id: 1, name: 'project 1' },
4545
workflow_dump: { id: 1, name: 'workflow 1' },
46-
input_dataset_dump: { id: 1, name: 'input1' },
47-
output_dataset_dump: { id: 2, name: 'output1' },
4846
status: 'done',
4947
user_email: '[email protected]'
5048
},
5149
{
5250
id: 2,
5351
project_id: 2,
5452
workflow_id: 2,
55-
input_dataset_id: 3,
56-
output_dataset_id: 4,
53+
dataset_id: 2,
54+
dataset_dump: { id: 2, name: 'dataset2' },
5755
start_timestamp: '2023-10-30T09:15:38.442196+00:00',
5856
end_timestamp: '2023-10-30T09:20:38.442196+00:00',
5957
project_dump: { id: 2, name: 'project 2' },
6058
workflow_dump: { id: 2, name: 'workflow 2' },
61-
input_dataset_dump: { id: 3, name: 'input2' },
62-
output_dataset_dump: { id: 4, name: 'output2' },
6359
status: 'failed',
6460
user_email: '[email protected]'
6561
},
6662
{
6763
id: 3,
6864
project_id: 2,
6965
workflow_id: 2,
70-
input_dataset_id: 5,
71-
output_dataset_id: 6,
66+
dataset_id: 3,
67+
dataset_dump: { id: 3, name: 'dataset3' },
7268
start_timestamp: '2023-10-30T09:30:38.442196+00:00',
7369
project_dump: { id: 2, name: 'project 2' },
7470
workflow_dump: { id: 2, name: 'workflow 2' },
75-
input_dataset_dump: { id: 5, name: 'input3' },
76-
output_dataset_dump: { id: 6, name: 'output3' },
7771
end_timestamp: null,
7872
status: 'submitted',
7973
user_email: '[email protected]'

__tests__/selected_api_version.test.js

Lines changed: 0 additions & 27 deletions
This file was deleted.

__tests__/v1/TaskCollection.test.js

Lines changed: 0 additions & 210 deletions
This file was deleted.

0 commit comments

Comments
 (0)