From 0cb436e4921ef2ef75ec8f43687a0a88ef3310f8 Mon Sep 17 00:00:00 2001 From: Karolina Przerwa Date: Thu, 8 Feb 2024 15:06:42 +0100 Subject: [PATCH] mappings: update to theme.style --- .../CommunityCompactItemComputer.js | 4 ---- .../communities/dumpers/__init__.py | 10 ++++++++ .../os-v1/communities/communities-v1.0.0.json | 2 +- .../os-v2/communities/communities-v1.0.0.json | 14 +---------- .../v7/communities/communities-v1.0.0.json | 2 +- tests/conftest.py | 24 +++++++++---------- 6 files changed, 25 insertions(+), 31 deletions(-) diff --git a/invenio_communities/assets/semantic-ui/js/invenio_communities/community/communitiesItems/CommunityCompactItemComputer.js b/invenio_communities/assets/semantic-ui/js/invenio_communities/community/communitiesItems/CommunityCompactItemComputer.js index 10118959c..d9bd2df0b 100644 --- a/invenio_communities/assets/semantic-ui/js/invenio_communities/community/communitiesItems/CommunityCompactItemComputer.js +++ b/invenio_communities/assets/semantic-ui/js/invenio_communities/community/communitiesItems/CommunityCompactItemComputer.js @@ -25,20 +25,16 @@ export const CommunityCompactItemComputer = ({ const { metadata, ui, links, access, id } = result; const communityType = ui?.type?.title_l10n; return ( - -
diff --git a/invenio_communities/communities/dumpers/__init__.py b/invenio_communities/communities/dumpers/__init__.py index e69de29bb..e5bfd444f 100644 --- a/invenio_communities/communities/dumpers/__init__.py +++ b/invenio_communities/communities/dumpers/__init__.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# +# This file is part of Invenio. +# Copyright (C) 2024 CERN. +# +# Invenio is free software; you can redistribute it and/or modify it +# under the terms of the MIT License; see LICENSE file for more details. + + +"""Communities dumpers module.""" diff --git a/invenio_communities/communities/records/mappings/os-v1/communities/communities-v1.0.0.json b/invenio_communities/communities/records/mappings/os-v1/communities/communities-v1.0.0.json index f81d7f2aa..6130a1b3a 100644 --- a/invenio_communities/communities/records/mappings/os-v1/communities/communities-v1.0.0.json +++ b/invenio_communities/communities/records/mappings/os-v1/communities/communities-v1.0.0.json @@ -245,7 +245,7 @@ "brand": { "type": "keyword" }, - "config": { + "style": { "type": "object", "enabled": false } diff --git a/invenio_communities/communities/records/mappings/os-v2/communities/communities-v1.0.0.json b/invenio_communities/communities/records/mappings/os-v2/communities/communities-v1.0.0.json index a244914d0..949fa721d 100644 --- a/invenio_communities/communities/records/mappings/os-v2/communities/communities-v1.0.0.json +++ b/invenio_communities/communities/records/mappings/os-v2/communities/communities-v1.0.0.json @@ -116,18 +116,6 @@ "custom_fields": { "type": "object" }, - "theme": { - "enabled": false, - "type": "object", - "properties": { - "brand": { - "type": "keyword" - }, - "style": { - "type": "object" - } - } - }, "metadata": { "properties": { "title": { @@ -252,7 +240,7 @@ "brand": { "type": "keyword" }, - "config": { + "style": { "type": "object", "enabled": false } diff --git a/invenio_communities/communities/records/mappings/v7/communities/communities-v1.0.0.json b/invenio_communities/communities/records/mappings/v7/communities/communities-v1.0.0.json index f81d7f2aa..6130a1b3a 100644 --- a/invenio_communities/communities/records/mappings/v7/communities/communities-v1.0.0.json +++ b/invenio_communities/communities/records/mappings/v7/communities/communities-v1.0.0.json @@ -245,7 +245,7 @@ "brand": { "type": "keyword" }, - "config": { + "style": { "type": "object", "enabled": false } diff --git a/tests/conftest.py b/tests/conftest.py index e26a8ff2d..f1eea4899 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -79,12 +79,12 @@ def build(cls, **kwargs): @pytest.fixture(scope="module") def app_config(app_config): """Override pytest-invenio app_config fixture.""" - app_config[ - "RECORDS_REFRESOLVER_CLS" - ] = "invenio_records.resolver.InvenioRefResolver" - app_config[ - "RECORDS_REFRESOLVER_STORE" - ] = "invenio_jsonschemas.proxies.current_refresolver_store" + app_config["RECORDS_REFRESOLVER_CLS"] = ( + "invenio_records.resolver.InvenioRefResolver" + ) + app_config["RECORDS_REFRESOLVER_STORE"] = ( + "invenio_jsonschemas.proxies.current_refresolver_store" + ) # Variable not used. We set it to silent warnings app_config["JSONSCHEMAS_HOST"] = "not-used" @@ -106,9 +106,9 @@ def app_config(app_config): app_config["COMMUNITIES_IDENTITIES_CACHE_REDIS_URL"] = "redis://localhost:6379/4" # Cache handler - app_config[ - "COMMUNITIES_IDENTITIES_CACHE_HANDLER" - ] = "invenio_communities.cache.redis:IdentityRedisCache" + app_config["COMMUNITIES_IDENTITIES_CACHE_HANDLER"] = ( + "invenio_communities.cache.redis:IdentityRedisCache" + ) app_config["MAIL_DEFAULT_SENDER"] = "test@invenio-rdm-records.org" @@ -135,9 +135,9 @@ def app_config(app_config): ] # Extending preferences schemas, to include notification preferences. Should not matter for most test cases - app_config[ - "ACCOUNTS_USER_PREFERENCES_SCHEMA" - ] = UserPreferencesNotificationsSchema() + app_config["ACCOUNTS_USER_PREFERENCES_SCHEMA"] = ( + UserPreferencesNotificationsSchema() + ) app_config["USERS_RESOURCES_SERVICE_SCHEMA"] = NotificationsUserSchema # Users are verified by default. This will disable the automatic creation of moderation requests after publishing a record.