Skip to content

Commit

Permalink
Merge branch 'dev' into feat/allow-files-deletion-in-debug-view
Browse files Browse the repository at this point in the history
  • Loading branch information
MartinBelthle committed Sep 19, 2024
2 parents 94994c8 + 3756176 commit b454dc8
Show file tree
Hide file tree
Showing 425 changed files with 862 additions and 437 deletions.
4 changes: 2 additions & 2 deletions antarest/study/storage/variantstudy/variant_study_service.py
Original file line number Diff line number Diff line change
Expand Up @@ -497,7 +497,7 @@ def get(
Returns: study data formatted in json
"""
self._safe_generation(metadata, timeout=60)
self._safe_generation(metadata, timeout=600)
self.repository.refresh(metadata)
return super().get(
metadata=metadata,
Expand Down Expand Up @@ -939,7 +939,7 @@ def get_study_sim_result(self, study: VariantStudy) -> t.List[StudySimResultDTO]
study: study
Returns: study output data
"""
self._safe_generation(study, timeout=60)
self._safe_generation(study, timeout=600)
return super().get_study_sim_result(study=study)

def set_reference_output(self, metadata: VariantStudy, output_id: str, status: bool) -> None:
Expand Down
16 changes: 3 additions & 13 deletions scripts/license_checker_and_adder.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,9 @@
# This file is part of the Antares project.
"""

FRONTEND_LICENSE_HEADER = """/** Copyright (c) 2024, RTE (https://www.rte-france.com)
*
* See AUTHORS.txt
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* SPDX-License-Identifier: MPL-2.0
*
* This file is part of the Antares project.
*/
"""

front_license_path = Path(__file__).resolve().parent.parent / "webapp" / "license-header.js"
FRONTEND_LICENSE_HEADER = front_license_path.read_text()


def is_license_file(filename: str) -> bool:
Expand Down
13 changes: 13 additions & 0 deletions webapp/license-header.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
/**
* Copyright (c) 2024, RTE (https://www.rte-france.com)
*
* See AUTHORS.txt
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* SPDX-License-Identifier: MPL-2.0
*
* This file is part of the Antares project.
*/
3 changes: 2 additions & 1 deletion webapp/src/common/types.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** Copyright (c) 2024, RTE (https://www.rte-france.com)
/**
* Copyright (c) 2024, RTE (https://www.rte-france.com)
*
* See AUTHORS.txt
*
Expand Down
3 changes: 2 additions & 1 deletion webapp/src/components/App/Api.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** Copyright (c) 2024, RTE (https://www.rte-france.com)
/**
* Copyright (c) 2024, RTE (https://www.rte-france.com)
*
* See AUTHORS.txt
*
Expand Down
3 changes: 2 additions & 1 deletion webapp/src/components/App/Data/DataListing.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** Copyright (c) 2024, RTE (https://www.rte-france.com)
/**
* Copyright (c) 2024, RTE (https://www.rte-france.com)
*
* See AUTHORS.txt
*
Expand Down
3 changes: 2 additions & 1 deletion webapp/src/components/App/Data/DataPropsView.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** Copyright (c) 2024, RTE (https://www.rte-france.com)
/**
* Copyright (c) 2024, RTE (https://www.rte-france.com)
*
* See AUTHORS.txt
*
Expand Down
3 changes: 2 additions & 1 deletion webapp/src/components/App/Data/DatasetCreationDialog.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** Copyright (c) 2024, RTE (https://www.rte-france.com)
/**
* Copyright (c) 2024, RTE (https://www.rte-france.com)
*
* See AUTHORS.txt
*
Expand Down
3 changes: 2 additions & 1 deletion webapp/src/components/App/Data/MatrixDialog.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** Copyright (c) 2024, RTE (https://www.rte-france.com)
/**
* Copyright (c) 2024, RTE (https://www.rte-france.com)
*
* See AUTHORS.txt
*
Expand Down
3 changes: 2 additions & 1 deletion webapp/src/components/App/Data/index.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** Copyright (c) 2024, RTE (https://www.rte-france.com)
/**
* Copyright (c) 2024, RTE (https://www.rte-france.com)
*
* See AUTHORS.txt
*
Expand Down
3 changes: 2 additions & 1 deletion webapp/src/components/App/Data/styles.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** Copyright (c) 2024, RTE (https://www.rte-france.com)
/**
* Copyright (c) 2024, RTE (https://www.rte-france.com)
*
* See AUTHORS.txt
*
Expand Down
3 changes: 2 additions & 1 deletion webapp/src/components/App/Data/utils.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** Copyright (c) 2024, RTE (https://www.rte-france.com)
/**
* Copyright (c) 2024, RTE (https://www.rte-france.com)
*
* See AUTHORS.txt
*
Expand Down
3 changes: 2 additions & 1 deletion webapp/src/components/App/Settings/Groups/Header.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** Copyright (c) 2024, RTE (https://www.rte-france.com)
/**
* Copyright (c) 2024, RTE (https://www.rte-france.com)
*
* See AUTHORS.txt
*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** Copyright (c) 2024, RTE (https://www.rte-france.com)
/**
* Copyright (c) 2024, RTE (https://www.rte-france.com)
*
* See AUTHORS.txt
*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** Copyright (c) 2024, RTE (https://www.rte-france.com)
/**
* Copyright (c) 2024, RTE (https://www.rte-france.com)
*
* See AUTHORS.txt
*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** Copyright (c) 2024, RTE (https://www.rte-france.com)
/**
* Copyright (c) 2024, RTE (https://www.rte-france.com)
*
* See AUTHORS.txt
*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** Copyright (c) 2024, RTE (https://www.rte-france.com)
/**
* Copyright (c) 2024, RTE (https://www.rte-france.com)
*
* See AUTHORS.txt
*
Expand Down
3 changes: 2 additions & 1 deletion webapp/src/components/App/Settings/Groups/index.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** Copyright (c) 2024, RTE (https://www.rte-france.com)
/**
* Copyright (c) 2024, RTE (https://www.rte-france.com)
*
* See AUTHORS.txt
*
Expand Down
3 changes: 2 additions & 1 deletion webapp/src/components/App/Settings/Maintenance/index.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** Copyright (c) 2024, RTE (https://www.rte-france.com)
/**
* Copyright (c) 2024, RTE (https://www.rte-france.com)
*
* See AUTHORS.txt
*
Expand Down
3 changes: 2 additions & 1 deletion webapp/src/components/App/Settings/Tokens/Header.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** Copyright (c) 2024, RTE (https://www.rte-france.com)
/**
* Copyright (c) 2024, RTE (https://www.rte-france.com)
*
* See AUTHORS.txt
*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** Copyright (c) 2024, RTE (https://www.rte-france.com)
/**
* Copyright (c) 2024, RTE (https://www.rte-france.com)
*
* See AUTHORS.txt
*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** Copyright (c) 2024, RTE (https://www.rte-france.com)
/**
* Copyright (c) 2024, RTE (https://www.rte-france.com)
*
* See AUTHORS.txt
*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** Copyright (c) 2024, RTE (https://www.rte-france.com)
/**
* Copyright (c) 2024, RTE (https://www.rte-france.com)
*
* See AUTHORS.txt
*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** Copyright (c) 2024, RTE (https://www.rte-france.com)
/**
* Copyright (c) 2024, RTE (https://www.rte-france.com)
*
* See AUTHORS.txt
*
Expand Down
3 changes: 2 additions & 1 deletion webapp/src/components/App/Settings/Tokens/index.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** Copyright (c) 2024, RTE (https://www.rte-france.com)
/**
* Copyright (c) 2024, RTE (https://www.rte-france.com)
*
* See AUTHORS.txt
*
Expand Down
3 changes: 2 additions & 1 deletion webapp/src/components/App/Settings/Users/Header.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** Copyright (c) 2024, RTE (https://www.rte-france.com)
/**
* Copyright (c) 2024, RTE (https://www.rte-france.com)
*
* See AUTHORS.txt
*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** Copyright (c) 2024, RTE (https://www.rte-france.com)
/**
* Copyright (c) 2024, RTE (https://www.rte-france.com)
*
* See AUTHORS.txt
*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** Copyright (c) 2024, RTE (https://www.rte-france.com)
/**
* Copyright (c) 2024, RTE (https://www.rte-france.com)
*
* See AUTHORS.txt
*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** Copyright (c) 2024, RTE (https://www.rte-france.com)
/**
* Copyright (c) 2024, RTE (https://www.rte-france.com)
*
* See AUTHORS.txt
*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** Copyright (c) 2024, RTE (https://www.rte-france.com)
/**
* Copyright (c) 2024, RTE (https://www.rte-france.com)
*
* See AUTHORS.txt
*
Expand Down
3 changes: 2 additions & 1 deletion webapp/src/components/App/Settings/Users/index.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** Copyright (c) 2024, RTE (https://www.rte-france.com)
/**
* Copyright (c) 2024, RTE (https://www.rte-france.com)
*
* See AUTHORS.txt
*
Expand Down
3 changes: 2 additions & 1 deletion webapp/src/components/App/Settings/index.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** Copyright (c) 2024, RTE (https://www.rte-france.com)
/**
* Copyright (c) 2024, RTE (https://www.rte-france.com)
*
* See AUTHORS.txt
*
Expand Down
3 changes: 2 additions & 1 deletion webapp/src/components/App/Settings/utils.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** Copyright (c) 2024, RTE (https://www.rte-france.com)
/**
* Copyright (c) 2024, RTE (https://www.rte-france.com)
*
* See AUTHORS.txt
*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** Copyright (c) 2024, RTE (https://www.rte-france.com)
/**
* Copyright (c) 2024, RTE (https://www.rte-france.com)
*
* See AUTHORS.txt
*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** Copyright (c) 2024, RTE (https://www.rte-france.com)
/**
* Copyright (c) 2024, RTE (https://www.rte-france.com)
*
* See AUTHORS.txt
*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** Copyright (c) 2024, RTE (https://www.rte-france.com)
/**
* Copyright (c) 2024, RTE (https://www.rte-france.com)
*
* See AUTHORS.txt
*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** Copyright (c) 2024, RTE (https://www.rte-france.com)
/**
* Copyright (c) 2024, RTE (https://www.rte-france.com)
*
* See AUTHORS.txt
*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** Copyright (c) 2024, RTE (https://www.rte-france.com)
/**
* Copyright (c) 2024, RTE (https://www.rte-france.com)
*
* See AUTHORS.txt
*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** Copyright (c) 2024, RTE (https://www.rte-france.com)
/**
* Copyright (c) 2024, RTE (https://www.rte-france.com)
*
* See AUTHORS.txt
*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** Copyright (c) 2024, RTE (https://www.rte-france.com)
/**
* Copyright (c) 2024, RTE (https://www.rte-france.com)
*
* See AUTHORS.txt
*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** Copyright (c) 2024, RTE (https://www.rte-france.com)
/**
* Copyright (c) 2024, RTE (https://www.rte-france.com)
*
* See AUTHORS.txt
*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** Copyright (c) 2024, RTE (https://www.rte-france.com)
/**
* Copyright (c) 2024, RTE (https://www.rte-france.com)
*
* See AUTHORS.txt
*
Expand Down
3 changes: 2 additions & 1 deletion webapp/src/components/App/Singlestudy/Commands/index.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** Copyright (c) 2024, RTE (https://www.rte-france.com)
/**
* Copyright (c) 2024, RTE (https://www.rte-france.com)
*
* See AUTHORS.txt
*
Expand Down
3 changes: 2 additions & 1 deletion webapp/src/components/App/Singlestudy/Commands/style.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** Copyright (c) 2024, RTE (https://www.rte-france.com)
/**
* Copyright (c) 2024, RTE (https://www.rte-france.com)
*
* See AUTHORS.txt
*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** Copyright (c) 2024, RTE (https://www.rte-france.com)
/**
* Copyright (c) 2024, RTE (https://www.rte-france.com)
*
* See AUTHORS.txt
*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** Copyright (c) 2024, RTE (https://www.rte-france.com)
/**
* Copyright (c) 2024, RTE (https://www.rte-france.com)
*
* See AUTHORS.txt
*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** Copyright (c) 2024, RTE (https://www.rte-france.com)
/**
* Copyright (c) 2024, RTE (https://www.rte-france.com)
*
* See AUTHORS.txt
*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** Copyright (c) 2024, RTE (https://www.rte-france.com)
/**
* Copyright (c) 2024, RTE (https://www.rte-france.com)
*
* See AUTHORS.txt
*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** Copyright (c) 2024, RTE (https://www.rte-france.com)
/**
* Copyright (c) 2024, RTE (https://www.rte-france.com)
*
* See AUTHORS.txt
*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** Copyright (c) 2024, RTE (https://www.rte-france.com)
/**
* Copyright (c) 2024, RTE (https://www.rte-france.com)
*
* See AUTHORS.txt
*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** Copyright (c) 2024, RTE (https://www.rte-france.com)
/**
* Copyright (c) 2024, RTE (https://www.rte-france.com)
*
* See AUTHORS.txt
*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** Copyright (c) 2024, RTE (https://www.rte-france.com)
/**
* Copyright (c) 2024, RTE (https://www.rte-france.com)
*
* See AUTHORS.txt
*
Expand Down
Loading

0 comments on commit b454dc8

Please sign in to comment.