From 8ba02cf181c97898fd2ed6d8a9edeef54545d2a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20M=C3=BChlbauer?= Date: Thu, 20 Jul 2023 14:22:34 +0200 Subject: [PATCH] update licenses --- TODOs.md | 6 ++++++ database/007-create-keyword-and-category.sql | 3 +++ database/020-row-level-security.sql | 3 +++ database/999-add-hgf-categories.sql | 5 +++++ frontend/components/software/SoftwareCategories.tsx | 4 ++++ frontend/components/software/edit/editSoftwareConfig.tsx | 4 +++- .../edit/information/AutosaveSoftwareCategories.tsx | 9 +++------ .../edit/information/SoftwareInformationForm.tsx | 3 +++ .../software/edit/information/useSoftwareToEdit.tsx | 4 +++- 9 files changed, 33 insertions(+), 8 deletions(-) diff --git a/TODOs.md b/TODOs.md index 87e9f8ea3..7be5457f4 100644 --- a/TODOs.md +++ b/TODOs.md @@ -1,3 +1,9 @@ + TODOs for category feature ========================== diff --git a/database/007-create-keyword-and-category.sql b/database/007-create-keyword-and-category.sql index 9d0a9fae7..c809c117f 100644 --- a/database/007-create-keyword-and-category.sql +++ b/database/007-create-keyword-and-category.sql @@ -1,7 +1,10 @@ -- SPDX-FileCopyrightText: 2022 Ewan Cahen (Netherlands eScience Center) -- SPDX-FileCopyrightText: 2022 Netherlands eScience Center +-- SPDX-FileCopyrightText: 2023 Felix Mühlbauer (GFZ) +-- SPDX-FileCopyrightText: 2023 Helmholtz Centre Potsdam - GFZ German Research Centre for Geosciences -- -- SPDX-License-Identifier: Apache-2.0 +-- SPDX-License-Identifier: EUPL-1.2 -------------- -- Keywords -- diff --git a/database/020-row-level-security.sql b/database/020-row-level-security.sql index c838b3bbc..0de28470e 100644 --- a/database/020-row-level-security.sql +++ b/database/020-row-level-security.sql @@ -2,8 +2,11 @@ -- SPDX-FileCopyrightText: 2021 - 2023 Netherlands eScience Center -- SPDX-FileCopyrightText: 2022 - 2023 Dusan Mijatovic (dv4all) -- SPDX-FileCopyrightText: 2022 - 2023 dv4all +-- SPDX-FileCopyrightText: 2023 Felix Mühlbauer (GFZ) +-- SPDX-FileCopyrightText: 2023 Helmholtz Centre Potsdam - GFZ German Research Centre for Geosciences -- -- SPDX-License-Identifier: Apache-2.0 +-- SPDX-License-Identifier: EUPL-1.2 -- maintainer tables ALTER TABLE maintainer_for_software ENABLE ROW LEVEL SECURITY; diff --git a/database/999-add-hgf-categories.sql b/database/999-add-hgf-categories.sql index ef115af79..68c155d67 100644 --- a/database/999-add-hgf-categories.sql +++ b/database/999-add-hgf-categories.sql @@ -1,3 +1,8 @@ +-- SPDX-FileCopyrightText: 2023 Felix Mühlbauer (GFZ) +-- SPDX-FileCopyrightText: 2023 Helmholtz Centre Potsdam - GFZ German Research Centre for Geosciences +-- +-- SPDX-License-Identifier: EUPL-1.2 + -- THIS FILE SHOULD BE MOVED TO THE DEPLOMENT REPO AND USED AS A MIGRATION FILE CREATE FUNCTION add_category(parent_name varchar, parent_short_name varchar, sub_categories varchar[][]) diff --git a/frontend/components/software/SoftwareCategories.tsx b/frontend/components/software/SoftwareCategories.tsx index 8b20c0a78..e76348826 100644 --- a/frontend/components/software/SoftwareCategories.tsx +++ b/frontend/components/software/SoftwareCategories.tsx @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2023 Felix Mühlbauer (GFZ) +// SPDX-FileCopyrightText: 2023 Helmholtz Centre Potsdam - GFZ German Research Centre for Geosciences +// +// SPDX-License-Identifier: EUPL-1.2 import CategoryIcon from '@mui/icons-material/Category' import { CategoriesForSoftware, CategoryID, CategoryPath } from '../../types/SoftwareTypes' diff --git a/frontend/components/software/edit/editSoftwareConfig.tsx b/frontend/components/software/edit/editSoftwareConfig.tsx index 5f646f182..1f086710f 100644 --- a/frontend/components/software/edit/editSoftwareConfig.tsx +++ b/frontend/components/software/edit/editSoftwareConfig.tsx @@ -1,12 +1,14 @@ // SPDX-FileCopyrightText: 2022 - 2023 Dusan Mijatovic (dv4all) +// SPDX-FileCopyrightText: 2022 - 2023 Helmholtz Centre Potsdam - GFZ German Research Centre for Geosciences // SPDX-FileCopyrightText: 2022 - 2023 dv4all // SPDX-FileCopyrightText: 2022 Christian Meeßen (GFZ) // SPDX-FileCopyrightText: 2022 Ewan Cahen (Netherlands eScience Center) -// SPDX-FileCopyrightText: 2022 Helmholtz Centre Potsdam - GFZ German Research Centre for Geosciences // SPDX-FileCopyrightText: 2022 Matthias Rüster (GFZ) // SPDX-FileCopyrightText: 2022 Netherlands eScience Center +// SPDX-FileCopyrightText: 2023 Felix Mühlbauer (GFZ) // // SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: EUPL-1.2 export const softwareInformation = { slug: { diff --git a/frontend/components/software/edit/information/AutosaveSoftwareCategories.tsx b/frontend/components/software/edit/information/AutosaveSoftwareCategories.tsx index 2b4da178b..f1906e32e 100644 --- a/frontend/components/software/edit/information/AutosaveSoftwareCategories.tsx +++ b/frontend/components/software/edit/information/AutosaveSoftwareCategories.tsx @@ -1,10 +1,7 @@ -// SPDX-FileCopyrightText: 2022 - 2023 dv4all -// SPDX-FileCopyrightText: 2022 Dusan Mijatovic (dv4all) -// SPDX-FileCopyrightText: 2022 Helmholtz Centre Potsdam - GFZ German Research Centre for Geosciences -// SPDX-FileCopyrightText: 2022 Matthias Rüster (GFZ) -// SPDX-FileCopyrightText: 2023 Dusan Mijatovic (dv4all) (dv4all) +// SPDX-FileCopyrightText: 2023 Felix Mühlbauer (GFZ) +// SPDX-FileCopyrightText: 2023 Helmholtz Centre Potsdam - GFZ German Research Centre for Geosciences // -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: EUPL-1.2 import { ChangeEventHandler, useEffect, useMemo, useState } from 'react' diff --git a/frontend/components/software/edit/information/SoftwareInformationForm.tsx b/frontend/components/software/edit/information/SoftwareInformationForm.tsx index 58d4d1222..ae6e3b3d0 100644 --- a/frontend/components/software/edit/information/SoftwareInformationForm.tsx +++ b/frontend/components/software/edit/information/SoftwareInformationForm.tsx @@ -1,7 +1,10 @@ // SPDX-FileCopyrightText: 2023 Dusan Mijatovic (dv4all) +// SPDX-FileCopyrightText: 2023 Felix Mühlbauer (GFZ) +// SPDX-FileCopyrightText: 2023 Helmholtz Centre Potsdam - GFZ German Research Centre for Geosciences // SPDX-FileCopyrightText: 2023 dv4all // // SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: EUPL-1.2 import {FormProvider, useForm} from 'react-hook-form' import {EditSoftwareItem} from '~/types/SoftwareTypes' diff --git a/frontend/components/software/edit/information/useSoftwareToEdit.tsx b/frontend/components/software/edit/information/useSoftwareToEdit.tsx index 2fca05fde..111ba92f3 100644 --- a/frontend/components/software/edit/information/useSoftwareToEdit.tsx +++ b/frontend/components/software/edit/information/useSoftwareToEdit.tsx @@ -1,10 +1,12 @@ // SPDX-FileCopyrightText: 2022 - 2023 Dusan Mijatovic (dv4all) +// SPDX-FileCopyrightText: 2022 - 2023 Helmholtz Centre Potsdam - GFZ German Research Centre for Geosciences // SPDX-FileCopyrightText: 2022 - 2023 dv4all // SPDX-FileCopyrightText: 2022 Christian Meeßen (GFZ) -// SPDX-FileCopyrightText: 2022 Helmholtz Centre Potsdam - GFZ German Research Centre for Geosciences // SPDX-FileCopyrightText: 2023 Dusan Mijatovic (dv4all) (dv4all) +// SPDX-FileCopyrightText: 2023 Felix Mühlbauer (GFZ) // // SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: EUPL-1.2 import {useEffect, useState} from 'react' import {AutocompleteOption} from '../../../../types/AutocompleteOptions'