From 004304b588a34505335b7546af82a06474d214ee Mon Sep 17 00:00:00 2001 From: Jochen Klar Date: Tue, 12 Dec 2023 14:44:37 +0100 Subject: [PATCH 001/504] Update version --- rdmo/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rdmo/__init__.py b/rdmo/__init__.py index e835b9d023..72838cc1a6 100644 --- a/rdmo/__init__.py +++ b/rdmo/__init__.py @@ -1 +1 @@ -__version__ = "2.1.3" +__version__ = "2.2.0.dev1" From 9bdebfc40db1580808c1a40dac0e3457c1753c9d Mon Sep 17 00:00:00 2001 From: leucoryx <33422021+leucoryx@users.noreply.github.com> Date: Wed, 28 Feb 2024 09:09:38 +0100 Subject: [PATCH 002/504] Update about_text_de.html --- rdmo/core/templates/core/about_text_de.html | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/rdmo/core/templates/core/about_text_de.html b/rdmo/core/templates/core/about_text_de.html index f0d2a71023..7f7dd07183 100644 --- a/rdmo/core/templates/core/about_text_de.html +++ b/rdmo/core/templates/core/about_text_de.html @@ -13,10 +13,7 @@

Version {% version %}

Mit dem Research Data Management Organiser (RDMO) können Institutionen und Forschende das Forschungsdatenmanagement ihre Projekte strukturiert planen und durchführen. Es erlaubt das Erfassen aller relevanten Planungsinformationen in Datenmanagementplänen und die Verwaltung aller Datenmanagementaufgaben über den gesamten Datenlebenszyklus. -

- -

- RDMO ist bereit für die Anwendung in kleineren und größeren Projekten. In der zweiten Phase des RDMO-Projekts seit November 2017 erweitern die Projektpartner AIP, FHP und KIT-Bibliothek die bereits veröffentlichte Version des RDMO und arbeiten vertieft mit Anwendern zusammen. Im Fokus der Erweiterung von RDMO stehen u.a. Rollenkonzepte und Anbindungen an die institutionelle Infrastruktur wie Repositorien, Ticket-Systeme und Infrastruktur für Authentifizierung und Autorisierung. Es werden Workshops zur Diskussion der Funktionalitäten durchgeführt, Einführungsmaterialien erstellt und eine Verbreiterung der Entwickler-Community angestrebt. + RDMO wurde von den Projektpartner des Leibniz-Instituts für Astrophysik Potsdam, der Fachhochschule Potsdam und der Bibliothek des Karlsruher Instituts für Technologie entwickelt und wird von der RDMO Arbeitsgemeinschaft gepflegt.

From 2aabf9b713cdae03b0a94e62d3701b06c1c747ab Mon Sep 17 00:00:00 2001 From: Giacomo Lanza <37865804+Zack-83@users.noreply.github.com> Date: Thu, 29 Feb 2024 11:31:41 +0100 Subject: [PATCH 003/504] Update home_text_de.html --- rdmo/core/templates/core/home_text_de.html | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/rdmo/core/templates/core/home_text_de.html b/rdmo/core/templates/core/home_text_de.html index cfba3c8a9c..c5bc2ba1b9 100644 --- a/rdmo/core/templates/core/home_text_de.html +++ b/rdmo/core/templates/core/home_text_de.html @@ -1,13 +1,11 @@

Willkommen bei RDMO

- Das Ziel des RDMO Projekts ist es, eine Webapplikation bereitzustellen, die die strukturierte Planung, Umsetzung und Verwaltung der Daten in einem wissenschaftlichen Projekt unterstützt. Zusätzlich sollen die gesammelten Informationen in textueller Form für Anforderungen von Förderern oder für Berichte ausgebbar sein. + RDMO ist eine Webapplikation, die die strukturierte Planung, Umsetzung und Verwaltung der Daten in einem wissenschaftlichen Projekt unterstützt.
+ Die gesammelten Informationen können in Forschungsworkflows weiterverwendet werden und zusätzlich in textueller Form ausgegeben werden - + als Datenmanagementplan für die Förderer oder als teil eines Forschungsberichts.

- Diese Webseite ist ein Prototyp zur Veranschaulichung der bereits implementierten Funktionen. -

- -

- Wenn Sie mehr über das Projekt erfahren wollen, besuchen Sie rdmorganiser.github.io. + Wenn Sie mehr über die Nutzung von RDMO als Endnutzer oder Manager erfahren wollen, besuchen Sie rdmorganiser.github.io.

From e90be4d46512fd6f55b637198bffcb6b166eb5eb Mon Sep 17 00:00:00 2001 From: Giacomo Lanza <37865804+Zack-83@users.noreply.github.com> Date: Thu, 29 Feb 2024 11:33:06 +0100 Subject: [PATCH 004/504] Update rdmo/core/templates/core/about_text_de.html --- rdmo/core/templates/core/about_text_de.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rdmo/core/templates/core/about_text_de.html b/rdmo/core/templates/core/about_text_de.html index 7f7dd07183..a6dfaae7a5 100644 --- a/rdmo/core/templates/core/about_text_de.html +++ b/rdmo/core/templates/core/about_text_de.html @@ -13,7 +13,7 @@

Version {% version %}

Mit dem Research Data Management Organiser (RDMO) können Institutionen und Forschende das Forschungsdatenmanagement ihre Projekte strukturiert planen und durchführen. Es erlaubt das Erfassen aller relevanten Planungsinformationen in Datenmanagementplänen und die Verwaltung aller Datenmanagementaufgaben über den gesamten Datenlebenszyklus. - RDMO wurde von den Projektpartner des Leibniz-Instituts für Astrophysik Potsdam, der Fachhochschule Potsdam und der Bibliothek des Karlsruher Instituts für Technologie entwickelt und wird von der RDMO Arbeitsgemeinschaft gepflegt. + RDMO wurde im Rahmen einer Kooperation zwischen dem Leibniz-Instituts für Astrophysik Potsdam, der Fachhochschule Potsdam und der Bibliothek des Karlsruher Instituts für Technologie entwickelt und wird heute durch die RDMO Arbeitsgemeinschaft gepflegt, weiterentwickelt und verstetigt.

From 5b2827323c9270509a9bba65fde5465bee7a2416 Mon Sep 17 00:00:00 2001 From: Giacomo Lanza Date: Thu, 29 Feb 2024 11:52:55 +0100 Subject: [PATCH 005/504] localisation --- rdmo/core/templates/core/about_text_en.html | 7 ++---- rdmo/core/templates/core/about_text_es.html | 22 +++++++++++++++++++ rdmo/core/templates/core/about_text_fr.html | 7 ++---- rdmo/core/templates/core/about_text_it.html | 11 ++-------- rdmo/core/templates/core/footer_text_es.html | 23 ++++++++++++++++++++ rdmo/core/templates/core/home_text_en.html | 8 +++---- rdmo/core/templates/core/home_text_es.html | 11 ++++++++++ rdmo/core/templates/core/home_text_fr.html | 8 +++---- rdmo/core/templates/core/home_text_it.html | 8 +++---- 9 files changed, 71 insertions(+), 34 deletions(-) create mode 100644 rdmo/core/templates/core/about_text_es.html create mode 100644 rdmo/core/templates/core/footer_text_es.html create mode 100644 rdmo/core/templates/core/home_text_es.html diff --git a/rdmo/core/templates/core/about_text_en.html b/rdmo/core/templates/core/about_text_en.html index 657676c360..e3591443fa 100644 --- a/rdmo/core/templates/core/about_text_en.html +++ b/rdmo/core/templates/core/about_text_en.html @@ -12,11 +12,8 @@

Version {% version %}

- The Research Data Management Organiser (RDMO) enables institutions as well as researchers to plan and carry out their management of research data. RDMO can assemble all relevant planning information and data management tasks across the whole life cycle of the research data. -

- -

- RDMO is ready for application in smaller or bigger projects. In the next projectphase, which started November 2017, the RDMO tool will be extended and the project partners AIP, FHP, and KIT Library will collaborate with the RDMO users to improve its usage. The tool will be extended by enhancing its implementation of roles and interfaces to institutional infrastructure, e.g. repositories, ticketing systems, and the infrastructure for authentication and authorization. Tutorials, documentation and other material are planned for dissemination, and workshops for users and developers. + With the Research Data Management Organiser (RDMO), institutions and researchers can plan and implement the research data management of their projects in a structured manner. It allows the recording of all relevant planning information in data management plans and the administration of all data management tasks over the entire data life cycle. + RDMO was developed as part of a co-operation between the Leibniz Institute for Astrophysics Potsdam, the University of Applied Sciences Potsdam and the library of the Karlsruhe Institute of Technology and is now maintained, further developed and consolidated by the RDMO working group.

diff --git a/rdmo/core/templates/core/about_text_es.html b/rdmo/core/templates/core/about_text_es.html new file mode 100644 index 0000000000..6b850f7e61 --- /dev/null +++ b/rdmo/core/templates/core/about_text_es.html @@ -0,0 +1,22 @@ +{% load static %} +{% load core_tags %} +{% load i18n %} + +

+ + +

Research data management organiser

+ +

Version {% version %}

+
+ +
+

+ Con el Organizador de Gestión de Datos de Investigación (RDMO), las instituciones y los investigadores pueden planificar y llevar a cabo la gestión de datos de investigación de sus proyectos de forma estructurada. Permite el registro de toda la información de planificación relevante en los planes de gestión de datos y la administración de todas las tareas de gestión de datos a lo largo de todo el ciclo de vida de los datos. + RDMO se desarrolló en el marco de una cooperación entre el Instituto Leibniz de Astrofísica de Potsdam, la Universidad de Ciencias Aplicadas de Potsdam y la biblioteca del Instituto de Tecnología de Karlsruhe, y en la actualidad es mantenido, desarrollado y consolidado por el grupo de trabajo RDMO. +

+ +

+ Encontrará más información sobre RDMO en rdmorganiser.github.io. +

+
diff --git a/rdmo/core/templates/core/about_text_fr.html b/rdmo/core/templates/core/about_text_fr.html index 8f38ec2b69..d88db71f96 100644 --- a/rdmo/core/templates/core/about_text_fr.html +++ b/rdmo/core/templates/core/about_text_fr.html @@ -12,11 +12,8 @@

Version {% version %}

- RDMO permet aux institutions ainsi qu'aux chercheurs de planifier et de réaliser leur gestion des données de recherche. RDMO peut rassembler toutes les informations de planification pertinentes et les tâches de gestion des données tout au long du cycle de vie des données de recherche. -

- -

- RDMO est prêt à être appliqué dans des projets plus ou moins importants. Dans la prochaine phase du projet, qui a débuté en novembre 2017, l'outil RDMO sera étendu et les partenaires du projet, l'AIP, la FHP et la bibliothèque du KIT, collaboreront avec les utilisateurs de RDMO pour améliorer son utilisation. L'outil sera étendu en améliorant sa mise en œuvre des rôles et des interfaces avec l'infrastructure institutionnelle, par exemple les dépôts, les systèmes de billetterie, et l'infrastructure d'authentification et d'autorisation. Des tutoriels, de la documentation et d'autres matériels sont prévus pour la diffusion, ainsi que des ateliers pour les utilisateurs et les développeurs. + Le Research Data Management Organiser (RDMO) permet aux institutions et aux chercheurs de planifier et de réaliser la gestion des données de recherche de leurs projets de manière structurée. Il permet de saisir toutes les informations de planification pertinentes dans des plans de gestion des données et de gérer toutes les tâches de gestion des données tout au long du cycle de vie des données. + RDMO a été développé dans le cadre d'une coopération entre le Leibniz-Institut für Astrophysik Potsdam, la Fachhochschule Potsdam et la bibliothèque du Karlsruher Institut für Technologie et est aujourd'hui entretenu, développé et pérennisé par le groupe de travail RDMO.

diff --git a/rdmo/core/templates/core/about_text_it.html b/rdmo/core/templates/core/about_text_it.html index 784c25ec38..8830f41606 100644 --- a/rdmo/core/templates/core/about_text_it.html +++ b/rdmo/core/templates/core/about_text_it.html @@ -12,15 +12,8 @@

Versione {% version %}

- RDMO consente alle istituzioni e ai singoli ricercatori la pianificazione della gestione dei dati della ricerca. RDMO assembla tutte le informazioni riguardanti la pianificazione e la gestione - dei dati durante l'intera vita dei dati della ricerca. -

- -

- RDMO può essere usata in progetti grossi e piccoli. Nella prossima fase del progetto, iniziata nel Novembre 2017, RDMO sarà esteso e i partner del progetto - AIP, FHP, biblioteca KIT collaboreranno con gli utenti RDMO per migliorarne l'utilizzo. Questo strumento sarà esteso, migliorando l'implementazione dei ruoli e dell'interfacciamento - con le infrastrutture istituzionali, ad es. repositories, sistemi di ticketing, e infrastruttura di autenticazione e autorizzazione. Verranno anche scritti tutorial e documentazione, e - organizzati workshop per utenti e sviluppatori. + Con Research Data Management Organiser (RDMO), istituzioni e ricercatori possono pianificare e implementare la gestione dei dati di ricerca dei loro progetti in modo strutturato. Consente di registrare tutte le informazioni rilevanti per la pianificazione nei piani di gestione dei dati e di gestire tutte le attività di gestione dei dati per l'intero ciclo di vita dei dati. + RDMO è stato sviluppato nell'ambito di una collaborazione tra l'Istituto Leibniz per l'Astrofisica di Potsdam, l'Università di Scienze Applicate di Potsdam e la biblioteca dell'Istituto di Tecnologia di Karlsruhe ed è ora mantenuto, ulteriormente sviluppato e consolidato dal gruppo di lavoro RDMO.

diff --git a/rdmo/core/templates/core/footer_text_es.html b/rdmo/core/templates/core/footer_text_es.html new file mode 100644 index 0000000000..4987256fd3 --- /dev/null +++ b/rdmo/core/templates/core/footer_text_es.html @@ -0,0 +1,23 @@ +

+
+

Über RDMO

+

+ El Research Data Management Organiser apoya la planificación, organización y ejecución sistemáticas de la gestión de datos en el curso de un proyecto de investigación. +

+

+ RDMO es un software de código abierto y está disponible en https://github.com/rdmorganiser/rdmo. +

+
+
+

Contactos

+

+ +

+
+
+

Aviso legal y protección de datos

+

+ +

+
+
diff --git a/rdmo/core/templates/core/home_text_en.html b/rdmo/core/templates/core/home_text_en.html index 1eb966979a..e0f459cdaf 100644 --- a/rdmo/core/templates/core/home_text_en.html +++ b/rdmo/core/templates/core/home_text_en.html @@ -1,11 +1,9 @@

Welcome to RDMO

- The aim of the RDMO project is to deliver a web application to assist structured planning, implementation and administration of the data in a scientific project. Additionally, the gathered information can be cast into textual forms suitable for funding agencies requirements or for reports. -

- -

- This is a prototype of the software, for demonstration purposes. + RDMO is a web application that supports the structured planning, realisation and management of data in a scientific project.
+ The information collected can be used in research workflows and can also be output in textual form - as a data management plan for funders or as part of a research report. + as a data management plan for the sponsors or as part of a research report.

diff --git a/rdmo/core/templates/core/home_text_es.html b/rdmo/core/templates/core/home_text_es.html new file mode 100644 index 0000000000..00407c3cd4 --- /dev/null +++ b/rdmo/core/templates/core/home_text_es.html @@ -0,0 +1,11 @@ +

Willkommen bei RDMO

+ +

+ RDMO es una aplicación web que apoya la planificación estructurada, la realización y la gestión de datos en un proyecto científico.
+ La información recopilada puede utilizarse en flujos de trabajo de investigación y también puede presentarse en forma textual: como plan de gestión de datos para los financiadores o como parte de un informe de investigación. + como plan de gestión de datos para los patrocinadores o como parte de un informe de investigación. +

+ +

+ Si desea obtener más información sobre el uso de RDMO como usuario final o gestor, visite rdmorganiser.github.io. +

diff --git a/rdmo/core/templates/core/home_text_fr.html b/rdmo/core/templates/core/home_text_fr.html index 7b806ad812..e4ace4f14b 100644 --- a/rdmo/core/templates/core/home_text_fr.html +++ b/rdmo/core/templates/core/home_text_fr.html @@ -1,11 +1,9 @@

Bienvenue sur RDMO

- L'objectif du projet RDMO est de fournir une application web pour aider à la planification structurée, à la mise en œuvre et à l'administration des données d'un projet scientifique. En outre, les informations recueillies peuvent être transposées sous forme textuelle pour répondre aux exigences des organismes de financement ou pour les rapports. -

- -

- Il s'agit d'un prototype du logiciel, à des fins de démonstration. + RDMO est une application web qui soutient la planification structurée, la mise en œuvre et la gestion des données dans un projet scientifique.
+ Les informations collectées peuvent être réutilisées dans des workflows de recherche et peuvent en outre être éditées sous forme de texte - + comme plan de gestion des données pour les bailleurs de fonds ou comme partie d'un rapport de recherche.

diff --git a/rdmo/core/templates/core/home_text_it.html b/rdmo/core/templates/core/home_text_it.html index bf684776ff..7d8819afcb 100644 --- a/rdmo/core/templates/core/home_text_it.html +++ b/rdmo/core/templates/core/home_text_it.html @@ -1,11 +1,9 @@

Benvenuti a RDMO

- L'obiettivo del progetto RDMO è fornire un'applicazione web per aiutare la pianificazione, l'implementazione e l'amministrazione dei dati in un progetto scientifico. In aggiunta, le informazioni raccolte possono essere stampate in formato testuale per essere inviate ai finanziatori. -

- -

- Questo è un prototipo del software, per soli scopi dimostrativi. + RDMO è un'applicazione web che supporta la pianificazione, la realizzazione e la gestione strutturata dei dati in un progetto scientifico.
+ Le informazioni raccolte possono essere utilizzate nei flussi di lavoro della ricerca e possono anche essere prodotte in forma testuale - come piano di gestione dei dati per i finanziatori o come parte di una relazione di ricerca. + come piano di gestione dei dati per gli sponsor o come parte di una relazione di ricerca.

From 4b6a84cbb8bed9e6358735aeb065c220f95397b6 Mon Sep 17 00:00:00 2001 From: leucoryx <33422021+leucoryx@users.noreply.github.com> Date: Wed, 28 Feb 2024 09:11:16 +0100 Subject: [PATCH 006/504] Update about_text_en.html --- rdmo/core/templates/core/about_text_en.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rdmo/core/templates/core/about_text_en.html b/rdmo/core/templates/core/about_text_en.html index e3591443fa..8a72ed1908 100644 --- a/rdmo/core/templates/core/about_text_en.html +++ b/rdmo/core/templates/core/about_text_en.html @@ -12,8 +12,8 @@

Version {% version %}

- With the Research Data Management Organiser (RDMO), institutions and researchers can plan and implement the research data management of their projects in a structured manner. It allows the recording of all relevant planning information in data management plans and the administration of all data management tasks over the entire data life cycle. - RDMO was developed as part of a co-operation between the Leibniz Institute for Astrophysics Potsdam, the University of Applied Sciences Potsdam and the library of the Karlsruhe Institute of Technology and is now maintained, further developed and consolidated by the RDMO working group. + The Research Data Management Organiser (RDMO) enables institutions as well as researchers to plan and carry out their management of research data. RDMO can assemble all relevant planning information and data management tasks across the whole life cycle of the research data. + The RDMO tool was developed by the project partners of Leibniz Institute for Astrophysics Potsdam, University of Applied Sciences of Potsdam and the library of Karlsruhe Institute of Technology and is mantained by the RDMO consortium.

From 6962bdf31362410ef7bde9b3d0ccb46d811597e2 Mon Sep 17 00:00:00 2001 From: Giacomo Lanza <37865804+Zack-83@users.noreply.github.com> Date: Thu, 29 Feb 2024 13:06:28 +0100 Subject: [PATCH 007/504] Update rdmo/core/templates/core/about_text_en.html --- rdmo/core/templates/core/about_text_en.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rdmo/core/templates/core/about_text_en.html b/rdmo/core/templates/core/about_text_en.html index 8a72ed1908..ff252e8139 100644 --- a/rdmo/core/templates/core/about_text_en.html +++ b/rdmo/core/templates/core/about_text_en.html @@ -12,8 +12,8 @@

Version {% version %}

- The Research Data Management Organiser (RDMO) enables institutions as well as researchers to plan and carry out their management of research data. RDMO can assemble all relevant planning information and data management tasks across the whole life cycle of the research data. - The RDMO tool was developed by the project partners of Leibniz Institute for Astrophysics Potsdam, University of Applied Sciences of Potsdam and the library of Karlsruhe Institute of Technology and is mantained by the RDMO consortium. + The Research Data Management Organiser (RDMO) enables institutions as well as researchers to plan and carry out their management of research data in a structured manner. RDMO can assemble all relevant planning information and data management tasks across the whole life cycle of the research data. + RDMO was developed within a cooperation between the Leibniz Institute for Astrophysics Potsdam, the University of Applied Sciences of Potsdam and the library of the Karlsruhe Institute of Technology and is now maintained, further developed and consolidated by the RDMO working group.

From a7b5da6ecef4dd11ae66b71c05f08d55a91fb076 Mon Sep 17 00:00:00 2001 From: Giacomo Lanza <37865804+Zack-83@users.noreply.github.com> Date: Thu, 29 Feb 2024 13:10:37 +0100 Subject: [PATCH 008/504] Apply suggestions from code review --- rdmo/core/templates/core/home_text_en.html | 1 - rdmo/core/templates/core/home_text_es.html | 3 +-- rdmo/core/templates/core/home_text_it.html | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/rdmo/core/templates/core/home_text_en.html b/rdmo/core/templates/core/home_text_en.html index e0f459cdaf..de9dcebfc2 100644 --- a/rdmo/core/templates/core/home_text_en.html +++ b/rdmo/core/templates/core/home_text_en.html @@ -3,7 +3,6 @@

Welcome to RDMO

RDMO is a web application that supports the structured planning, realisation and management of data in a scientific project.
The information collected can be used in research workflows and can also be output in textual form - as a data management plan for funders or as part of a research report. - as a data management plan for the sponsors or as part of a research report.

diff --git a/rdmo/core/templates/core/home_text_es.html b/rdmo/core/templates/core/home_text_es.html index 00407c3cd4..63c406e40c 100644 --- a/rdmo/core/templates/core/home_text_es.html +++ b/rdmo/core/templates/core/home_text_es.html @@ -2,8 +2,7 @@

Willkommen bei RDMO

RDMO es una aplicación web que apoya la planificación estructurada, la realización y la gestión de datos en un proyecto científico.
- La información recopilada puede utilizarse en flujos de trabajo de investigación y también puede presentarse en forma textual: como plan de gestión de datos para los financiadores o como parte de un informe de investigación. - como plan de gestión de datos para los patrocinadores o como parte de un informe de investigación. + La información recopilada puede utilizarse en flujos de trabajo de investigación y también puede ser exportada en forma textual: como plan de gestión de datos para los financiadores o como parte de un informe de investigación.

diff --git a/rdmo/core/templates/core/home_text_it.html b/rdmo/core/templates/core/home_text_it.html index 7d8819afcb..b0ca5c4409 100644 --- a/rdmo/core/templates/core/home_text_it.html +++ b/rdmo/core/templates/core/home_text_it.html @@ -3,7 +3,6 @@

Benvenuti a RDMO

RDMO è un'applicazione web che supporta la pianificazione, la realizzazione e la gestione strutturata dei dati in un progetto scientifico.
Le informazioni raccolte possono essere utilizzate nei flussi di lavoro della ricerca e possono anche essere prodotte in forma testuale - come piano di gestione dei dati per i finanziatori o come parte di una relazione di ricerca. - come piano di gestione dei dati per gli sponsor o come parte di una relazione di ricerca.

From e2e53e1ccee0577b66059bbff3d3e3bc7155d144 Mon Sep 17 00:00:00 2001 From: Jimena Linares <73355288+mia-lgo@users.noreply.github.com> Date: Tue, 12 Mar 2024 10:40:40 +0100 Subject: [PATCH 009/504] Update about_text_es.html --- rdmo/core/templates/core/about_text_es.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rdmo/core/templates/core/about_text_es.html b/rdmo/core/templates/core/about_text_es.html index 6b850f7e61..063c9ec1a0 100644 --- a/rdmo/core/templates/core/about_text_es.html +++ b/rdmo/core/templates/core/about_text_es.html @@ -12,7 +12,7 @@

Version {% version %}

- Con el Organizador de Gestión de Datos de Investigación (RDMO), las instituciones y los investigadores pueden planificar y llevar a cabo la gestión de datos de investigación de sus proyectos de forma estructurada. Permite el registro de toda la información de planificación relevante en los planes de gestión de datos y la administración de todas las tareas de gestión de datos a lo largo de todo el ciclo de vida de los datos. + Con el Organizador de Gestión de Datos de Investigación (RDMO), las instituciones y los investigadores pueden planificar y llevar a cabo la gestión de datos de investigación de sus proyectos de forma estructurada. RDMO permite la integración de toda la información de planificación relevante en los planes de gestión de datos y la administración de las tareas de gestión de datos a lo largo de todo el ciclo de vida de los datos. RDMO se desarrolló en el marco de una cooperación entre el Instituto Leibniz de Astrofísica de Potsdam, la Universidad de Ciencias Aplicadas de Potsdam y la biblioteca del Instituto de Tecnología de Karlsruhe, y en la actualidad es mantenido, desarrollado y consolidado por el grupo de trabajo RDMO.

From 962032a7ce5531f329fbb1ae6d868702371e0b1b Mon Sep 17 00:00:00 2001 From: Jimena Linares <73355288+mia-lgo@users.noreply.github.com> Date: Tue, 12 Mar 2024 10:43:18 +0100 Subject: [PATCH 010/504] Update footer_text_es.html --- rdmo/core/templates/core/footer_text_es.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rdmo/core/templates/core/footer_text_es.html b/rdmo/core/templates/core/footer_text_es.html index 4987256fd3..0a232249aa 100644 --- a/rdmo/core/templates/core/footer_text_es.html +++ b/rdmo/core/templates/core/footer_text_es.html @@ -1,8 +1,8 @@
-

Über RDMO

+

Sobre RDMO

- El Research Data Management Organiser apoya la planificación, organización y ejecución sistemáticas de la gestión de datos en el curso de un proyecto de investigación. + El Organizador de Gestión de Datos de Investigación (RDMO) apoya la planificación, organización y ejecución sistemática de la gestión de datos en el curso de un proyecto de investigación.

RDMO es un software de código abierto y está disponible en https://github.com/rdmorganiser/rdmo. From b567a666fe4d2a0f4631fabbe5da0c52a2714c01 Mon Sep 17 00:00:00 2001 From: Jimena Linares <73355288+mia-lgo@users.noreply.github.com> Date: Tue, 12 Mar 2024 10:54:38 +0100 Subject: [PATCH 011/504] Update home_text_es.html --- rdmo/core/templates/core/home_text_es.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rdmo/core/templates/core/home_text_es.html b/rdmo/core/templates/core/home_text_es.html index 63c406e40c..fce115f690 100644 --- a/rdmo/core/templates/core/home_text_es.html +++ b/rdmo/core/templates/core/home_text_es.html @@ -1,8 +1,8 @@ -

Willkommen bei RDMO

+

Bienvenido a RDMO

RDMO es una aplicación web que apoya la planificación estructurada, la realización y la gestión de datos en un proyecto científico.
- La información recopilada puede utilizarse en flujos de trabajo de investigación y también puede ser exportada en forma textual: como plan de gestión de datos para los financiadores o como parte de un informe de investigación. + La información recopilada puede utilizarse en flujos de trabajo de investigación y también puede ser exportada en forma de texto: como plan de gestión de datos para los financiadores o como parte de un informe de investigación.

From 5b40122f89fe47f3f3751bd73c9875203735e298 Mon Sep 17 00:00:00 2001 From: Jochen Klar Date: Tue, 14 May 2024 16:29:41 +0200 Subject: [PATCH 012/504] Fix whitespace --- rdmo/core/templates/core/home_text_de.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rdmo/core/templates/core/home_text_de.html b/rdmo/core/templates/core/home_text_de.html index c5bc2ba1b9..ff500446e4 100644 --- a/rdmo/core/templates/core/home_text_de.html +++ b/rdmo/core/templates/core/home_text_de.html @@ -2,7 +2,7 @@

Willkommen bei RDMO

RDMO ist eine Webapplikation, die die strukturierte Planung, Umsetzung und Verwaltung der Daten in einem wissenschaftlichen Projekt unterstützt.
- Die gesammelten Informationen können in Forschungsworkflows weiterverwendet werden und zusätzlich in textueller Form ausgegeben werden - + Die gesammelten Informationen können in Forschungsworkflows weiterverwendet werden und zusätzlich in textueller Form ausgegeben werden - als Datenmanagementplan für die Förderer oder als teil eines Forschungsberichts.

From 246c3ec63476975a34b88dd1f75edabf34ef1c59 Mon Sep 17 00:00:00 2001 From: Jochen Klar Date: Tue, 26 Mar 2024 15:18:21 +0100 Subject: [PATCH 013/504] Fix export links in management, again (#915) --- rdmo/management/assets/js/components/element/Attribute.js | 2 +- rdmo/management/assets/js/components/element/Catalog.js | 2 +- rdmo/management/assets/js/components/element/Condition.js | 2 +- rdmo/management/assets/js/components/element/Option.js | 2 +- rdmo/management/assets/js/components/element/OptionSet.js | 2 +- rdmo/management/assets/js/components/element/Page.js | 2 +- rdmo/management/assets/js/components/element/Question.js | 2 +- rdmo/management/assets/js/components/element/QuestionSet.js | 2 +- rdmo/management/assets/js/components/element/Section.js | 2 +- rdmo/management/assets/js/components/element/Task.js | 2 +- rdmo/management/assets/js/components/element/View.js | 2 +- .../assets/js/components/sidebar/ElementsSidebar.js | 6 ++---- rdmo/management/assets/js/reducers/configReducer.js | 1 + 13 files changed, 14 insertions(+), 15 deletions(-) diff --git a/rdmo/management/assets/js/components/element/Attribute.js b/rdmo/management/assets/js/components/element/Attribute.js index 7c8d161d7f..423ef5919c 100644 --- a/rdmo/management/assets/js/components/element/Attribute.js +++ b/rdmo/management/assets/js/components/element/Attribute.js @@ -16,7 +16,7 @@ const Attribute = ({ config, attribute, elementActions, display='list', indent=0 const editUrl = buildPath(config.baseUrl, 'attributes', attribute.id) const copyUrl = buildPath(config.baseUrl, 'attributes', attribute.id, 'copy') const nestedUrl = buildPath(config.baseUrl, 'attributes', attribute.id, 'nested') - const exportUrl = buildPath('/api/v1/', 'domain', 'attributes', attribute.id, 'export') + const exportUrl = buildPath(config.apiUrl, 'domain', 'attributes', attribute.id, 'export') const fetchEdit = () => elementActions.fetchElement('attributes', attribute.id) const fetchCopy = () => elementActions.fetchElement('attributes', attribute.id, 'copy') diff --git a/rdmo/management/assets/js/components/element/Catalog.js b/rdmo/management/assets/js/components/element/Catalog.js index fd934ae585..24bcd5d8b1 100644 --- a/rdmo/management/assets/js/components/element/Catalog.js +++ b/rdmo/management/assets/js/components/element/Catalog.js @@ -18,7 +18,7 @@ const Catalog = ({ config, catalog, elementActions, display='list', const editUrl = buildPath(config.baseUrl, 'catalogs', catalog.id) const copyUrl = buildPath(config.baseUrl, 'catalogs', catalog.id, 'copy') const nestedUrl = buildPath(config.baseUrl, 'catalogs', catalog.id, 'nested') - const exportUrl = buildPath('/api/v1/', 'questions', 'catalogs', catalog.id, 'export') + const exportUrl = buildPath(config.apiUrl, 'questions', 'catalogs', catalog.id, 'export') const fetchEdit = () => elementActions.fetchElement('catalogs', catalog.id) const fetchCopy = () => elementActions.fetchElement('catalogs', catalog.id, 'copy') diff --git a/rdmo/management/assets/js/components/element/Condition.js b/rdmo/management/assets/js/components/element/Condition.js index 816f77c65d..86c441db11 100644 --- a/rdmo/management/assets/js/components/element/Condition.js +++ b/rdmo/management/assets/js/components/element/Condition.js @@ -14,7 +14,7 @@ const Condition = ({ config, condition, elementActions, filter=false, filterEdit const editUrl = buildPath(config.baseUrl, 'conditions', condition.id) const copyUrl = buildPath(config.baseUrl, 'conditions', condition.id, 'copy') - const exportUrl = buildPath('/api/v1/', 'conditions', 'conditions', condition.id, 'export') + const exportUrl = buildPath(config.apiUrl, 'conditions', 'conditions', condition.id, 'export') const fetchEdit = () => elementActions.fetchElement('conditions', condition.id) const fetchCopy = () => elementActions.fetchElement('conditions', condition.id, 'copy') diff --git a/rdmo/management/assets/js/components/element/Option.js b/rdmo/management/assets/js/components/element/Option.js index 64aac49362..ac6e9e85f9 100644 --- a/rdmo/management/assets/js/components/element/Option.js +++ b/rdmo/management/assets/js/components/element/Option.js @@ -15,7 +15,7 @@ const Option = ({ config, option, elementActions, display='list', indent=0, filt const editUrl = buildPath(config.baseUrl, 'options', option.id) const copyUrl = buildPath(config.baseUrl, 'options', option.id, 'copy') - const exportUrl = buildPath('/api/v1/', 'options', 'options', option.id, 'export') + const exportUrl = buildPath(config.apiUrl, 'options', 'options', option.id, 'export') const fetchEdit = () => elementActions.fetchElement('options', option.id) const fetchCopy = () => elementActions.fetchElement('options', option.id, 'copy') diff --git a/rdmo/management/assets/js/components/element/OptionSet.js b/rdmo/management/assets/js/components/element/OptionSet.js index 3628d8efa1..1ef7c1aaa3 100644 --- a/rdmo/management/assets/js/components/element/OptionSet.js +++ b/rdmo/management/assets/js/components/element/OptionSet.js @@ -16,7 +16,7 @@ const OptionSet = ({ config, optionset, elementActions, display='list', filter=f const editUrl = buildPath(config.baseUrl, 'optionsets', optionset.id) const copyUrl = buildPath(config.baseUrl, 'optionsets', optionset.id, 'copy') const nestedUrl = buildPath(config.baseUrl, 'optionsets', optionset.id, 'nested') - const exportUrl = buildPath('/api/v1/', 'options', 'optionsets', optionset.id, 'export') + const exportUrl = buildPath(config.apiUrl, 'options', 'optionsets', optionset.id, 'export') const fetchEdit = () => elementActions.fetchElement('optionsets', optionset.id) const fetchCopy = () => elementActions.fetchElement('optionsets', optionset.id, 'copy') diff --git a/rdmo/management/assets/js/components/element/Page.js b/rdmo/management/assets/js/components/element/Page.js index 0a7e086296..d1cf203511 100644 --- a/rdmo/management/assets/js/components/element/Page.js +++ b/rdmo/management/assets/js/components/element/Page.js @@ -22,7 +22,7 @@ const Page = ({ config, page, configActions, elementActions, display='list', ind const editUrl = buildPath(config.baseUrl, 'pages', page.id) const copyUrl = buildPath(config.baseUrl, 'pages', page.id, 'copy') const nestedUrl = buildPath(config.baseUrl, 'pages', page.id, 'nested') - const exportUrl = buildPath('/api/v1/', 'questions', 'pages', page.id, 'export') + const exportUrl = buildPath(config.apiUrl, 'questions', 'pages', page.id, 'export') const fetchEdit = () => elementActions.fetchElement('pages', page.id) const fetchCopy = () => elementActions.fetchElement('pages', page.id, 'copy') diff --git a/rdmo/management/assets/js/components/element/Question.js b/rdmo/management/assets/js/components/element/Question.js index e9864d8cd2..95e2ec3ea4 100644 --- a/rdmo/management/assets/js/components/element/Question.js +++ b/rdmo/management/assets/js/components/element/Question.js @@ -17,7 +17,7 @@ const Question = ({ config, question, elementActions, display='list', indent=0, const editUrl = buildPath(config.baseUrl, 'questions', question.id) const copyUrl = buildPath(config.baseUrl, 'questions', question.id, 'copy') - const exportUrl = buildPath('/api/v1/', 'questions', 'questions', question.id, 'export') + const exportUrl = buildPath(config.apiUrl, 'questions', 'questions', question.id, 'export') const fetchEdit = () => elementActions.fetchElement('questions', question.id) const fetchCopy = () => elementActions.fetchElement('questions', question.id, 'copy') diff --git a/rdmo/management/assets/js/components/element/QuestionSet.js b/rdmo/management/assets/js/components/element/QuestionSet.js index 56d3bdd701..904f201699 100644 --- a/rdmo/management/assets/js/components/element/QuestionSet.js +++ b/rdmo/management/assets/js/components/element/QuestionSet.js @@ -21,7 +21,7 @@ const QuestionSet = ({ config, questionset, configActions, elementActions, displ const editUrl = buildPath(config.baseUrl, 'questionsets', questionset.id) const copyUrl = buildPath(config.baseUrl, 'questionsets', questionset.id, 'copy') const nestedUrl = buildPath(config.baseUrl, 'questionsets', questionset.id, 'nested') - const exportUrl = buildPath('/api/v1/', 'questions', 'questionsets', questionset.id, 'export') + const exportUrl = buildPath(config.apiUrl, 'questions', 'questionsets', questionset.id, 'export') const fetchEdit = () => elementActions.fetchElement('questionsets', questionset.id) const fetchCopy = () => elementActions.fetchElement('questionsets', questionset.id, 'copy') diff --git a/rdmo/management/assets/js/components/element/Section.js b/rdmo/management/assets/js/components/element/Section.js index 92e0150ad7..3f6915352c 100644 --- a/rdmo/management/assets/js/components/element/Section.js +++ b/rdmo/management/assets/js/components/element/Section.js @@ -23,7 +23,7 @@ const Section = ({ config, section, configActions, elementActions, display='list const editUrl = buildPath(config.baseUrl, 'sections', section.id) const copyUrl = buildPath(config.baseUrl, 'sections', section.id, 'copy') const nestedUrl = buildPath(config.baseUrl, 'sections', section.id, 'nested') - const exportUrl = buildPath('/api/v1/', 'questions', 'sections', section.id, 'export') + const exportUrl = buildPath(config.apiUrl, 'questions', 'sections', section.id, 'export') const fetchEdit = () => elementActions.fetchElement('sections', section.id) const fetchCopy = () => elementActions.fetchElement('sections', section.id, 'copy') diff --git a/rdmo/management/assets/js/components/element/Task.js b/rdmo/management/assets/js/components/element/Task.js index 12676cc89f..d95ec65bfe 100644 --- a/rdmo/management/assets/js/components/element/Task.js +++ b/rdmo/management/assets/js/components/element/Task.js @@ -15,7 +15,7 @@ const Task = ({ config, task, elementActions, filter=false, filterSites=false, f const editUrl = buildPath(config.baseUrl, 'tasks', task.id) const copyUrl = buildPath(config.baseUrl, 'tasks', task.id, 'copy') - const exportUrl = buildPath('/api/v1/', 'tasks', 'tasks', task.id, 'export') + const exportUrl = buildPath(config.apiUrl, 'tasks', 'tasks', task.id, 'export') const fetchEdit = () => elementActions.fetchElement('tasks', task.id) const fetchCopy = () => elementActions.fetchElement('tasks', task.id, 'copy') diff --git a/rdmo/management/assets/js/components/element/View.js b/rdmo/management/assets/js/components/element/View.js index 3c1655ae81..3805929ac8 100644 --- a/rdmo/management/assets/js/components/element/View.js +++ b/rdmo/management/assets/js/components/element/View.js @@ -14,7 +14,7 @@ const View = ({ config, view, elementActions, filter=false, filterSites=false, f const editUrl = buildPath(config.baseUrl, 'views', view.id) const copyUrl = buildPath(config.baseUrl, 'views', view.id, 'copy') - const exportUrl = buildPath('/api/v1/', 'views', 'views', view.id, 'export') + const exportUrl = buildPath(config.apiUrl, 'views', 'views', view.id, 'export') const fetchEdit = () => elementActions.fetchElement('views', view.id) const fetchCopy = () => elementActions.fetchElement('views', view.id, 'copy') diff --git a/rdmo/management/assets/js/components/sidebar/ElementsSidebar.js b/rdmo/management/assets/js/components/sidebar/ElementsSidebar.js index 65420eab49..8ed0bd5252 100644 --- a/rdmo/management/assets/js/components/sidebar/ElementsSidebar.js +++ b/rdmo/management/assets/js/components/sidebar/ElementsSidebar.js @@ -3,8 +3,6 @@ import PropTypes from 'prop-types' import isNil from 'lodash/isNil' import invert from 'lodash/invert' -import baseUrl from 'rdmo/core/assets/js/utils/baseUrl' - import { elementTypes, elementModules } from '../../constants/elements' import { buildPath } from '../../utils/location' @@ -18,8 +16,8 @@ const ElementsSidebar = ({ config, elements, elementActions, importActions }) => const { elementType, elementId } = elements const model = invert(elementTypes)[elementType] - const exportUrl = isNil(elementId) ? `${baseUrl}/api/v1/${elementModules[model]}/${elementType}/export/` - : `${baseUrl}/api/v1/${elementModules[model]}/${elementType}/${elementId}/export/` + const exportUrl = isNil(elementId) ? buildPath(config.apiUrl, elementModules[model], elementType, 'export') + : buildPath(config.apiUrl, elementModules[model], elementType, elementId, 'export') const exportParams = getExportParams(config.filter[elementType]) return ( diff --git a/rdmo/management/assets/js/reducers/configReducer.js b/rdmo/management/assets/js/reducers/configReducer.js index 4eb2500380..31029c17f0 100644 --- a/rdmo/management/assets/js/reducers/configReducer.js +++ b/rdmo/management/assets/js/reducers/configReducer.js @@ -4,6 +4,7 @@ import baseUrl from 'rdmo/core/assets/js/utils/baseUrl' const initialState = { baseUrl: baseUrl + '/management/', + apiUrl: baseUrl + '/api/v1/', settings: {}, filter: {}, display: {} From 25dbd092097cf5ab1b18c969a9c5f2742405b101 Mon Sep 17 00:00:00 2001 From: Jochen Klar Date: Tue, 26 Mar 2024 15:42:13 +0100 Subject: [PATCH 014/504] Remove local hosts from ALLOWED_HOSTS settings (#918) --- rdmo/core/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rdmo/core/settings.py b/rdmo/core/settings.py index dcd176b4e5..bdadceccb7 100644 --- a/rdmo/core/settings.py +++ b/rdmo/core/settings.py @@ -4,7 +4,7 @@ DEBUG = False -ALLOWED_HOSTS = ['localhost', 'ip6-localhost', '127.0.0.1', '[::1]'] +ALLOWED_HOSTS = [] INSTALLED_APPS = [ # django modules From a2b66083cc070a3722d04c571eee238906383439 Mon Sep 17 00:00:00 2001 From: Jochen Klar Date: Tue, 14 May 2024 16:37:35 +0200 Subject: [PATCH 015/504] Remove ALLOWED_HOSTS from settings --- rdmo/core/settings.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/rdmo/core/settings.py b/rdmo/core/settings.py index bdadceccb7..c6ecd4bf3c 100644 --- a/rdmo/core/settings.py +++ b/rdmo/core/settings.py @@ -4,8 +4,6 @@ DEBUG = False -ALLOWED_HOSTS = [] - INSTALLED_APPS = [ # django modules 'django.contrib.admin', From 35bf5b57eed0dbcdbc9fc59358e1d75dffe0beb3 Mon Sep 17 00:00:00 2001 From: Jochen Klar Date: Tue, 26 Mar 2024 15:47:32 +0100 Subject: [PATCH 016/504] Fix edit component for page and question set (#944) --- rdmo/management/assets/js/components/edit/EditPage.js | 4 ++-- rdmo/management/assets/js/components/edit/EditQuestionSet.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rdmo/management/assets/js/components/edit/EditPage.js b/rdmo/management/assets/js/components/edit/EditPage.js index 707a82a2d4..6064b6f2c5 100644 --- a/rdmo/management/assets/js/components/edit/EditPage.js +++ b/rdmo/management/assets/js/components/edit/EditPage.js @@ -70,8 +70,8 @@ const EditPage = ({ config, page, elements, elementActions }) => { // for reasons unknown, the strings are not picked up by makemessages from the props const addElementText = gettext('Add existing element') - const createQuestionText = gettext('Create new question set') - const createQuestionSetText = gettext('Create new question') + const createQuestionText = gettext('Create new question') + const createQuestionSetText = gettext('Create new question set') return (
diff --git a/rdmo/management/assets/js/components/edit/EditQuestionSet.js b/rdmo/management/assets/js/components/edit/EditQuestionSet.js index e23c4fa146..e78935196f 100644 --- a/rdmo/management/assets/js/components/edit/EditQuestionSet.js +++ b/rdmo/management/assets/js/components/edit/EditQuestionSet.js @@ -70,8 +70,8 @@ const EditQuestionSet = ({ config, questionset, elements, elementActions }) => { // for reasons unknown, the strings are not picked up by makemessages from the props const addElementText = gettext('Add existing element') - const createQuestionText = gettext('Create new question set') - const createQuestionSetText = gettext('Create new question') + const createQuestionText = gettext('Create new question') + const createQuestionSetText = gettext('Create new question set') return (
From 8d20c88acc0d0effa9c1f2f8aff7c6d3ec661124 Mon Sep 17 00:00:00 2001 From: David Wallace Date: Mon, 22 Apr 2024 14:31:18 +0200 Subject: [PATCH 017/504] fix: rename to catalog_section #977 Signed-off-by: David Wallace --- rdmo/projects/progress.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rdmo/projects/progress.py b/rdmo/projects/progress.py index 36eca6d841..536f1c639e 100644 --- a/rdmo/projects/progress.py +++ b/rdmo/projects/progress.py @@ -53,7 +53,7 @@ def compute_navigation(section, project, snapshot=None): 'id': catalog_section.id, 'uri': catalog_section.uri, 'title': catalog_section.title, - 'first': catalog_section.elements[0].id if section.elements else None + 'first': catalog_section.elements[0].id if catalog_section.elements else None } if catalog_section.id == section.id: navigation_section['pages'] = [] From 3924245690d4054c8e6d168a501d06b09abd62b2 Mon Sep 17 00:00:00 2001 From: David Wallace Date: Mon, 22 Apr 2024 14:32:23 +0200 Subject: [PATCH 018/504] tests: add initial tests for project navigation #977 Signed-off-by: David Wallace --- .../tests/test_viewset_project_navigation.py | 68 +++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 rdmo/projects/tests/test_viewset_project_navigation.py diff --git a/rdmo/projects/tests/test_viewset_project_navigation.py b/rdmo/projects/tests/test_viewset_project_navigation.py new file mode 100644 index 0000000000..eb0c5a977d --- /dev/null +++ b/rdmo/projects/tests/test_viewset_project_navigation.py @@ -0,0 +1,68 @@ +import pytest + +from django.urls import reverse + +from ..models import Project + +users = ( + ('owner', 'owner'), + ('manager', 'manager'), + ('author', 'author'), + ('guest', 'guest'), + ('api', 'api'), + ('user', 'user'), + ('site', 'site'), + ('anonymous', None), +) + +view_progress_permission_map = { + 'owner': [1, 2, 3, 4, 5, 10], + 'manager': [1, 3, 5, 7], + 'author': [1, 3, 5, 8], + 'guest': [1, 3, 5, 9], + 'api': [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11], + 'site': [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11] +} + +change_progress_permission_map = { + 'owner': [1, 2, 3, 4, 5, 10], + 'manager': [1, 3, 5, 7], + 'author': [1, 3, 5, 8], + 'api': [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11], + 'site': [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11] +} + +urlnames = { + 'navigation': 'v1-projects:project-navigation' +} + +projects = [1, 2, 3, 4, 5] +sections = [1] + + +@pytest.mark.parametrize('username,password', users) +@pytest.mark.parametrize('project_id', projects) +def test_navigation_get(db, client, username, password, project_id): + client.login(username=username, password=password) + + project = Project.objects.get(id=project_id) + sections = project.catalog.sections.order_by("section_catalogs").all() + + if project_id in view_progress_permission_map.get(username, []): + catalog_elements = project.catalog.elements + for section in sections: + url = reverse(urlnames['navigation'], args=[project_id, section.id]) + response = client.get(url) + assert response.status_code == 200 + data = response.json() + assert isinstance(data, list) + assert len(catalog_elements) == len(data) + + else: + if sections: + url = reverse(urlnames['navigation'], args=[project_id, sections[0].id]) + response = client.get(url) + if password: + assert response.status_code == 404 + else: + assert response.status_code == 401 From 983d21c7d7719da9252134c169743b3306728910 Mon Sep 17 00:00:00 2001 From: David Wallace Date: Mon, 22 Apr 2024 16:14:34 +0200 Subject: [PATCH 019/504] fix typo: rename uriPrefix to uri_prefix in Attributes.js Signed-off-by: David Wallace --- rdmo/management/assets/js/components/elements/Attributes.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rdmo/management/assets/js/components/elements/Attributes.js b/rdmo/management/assets/js/components/elements/Attributes.js index ffb83c62d9..e89b5b8d7b 100644 --- a/rdmo/management/assets/js/components/elements/Attributes.js +++ b/rdmo/management/assets/js/components/elements/Attributes.js @@ -33,7 +33,7 @@ const Attributes = ({ config, attributes, configActions, elementActions }) => { placeholder={gettext('Filter attributes')} />
-
{ From ed7f6dab6de02a91a75808d88b5de4dde80687fd Mon Sep 17 00:00:00 2001 From: David Wallace Date: Fri, 5 Apr 2024 17:04:20 +0200 Subject: [PATCH 020/504] feat: add simple view tag render_custom_inline_list Co-authored-by: @jwindeck Signed-off-by: David Wallace --- rdmo/views/templatetags/view_tags.py | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/rdmo/views/templatetags/view_tags.py b/rdmo/views/templatetags/view_tags.py index 44f7b13319..83eb4dcbf2 100644 --- a/rdmo/views/templatetags/view_tags.py +++ b/rdmo/views/templatetags/view_tags.py @@ -111,6 +111,33 @@ def get_set(context, attribute, set_prefix='', project=None): return get_sets(context, attribute, set_prefix=set_prefix, project=project) +@register.simple_tag +def render_custom_inline_list(values=None, sep=',', sep_last=', and'): + values = values or [] + + if not values: + return '' + + if len(values) == 1: + return values[0]['value_and_unit'] + + if len(values) == 2: + if sep_last.startswith(', '): # for english sep_last + sep_last = sep_last.split(', ')[-1] + return f"{values[0]['value_and_unit']} {sep_last} {values[1]['value_and_unit']}" + + _text = '' + for n,value in enumerate(values): + if n == len(values) - 1 and _text: + _text += f"{sep_last} " + _text += value['value_and_unit'] + if n < len(values) - 2: + _text += f"{sep} " + else: + _text += ' ' + return _text + + @register.inclusion_tag('views/tags/value.html', takes_context=True) def render_value(context, attribute, set_prefix='', set_index=0, index=0, project=None): context['value'] = get_value(context, attribute, set_prefix=set_prefix, set_index=set_index, From b8b12f95eb90301f48a616ec0854f03e2658b609 Mon Sep 17 00:00:00 2001 From: Giacomo Lanza <37865804+Zack-83@users.noreply.github.com> Date: Thu, 16 May 2024 14:03:24 +0200 Subject: [PATCH 021/504] Second trial with zip() and join() --- rdmo/views/templatetags/view_tags.py | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/rdmo/views/templatetags/view_tags.py b/rdmo/views/templatetags/view_tags.py index 83eb4dcbf2..b2915456eb 100644 --- a/rdmo/views/templatetags/view_tags.py +++ b/rdmo/views/templatetags/view_tags.py @@ -112,7 +112,7 @@ def get_set(context, attribute, set_prefix='', project=None): @register.simple_tag -def render_custom_inline_list(values=None, sep=',', sep_last=', and'): +def join_values_inline(values=None, separator=',', separator_last=', and', separator_two='and'): values = values or [] if not values: @@ -122,20 +122,11 @@ def render_custom_inline_list(values=None, sep=',', sep_last=', and'): return values[0]['value_and_unit'] if len(values) == 2: - if sep_last.startswith(', '): # for english sep_last - sep_last = sep_last.split(', ')[-1] - return f"{values[0]['value_and_unit']} {sep_last} {values[1]['value_and_unit']}" - - _text = '' - for n,value in enumerate(values): - if n == len(values) - 1 and _text: - _text += f"{sep_last} " - _text += value['value_and_unit'] - if n < len(values) - 2: - _text += f"{sep} " - else: - _text += ' ' - return _text + return f"{values[0]['value_and_unit']} {separator_two} {values[1]['value_and_unit']}" + + separators = [separator]*(len(values)-2) + [separator_last] + [''] + text = " ".join(i + j for i, j in zip(values, separators)) + return text @register.inclusion_tag('views/tags/value.html', takes_context=True) From 795e84d9e3a4f5278b46754d6f6f8b308b414df7 Mon Sep 17 00:00:00 2001 From: Jochen Klar Date: Fri, 17 May 2024 14:04:24 +0200 Subject: [PATCH 022/504] Fix join_values_inline --- rdmo/views/templatetags/view_tags.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rdmo/views/templatetags/view_tags.py b/rdmo/views/templatetags/view_tags.py index b2915456eb..6a3e7d3e58 100644 --- a/rdmo/views/templatetags/view_tags.py +++ b/rdmo/views/templatetags/view_tags.py @@ -125,7 +125,7 @@ def join_values_inline(values=None, separator=',', separator_last=', and', separ return f"{values[0]['value_and_unit']} {separator_two} {values[1]['value_and_unit']}" separators = [separator]*(len(values)-2) + [separator_last] + [''] - text = " ".join(i + j for i, j in zip(values, separators)) + text = " ".join(v['value_and_unit'] + s for v,s in zip(values, separators)) return text From 287880038abb9966d3e08f09ac60897c1a57f0ba Mon Sep 17 00:00:00 2001 From: Jochen Klar Date: Tue, 23 Jan 2024 12:29:00 +0100 Subject: [PATCH 023/504] Add ORCID icon/link to membership list in project --- rdmo/accounts/static/accounts/img/orcid_16x16.png | Bin 0 -> 236 bytes .../projects/project_detail_memberships.html | 2 ++ ...project_detail_memberships_socialaccounts.html | 9 +++++++++ rdmo/projects/views/project.py | 3 ++- 4 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 rdmo/accounts/static/accounts/img/orcid_16x16.png create mode 100644 rdmo/projects/templates/projects/project_detail_memberships_socialaccounts.html diff --git a/rdmo/accounts/static/accounts/img/orcid_16x16.png b/rdmo/accounts/static/accounts/img/orcid_16x16.png new file mode 100644 index 0000000000000000000000000000000000000000..6b697e4d7be98fd44de3e68f73f1bcd44502e8d3 GIT binary patch literal 236 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPHF4e$wZ1=7pTSt6tV|Nnpa`RwtB zgZJKUz5IO6o?F>#F1i90Ogf<1tKReqsDZ5{$S;^dAz}ad_i9suE(1j}JY5_^DsK7q zZRBh)5OMJ@Xb{Ou$W7LNp^)inXECYRqSg0^SKMs9a|wd3yN?(4TYH*rnH0jv6ZBB` z;KPt4&KFk;RLz>KbowrDHq)$ literal 0 HcmV?d00001 diff --git a/rdmo/projects/templates/projects/project_detail_memberships.html b/rdmo/projects/templates/projects/project_detail_memberships.html index f36a7fcbe1..294d4c451d 100644 --- a/rdmo/projects/templates/projects/project_detail_memberships.html +++ b/rdmo/projects/templates/projects/project_detail_memberships.html @@ -1,5 +1,6 @@ {% load i18n %} {% load rules %} +{% load static %} {% load accounts_tags %} {% has_perm 'projects.add_membership_object' request.user project as can_add_membership %} @@ -32,6 +33,7 @@

{% trans 'Members' %}

{% full_name membership.user %} + {% include 'projects/project_detail_memberships_socialaccounts.html' %} {{ membership.user.email }} diff --git a/rdmo/projects/templates/projects/project_detail_memberships_socialaccounts.html b/rdmo/projects/templates/projects/project_detail_memberships_socialaccounts.html new file mode 100644 index 0000000000..2ba72de77d --- /dev/null +++ b/rdmo/projects/templates/projects/project_detail_memberships_socialaccounts.html @@ -0,0 +1,9 @@ +{% load static %} + +{% for socialaccount in membership.user.socialaccount_set.all %} +{% if socialaccount.provider == 'orcid' %} + + ORCID logo + +{% endif %} +{% endfor %} diff --git a/rdmo/projects/views/project.py b/rdmo/projects/views/project.py index e77373d280..e1daf6250e 100644 --- a/rdmo/projects/views/project.py +++ b/rdmo/projects/views/project.py @@ -136,7 +136,8 @@ def get_context_data(self, **kwargs): memberships = Membership.objects.filter(project__in=ancestors) \ .annotate(highest=Subquery(highest.values('project__level')[:1])) \ .filter(highest=F('project__level')) \ - .select_related('user') + .select_related('user') \ + .prefetch_related('user__socialaccount_set') integrations = Integration.objects.filter(project__in=ancestors) context['catalogs'] = Catalog.objects.filter_current_site() \ From d8a83ab603fc203d978b3d856f5319ba71c8f346 Mon Sep 17 00:00:00 2001 From: Jochen Klar Date: Fri, 17 May 2024 17:09:15 +0200 Subject: [PATCH 024/504] Fix ProjectDetailView if SOCIALACCOUNT is not enabled --- rdmo/projects/views/project.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/rdmo/projects/views/project.py b/rdmo/projects/views/project.py index e1daf6250e..ce38a6d39f 100644 --- a/rdmo/projects/views/project.py +++ b/rdmo/projects/views/project.py @@ -1,5 +1,6 @@ import logging +from django.conf import settings from django.contrib.auth.mixins import LoginRequiredMixin from django.core.exceptions import PermissionDenied from django.db import models @@ -136,8 +137,11 @@ def get_context_data(self, **kwargs): memberships = Membership.objects.filter(project__in=ancestors) \ .annotate(highest=Subquery(highest.values('project__level')[:1])) \ .filter(highest=F('project__level')) \ - .select_related('user') \ - .prefetch_related('user__socialaccount_set') + .select_related('user') + + if settings.SOCIALACCOUNT: + # prefetch the users social account, if that relation exists + memberships = memberships.prefetch_related('user__socialaccount_set') integrations = Integration.objects.filter(project__in=ancestors) context['catalogs'] = Catalog.objects.filter_current_site() \ From aeae9d08d6213979b9e12b504a83b6a6bd235523 Mon Sep 17 00:00:00 2001 From: Jochen Klar Date: Fri, 17 May 2024 18:18:42 +0200 Subject: [PATCH 025/504] Fix dispatch after copy action in management interface (#980) --- rdmo/management/assets/js/actions/elementActions.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rdmo/management/assets/js/actions/elementActions.js b/rdmo/management/assets/js/actions/elementActions.js index e16db608db..9a0e85b4ce 100644 --- a/rdmo/management/assets/js/actions/elementActions.js +++ b/rdmo/management/assets/js/actions/elementActions.js @@ -398,7 +398,7 @@ export function storeElement(elementType, element, back) { dispatch(storeElementSuccess(element)) if (back) { history.back() - } else if (getState().elements.elementAction == 'create') { + } else if (['create', 'copy'].includes(getState().elements.elementAction)) { dispatch(fetchElement(getState().elements.elementType, element.id)) } }) From b7b4c9d98ee0d2d50a86e60ad8e76dbc94691ec9 Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Wed, 22 May 2024 20:12:49 +0200 Subject: [PATCH 026/504] Fix text in German overlay for project import Signed-off-by: Stefan Weil --- .../templates/projects/overlays/projects_import_project_de.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rdmo/projects/templates/projects/overlays/projects_import_project_de.html b/rdmo/projects/templates/projects/overlays/projects_import_project_de.html index 7eb7906c7c..e7ecab29c0 100644 --- a/rdmo/projects/templates/projects/overlays/projects_import_project_de.html +++ b/rdmo/projects/templates/projects/overlays/projects_import_project_de.html @@ -4,7 +4,7 @@ Sollten Sie bereits ein Projekt in RDMO angelegt und exportiert haben und möchten es Ihrer Projektliste an dieser Stelle hinzufügen, - so können sie hier ein vorhandenes Projekt importieren. + so können Sie hier ein vorhandenes Projekt importieren. {% include 'overlays/buttons.html'%}
From a7cff0987fcd5a4c2070c99a7ef30f4f2f05d7ff Mon Sep 17 00:00:00 2001 From: Claudia Malzer Date: Fri, 10 Nov 2023 16:50:32 +0100 Subject: [PATCH 027/504] add-react-projects-site * create new empty react page for projects --- rdmo/core/assets/js/components/ButtonGroup.js | 38 +++ .../assets/js/actions/projectsActions.js | 27 ++ rdmo/projects/assets/js/actions/types.js | 3 + rdmo/projects/assets/js/api/ProjectsApi.js | 11 + .../assets/js/components/main/Projects.js | 53 +++ rdmo/projects/assets/js/containers/Main.js | 35 ++ rdmo/projects/assets/js/projects.js | 21 ++ .../assets/js/reducers/projectsReducer.js | 19 ++ .../assets/js/reducers/rootReducer.js | 8 + .../assets/js/store/configureStore.js | 27 ++ rdmo/projects/assets/scss/projects.scss | 302 ++++++++++++++++++ .../templates/projects/new_projects.html | 34 ++ rdmo/projects/urls/__init__.py | 3 + rdmo/projects/views/__init__.py | 1 + rdmo/projects/views/project.py | 17 +- webpack/common.config.js | 14 + 16 files changed, 611 insertions(+), 2 deletions(-) create mode 100644 rdmo/core/assets/js/components/ButtonGroup.js create mode 100644 rdmo/projects/assets/js/actions/projectsActions.js create mode 100644 rdmo/projects/assets/js/actions/types.js create mode 100644 rdmo/projects/assets/js/api/ProjectsApi.js create mode 100644 rdmo/projects/assets/js/components/main/Projects.js create mode 100644 rdmo/projects/assets/js/containers/Main.js create mode 100644 rdmo/projects/assets/js/projects.js create mode 100644 rdmo/projects/assets/js/reducers/projectsReducer.js create mode 100644 rdmo/projects/assets/js/reducers/rootReducer.js create mode 100644 rdmo/projects/assets/js/store/configureStore.js create mode 100644 rdmo/projects/assets/scss/projects.scss create mode 100644 rdmo/projects/templates/projects/new_projects.html diff --git a/rdmo/core/assets/js/components/ButtonGroup.js b/rdmo/core/assets/js/components/ButtonGroup.js new file mode 100644 index 0000000000..5460d627e1 --- /dev/null +++ b/rdmo/core/assets/js/components/ButtonGroup.js @@ -0,0 +1,38 @@ +import React, { useState } from 'react' +import PropTypes from 'prop-types' + +const ButtonGroup = ({ buttons }) => { + const [activeButton, setActiveButton] = useState(buttons[0].type) + + const handleButtonClick = (buttonType, onClick) => { + setActiveButton(buttonType) + onClick && onClick() + } + + return ( +
+ {buttons.map((button) => ( + + ))} +
+ ) +} + +ButtonGroup.propTypes = { + buttons: PropTypes.arrayOf( + PropTypes.shape({ + label: PropTypes.string.isRequired, + type: PropTypes.string.isRequired, + onClick: PropTypes.func, + }) + ).isRequired, +} + +export default ButtonGroup diff --git a/rdmo/projects/assets/js/actions/projectsActions.js b/rdmo/projects/assets/js/actions/projectsActions.js new file mode 100644 index 0000000000..9abc09121f --- /dev/null +++ b/rdmo/projects/assets/js/actions/projectsActions.js @@ -0,0 +1,27 @@ + +import ProjectsApi from '../api/ProjectsApi' +import { FETCH_PROJECTS_ERROR, FETCH_PROJECTS_INIT, FETCH_PROJECTS_SUCCESS } from './types' + +export function fetchAllProjects() { + return function(dispatch) { + dispatch(fetchProjectsInit()) + const action = (dispatch) => ProjectsApi.fetchProjects(true) + .then(projects => { + dispatch(fetchProjectsSuccess({ projects }))}) + + return dispatch(action) + .catch(error => dispatch(fetchProjectsError(error))) + } +} + +export function fetchProjectsInit() { + return {type: FETCH_PROJECTS_INIT} +} + +export function fetchProjectsSuccess(projects) { + return {type: FETCH_PROJECTS_SUCCESS, projects} +} + +export function fetchProjectsError(error) { + return {type: FETCH_PROJECTS_ERROR, error} +} diff --git a/rdmo/projects/assets/js/actions/types.js b/rdmo/projects/assets/js/actions/types.js new file mode 100644 index 0000000000..0391ffaca7 --- /dev/null +++ b/rdmo/projects/assets/js/actions/types.js @@ -0,0 +1,3 @@ +export const FETCH_PROJECTS_SUCCESS = 'projects/fetchProjectsSuccess' +export const FETCH_PROJECTS_ERROR = 'projects/fetchProjectsError' +export const FETCH_PROJECTS_INIT = 'projects/fetchProjectsInit' diff --git a/rdmo/projects/assets/js/api/ProjectsApi.js b/rdmo/projects/assets/js/api/ProjectsApi.js new file mode 100644 index 0000000000..62db2e8259 --- /dev/null +++ b/rdmo/projects/assets/js/api/ProjectsApi.js @@ -0,0 +1,11 @@ +import BaseApi from 'rdmo/core/assets/js/api/BaseApi' + +class ProjectsApi extends BaseApi { + + static fetchProjects() { + console.log('fetch ') + return this.get('/api/v1/projects/projects/') + } +} + +export default ProjectsApi diff --git a/rdmo/projects/assets/js/components/main/Projects.js b/rdmo/projects/assets/js/components/main/Projects.js new file mode 100644 index 0000000000..8a7dc151bc --- /dev/null +++ b/rdmo/projects/assets/js/components/main/Projects.js @@ -0,0 +1,53 @@ +import React from 'react' +import PropTypes from 'prop-types' +// import ButtonGroup from 'rdmo/core/assets/js/components/ButtonGroup' + +const Projects = ({ projects }) => { + // useEffect(() => { + // projectsActions.fetchProjects() + // }, [projectsActions.fetchProjects()]) + +// const handleMyProjectsClick = () => { +// // Custom logic for 'My projects' button click +// } + +// const handleAllProjectsClick = () => { +// // Custom logic for 'All projects' button click +// } + + +// const buttons = [ +// { label: 'My projects', type: 'myProjects', onClick: handleMyProjectsClick }, +// { label: 'All projects', type: 'allProjects', onClick: handleAllProjectsClick }, +// // Add more buttons as needed +// ] + +console.log('projects', projects.projects) +// console.log(projectList.map((project) => project.title)) +// projectList.forEach((project) => { +// console.log(project.title) +// }) + + const renderProjects = () => { + return projects.projects.map(project => { + console.log('project %o', project) + project?.title || 'no projects' }) + } + + return ( + <> + {/* */} +
+ {'Test'} + {/* Render projects */} + {renderProjects()} +
+ ) +} + +Projects.propTypes = { + // projectsActions: PropTypes.object.isRequired, + projects: PropTypes.object.isRequired, +} + +export default Projects diff --git a/rdmo/projects/assets/js/containers/Main.js b/rdmo/projects/assets/js/containers/Main.js new file mode 100644 index 0000000000..20718eab68 --- /dev/null +++ b/rdmo/projects/assets/js/containers/Main.js @@ -0,0 +1,35 @@ +import React from 'react' +import PropTypes from 'prop-types' +import { bindActionCreators } from 'redux' +import { connect } from 'react-redux' +import isEmpty from 'lodash/isEmpty' +import * as projectActions from '../actions/projectsActions' +import Projects from '../components/main/Projects' + +const Main = ({ projectActions, projects }) => { + // check if anything was loaded yet + if (!isEmpty(projects)) { + return + } + + return null +} + +Main.propTypes = { + projectActions: PropTypes.object.isRequired, + projects: PropTypes.object.isRequired, +} + +function mapStateToProps(state) { + return { + projects: state.projects, + } +} + +function mapDispatchToProps(dispatch) { + return { + projectActions: bindActionCreators(projectActions, dispatch), + } +} + +export default connect(mapStateToProps, mapDispatchToProps)(Main) diff --git a/rdmo/projects/assets/js/projects.js b/rdmo/projects/assets/js/projects.js new file mode 100644 index 0000000000..23b5ae30d6 --- /dev/null +++ b/rdmo/projects/assets/js/projects.js @@ -0,0 +1,21 @@ +import React from 'react' +import { createRoot } from 'react-dom/client' +import { Provider } from 'react-redux' + +import configureStore from './store/configureStore' + +import { DndProvider } from 'react-dnd' +import { HTML5Backend } from 'react-dnd-html5-backend' + +import Main from './containers/Main' + +const store = configureStore() + +console.log('projects.js') +createRoot(document.getElementById('main')).render( + + +
+ + +) diff --git a/rdmo/projects/assets/js/reducers/projectsReducer.js b/rdmo/projects/assets/js/reducers/projectsReducer.js new file mode 100644 index 0000000000..a2a031929c --- /dev/null +++ b/rdmo/projects/assets/js/reducers/projectsReducer.js @@ -0,0 +1,19 @@ +import { FETCH_PROJECTS_ERROR, FETCH_PROJECTS_INIT, FETCH_PROJECTS_SUCCESS } from '../actions/types' + +const initialState = { + projects: [], +} + +export default function projectsReducer(state = initialState, action) { + switch(action.type) { + // fetch elements + case FETCH_PROJECTS_INIT: + return {...state, ...action.projects} + case FETCH_PROJECTS_SUCCESS: + return {...state, ...action.projects} + case FETCH_PROJECTS_ERROR: + return {...state, errors: action.error.errors} + default: + return state + } +} diff --git a/rdmo/projects/assets/js/reducers/rootReducer.js b/rdmo/projects/assets/js/reducers/rootReducer.js new file mode 100644 index 0000000000..2a4c99cdd1 --- /dev/null +++ b/rdmo/projects/assets/js/reducers/rootReducer.js @@ -0,0 +1,8 @@ +import { combineReducers } from 'redux' +import projectsReducer from './projectsReducer' + +const rootReducer = combineReducers({ + projects: projectsReducer, +}) + +export default rootReducer diff --git a/rdmo/projects/assets/js/store/configureStore.js b/rdmo/projects/assets/js/store/configureStore.js new file mode 100644 index 0000000000..64e4957ee6 --- /dev/null +++ b/rdmo/projects/assets/js/store/configureStore.js @@ -0,0 +1,27 @@ +import { createStore, applyMiddleware } from 'redux' +import thunk from 'redux-thunk' +import rootReducer from '../reducers/rootReducer' +import * as projectsActions from '../actions/projectsActions' + +export default function configureStore() { + const middlewares = [thunk] + + if (process.env.NODE_ENV === 'development') { + const { logger } = require('redux-logger') + middlewares.push(logger) + } + + const store = createStore( + rootReducer, + applyMiddleware(...middlewares) + ) + + console.log('store') + + window.addEventListener('load', () => { + console.log('event listener') + store.dispatch(projectsActions.fetchAllProjects()) + }) + + return store +} diff --git a/rdmo/projects/assets/scss/projects.scss b/rdmo/projects/assets/scss/projects.scss new file mode 100644 index 0000000000..be8787c4ea --- /dev/null +++ b/rdmo/projects/assets/scss/projects.scss @@ -0,0 +1,302 @@ +$icon-font-path: "bootstrap-sass/assets/fonts/bootstrap/"; +@import '~bootstrap-sass'; +@import '~font-awesome/css/font-awesome.css'; +@import 'rdmo/core/assets/scss/variables'; + +a.disabled { + cursor: not-allowed; +} + +.flip { + transform: rotate(180deg) scaleX(-1); +} + +.w-100 { + width: 100%; +} +.mt-0 { + margin-top: 0; +} +.mt-5 { + margin-top: 5px; +} +.mt-10 { + margin-top: 10px; +} +.mt-20 { + margin-top: 20px; +} +.mr-0 { + margin-right: 0; +} +.mr-5 { + margin-right: 5px; +} +.mr-10 { + margin-right: 10px; +} +.mr-20 { + margin-right: 20px; +} +.mb-0 { + margin-bottom: 0; +} +.mb-5 { + margin-bottom: 5px; +} +.mb-10 { + margin-bottom: 10px; +} +.mb-20 { + margin-bottom: 20px; +} +.ml-0 { + margin-left: 0; +} +.ml-5 { + margin-left: 5px; +} +.ml-10 { + margin-left: 10px; +} +.ml-20 { + margin-left: 20px; +} + +.pt-0 { + padding-top: 0; +} +.pt-10 { + padding-top: 10px; +} +.pt-20 { + padding-top: 20px; +} +.pr-0 { + padding-right: 0; +} +.pr-10 { + padding-right: 10px; +} +.pr-20 { + padding-right: 20px; +} +.pb-0 { + padding-bottom: 0; +} +.pb-10 { + padding-bottom: 10px; +} +.pb-20 { + padding-bottom: 20px; +} +.pl-0 { + padding-left: 0; +} +.pl-10 { + padding-left: 10px; +} +.pl-20 { + padding-left: 20px; +} + +.form-group { + .react-select__control { + min-height: 34px; + } + .react-select__value-container { + padding: 0 14px; + } + .react-select__input-container { + margin: 0; + padding: 0; + } + .react-select__indicator { + padding: 6px; + } + .react-select__option { + padding: 0 14px; + } +} + +.management { + .panel { + p { + margin-bottom: 5px; + } + p:last-child { + margin-bottom: 0; + } + + + .panel-body { + > :last-child { + margin-bottom: 0; + } + } + + .panel-border { + border-bottom: 1px solid #ddd; + } + + &.panel-nested { + margin-bottom: 10px; + } + + &.panel-edit { + .panel-heading, + .panel-footer { + min-height: 41px; + } + } + + &.panel-import { + .checkbox { + position: static; + margin: 0; + + label { + font-weight: normal; + } + } + } + } + .pull-right { + .element-link, + .element-btn-link, + .element-button { + margin-left: 4px; + + &.disabled, + &:disabled { + color: #ccc !important; + cursor: not-allowed !important; + } + } + .element-btn-link { + padding: 0; + border: 0; + text-decoration: none; + } + .element-button { + &:first-child { + margin-left: 8px; + } + } + } + .checkboxes { + .checkbox { + display: inline-block; + margin-right: 20px; + margin-bottom: 0; + } + code { + user-select: none; + } + } + .nav-tabs { + border-bottom: none; + } + .tab-content { + margin-bottom: 15px; + } + .tab-pane { + padding: 15px 15px 0 15px; + border: 1px solid #ddd; + border-radius: 4px; + + &:first-child { + border-top-left-radius: 0; + } + + } + + .drag { + color: $link-color; + cursor: grab; + } + + .drop { + display: none; + margin-top: -10px; + padding: 4px 0; + + &::after { + content: ' '; + height: 2px; + display: block; + background-color: transparent; + } + + &.over { + &::after { + background-color: $link-color; + } + } + } + .drop-in { + &.over .panel { + border: 2px solid $link-color; + + .panel-heading { + padding: 9px 14px; + } + } + } +} + +.list-group-item { + .indent { + padding-left: 20px; + } +} + +.codemirror.form-control { + height: auto; + padding: 0; + + .cm-editor { + border-radius: 4px; + } + .cm-gutter { + background-color: white; + } + .cm-focused { + // copy the .form-control:focus from bootstrap + border-color: #66afe9; + outline: 0; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(102, 175, 233, 0.6); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(102, 175, 233, 0.6); + } +} + +.select-item-options, +.multi-select-item-options, +.ordered-multi-select-item-options { + float: right; + display: flex; + gap: 4px; + padding: 10px 0; + + .disabled { + color: #ccc !important; + cursor: not-allowed !important; + } +} + +.ordered-multi-select-item { + margin-bottom: 10px; + + .ordered-multi-select-item-select { + height: 34px; + } +} + +.import-buttons { + display: flex; + gap: 5px; + + .btn:first-child { + flex: 1; + } +} diff --git a/rdmo/projects/templates/projects/new_projects.html b/rdmo/projects/templates/projects/new_projects.html new file mode 100644 index 0000000000..34ca63173d --- /dev/null +++ b/rdmo/projects/templates/projects/new_projects.html @@ -0,0 +1,34 @@ +{% extends 'core/page.html' %} +{% load static %} +{% load i18n %} +{% load core_tags %} + +{% block vendor %} +{% endblock %} + +{% block css %} + + {{ block.super }} +{% endblock %} + +{% block js %} + + + + + +{% endblock %} + +{% block sidebar %} + + + +{% endblock %} + +{% block page %} + +

{% trans 'Projects' %}

+ +
+ +{% endblock %} diff --git a/rdmo/projects/urls/__init__.py b/rdmo/projects/urls/__init__.py index b71fb82221..0e1009480e 100644 --- a/rdmo/projects/urls/__init__.py +++ b/rdmo/projects/urls/__init__.py @@ -12,6 +12,7 @@ MembershipCreateView, MembershipDeleteView, MembershipUpdateView, + NewProjectsView, ProjectAnswersExportView, ProjectAnswersView, ProjectCancelView, @@ -45,6 +46,8 @@ ProjectsView.as_view(), name='projects'), re_path(r'^all/$', SiteProjectsView.as_view(), name='site_projects'), + re_path(r'^new/$', + NewProjectsView.as_view(), name='new_projects'), re_path(r'^create/$', ProjectCreateView.as_view(), name='project_create'), diff --git a/rdmo/projects/views/__init__.py b/rdmo/projects/views/__init__.py index 063dc97280..c05c5f61fa 100644 --- a/rdmo/projects/views/__init__.py +++ b/rdmo/projects/views/__init__.py @@ -3,6 +3,7 @@ from .issue import IssueDetailView, IssueSendView, IssueUpdateView from .membership import MembershipCreateView, MembershipDeleteView, MembershipUpdateView from .project import ( + NewProjectsView, ProjectCancelView, ProjectDeleteView, ProjectDetailView, diff --git a/rdmo/projects/views/project.py b/rdmo/projects/views/project.py index ce38a6d39f..0120139041 100644 --- a/rdmo/projects/views/project.py +++ b/rdmo/projects/views/project.py @@ -20,7 +20,7 @@ from rdmo.accounts.utils import is_site_manager from rdmo.core.plugins import get_plugin, get_plugins -from rdmo.core.views import ObjectPermissionMixin, RedirectViewMixin +from rdmo.core.views import CSRFViewMixin, ObjectPermissionMixin, RedirectViewMixin from rdmo.questions.models import Catalog from rdmo.questions.utils import get_widgets from rdmo.tasks.models import Task @@ -32,6 +32,20 @@ logger = logging.getLogger(__name__) +# class NewProjectsView(LoginRequiredMixin, PermissionRedirectMixin, RulesPermissionRequiredMixin, +# CSRFViewMixin, TemplateView): +# template_name = 'projects/new_projects.html' + +# def has_permission(self): +# # Use test_rule from rules for permissions check +# return test_rule('projects.can_view_all_projects', self.request.user, self.request.site) + +class NewProjectsView(LoginRequiredMixin, CSRFViewMixin, TemplateView): + template_name = 'projects/new_projects.html' + + # def has_permission(self): + # # Use test_rule from rules for permissions check + # return test_rule('projects.can_view_all_projects', self.request.user, self.request.site) class ProjectsView(LoginRequiredMixin, FilterView): template_name = 'projects/projects.html' @@ -76,7 +90,6 @@ def get_context_data(self, **kwargs): context = set_context_querystring_with_filter_and_page(context) return context - class SiteProjectsView(LoginRequiredMixin, FilterView): template_name = 'projects/site_projects.html' context_object_name = 'projects' diff --git a/webpack/common.config.js b/webpack/common.config.js index 57f6f89b9b..b3b81deced 100644 --- a/webpack/common.config.js +++ b/webpack/common.config.js @@ -62,5 +62,19 @@ module.exports = [ filename: 'js/management.js', path: path.resolve(__dirname, '../rdmo/management/static/management/'), } + }), + merge(base, { + name: 'projects', + entry: { + projects: [ + './rdmo/projects/assets/js/projects.js', + './rdmo/projects/assets/scss/projects.scss' + ] + }, + output: { + filename: 'js/projects.js', + publicPath: '/static/projects/', + path: path.resolve(__dirname, '../rdmo/projects/static/projects/'), + } }) ] From b3890bd709787f4045695335950c337043a77e8c Mon Sep 17 00:00:00 2001 From: Claudia Malzer Date: Wed, 22 May 2024 13:22:33 +0200 Subject: [PATCH 028/504] consolidate changes due to rebase issues --- .gitignore | 4 + package-lock.json | 3529 +++++++++++------ package.json | 3 + rdmo/accounts/serializers/v1.py | 4 +- rdmo/accounts/viewsets.py | 8 + rdmo/core/assets/js/components/ButtonGroup.js | 38 - .../assets/js/components/FileUploadButton.js | 32 + rdmo/core/assets/js/components/Modal.js | 40 + rdmo/core/assets/js/components/SearchField.js | 56 + rdmo/core/assets/js/components/Select.js | 38 + .../assets/js/components/UploadDropZone.js | 40 + rdmo/core/assets/js/components/index.js | 7 + rdmo/core/assets/js/hooks/index.js | 3 + .../assets/js/hooks/useFormattedDateTime.js | 20 + rdmo/core/assets/js/hooks/useModal.js | 11 + rdmo/core/assets/js/hooks/useScrollToTop.js | 22 + rdmo/core/assets/js/utils/api.js | 15 + rdmo/core/assets/js/utils/index.js | 5 + rdmo/core/assets/js/utils/language.js | 2 + rdmo/core/assets/js/utils/siteId.js | 2 + rdmo/core/assets/js/utils/staticUrl.js | 2 + rdmo/core/templates/core/base_head.html | 4 + rdmo/core/templates/core/projects_page.html | 13 + rdmo/locale/de/LC_MESSAGES/djangojs.mo | Bin 21672 -> 23839 bytes rdmo/locale/de/LC_MESSAGES/djangojs.po | 244 +- rdmo/locale/es/LC_MESSAGES/djangojs.po | 34 +- rdmo/locale/fr/LC_MESSAGES/djangojs.po | 23 +- rdmo/locale/it/LC_MESSAGES/djangojs.po | 34 +- .../assets/js/store/configureStore.js | 26 +- .../projects/assets/js/actions/actionTypes.js | 23 + .../assets/js/actions/configActions.js | 9 + .../assets/js/actions/projectsActions.js | 134 +- rdmo/projects/assets/js/actions/types.js | 3 - .../projects/assets/js/actions/userActions.js | 30 + rdmo/projects/assets/js/api/AccountsApi.js | 9 + rdmo/projects/assets/js/api/ProjectsApi.js | 106 +- .../components/helper/PendingInvitations.js | 35 + .../js/components/helper/ProjectFilters.js | 158 + .../js/components/helper/ProjectImport.js | 42 + .../assets/js/components/helper/Table.js | 169 + .../assets/js/components/helper/index.js | 4 + .../assets/js/components/main/Projects.js | 268 +- rdmo/projects/assets/js/containers/Main.js | 33 +- .../projects/assets/js/hooks/useDatePicker.js | 43 + rdmo/projects/assets/js/projects.js | 1 - .../assets/js/reducers/configReducer.js | 28 + .../assets/js/reducers/projectsReducer.js | 37 +- .../assets/js/reducers/rootReducer.js | 4 + .../assets/js/reducers/userReducer.js | 19 + .../assets/js/store/configureStore.js | 52 +- rdmo/projects/assets/js/utils/constants.js | 20 + .../assets/js/utils/getProjectTitlePath.js | 24 + rdmo/projects/assets/js/utils/getUserRoles.js | 37 + rdmo/projects/assets/js/utils/index.js | 5 + rdmo/projects/assets/js/utils/translations.js | 22 + .../projects/assets/js/utils/userIsManager.js | 11 + rdmo/projects/assets/scss/projects.scss | 332 +- rdmo/projects/filters.py | 102 +- rdmo/projects/serializers/v1/__init__.py | 14 + .../templates/projects/new_projects.html | 34 - .../overlays/projects_create_project_de.html | 2 +- .../overlays/projects_create_project_en.html | 2 +- .../overlays/projects_create_project_fr.html | 2 +- .../overlays/projects_create_project_it.html | 2 +- .../overlays/projects_import_project_de.html | 2 +- .../overlays/projects_import_project_en.html | 2 +- .../overlays/projects_import_project_fr.html | 2 +- .../overlays/projects_import_project_it.html | 2 +- .../projects/templates/projects/projects.html | 184 +- .../templates/projects/site_projects.html | 99 - rdmo/projects/tests/test_view_project.py | 38 +- rdmo/projects/tests/test_viewset_catalog.py | 34 + rdmo/projects/tests/test_viewset_invite.py | 22 +- rdmo/projects/tests/test_viewset_project.py | 31 + rdmo/projects/urls/__init__.py | 7 - rdmo/projects/urls/v1.py | 3 +- rdmo/projects/views/__init__.py | 2 - rdmo/projects/views/project.py | 107 +- rdmo/projects/viewsets.py | 63 +- testing/config/settings/base.py | 6 + webpack/common.config.js | 1 - 81 files changed, 4655 insertions(+), 2025 deletions(-) delete mode 100644 rdmo/core/assets/js/components/ButtonGroup.js create mode 100644 rdmo/core/assets/js/components/FileUploadButton.js create mode 100644 rdmo/core/assets/js/components/Modal.js create mode 100644 rdmo/core/assets/js/components/SearchField.js create mode 100644 rdmo/core/assets/js/components/Select.js create mode 100644 rdmo/core/assets/js/components/UploadDropZone.js create mode 100644 rdmo/core/assets/js/components/index.js create mode 100644 rdmo/core/assets/js/hooks/index.js create mode 100644 rdmo/core/assets/js/hooks/useFormattedDateTime.js create mode 100644 rdmo/core/assets/js/hooks/useModal.js create mode 100644 rdmo/core/assets/js/hooks/useScrollToTop.js create mode 100644 rdmo/core/assets/js/utils/api.js create mode 100644 rdmo/core/assets/js/utils/index.js create mode 100644 rdmo/core/assets/js/utils/language.js create mode 100644 rdmo/core/assets/js/utils/siteId.js create mode 100644 rdmo/core/assets/js/utils/staticUrl.js create mode 100644 rdmo/core/templates/core/projects_page.html create mode 100644 rdmo/projects/assets/js/actions/actionTypes.js create mode 100644 rdmo/projects/assets/js/actions/configActions.js delete mode 100644 rdmo/projects/assets/js/actions/types.js create mode 100644 rdmo/projects/assets/js/actions/userActions.js create mode 100644 rdmo/projects/assets/js/api/AccountsApi.js create mode 100644 rdmo/projects/assets/js/components/helper/PendingInvitations.js create mode 100644 rdmo/projects/assets/js/components/helper/ProjectFilters.js create mode 100644 rdmo/projects/assets/js/components/helper/ProjectImport.js create mode 100644 rdmo/projects/assets/js/components/helper/Table.js create mode 100644 rdmo/projects/assets/js/components/helper/index.js create mode 100644 rdmo/projects/assets/js/hooks/useDatePicker.js create mode 100644 rdmo/projects/assets/js/reducers/configReducer.js create mode 100644 rdmo/projects/assets/js/reducers/userReducer.js create mode 100644 rdmo/projects/assets/js/utils/constants.js create mode 100644 rdmo/projects/assets/js/utils/getProjectTitlePath.js create mode 100644 rdmo/projects/assets/js/utils/getUserRoles.js create mode 100644 rdmo/projects/assets/js/utils/index.js create mode 100644 rdmo/projects/assets/js/utils/translations.js create mode 100644 rdmo/projects/assets/js/utils/userIsManager.js delete mode 100644 rdmo/projects/templates/projects/new_projects.html delete mode 100644 rdmo/projects/templates/projects/site_projects.html create mode 100644 rdmo/projects/tests/test_viewset_catalog.py diff --git a/.gitignore b/.gitignore index f5b363cdbf..2af3bf59da 100644 --- a/.gitignore +++ b/.gitignore @@ -36,4 +36,8 @@ dist rdmo/management/static +rdmo/projects/static/projects/js/projects.js +rdmo/projects/static/projects/fonts +rdmo/projects/static/projects/css/projects.css + screenshots diff --git a/package-lock.json b/package-lock.json index 510d52f058..27f507832e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,5 @@ { "name": "rdmo", - "version": "1.8.0", "lockfileVersion": 2, "requires": true, "packages": { @@ -13,6 +12,7 @@ "@uiw/react-codemirror": "^4.19.9", "bootstrap-sass": "^3.4.1", "classnames": "^2.3.2", + "date-fns": "^3.6.0", "font-awesome": "4.7.0", "jquery": "^3.6.0", "js-cookie": "^2.2.1", @@ -21,9 +21,11 @@ "prop-types": "^15.7.2", "react": "^18.2.0", "react-bootstrap": "0.33.1", + "react-datepicker": "6.6.0", "react-dnd": "^16.0.1", "react-dnd-html5-backend": "^16.0.1", "react-dom": "^18.2.0", + "react-dropzone": "^10.0.0", "react-redux": "^7.2.4", "react-select": "^5.7.0", "redux": "^4.1.1", @@ -59,12 +61,13 @@ } }, "node_modules/@ampproject/remapping": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz", - "integrity": "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz", + "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==", + "dev": true, "dependencies": { - "@jridgewell/gen-mapping": "^0.1.0", - "@jridgewell/trace-mapping": "^0.3.9" + "@jridgewell/gen-mapping": "^0.3.5", + "@jridgewell/trace-mapping": "^0.3.24" }, "engines": { "node": ">=6.0.0" @@ -1810,23 +1813,23 @@ "dev": true }, "node_modules/@babel/runtime": { - "version": "7.20.13", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.13.tgz", - "integrity": "sha512-gt3PKXs0DBoL9xCvOIIZ2NEqAGZqHjAnmVbfQtB620V0uReIQutpel14KcneZuer7UioY8ALKZ7iocavvzTNFA==", + "version": "7.24.1", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.1.tgz", + "integrity": "sha512-+BIznRzyqBf+2wCTxcKE3wDjfGeCoVE61KSHGpkzqrLi8qxqFwBeUFyId2cxkTmm55fzDGnm0+yCxaxygrLUnQ==", "dependencies": { - "regenerator-runtime": "^0.13.11" + "regenerator-runtime": "^0.14.0" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/runtime-corejs2": { - "version": "7.20.13", - "resolved": "https://registry.npmjs.org/@babel/runtime-corejs2/-/runtime-corejs2-7.20.13.tgz", - "integrity": "sha512-K2yRNithMJG4epI509n4ljPjogMhmYCB887iSD7rRecxWC9dkbfJZCPGj0BQaqG3d3Qkpb1SotEmyeMmtnvxhw==", + "version": "7.24.1", + "resolved": "https://registry.npmjs.org/@babel/runtime-corejs2/-/runtime-corejs2-7.24.1.tgz", + "integrity": "sha512-De0q0utpUPiXnc7+B7Ku86mJ0eDItC/v3uFa/lQkq63XnHyZiytDHeCIvechlnVwwpU2ChjGF7c3I+mBrTudwg==", "dependencies": { "core-js": "^2.6.12", - "regenerator-runtime": "^0.13.11" + "regenerator-runtime": "^0.14.0" }, "engines": { "node": ">=6.9.0" @@ -1879,13 +1882,13 @@ } }, "node_modules/@codemirror/autocomplete": { - "version": "6.4.2", - "resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.4.2.tgz", - "integrity": "sha512-8WE2xp+D0MpWEv5lZ6zPW1/tf4AGb358T5GWYiKEuCP8MvFfT3tH2mIF9Y2yr2e3KbHuSvsVhosiEyqCpiJhZQ==", + "version": "6.15.0", + "resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.15.0.tgz", + "integrity": "sha512-G2Zm0mXznxz97JhaaOdoEG2cVupn4JjPaS4AcNvZzhOsnnG9YVN68VzfoUw6dYTsIxT6a/cmoFEN47KAWhXaOg==", "dependencies": { "@codemirror/language": "^6.0.0", "@codemirror/state": "^6.0.0", - "@codemirror/view": "^6.6.0", + "@codemirror/view": "^6.17.0", "@lezer/common": "^1.0.0" }, "peerDependencies": { @@ -1896,74 +1899,75 @@ } }, "node_modules/@codemirror/commands": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.2.1.tgz", - "integrity": "sha512-FFiNKGuHA5O8uC6IJE5apI5rT9gyjlw4whqy4vlcX0wE/myxL6P1s0upwDhY4HtMWLOwzwsp0ap3bjdQhvfDOA==", + "version": "6.3.3", + "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.3.3.tgz", + "integrity": "sha512-dO4hcF0fGT9tu1Pj1D2PvGvxjeGkbC6RGcZw6Qs74TH+Ed1gw98jmUgd2axWvIZEqTeTuFrg1lEB1KV6cK9h1A==", "dependencies": { "@codemirror/language": "^6.0.0", - "@codemirror/state": "^6.2.0", + "@codemirror/state": "^6.4.0", "@codemirror/view": "^6.0.0", - "@lezer/common": "^1.0.0" + "@lezer/common": "^1.1.0" } }, "node_modules/@codemirror/lang-css": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/@codemirror/lang-css/-/lang-css-6.0.2.tgz", - "integrity": "sha512-4V4zmUOl2Glx0GWw0HiO1oGD4zvMlIQ3zx5hXOE6ipCjhohig2bhWRAasrZylH9pRNTcl1VMa59Lsl8lZWlTzw==", + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/@codemirror/lang-css/-/lang-css-6.2.1.tgz", + "integrity": "sha512-/UNWDNV5Viwi/1lpr/dIXJNWiwDxpw13I4pTUAsNxZdg6E0mI2kTQb0P2iHczg1Tu+H4EBgJR+hYhKiHKko7qg==", "dependencies": { "@codemirror/autocomplete": "^6.0.0", "@codemirror/language": "^6.0.0", "@codemirror/state": "^6.0.0", + "@lezer/common": "^1.0.2", "@lezer/css": "^1.0.0" } }, "node_modules/@codemirror/lang-html": { - "version": "6.4.2", - "resolved": "https://registry.npmjs.org/@codemirror/lang-html/-/lang-html-6.4.2.tgz", - "integrity": "sha512-bqCBASkteKySwtIbiV/WCtGnn/khLRbbiV5TE+d9S9eQJD7BA4c5dTRm2b3bVmSpilff5EYxvB4PQaZzM/7cNw==", + "version": "6.4.8", + "resolved": "https://registry.npmjs.org/@codemirror/lang-html/-/lang-html-6.4.8.tgz", + "integrity": "sha512-tE2YK7wDlb9ZpAH6mpTPiYm6rhfdQKVDa5r9IwIFlwwgvVaKsCfuKKZoJGWsmMZIf3FQAuJ5CHMPLymOtg1hXw==", "dependencies": { "@codemirror/autocomplete": "^6.0.0", "@codemirror/lang-css": "^6.0.0", "@codemirror/lang-javascript": "^6.0.0", "@codemirror/language": "^6.4.0", "@codemirror/state": "^6.0.0", - "@codemirror/view": "^6.2.2", + "@codemirror/view": "^6.17.0", "@lezer/common": "^1.0.0", "@lezer/css": "^1.1.0", "@lezer/html": "^1.3.0" } }, "node_modules/@codemirror/lang-javascript": { - "version": "6.1.4", - "resolved": "https://registry.npmjs.org/@codemirror/lang-javascript/-/lang-javascript-6.1.4.tgz", - "integrity": "sha512-OxLf7OfOZBTMRMi6BO/F72MNGmgOd9B0vetOLvHsDACFXayBzW8fm8aWnDM0yuy68wTK03MBf4HbjSBNRG5q7A==", + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/@codemirror/lang-javascript/-/lang-javascript-6.2.2.tgz", + "integrity": "sha512-VGQfY+FCc285AhWuwjYxQyUQcYurWlxdKYT4bqwr3Twnd5wP5WSeu52t4tvvuWmljT4EmgEgZCqSieokhtY8hg==", "dependencies": { "@codemirror/autocomplete": "^6.0.0", "@codemirror/language": "^6.6.0", "@codemirror/lint": "^6.0.0", "@codemirror/state": "^6.0.0", - "@codemirror/view": "^6.0.0", + "@codemirror/view": "^6.17.0", "@lezer/common": "^1.0.0", "@lezer/javascript": "^1.0.0" } }, "node_modules/@codemirror/language": { - "version": "6.6.0", - "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.6.0.tgz", - "integrity": "sha512-cwUd6lzt3MfNYOobdjf14ZkLbJcnv4WtndYaoBkbor/vF+rCNguMPK0IRtvZJG4dsWiaWPcK8x1VijhvSxnstg==", + "version": "6.10.1", + "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.10.1.tgz", + "integrity": "sha512-5GrXzrhq6k+gL5fjkAwt90nYDmjlzTIJV8THnxNFtNKWotMIlzzN+CpqxqwXOECnUdOndmSeWntVrVcv5axWRQ==", "dependencies": { "@codemirror/state": "^6.0.0", - "@codemirror/view": "^6.0.0", - "@lezer/common": "^1.0.0", + "@codemirror/view": "^6.23.0", + "@lezer/common": "^1.1.0", "@lezer/highlight": "^1.0.0", "@lezer/lr": "^1.0.0", "style-mod": "^4.0.0" } }, "node_modules/@codemirror/lint": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/@codemirror/lint/-/lint-6.1.1.tgz", - "integrity": "sha512-e+M543x0NVHGayNHQzLP4XByJsvbu/ojY6+0VF2Y4Uu66Rt1nADuxNflZwECLf7gS009smIsptSUa6bUj/U/rw==", + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@codemirror/lint/-/lint-6.5.0.tgz", + "integrity": "sha512-+5YyicIaaAZKU8K43IQi8TBy6mF6giGeWAH7N96Z5LC30Wm5JMjqxOYIE9mxwMG1NbhT2mA3l9hA4uuKUM3E5g==", "dependencies": { "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.0.0", @@ -1971,9 +1975,9 @@ } }, "node_modules/@codemirror/search": { - "version": "6.2.3", - "resolved": "https://registry.npmjs.org/@codemirror/search/-/search-6.2.3.tgz", - "integrity": "sha512-V9n9233lopQhB1dyjsBK2Wc1i+8hcCqxl1wQ46c5HWWLePoe4FluV3TGHoZ04rBRlGjNyz9DTmpJErig8UE4jw==", + "version": "6.5.6", + "resolved": "https://registry.npmjs.org/@codemirror/search/-/search-6.5.6.tgz", + "integrity": "sha512-rpMgcsh7o0GuCDUXKPvww+muLA1pDJaFrpq/CCHtpQJYz8xopu4D1hPcKRoDD0YlF8gZaqTNIRa4VRBWyhyy7Q==", "dependencies": { "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.0.0", @@ -1981,14 +1985,14 @@ } }, "node_modules/@codemirror/state": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.2.0.tgz", - "integrity": "sha512-69QXtcrsc3RYtOtd+GsvczJ319udtBf1PTrr2KbLWM/e2CXUPnh0Nz9AUo8WfhSQ7GeL8dPVNUmhQVgpmuaNGA==" + "version": "6.4.1", + "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.4.1.tgz", + "integrity": "sha512-QkEyUiLhsJoZkbumGZlswmAhA7CBU02Wrz7zvH4SrcifbsqwlXShVXg65f3v/ts57W3dqyamEriMhij1Z3Zz4A==" }, "node_modules/@codemirror/theme-one-dark": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/@codemirror/theme-one-dark/-/theme-one-dark-6.1.1.tgz", - "integrity": "sha512-+CfzmScfJuD6uDF5bHJkAjWTQ2QAAHxODCPxUEgcImDYcJLT+4l5vLnBHmDVv46kCC5uUJGMrBJct2Z6JbvqyQ==", + "version": "6.1.2", + "resolved": "https://registry.npmjs.org/@codemirror/theme-one-dark/-/theme-one-dark-6.1.2.tgz", + "integrity": "sha512-F+sH0X16j/qFLMAfbciKTxVOwkdAS336b7AXTKOZhy8BR3eH/RelsnLgLFINrpST63mmN2OuwUt0W2ndUgYwUA==", "dependencies": { "@codemirror/language": "^6.0.0", "@codemirror/state": "^6.0.0", @@ -1997,12 +2001,12 @@ } }, "node_modules/@codemirror/view": { - "version": "6.9.1", - "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.9.1.tgz", - "integrity": "sha512-bzfSjJn9dAADVpabLKWKNmMG4ibyTV2e3eOGowjElNPTdTkSbi6ixPYHm2u0ADcETfKsi2/R84Rkmi91dH9yEg==", + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.26.0.tgz", + "integrity": "sha512-nSSmzONpqsNzshPOxiKhK203R6BvABepugAe34QfQDbNDslyjkqBuKgrK5ZBvqNXpfxz5iLrlGTmEfhbQyH46A==", "dependencies": { - "@codemirror/state": "^6.1.4", - "style-mod": "^4.0.0", + "@codemirror/state": "^6.4.0", + "style-mod": "^4.1.0", "w3c-keyname": "^2.2.4" } }, @@ -2016,27 +2020,28 @@ } }, "node_modules/@emotion/babel-plugin": { - "version": "11.10.5", - "resolved": "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.10.5.tgz", - "integrity": "sha512-xE7/hyLHJac7D2Ve9dKroBBZqBT7WuPQmWcq7HSGb84sUuP4mlOWoB8dvVfD9yk5DHkU1m6RW7xSoDtnQHNQeA==", + "version": "11.11.0", + "resolved": "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.11.0.tgz", + "integrity": "sha512-m4HEDZleaaCH+XgDDsPF15Ht6wTLsgDTeR3WYj9Q/k76JtWhrJjcP4+/XlG8LGT/Rol9qUfOIztXeA84ATpqPQ==", "dependencies": { "@babel/helper-module-imports": "^7.16.7", - "@babel/plugin-syntax-jsx": "^7.17.12", "@babel/runtime": "^7.18.3", - "@emotion/hash": "^0.9.0", - "@emotion/memoize": "^0.8.0", - "@emotion/serialize": "^1.1.1", + "@emotion/hash": "^0.9.1", + "@emotion/memoize": "^0.8.1", + "@emotion/serialize": "^1.1.2", "babel-plugin-macros": "^3.1.0", "convert-source-map": "^1.5.0", "escape-string-regexp": "^4.0.0", "find-root": "^1.1.0", "source-map": "^0.5.7", - "stylis": "4.1.3" - }, - "peerDependencies": { - "@babel/core": "^7.0.0" + "stylis": "4.2.0" } }, + "node_modules/@emotion/babel-plugin/node_modules/convert-source-map": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz", + "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==" + }, "node_modules/@emotion/babel-plugin/node_modules/escape-string-regexp": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", @@ -2048,102 +2053,90 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/@emotion/babel-plugin/node_modules/source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/@emotion/cache": { - "version": "11.10.5", - "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.10.5.tgz", - "integrity": "sha512-dGYHWyzTdmK+f2+EnIGBpkz1lKc4Zbj2KHd4cX3Wi8/OWr5pKslNjc3yABKH4adRGCvSX4VDC0i04mrrq0aiRA==", + "version": "11.11.0", + "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.11.0.tgz", + "integrity": "sha512-P34z9ssTCBi3e9EI1ZsWpNHcfY1r09ZO0rZbRO2ob3ZQMnFI35jB536qoXbkdesr5EUhYi22anuEJuyxifaqAQ==", "dependencies": { - "@emotion/memoize": "^0.8.0", - "@emotion/sheet": "^1.2.1", - "@emotion/utils": "^1.2.0", - "@emotion/weak-memoize": "^0.3.0", - "stylis": "4.1.3" + "@emotion/memoize": "^0.8.1", + "@emotion/sheet": "^1.2.2", + "@emotion/utils": "^1.2.1", + "@emotion/weak-memoize": "^0.3.1", + "stylis": "4.2.0" } }, "node_modules/@emotion/hash": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.9.0.tgz", - "integrity": "sha512-14FtKiHhy2QoPIzdTcvh//8OyBlknNs2nXRwIhG904opCby3l+9Xaf/wuPvICBF0rc1ZCNBd3nKe9cd2mecVkQ==" + "version": "0.9.1", + "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.9.1.tgz", + "integrity": "sha512-gJB6HLm5rYwSLI6PQa+X1t5CFGrv1J1TWG+sOyMCeKz2ojaj6Fnl/rZEspogG+cvqbt4AE/2eIyD2QfLKTBNlQ==" }, "node_modules/@emotion/memoize": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.8.0.tgz", - "integrity": "sha512-G/YwXTkv7Den9mXDO7AhLWkE3q+I92B+VqAE+dYG4NGPaHZGvt3G8Q0p9vmE+sq7rTGphUbAvmQ9YpbfMQGGlA==" + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.8.1.tgz", + "integrity": "sha512-W2P2c/VRW1/1tLox0mVUalvnWXxavmv/Oum2aPsRcoDJuob75FC3Y8FbpfLwUegRcxINtGUMPq0tFCvYNTBXNA==" }, "node_modules/@emotion/react": { - "version": "11.10.5", - "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.10.5.tgz", - "integrity": "sha512-TZs6235tCJ/7iF6/rvTaOH4oxQg2gMAcdHemjwLKIjKz4rRuYe1HJ2TQJKnAcRAfOUDdU8XoDadCe1rl72iv8A==", + "version": "11.11.4", + "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.11.4.tgz", + "integrity": "sha512-t8AjMlF0gHpvvxk5mAtCqR4vmxiGHCeJBaQO6gncUSdklELOgtwjerNY2yuJNfwnc6vi16U/+uMF+afIawJ9iw==", "dependencies": { "@babel/runtime": "^7.18.3", - "@emotion/babel-plugin": "^11.10.5", - "@emotion/cache": "^11.10.5", - "@emotion/serialize": "^1.1.1", - "@emotion/use-insertion-effect-with-fallbacks": "^1.0.0", - "@emotion/utils": "^1.2.0", - "@emotion/weak-memoize": "^0.3.0", + "@emotion/babel-plugin": "^11.11.0", + "@emotion/cache": "^11.11.0", + "@emotion/serialize": "^1.1.3", + "@emotion/use-insertion-effect-with-fallbacks": "^1.0.1", + "@emotion/utils": "^1.2.1", + "@emotion/weak-memoize": "^0.3.1", "hoist-non-react-statics": "^3.3.1" }, "peerDependencies": { - "@babel/core": "^7.0.0", "react": ">=16.8.0" }, "peerDependenciesMeta": { - "@babel/core": { - "optional": true - }, "@types/react": { "optional": true } } }, "node_modules/@emotion/serialize": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-1.1.1.tgz", - "integrity": "sha512-Zl/0LFggN7+L1liljxXdsVSVlg6E/Z/olVWpfxUTxOAmi8NU7YoeWeLfi1RmnB2TATHoaWwIBRoL+FvAJiTUQA==", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-1.1.3.tgz", + "integrity": "sha512-iD4D6QVZFDhcbH0RAG1uVu1CwVLMWUkCvAqqlewO/rxf8+87yIBAlt4+AxMiiKPLs5hFc0owNk/sLLAOROw3cA==", "dependencies": { - "@emotion/hash": "^0.9.0", - "@emotion/memoize": "^0.8.0", - "@emotion/unitless": "^0.8.0", - "@emotion/utils": "^1.2.0", + "@emotion/hash": "^0.9.1", + "@emotion/memoize": "^0.8.1", + "@emotion/unitless": "^0.8.1", + "@emotion/utils": "^1.2.1", "csstype": "^3.0.2" } }, "node_modules/@emotion/sheet": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@emotion/sheet/-/sheet-1.2.1.tgz", - "integrity": "sha512-zxRBwl93sHMsOj4zs+OslQKg/uhF38MB+OMKoCrVuS0nyTkqnau+BM3WGEoOptg9Oz45T/aIGs1qbVAsEFo3nA==" + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/@emotion/sheet/-/sheet-1.2.2.tgz", + "integrity": "sha512-0QBtGvaqtWi+nx6doRwDdBIzhNdZrXUppvTM4dtZZWEGTXL/XE/yJxLMGlDT1Gt+UHH5IX1n+jkXyytE/av7OA==" }, "node_modules/@emotion/unitless": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.8.0.tgz", - "integrity": "sha512-VINS5vEYAscRl2ZUDiT3uMPlrFQupiKgHz5AA4bCH1miKBg4qtwkim1qPmJj/4WG6TreYMY111rEFsjupcOKHw==" + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.8.1.tgz", + "integrity": "sha512-KOEGMu6dmJZtpadb476IsZBclKvILjopjUii3V+7MnXIQCYh8W3NgNcgwo21n9LXZX6EDIKvqfjYxXebDwxKmQ==" }, "node_modules/@emotion/use-insertion-effect-with-fallbacks": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@emotion/use-insertion-effect-with-fallbacks/-/use-insertion-effect-with-fallbacks-1.0.0.tgz", - "integrity": "sha512-1eEgUGmkaljiBnRMTdksDV1W4kUnmwgp7X9G8B++9GYwl1lUdqSndSriIrTJ0N7LQaoauY9JJ2yhiOYK5+NI4A==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@emotion/use-insertion-effect-with-fallbacks/-/use-insertion-effect-with-fallbacks-1.0.1.tgz", + "integrity": "sha512-jT/qyKZ9rzLErtrjGgdkMBn2OP8wl0G3sQlBb3YPryvKHsjvINUhVaPFfP+fpBcOkmrVOVEEHQFJ7nbj2TH2gw==", "peerDependencies": { "react": ">=16.8.0" } }, "node_modules/@emotion/utils": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@emotion/utils/-/utils-1.2.0.tgz", - "integrity": "sha512-sn3WH53Kzpw8oQ5mgMmIzzyAaH2ZqFEbozVVBSYp538E06OSE6ytOp7pRAjNQR+Q/orwqdQYJSe2m3hCOeznkw==" + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@emotion/utils/-/utils-1.2.1.tgz", + "integrity": "sha512-Y2tGf3I+XVnajdItskUCn6LX+VUDmP6lTL4fcqsXAv43dnlbZiuW4MWQW38rW/BVWSE7Q/7+XQocmpnRYILUmg==" }, "node_modules/@emotion/weak-memoize": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.3.0.tgz", - "integrity": "sha512-AHPmaAx+RYfZz0eYu6Gviiagpmiyw98ySSlQvCUhVGDRtDFe4DBS0x1bSjdF3gqUDYOczB+yYvBTtEylYSdRhg==" + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.3.1.tgz", + "integrity": "sha512-EsBwpc7hBUJWAsNPBmJy4hxWx12v6bshQsldrVmjxJoc3isbxhOrF2IcCpaXxfvq03NwkI7sbsOLXbYuqF/8Ww==" }, "node_modules/@eslint-community/eslint-utils": { "version": "4.4.0", @@ -2217,18 +2210,53 @@ } }, "node_modules/@floating-ui/core": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.2.1.tgz", - "integrity": "sha512-LSqwPZkK3rYfD7GKoIeExXOyYx6Q1O4iqZWwIehDNuv3Dv425FIAE8PRwtAx1imEolFTHgBEcoFHm9MDnYgPCg==" + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.6.0.tgz", + "integrity": "sha512-PcF++MykgmTj3CIyOQbKA/hDzOAiqI3mhuoN44WRCopIs1sgoDoU4oty4Jtqaj/y3oDU6fnVSm4QG0a3t5i0+g==", + "dependencies": { + "@floating-ui/utils": "^0.2.1" + } }, "node_modules/@floating-ui/dom": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.2.1.tgz", - "integrity": "sha512-Rt45SmRiV8eU+xXSB9t0uMYiQ/ZWGE/jumse2o3i5RGlyvcbqOF4q+1qBnzLE2kZ5JGhq0iMkcGXUKbFe7MpTA==", + "version": "1.6.3", + "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.6.3.tgz", + "integrity": "sha512-RnDthu3mzPlQ31Ss/BTwQ1zjzIhr3lk1gZB1OC56h/1vEtaXkESrOqL5fQVMfXpwGtRwX+YsZBdyHtJMQnkArw==", + "dependencies": { + "@floating-ui/core": "^1.0.0", + "@floating-ui/utils": "^0.2.0" + } + }, + "node_modules/@floating-ui/react": { + "version": "0.26.12", + "resolved": "https://registry.npmjs.org/@floating-ui/react/-/react-0.26.12.tgz", + "integrity": "sha512-D09o62HrWdIkstF2kGekIKAC0/N/Dl6wo3CQsnLcOmO3LkW6Ik8uIb3kw8JYkwxNCcg+uJ2bpWUiIijTBep05w==", + "dependencies": { + "@floating-ui/react-dom": "^2.0.0", + "@floating-ui/utils": "^0.2.0", + "tabbable": "^6.0.0" + }, + "peerDependencies": { + "react": ">=16.8.0", + "react-dom": ">=16.8.0" + } + }, + "node_modules/@floating-ui/react-dom": { + "version": "2.0.8", + "resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-2.0.8.tgz", + "integrity": "sha512-HOdqOt3R3OGeTKidaLvJKcgg75S6tibQ3Tif4eyd91QnIJWr0NLvoXFpJA/j8HqkFSL68GDca9AuyWEHlhyClw==", "dependencies": { - "@floating-ui/core": "^1.2.1" + "@floating-ui/dom": "^1.6.1" + }, + "peerDependencies": { + "react": ">=16.8.0", + "react-dom": ">=16.8.0" } }, + "node_modules/@floating-ui/utils": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.1.tgz", + "integrity": "sha512-9TANp6GPoMtYzQdt54kfAyMmz1+osLlXdg2ENroU7zzrtflTLrrC/lgrIfaSe+Wu0b89GKccT7vxXA0MoAIO+Q==" + }, "node_modules/@humanwhocodes/config-array": { "version": "0.11.13", "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.13.tgz", @@ -2263,12 +2291,14 @@ "dev": true }, "node_modules/@jridgewell/gen-mapping": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz", - "integrity": "sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==", + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz", + "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==", + "dev": true, "dependencies": { - "@jridgewell/set-array": "^1.0.0", - "@jridgewell/sourcemap-codec": "^1.4.10" + "@jridgewell/set-array": "^1.2.1", + "@jridgewell/sourcemap-codec": "^1.4.10", + "@jridgewell/trace-mapping": "^0.3.24" }, "engines": { "node": ">=6.0.0" @@ -2283,9 +2313,10 @@ } }, "node_modules/@jridgewell/set-array": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.0.tgz", - "integrity": "sha512-SfJxIxNVYLTsKwzB3MoOQ1yxf4w/E6MdkvTgrgAt1bfxjSrLUoHMKrDOykwN14q65waezZIdqDneUIPh4/sKxg==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz", + "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==", + "dev": true, "engines": { "node": ">=6.0.0" } @@ -2329,50 +2360,52 @@ } }, "node_modules/@lezer/common": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@lezer/common/-/common-1.0.2.tgz", - "integrity": "sha512-SVgiGtMnMnW3ActR8SXgsDhw7a0w0ChHSYAyAUxxrOiJ1OqYWEKk/xJd84tTSPo1mo6DXLObAJALNnd0Hrv7Ng==" + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@lezer/common/-/common-1.2.1.tgz", + "integrity": "sha512-yemX0ZD2xS/73llMZIK6KplkjIjf2EvAHcinDi/TfJ9hS25G0388+ClHt6/3but0oOxinTcQHJLDXh6w1crzFQ==" }, "node_modules/@lezer/css": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@lezer/css/-/css-1.1.1.tgz", - "integrity": "sha512-mSjx+unLLapEqdOYDejnGBokB5+AiJKZVclmud0MKQOKx3DLJ5b5VTCstgDDknR6iIV4gVrN6euzsCnj0A2gQA==", + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/@lezer/css/-/css-1.1.8.tgz", + "integrity": "sha512-7JhxupKuMBaWQKjQoLtzhGj83DdnZY9MckEOG5+/iLKNK2ZJqKc6hf6uc0HjwCX7Qlok44jBNqZhHKDhEhZYLA==", "dependencies": { + "@lezer/common": "^1.2.0", "@lezer/highlight": "^1.0.0", "@lezer/lr": "^1.0.0" } }, "node_modules/@lezer/highlight": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/@lezer/highlight/-/highlight-1.1.3.tgz", - "integrity": "sha512-3vLKLPThO4td43lYRBygmMY18JN3CPh9w+XS2j8WC30vR4yZeFG4z1iFe4jXE43NtGqe//zHW5q8ENLlHvz9gw==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@lezer/highlight/-/highlight-1.2.0.tgz", + "integrity": "sha512-WrS5Mw51sGrpqjlh3d4/fOwpEV2Hd3YOkp9DBt4k8XZQcoTHZFB7sx030A6OcahF4J1nDQAa3jXlTVVYH50IFA==", "dependencies": { "@lezer/common": "^1.0.0" } }, "node_modules/@lezer/html": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/@lezer/html/-/html-1.3.3.tgz", - "integrity": "sha512-04Fyvu66DjV2EjhDIG1kfDdktn5Pfw56SXPrzKNQH5B2m7BDfc6bDsz+ZJG8dLS3kIPEKbyyq1Sm2/kjeG0+AA==", + "version": "1.3.9", + "resolved": "https://registry.npmjs.org/@lezer/html/-/html-1.3.9.tgz", + "integrity": "sha512-MXxeCMPyrcemSLGaTQEZx0dBUH0i+RPl8RN5GwMAzo53nTsd/Unc/t5ZxACeQoyPUM5/GkPLRUs2WliOImzkRA==", "dependencies": { - "@lezer/common": "^1.0.0", + "@lezer/common": "^1.2.0", "@lezer/highlight": "^1.0.0", "@lezer/lr": "^1.0.0" } }, "node_modules/@lezer/javascript": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/@lezer/javascript/-/javascript-1.4.1.tgz", - "integrity": "sha512-Hqx36DJeYhKtdpc7wBYPR0XF56ZzIp0IkMO/zNNj80xcaFOV4Oj/P7TQc/8k2TxNhzl7tV5tXS8ZOCPbT4L3nA==", + "version": "1.4.13", + "resolved": "https://registry.npmjs.org/@lezer/javascript/-/javascript-1.4.13.tgz", + "integrity": "sha512-5IBr8LIO3xJdJH1e9aj/ZNLE4LSbdsx25wFmGRAZsj2zSmwAYjx26JyU/BYOCpRQlu1jcv1z3vy4NB9+UkfRow==", "dependencies": { + "@lezer/common": "^1.2.0", "@lezer/highlight": "^1.1.3", "@lezer/lr": "^1.3.0" } }, "node_modules/@lezer/lr": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/@lezer/lr/-/lr-1.3.3.tgz", - "integrity": "sha512-JPQe3mwJlzEVqy67iQiiGozhcngbO8QBgpqZM6oL1Wj/dXckrEexpBLeFkq0edtW5IqnPRFxA24BHJni8Js69w==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@lezer/lr/-/lr-1.4.0.tgz", + "integrity": "sha512-Wst46p51km8gH0ZUmeNrtpRYmdlRHUpN1DQd3GFAyKANi8WVz8c2jHYTf1CVScFaCjQw1iO3ZZdqGDxQPRErTg==", "dependencies": { "@lezer/common": "^1.0.0" } @@ -2435,9 +2468,9 @@ "integrity": "sha512-/RVXdLvJxLg4QKvMoM5WlwNR9ViO9z8B/qPcc+C0Sa/teJY7QG7kJ441DwzOjMYEY7GmU4dj5EcGHIkKZiQZCA==" }, "node_modules/@types/eslint": { - "version": "8.4.2", - "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.2.tgz", - "integrity": "sha512-Z1nseZON+GEnFjJc04sv4NSALGjhFwy6K0HXt7qsn5ArfAKtb63dXNJHf+1YW6IpOIYRBGUbu3GwJdj8DGnCjA==", + "version": "8.56.6", + "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.56.6.tgz", + "integrity": "sha512-ymwc+qb1XkjT/gfoQwxIeHZ6ixH23A+tCT2ADSA/DPVKzAjwYkTXBMCQ/f6fe4wEa85Lhp26VPeUxI7wMhAi7A==", "dev": true, "dependencies": { "@types/estree": "*", @@ -2445,9 +2478,9 @@ } }, "node_modules/@types/eslint-scope": { - "version": "3.7.3", - "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.3.tgz", - "integrity": "sha512-PB3ldyrcnAicT35TWPs5IcwKD8S333HMaa2VVv4+wdvebJkjWuW/xESoB8IwRcog8HYVYamb1g/R31Qv5Bx03g==", + "version": "3.7.7", + "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz", + "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==", "dev": true, "dependencies": { "@types/eslint": "*", @@ -2461,40 +2494,43 @@ "dev": true }, "node_modules/@types/hoist-non-react-statics": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz", - "integrity": "sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA==", + "version": "3.3.5", + "resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.5.tgz", + "integrity": "sha512-SbcrWzkKBw2cdwRTwQAswfpB9g9LJWfjtUeW/jvNwbhC8cpmmNYVePa+ncbUe0rGTQ7G3Ff6mYUN2VMfLVr+Sg==", "dependencies": { "@types/react": "*", "hoist-non-react-statics": "^3.3.0" } }, "node_modules/@types/json-schema": { - "version": "7.0.11", - "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz", - "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==", + "version": "7.0.15", + "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz", + "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==", "dev": true }, "node_modules/@types/node": { - "version": "17.0.31", - "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.31.tgz", - "integrity": "sha512-AR0x5HbXGqkEx9CadRH3EBYx/VkiUgZIhP4wvPn/+5KIsgpNoyFaRlVe0Zlx9gRtg8fA06a9tskE2MSN7TcG4Q==", - "devOptional": true + "version": "20.11.30", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.30.tgz", + "integrity": "sha512-dHM6ZxwlmuZaRmUPfv1p+KrdD1Dci04FbdEm/9wEMouFqxYoFl5aMkt0VMAUtYRQDyYvD41WJLukhq/ha3YuTw==", + "devOptional": true, + "dependencies": { + "undici-types": "~5.26.4" + } }, "node_modules/@types/parse-json": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz", - "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==" + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.2.tgz", + "integrity": "sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw==" }, "node_modules/@types/prop-types": { - "version": "15.7.5", - "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz", - "integrity": "sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==" + "version": "15.7.11", + "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.11.tgz", + "integrity": "sha512-ga8y9v9uyeiLdpKddhxYQkxNDrfvuPrlFb0N1qnZZByvcElJaXthF1UhvCh9TLWJBEHeNtdnbysW7Y6Uq8CVng==" }, "node_modules/@types/react": { - "version": "18.0.8", - "resolved": "https://registry.npmjs.org/@types/react/-/react-18.0.8.tgz", - "integrity": "sha512-+j2hk9BzCOrrOSJASi5XiOyBbERk9jG5O73Ya4M0env5Ixi6vUNli4qy994AINcEF+1IEHISYFfIT4zwr++LKw==", + "version": "18.2.67", + "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.67.tgz", + "integrity": "sha512-vkIE2vTIMHQ/xL0rgmuoECBCkZFZeHr49HeWSc24AptMbNRo7pwSBvj73rlJJs9fGKj0koS+V7kQB1jHS0uCgw==", "dependencies": { "@types/prop-types": "*", "@types/scheduler": "*", @@ -2502,9 +2538,9 @@ } }, "node_modules/@types/react-redux": { - "version": "7.1.24", - "resolved": "https://registry.npmjs.org/@types/react-redux/-/react-redux-7.1.24.tgz", - "integrity": "sha512-7FkurKcS1k0FHZEtdbbgN8Oc6b+stGSfZYjQGicofJ0j4U0qIn/jaSvnP2pLwZKiai3/17xqqxkkrxTgN8UNbQ==", + "version": "7.1.33", + "resolved": "https://registry.npmjs.org/@types/react-redux/-/react-redux-7.1.33.tgz", + "integrity": "sha512-NF8m5AjWCkert+fosDsN3hAlHzpjSiXlVy9EgQEmLoBhaNXbmyeGs/aj5dQzKuF+/q+S7JQagorGDW8pJ28Hmg==", "dependencies": { "@types/hoist-non-react-statics": "^3.3.0", "@types/react": "*", @@ -2513,22 +2549,22 @@ } }, "node_modules/@types/react-transition-group": { - "version": "4.4.4", - "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.4.tgz", - "integrity": "sha512-7gAPz7anVK5xzbeQW9wFBDg7G++aPLAFY0QaSMOou9rJZpbuI58WAuJrgu+qR92l61grlnCUe7AFX8KGahAgug==", + "version": "4.4.10", + "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.10.tgz", + "integrity": "sha512-hT/+s0VQs2ojCX823m60m5f0sL5idt9SO6Tj6Dg+rdphGPIeJbJ6CxvBYkgkGKrYeDjvIpKTR38UzmtHJOGW3Q==", "dependencies": { "@types/react": "*" } }, "node_modules/@types/scheduler": { - "version": "0.16.2", - "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.2.tgz", - "integrity": "sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==" + "version": "0.16.8", + "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.8.tgz", + "integrity": "sha512-WZLiwShhwLRmeV6zH+GkbOFT6Z6VklCItrDioxUnv+u4Ll+8vKeFySoFyK/0ctcRpOmwAicELfmys1sDc/Rw+A==" }, "node_modules/@uiw/codemirror-extensions-basic-setup": { - "version": "4.19.9", - "resolved": "https://registry.npmjs.org/@uiw/codemirror-extensions-basic-setup/-/codemirror-extensions-basic-setup-4.19.9.tgz", - "integrity": "sha512-O4yAgVpD3Pon4t4+lwZ2MTGg2TeU/Jv8YzKS9ap4fP/WMTVrKmpdq+DOafbhZSlhmU0XGfQPPJ4WX6rtZgx3Rw==", + "version": "4.21.24", + "resolved": "https://registry.npmjs.org/@uiw/codemirror-extensions-basic-setup/-/codemirror-extensions-basic-setup-4.21.24.tgz", + "integrity": "sha512-TJYKlPxNAVJNclW1EGumhC7I02jpdMgBon4jZvb5Aju9+tUzS44IwORxUx8BD8ZtH2UHmYS+04rE3kLk/BtnCQ==", "dependencies": { "@codemirror/autocomplete": "^6.0.0", "@codemirror/commands": "^6.0.0", @@ -2538,6 +2574,9 @@ "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.0.0" }, + "funding": { + "url": "https://jaywcjlove.github.io/#/sponsor" + }, "peerDependencies": { "@codemirror/autocomplete": ">=6.0.0", "@codemirror/commands": ">=6.0.0", @@ -2549,17 +2588,20 @@ } }, "node_modules/@uiw/react-codemirror": { - "version": "4.19.9", - "resolved": "https://registry.npmjs.org/@uiw/react-codemirror/-/react-codemirror-4.19.9.tgz", - "integrity": "sha512-U+A1fSfELMFFs5a+ZOPwCJKZMYaMy6QHOfNOOV7WhSveM7GYHT970GjTfs2dn1LlvhebwyK9ei0rCXZdsI9n9Q==", + "version": "4.21.24", + "resolved": "https://registry.npmjs.org/@uiw/react-codemirror/-/react-codemirror-4.21.24.tgz", + "integrity": "sha512-8zs5OuxbhikHocHBsVBMuW1vqlv4ccZAkt4rFwr7ebLP2Q6RwHsjpsR9GeGyAigAqonKRoeHugqF78UMrkaTgg==", "dependencies": { "@babel/runtime": "^7.18.6", "@codemirror/commands": "^6.1.0", "@codemirror/state": "^6.1.1", "@codemirror/theme-one-dark": "^6.0.0", - "@uiw/codemirror-extensions-basic-setup": "4.19.9", + "@uiw/codemirror-extensions-basic-setup": "4.21.24", "codemirror": "^6.0.0" }, + "funding": { + "url": "https://jaywcjlove.github.io/#/sponsor" + }, "peerDependencies": { "@babel/runtime": ">=7.11.0", "@codemirror/state": ">=6.0.0", @@ -2893,9 +2935,9 @@ } }, "node_modules/anymatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz", - "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==", + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", + "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", "dev": true, "dependencies": { "normalize-path": "^3.0.0", @@ -2912,28 +2954,32 @@ "dev": true }, "node_modules/array-buffer-byte-length": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz", - "integrity": "sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz", + "integrity": "sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "is-array-buffer": "^3.0.1" + "call-bind": "^1.0.5", + "is-array-buffer": "^3.0.4" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/array-includes": { - "version": "3.1.6", - "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.6.tgz", - "integrity": "sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==", + "version": "3.1.8", + "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.8.tgz", + "integrity": "sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4", - "get-intrinsic": "^1.1.3", + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.2", + "es-object-atoms": "^1.0.0", + "get-intrinsic": "^1.2.4", "is-string": "^1.0.7" }, "engines": { @@ -2950,8 +2996,8 @@ "dev": true, "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", "es-shim-unscopables": "^1.0.0" }, "engines": { @@ -2961,17 +3007,77 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/array.prototype.tosorted": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.1.tgz", - "integrity": "sha512-pZYPXPRl2PqWcsUs6LOMn+1f1532nEoPTYowBtqLwAW+W8vSVhkIGnmOX1t/UQjD6YGI0vcD2B1U7ZFGQH9jnQ==", + "node_modules/array.prototype.flatmap": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz", + "integrity": "sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4", - "es-shim-unscopables": "^1.0.0", - "get-intrinsic": "^1.1.3" + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "es-shim-unscopables": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array.prototype.toreversed": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/array.prototype.toreversed/-/array.prototype.toreversed-1.1.2.tgz", + "integrity": "sha512-wwDCoT4Ck4Cz7sLtgUmzR5UV3YF5mFHUlbChCzZBQZ+0m2cl/DH3tKgvphv1nKgFsJ48oCSg6p91q2Vm0I/ZMA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "es-shim-unscopables": "^1.0.0" + } + }, + "node_modules/array.prototype.tosorted": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.3.tgz", + "integrity": "sha512-/DdH4TiTmOKzyQbp/eadcCVexiCb36xJg7HshYOYJnNZFDj33GEv0P7GxsynpShhq4OLYJzbGcBDkLsDt7MnNg==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.5", + "define-properties": "^1.2.1", + "es-abstract": "^1.22.3", + "es-errors": "^1.1.0", + "es-shim-unscopables": "^1.0.2" + } + }, + "node_modules/arraybuffer.prototype.slice": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz", + "integrity": "sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==", + "dev": true, + "dependencies": { + "array-buffer-byte-length": "^1.0.1", + "call-bind": "^1.0.5", + "define-properties": "^1.2.1", + "es-abstract": "^1.22.3", + "es-errors": "^1.2.1", + "get-intrinsic": "^1.2.3", + "is-array-buffer": "^3.0.4", + "is-shared-array-buffer": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/attr-accept": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/attr-accept/-/attr-accept-2.2.2.tgz", + "integrity": "sha512-7prDjvt9HmqiZ0cl5CRjtS84sEyhsHP2coDkaZKRKVfCDo9s7iw7ChVmar78Gu9pC4SoR/28wFu/G5JJhTnqEg==", + "engines": { + "node": ">=4" } }, "node_modules/arraybuffer.prototype.slice": { @@ -3005,10 +3111,13 @@ } }, "node_modules/available-typed-arrays": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz", - "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz", + "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==", "dev": true, + "dependencies": { + "possible-typed-array-names": "^1.0.0" + }, "engines": { "node": ">= 0.4" }, @@ -3102,12 +3211,15 @@ } }, "node_modules/binary-extensions": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", - "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz", + "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==", "dev": true, "engines": { "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/bootstrap-sass": { @@ -3229,16 +3341,10 @@ } }, "node_modules/chokidar": { - "version": "3.5.3", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", - "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==", + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", + "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==", "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://paulmillr.com/funding/" - } - ], "dependencies": { "anymatch": "~3.1.2", "braces": "~3.0.2", @@ -3251,6 +3357,9 @@ "engines": { "node": ">= 8.10.0" }, + "funding": { + "url": "https://paulmillr.com/funding/" + }, "optionalDependencies": { "fsevents": "~2.3.2" } @@ -3265,9 +3374,9 @@ } }, "node_modules/classnames": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.3.2.tgz", - "integrity": "sha512-CSbhY4cFEJRe6/GQzIk5qXZ4Jeg5pcsP7b5peFSDpffpe1cqjASH/n9UTjBwOp6XpMSTwQ8Za2K5V02ueA7Tmw==" + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.5.1.tgz", + "integrity": "sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow==" }, "node_modules/clone-deep": { "version": "4.0.1", @@ -3283,6 +3392,14 @@ "node": ">=6" } }, + "node_modules/clsx": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.0.tgz", + "integrity": "sha512-m3iNNWpd9rl3jvvcBnu70ylMdrXt8Vlq4HYadnU5fwcOtvkSQWPmj7amUcDT2qYI7risszBjI5AUIUox9D16pg==", + "engines": { + "node": ">=6" + } + }, "node_modules/codemirror": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-6.0.1.tgz", @@ -3311,9 +3428,9 @@ "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==" }, "node_modules/colorette": { - "version": "2.0.16", - "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.16.tgz", - "integrity": "sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==", + "version": "2.0.20", + "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz", + "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==", "dev": true }, "node_modules/commander": { @@ -3334,16 +3451,14 @@ "node_modules/concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", "dev": true }, "node_modules/convert-source-map": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz", - "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==", - "dependencies": { - "safe-buffer": "~5.1.1" - } + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", + "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", + "dev": true }, "node_modules/copy-webpack-plugin": { "version": "11.0.0", @@ -3417,9 +3532,9 @@ } }, "node_modules/crelt": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/crelt/-/crelt-1.0.5.tgz", - "integrity": "sha512-+BO9wPPi+DWTDcNYhr/W90myha8ptzftZT+LwcmUbbok0rcP/fequmFYCw8NMoH7pkAZQzU78b3kYrlua5a9eA==" + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/crelt/-/crelt-1.0.6.tgz", + "integrity": "sha512-VQ2MBenTq1fWZUH9DJNGti7kKv6EeAuYr3cLwxUWhIu1baTaXh4Ib5W2CqHVqib4/MqbYGJqiL3Zb8GJZr3l4g==" }, "node_modules/cross-spawn": { "version": "7.0.3", @@ -3463,10 +3578,22 @@ "webpack": "^4.27.0 || ^5.0.0" } }, + "node_modules/css-loader/node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dev": true, + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/css-loader/node_modules/schema-utils": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz", - "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz", + "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==", "dev": true, "dependencies": { "@types/json-schema": "^7.0.8", @@ -3482,9 +3609,9 @@ } }, "node_modules/css-loader/node_modules/semver": { - "version": "7.5.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", - "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", + "version": "7.6.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz", + "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==", "dev": true, "dependencies": { "lru-cache": "^6.0.0" @@ -3496,6 +3623,12 @@ "node": ">=10" } }, + "node_modules/css-loader/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true + }, "node_modules/cssesc": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz", @@ -3509,14 +3642,75 @@ } }, "node_modules/csstype": { - "version": "3.0.11", - "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.11.tgz", - "integrity": "sha512-sa6P2wJ+CAbgyy4KFssIb/JNMLxFvKF1pCYCSXS8ZMuqZnMsrxqI2E5sPyoTpxoPU/gVZMzr2zjOfg8GIZOMsw==" + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz", + "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==" + }, + "node_modules/data-view-buffer": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.1.tgz", + "integrity": "sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.6", + "es-errors": "^1.3.0", + "is-data-view": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/data-view-byte-length": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.1.tgz", + "integrity": "sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "es-errors": "^1.3.0", + "is-data-view": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/data-view-byte-offset": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.0.tgz", + "integrity": "sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.6", + "es-errors": "^1.3.0", + "is-data-view": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/date-fns": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-3.6.0.tgz", + "integrity": "sha512-fRHTG8g/Gif+kSh50gaGEdToemgfj74aRX3swtiouboip5JDLAyDE9F11nHMIcvOaXeOC6D7SpNhi7uFyB7Uww==", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/kossnocorp" + } }, "node_modules/debug": { "version": "4.3.4", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "dev": true, "dependencies": { "ms": "2.1.2" }, @@ -3684,9 +3878,10 @@ "internal-slot": "^1.0.5", "is-array-buffer": "^3.0.2", "is-callable": "^1.2.7", - "is-negative-zero": "^2.0.2", + "is-data-view": "^1.0.1", + "is-negative-zero": "^2.0.3", "is-regex": "^1.1.4", - "is-shared-array-buffer": "^1.0.2", + "is-shared-array-buffer": "^1.0.3", "is-string": "^1.0.7", "is-typed-array": "^1.1.12", "is-weakref": "^1.0.2", @@ -3747,44 +3942,109 @@ "integrity": "sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==", "dev": true, "dependencies": { - "get-intrinsic": "^1.1.3", - "has": "^1.0.3", - "has-tostringtag": "^1.0.0" + "get-intrinsic": "^1.2.4" }, "engines": { "node": ">= 0.4" } }, - "node_modules/es-shim-unscopables": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz", - "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==", + "node_modules/es-errors": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", + "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", "dev": true, - "dependencies": { - "has": "^1.0.3" + "engines": { + "node": ">= 0.4" } }, - "node_modules/es-to-primitive": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", - "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", + "node_modules/es-iterator-helpers": { + "version": "1.0.18", + "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.0.18.tgz", + "integrity": "sha512-scxAJaewsahbqTYrGKJihhViaM6DDZDDoucfvzNbK0pOren1g/daDQ3IAhzn+1G14rBG7w+i5N+qul60++zlKA==", "dev": true, "dependencies": { - "is-callable": "^1.1.4", - "is-date-object": "^1.0.1", - "is-symbol": "^1.0.2" + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.0", + "es-errors": "^1.3.0", + "es-set-tostringtag": "^2.0.3", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.4", + "globalthis": "^1.0.3", + "has-property-descriptors": "^1.0.2", + "has-proto": "^1.0.3", + "has-symbols": "^1.0.3", + "internal-slot": "^1.0.7", + "iterator.prototype": "^1.1.2", + "safe-array-concat": "^1.1.2" }, "engines": { "node": ">= 0.4" - }, + } + }, + "node_modules/es-module-lexer": { + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.4.2.tgz", + "integrity": "sha512-7nOqkomXZEaxUDJw21XZNtRk739QvrPSoZoRtbsEfcii00vdzZUh6zh1CQwHhrib8MdEtJfv5rJiGeb4KuV/vw==", + "dev": true + }, + "node_modules/es-object-atoms": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.0.0.tgz", + "integrity": "sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==", + "dev": true, + "dependencies": { + "es-errors": "^1.3.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-set-tostringtag": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.3.tgz", + "integrity": "sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==", + "dev": true, + "dependencies": { + "get-intrinsic": "^1.2.4", + "has-tostringtag": "^1.0.2", + "hasown": "^2.0.1" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-shim-unscopables": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz", + "integrity": "sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==", + "dev": true, + "dependencies": { + "hasown": "^2.0.0" + } + }, + "node_modules/es-to-primitive": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", + "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", + "dev": true, + "dependencies": { + "is-callable": "^1.1.4", + "is-date-object": "^1.0.1", + "is-symbol": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/escalade": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", - "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz", + "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==", + "dev": true, "engines": { "node": ">=6" } @@ -3858,18 +4118,20 @@ "integrity": "sha512-73QQMKALArI8/7xGLNI/3LylrEYrlKZSb5C9+q3OtOewTnMQi5cT+aE9E41sLCmli3I9PGGmD1yiZydyo4FEPw==", "dev": true, "dependencies": { - "array-includes": "^3.1.6", - "array.prototype.flatmap": "^1.3.1", - "array.prototype.tosorted": "^1.1.1", + "array-includes": "^3.1.7", + "array.prototype.findlast": "^1.2.4", + "array.prototype.flatmap": "^1.3.2", + "array.prototype.toreversed": "^1.1.2", + "array.prototype.tosorted": "^1.1.3", "doctrine": "^2.1.0", "es-iterator-helpers": "^1.0.12", "estraverse": "^5.3.0", "jsx-ast-utils": "^2.4.1 || ^3.0.0", "minimatch": "^3.1.2", - "object.entries": "^1.1.6", - "object.fromentries": "^2.0.6", - "object.hasown": "^1.1.2", - "object.values": "^1.1.6", + "object.entries": "^1.1.7", + "object.fromentries": "^2.0.7", + "object.hasown": "^1.1.3", + "object.values": "^1.1.7", "prop-types": "^15.8.1", "resolve": "^2.0.0-next.4", "semver": "^6.3.1", @@ -3894,22 +4156,13 @@ "node": ">=0.10.0" } }, - "node_modules/eslint-plugin-react/node_modules/estraverse": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", - "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", - "dev": true, - "engines": { - "node": ">=4.0" - } - }, "node_modules/eslint-plugin-react/node_modules/resolve": { - "version": "2.0.0-next.4", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.4.tgz", - "integrity": "sha512-iMDbmAWtfU+MHpxt/I5iWI7cY6YVEZUQ3MBgPQ++XD1PELuJHIl82xBmObyP2KyQmkNB2dsqF7seoQQiAn5yDQ==", + "version": "2.0.0-next.5", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.5.tgz", + "integrity": "sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==", "dev": true, "dependencies": { - "is-core-module": "^2.9.0", + "is-core-module": "^2.13.0", "path-parse": "^1.0.7", "supports-preserve-symlinks-flag": "^1.0.0" }, @@ -3921,16 +4174,19 @@ } }, "node_modules/eslint-scope": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", - "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", + "version": "7.2.2", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", + "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", "dev": true, "dependencies": { "esrecurse": "^4.3.0", - "estraverse": "^4.1.1" + "estraverse": "^5.2.0" }, "engines": { - "node": ">=8.0.0" + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" } }, "node_modules/eslint-visitor-keys": { @@ -4060,9 +4316,9 @@ } }, "node_modules/eslint/node_modules/globals": { - "version": "13.20.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz", - "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==", + "version": "13.24.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz", + "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==", "dev": true, "dependencies": { "type-fest": "^0.20.2" @@ -4083,51 +4339,6 @@ "node": ">=8" } }, - "node_modules/eslint/node_modules/locate-path": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", - "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", - "dev": true, - "dependencies": { - "p-locate": "^5.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/eslint/node_modules/p-limit": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", - "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", - "dev": true, - "dependencies": { - "yocto-queue": "^0.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/eslint/node_modules/p-locate": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", - "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", - "dev": true, - "dependencies": { - "p-limit": "^3.0.2" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/eslint/node_modules/supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", @@ -4169,15 +4380,6 @@ "node": ">=0.10" } }, - "node_modules/esquery/node_modules/estraverse": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", - "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", - "dev": true, - "engines": { - "node": ">=4.0" - } - }, "node_modules/esrecurse": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", @@ -4190,7 +4392,7 @@ "node": ">=4.0" } }, - "node_modules/esrecurse/node_modules/estraverse": { + "node_modules/estraverse": { "version": "5.3.0", "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", @@ -4199,15 +4401,6 @@ "node": ">=4.0" } }, - "node_modules/estraverse": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", - "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", - "dev": true, - "engines": { - "node": ">=4.0" - } - }, "node_modules/esutils": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", @@ -4260,15 +4453,18 @@ "dev": true }, "node_modules/fastest-levenshtein": { - "version": "1.0.12", - "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz", - "integrity": "sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow==", - "dev": true + "version": "1.0.16", + "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz", + "integrity": "sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==", + "dev": true, + "engines": { + "node": ">= 4.9.1" + } }, "node_modules/fastq": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz", - "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==", + "version": "1.17.1", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz", + "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==", "dev": true, "dependencies": { "reusify": "^1.0.4" @@ -4307,9 +4503,9 @@ } }, "node_modules/file-loader/node_modules/schema-utils": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz", - "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz", + "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==", "dev": true, "dependencies": { "@types/json-schema": "^7.0.8", @@ -4324,6 +4520,17 @@ "url": "https://opencollective.com/webpack" } }, + "node_modules/file-selector": { + "version": "0.1.19", + "resolved": "https://registry.npmjs.org/file-selector/-/file-selector-0.1.19.tgz", + "integrity": "sha512-kCWw3+Aai8Uox+5tHCNgMFaUdgidxvMnLWO6fM5sZ0hA2wlHP5/DHGF0ECe84BiB95qdJbKNEJhWKVDvMN+JDQ==", + "dependencies": { + "tslib": "^2.0.1" + }, + "engines": { + "node": ">= 10" + } + }, "node_modules/fill-range": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", @@ -4455,16 +4662,28 @@ "integrity": "sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==" }, "node_modules/find-up": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", + "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", "dev": true, "dependencies": { - "locate-path": "^5.0.0", + "locate-path": "^6.0.0", "path-exists": "^4.0.0" }, "engines": { - "node": ">=8" + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/flat": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz", + "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==", + "dev": true, + "bin": { + "flat": "cli.js" } }, "node_modules/flat": { @@ -4477,12 +4696,13 @@ } }, "node_modules/flat-cache": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz", - "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz", + "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==", "dev": true, "dependencies": { - "flatted": "^3.1.0", + "flatted": "^3.2.9", + "keyv": "^4.5.3", "rimraf": "^3.0.2" }, "engines": { @@ -4490,9 +4710,9 @@ } }, "node_modules/flatted": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz", - "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz", + "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==", "dev": true }, "node_modules/font-awesome": { @@ -4521,13 +4741,13 @@ "node_modules/fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", "dev": true }, "node_modules/fsevents": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", - "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", "dev": true, "hasInstallScript": true, "optional": true, @@ -4577,6 +4797,7 @@ "version": "1.0.0-beta.2", "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", + "dev": true, "engines": { "node": ">=6.9.0" } @@ -4597,13 +4818,14 @@ } }, "node_modules/get-symbol-description": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz", - "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.2.tgz", + "integrity": "sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.1.1" + "call-bind": "^1.0.5", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.4" }, "engines": { "node": ">= 0.4" @@ -4613,15 +4835,15 @@ } }, "node_modules/glob": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz", - "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==", + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", "dev": true, "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", "inherits": "2", - "minimatch": "^3.0.4", + "minimatch": "^3.1.1", "once": "^1.3.0", "path-is-absolute": "^1.0.0" }, @@ -4654,6 +4876,7 @@ "version": "11.12.0", "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", + "dev": true, "engines": { "node": ">=4" } @@ -4728,17 +4951,6 @@ "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", "dev": true }, - "node_modules/has": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", - "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", - "dependencies": { - "function-bind": "^1.1.1" - }, - "engines": { - "node": ">= 0.4.0" - } - }, "node_modules/has-bigints": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz", @@ -4757,21 +4969,21 @@ } }, "node_modules/has-property-descriptors": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz", - "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", + "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", "dev": true, "dependencies": { - "get-intrinsic": "^1.1.1" + "es-define-property": "^1.0.0" }, "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/has-proto": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz", - "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz", + "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==", "dev": true, "engines": { "node": ">= 0.4" @@ -4793,12 +5005,12 @@ } }, "node_modules/has-tostringtag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz", - "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz", + "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==", "dev": true, "dependencies": { - "has-symbols": "^1.0.2" + "has-symbols": "^1.0.3" }, "engines": { "node": ">= 0.4" @@ -4849,9 +5061,9 @@ } }, "node_modules/immutable": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.1.0.tgz", - "integrity": "sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==", + "version": "4.3.5", + "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.5.tgz", + "integrity": "sha512-8eabxkth9gZatlwl5TBuJnCsoTADlL6ftEr7A4qgdaTsPyreilDSnUk57SO+jfKcNtxPa22U5KK6DSeAYhpBJw==", "dev": true }, "node_modules/import-fresh": { @@ -4869,14 +5081,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/import-fresh/node_modules/resolve-from": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", - "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", - "engines": { - "node": ">=4" - } - }, "node_modules/import-local": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz", @@ -4896,6 +5100,70 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/import-local/node_modules/find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "dev": true, + "dependencies": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/import-local/node_modules/locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "dev": true, + "dependencies": { + "p-locate": "^4.1.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/import-local/node_modules/p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "dev": true, + "dependencies": { + "p-try": "^2.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/import-local/node_modules/p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "dev": true, + "dependencies": { + "p-limit": "^2.2.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/import-local/node_modules/pkg-dir": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", + "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", + "dev": true, + "dependencies": { + "find-up": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/imurmurhash": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", @@ -4908,7 +5176,7 @@ "node_modules/inflight": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", "dev": true, "dependencies": { "once": "^1.3.0", @@ -4922,13 +5190,13 @@ "dev": true }, "node_modules/internal-slot": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.5.tgz", - "integrity": "sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.7.tgz", + "integrity": "sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==", "dev": true, "dependencies": { - "get-intrinsic": "^1.2.0", - "has": "^1.0.3", + "es-errors": "^1.3.0", + "hasown": "^2.0.0", "side-channel": "^1.0.4" }, "engines": { @@ -4953,14 +5221,16 @@ } }, "node_modules/is-array-buffer": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz", - "integrity": "sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==", + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.4.tgz", + "integrity": "sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "get-intrinsic": "^1.2.0", - "is-typed-array": "^1.1.10" + "get-intrinsic": "^1.2.1" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -5039,11 +5309,26 @@ } }, "node_modules/is-core-module": { - "version": "2.9.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz", - "integrity": "sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==", + "version": "2.13.1", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz", + "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==", + "dependencies": { + "hasown": "^2.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-data-view": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.1.tgz", + "integrity": "sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==", + "dev": true, "dependencies": { - "has": "^1.0.3" + "is-typed-array": "^1.1.13" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -5067,7 +5352,7 @@ "node_modules/is-extglob": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", + "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", "dev": true, "engines": { "node": ">=0.10.0" @@ -5122,9 +5407,9 @@ } }, "node_modules/is-negative-zero": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz", - "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.3.tgz", + "integrity": "sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==", "dev": true, "engines": { "node": ">= 0.4" @@ -5208,8 +5493,8 @@ "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz", "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==", "dev": true, - "dependencies": { - "call-bind": "^1.0.2" + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -5303,13 +5588,13 @@ "node_modules/isexe": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", "dev": true }, "node_modules/isobject": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==", "dev": true, "engines": { "node": ">=0.10.0" @@ -5367,9 +5652,9 @@ } }, "node_modules/jquery": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", - "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==" + "version": "3.7.1", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz", + "integrity": "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==" }, "node_modules/js-cookie": { "version": "2.2.1", @@ -5397,6 +5682,7 @@ "version": "2.5.2", "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", + "dev": true, "bin": { "jsesc": "bin/jsesc" }, @@ -5425,6 +5711,7 @@ "version": "2.2.3", "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", + "dev": true, "bin": { "json5": "lib/cli.js" }, @@ -5433,13 +5720,15 @@ } }, "node_modules/jsx-ast-utils": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.3.tgz", - "integrity": "sha512-fYQHZTZ8jSfmWZ0iyzfwiU4WDX4HpHbMCZ3gPlWYiCl3BoeOTsqKBqnTVfH2rYT7eP5c3sVbeSPHnnJOaTrWiw==", + "version": "3.3.5", + "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz", + "integrity": "sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==", "dev": true, "dependencies": { - "array-includes": "^3.1.5", - "object.assign": "^4.1.3" + "array-includes": "^3.1.6", + "array.prototype.flat": "^1.3.1", + "object.assign": "^4.1.4", + "object.values": "^1.1.6" }, "engines": { "node": ">=4.0" @@ -5450,6 +5739,15 @@ "resolved": "https://registry.npmjs.org/keycode/-/keycode-2.2.1.tgz", "integrity": "sha512-Rdgz9Hl9Iv4QKi8b0OlCRQEzp4AgVxyCtz5S/+VIHezDmrDhkp2N2TqBWOLz0/gbeREXOOiI9/4b8BY9uw2vFg==" }, + "node_modules/keyv": { + "version": "4.5.4", + "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", + "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", + "dev": true, + "dependencies": { + "json-buffer": "3.0.1" + } + }, "node_modules/kind-of": { "version": "6.0.3", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", @@ -5460,9 +5758,9 @@ } }, "node_modules/klona": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.5.tgz", - "integrity": "sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ==", + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.6.tgz", + "integrity": "sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==", "dev": true, "engines": { "node": ">= 8" @@ -5510,15 +5808,18 @@ } }, "node_modules/locate-path": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", + "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", "dev": true, "dependencies": { - "p-locate": "^4.1.0" + "p-locate": "^5.0.0" }, "engines": { - "node": ">=8" + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/lodash": { @@ -5550,15 +5851,12 @@ } }, "node_modules/lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", + "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", "dev": true, "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" + "yallist": "^3.0.2" } }, "node_modules/make-dir": { @@ -5659,9 +5957,9 @@ } }, "node_modules/mini-css-extract-plugin/node_modules/schema-utils": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz", - "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz", + "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==", "dev": true, "dependencies": { "@types/json-schema": "^7.0.8", @@ -5676,16 +5974,6 @@ "url": "https://opencollective.com/webpack" } }, - "node_modules/mini-css-extract-plugin/node_modules/webpack-sources": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz", - "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==", - "dev": true, - "dependencies": { - "source-list-map": "^2.0.0", - "source-map": "~0.6.1" - } - }, "node_modules/minimatch": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", @@ -5701,13 +5989,20 @@ "node_modules/ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true }, "node_modules/nanoid": { - "version": "3.3.4", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz", - "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==", + "version": "3.3.7", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz", + "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==", "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], "bin": { "nanoid": "bin/nanoid.cjs" }, @@ -5744,7 +6039,7 @@ "node_modules/object-assign": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", + "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", "engines": { "node": ">=0.10.0" } @@ -5768,13 +6063,13 @@ } }, "node_modules/object.assign": { - "version": "4.1.4", - "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz", - "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==", + "version": "4.1.5", + "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.5.tgz", + "integrity": "sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", + "call-bind": "^1.0.5", + "define-properties": "^1.2.1", "has-symbols": "^1.0.3", "object-keys": "^1.1.1" }, @@ -5786,28 +6081,29 @@ } }, "node_modules/object.entries": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.6.tgz", - "integrity": "sha512-leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w==", + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.8.tgz", + "integrity": "sha512-cmopxi8VwRIAw/fkijJohSfpef5PdN0pMQJN6VC/ZKvn0LIknWD8KtgY6KlQdEc4tIjcQ3HxSMmnvtzIscdaYQ==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-object-atoms": "^1.0.0" }, "engines": { "node": ">= 0.4" } }, "node_modules/object.fromentries": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.6.tgz", - "integrity": "sha512-VciD13dswC4j1Xt5394WR4MzmAQmlgN72phd/riNp9vtD7tp4QQWJ0R4wvclXcafgcYK8veHRed2W6XeGBvcfg==", + "version": "2.0.8", + "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.8.tgz", + "integrity": "sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.2", + "es-object-atoms": "^1.0.0" }, "engines": { "node": ">= 0.4" @@ -5817,27 +6113,27 @@ } }, "node_modules/object.hasown": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.2.tgz", - "integrity": "sha512-B5UIT3J1W+WuWIU55h0mjlwaqxiE5vYENJXIXZ4VFe05pNYrkKuK0U/6aFcb0pKywYJh7IhfoqUfKVmrJJHZHw==", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.3.tgz", + "integrity": "sha512-fFI4VcYpRHvSLXxP7yiZOMAd331cPfd2p7PFDVbgUsYOfCT3tICVqXWngbjr4m49OvsBwUBQ6O2uQoJvy3RexA==", "dev": true, "dependencies": { - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" }, "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/object.values": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz", - "integrity": "sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.2.0.tgz", + "integrity": "sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-object-atoms": "^1.0.0" }, "engines": { "node": ">= 0.4" @@ -5849,7 +6145,7 @@ "node_modules/once": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", "dev": true, "dependencies": { "wrappy": "1" @@ -5873,30 +6169,33 @@ } }, "node_modules/p-limit": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", "dev": true, "dependencies": { - "p-try": "^2.0.0" + "yocto-queue": "^0.1.0" }, "engines": { - "node": ">=6" + "node": ">=10" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/p-locate": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", + "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", "dev": true, "dependencies": { - "p-limit": "^2.2.0" + "p-limit": "^3.0.2" }, "engines": { - "node": ">=8" + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/p-try": { @@ -5948,7 +6247,7 @@ "node_modules/path-is-absolute": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", + "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", "dev": true, "engines": { "node": ">=0.10.0" @@ -6003,15 +6302,100 @@ } }, "node_modules/pkg-dir": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", - "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-7.0.0.tgz", + "integrity": "sha512-Ie9z/WINcxxLp27BKOCHGde4ITq9UklYKDzVo1nhk5sqGEXU3FpkwP5GM2voTGJkGd9B3Otl+Q4uwSOeSUtOBA==", "dev": true, "dependencies": { - "find-up": "^4.0.0" + "find-up": "^6.3.0" }, "engines": { - "node": ">=8" + "node": ">=14.16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/pkg-dir/node_modules/find-up": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-6.3.0.tgz", + "integrity": "sha512-v2ZsoEuVHYy8ZIlYqwPe/39Cy+cFDzp4dXPaxNvkEuouymu+2Jbz0PxpKarJHYJTmv2HWT3O382qY8l4jMWthw==", + "dev": true, + "dependencies": { + "locate-path": "^7.1.0", + "path-exists": "^5.0.0" + }, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/pkg-dir/node_modules/locate-path": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-7.2.0.tgz", + "integrity": "sha512-gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA==", + "dev": true, + "dependencies": { + "p-locate": "^6.0.0" + }, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/pkg-dir/node_modules/p-limit": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-4.0.0.tgz", + "integrity": "sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==", + "dev": true, + "dependencies": { + "yocto-queue": "^1.0.0" + }, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/pkg-dir/node_modules/p-locate": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-6.0.0.tgz", + "integrity": "sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw==", + "dev": true, + "dependencies": { + "p-limit": "^4.0.0" + }, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/pkg-dir/node_modules/path-exists": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-5.0.0.tgz", + "integrity": "sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ==", + "dev": true, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + } + }, + "node_modules/pkg-dir/node_modules/yocto-queue": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.0.0.tgz", + "integrity": "sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==", + "dev": true, + "engines": { + "node": ">=12.20" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/popper.js": { @@ -6024,10 +6408,19 @@ "url": "https://opencollective.com/popperjs" } }, + "node_modules/possible-typed-array-names": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz", + "integrity": "sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==", + "dev": true, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/postcss": { - "version": "8.4.18", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.18.tgz", - "integrity": "sha512-Wi8mWhncLJm11GATDaQKobXSNEYGUHeQLiQqDFG1qQ5UTDPTEvKw0Xt5NsTpktGTwLps3ByrWsBrG0rB8YQ9oA==", + "version": "8.4.38", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.38.tgz", + "integrity": "sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==", "dev": true, "funding": [ { @@ -6037,12 +6430,16 @@ { "type": "tidelift", "url": "https://tidelift.com/funding/github/npm/postcss" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" } ], "dependencies": { - "nanoid": "^3.3.4", + "nanoid": "^3.3.7", "picocolors": "^1.0.0", - "source-map-js": "^1.0.2" + "source-map-js": "^1.2.0" }, "engines": { "node": "^10 || ^12 || >=14" @@ -6061,9 +6458,9 @@ } }, "node_modules/postcss-modules-local-by-default": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz", - "integrity": "sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.4.tgz", + "integrity": "sha512-L4QzMnOdVwRm1Qb8m4x8jsZzKAaPAgrUF1r/hjDR2Xj7R+8Zsf97jAlSQzWtKx5YNiNGN8QxmPFIc/sh+RQl+Q==", "dev": true, "dependencies": { "icss-utils": "^5.0.0", @@ -6078,9 +6475,9 @@ } }, "node_modules/postcss-modules-scope": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz", - "integrity": "sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.1.1.tgz", + "integrity": "sha512-uZgqzdTleelWjzJY+Fhti6F3C9iF1JR/dODLs/JDefozYcKTBCdD8BIl6nNPbTbcLnGrk56hzwZC2DaGNvYjzA==", "dev": true, "dependencies": { "postcss-selector-parser": "^6.0.4" @@ -6108,9 +6505,9 @@ } }, "node_modules/postcss-selector-parser": { - "version": "6.0.10", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz", - "integrity": "sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==", + "version": "6.0.16", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.16.tgz", + "integrity": "sha512-A0RVJrX+IUkVZbW3ClroRWurercFhieevHB38sr2+l9eUClMqome3LmEmnhlNy+5Mr2EYN6B2Kaw9wYdd+VHiw==", "dev": true, "dependencies": { "cssesc": "^3.0.0", @@ -6157,10 +6554,18 @@ "react": ">=0.14.0" } }, + "node_modules/prop-types-extra/node_modules/warning": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz", + "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==", + "dependencies": { + "loose-envify": "^1.0.0" + } + }, "node_modules/punycode": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", - "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", + "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", "dev": true, "engines": { "node": ">=6" @@ -6229,12 +6634,20 @@ "react-dom": ">=16.3.0" } }, - "node_modules/react-bootstrap/node_modules/warning": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/warning/-/warning-3.0.0.tgz", - "integrity": "sha512-jMBt6pUrKn5I+OGgtQ4YZLdhIeJmObddh6CsibPxyQ5yPZm1XExSyzC1LCNX7BzhxWgiHmizBWJTHJIjMjTQYQ==", + "node_modules/react-datepicker": { + "version": "6.6.0", + "resolved": "https://registry.npmjs.org/react-datepicker/-/react-datepicker-6.6.0.tgz", + "integrity": "sha512-ERC0/Q4pPC9bNIcGUpdCbHc+oCxhkU3WI3UOGHkyJ3A9fqALCYpEmLc5S5xvAd7DuCDdbsyW97oRPM6pWWwjww==", "dependencies": { - "loose-envify": "^1.0.0" + "@floating-ui/react": "^0.26.2", + "clsx": "^2.1.0", + "date-fns": "^3.3.1", + "prop-types": "^15.7.2", + "react-onclickoutside": "^6.13.0" + }, + "peerDependencies": { + "react": "^16.9.0 || ^17 || ^18", + "react-dom": "^16.9.0 || ^17 || ^18" } }, "node_modules/react-dnd": { @@ -6286,6 +6699,22 @@ "react": "^18.2.0" } }, + "node_modules/react-dropzone": { + "version": "10.2.2", + "resolved": "https://registry.npmjs.org/react-dropzone/-/react-dropzone-10.2.2.tgz", + "integrity": "sha512-U5EKckXVt6IrEyhMMsgmHQiWTGLudhajPPG77KFSvgsMqNEHSyGpqWvOMc5+DhEah/vH4E1n+J5weBNLd5VtyA==", + "dependencies": { + "attr-accept": "^2.0.0", + "file-selector": "^0.1.12", + "prop-types": "^15.7.2" + }, + "engines": { + "node": ">= 8" + }, + "peerDependencies": { + "react": ">= 16.8" + } + }, "node_modules/react-is": { "version": "16.13.1", "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", @@ -6296,6 +6725,19 @@ "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz", "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==" }, + "node_modules/react-onclickoutside": { + "version": "6.13.0", + "resolved": "https://registry.npmjs.org/react-onclickoutside/-/react-onclickoutside-6.13.0.tgz", + "integrity": "sha512-ty8So6tcUpIb+ZE+1HAhbLROvAIJYyJe/1vRrrcmW+jLsaM+/powDRqxzo6hSh9CuRZGSL1Q8mvcF5WRD93a0A==", + "funding": { + "type": "individual", + "url": "https://github.com/Pomax/react-onclickoutside/blob/master/FUNDING.md" + }, + "peerDependencies": { + "react": "^15.5.x || ^16.x || ^17.x || ^18.x", + "react-dom": "^15.5.x || ^16.x || ^17.x || ^18.x" + } + }, "node_modules/react-overlays": { "version": "0.9.3", "resolved": "https://registry.npmjs.org/react-overlays/-/react-overlays-0.9.3.tgz", @@ -6313,14 +6755,6 @@ "react-dom": ">=16.3.0" } }, - "node_modules/react-overlays/node_modules/warning": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/warning/-/warning-3.0.0.tgz", - "integrity": "sha512-jMBt6pUrKn5I+OGgtQ4YZLdhIeJmObddh6CsibPxyQ5yPZm1XExSyzC1LCNX7BzhxWgiHmizBWJTHJIjMjTQYQ==", - "dependencies": { - "loose-envify": "^1.0.0" - } - }, "node_modules/react-prop-types": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/react-prop-types/-/react-prop-types-0.4.0.tgz", @@ -6332,18 +6766,10 @@ "react": ">=0.14.0" } }, - "node_modules/react-prop-types/node_modules/warning": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/warning/-/warning-3.0.0.tgz", - "integrity": "sha512-jMBt6pUrKn5I+OGgtQ4YZLdhIeJmObddh6CsibPxyQ5yPZm1XExSyzC1LCNX7BzhxWgiHmizBWJTHJIjMjTQYQ==", - "dependencies": { - "loose-envify": "^1.0.0" - } - }, "node_modules/react-redux": { - "version": "7.2.8", - "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-7.2.8.tgz", - "integrity": "sha512-6+uDjhs3PSIclqoCk0kd6iX74gzrGc3W5zcAjbrFgEdIjRSQObdIwfx80unTkVUYvbQ95Y8Av3OvFHq1w5EOUw==", + "version": "7.2.9", + "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-7.2.9.tgz", + "integrity": "sha512-Gx4L3uM182jEEayZfRbI/G11ZpYdNAnBs70lFVMNdHJI76XYtR+7m0MN+eAs7UHBPhWXcnFPaS+9owSCJQHNpQ==", "dependencies": { "@babel/runtime": "^7.15.4", "@types/react-redux": "^7.1.20", @@ -6370,9 +6796,9 @@ "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==" }, "node_modules/react-select": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/react-select/-/react-select-5.7.0.tgz", - "integrity": "sha512-lJGiMxCa3cqnUr2Jjtg9YHsaytiZqeNOKeibv6WF5zbK/fPegZ1hg3y/9P1RZVLhqBTs0PfqQLKuAACednYGhQ==", + "version": "5.8.0", + "resolved": "https://registry.npmjs.org/react-select/-/react-select-5.8.0.tgz", + "integrity": "sha512-TfjLDo58XrhP6VG5M/Mi56Us0Yt8X7xD6cDybC7yoRMUNm7BGO7qk8J0TLQOua/prb8vUOtsfnXZwfm30HGsAA==", "dependencies": { "@babel/runtime": "^7.12.0", "@emotion/cache": "^11.4.0", @@ -6453,9 +6879,9 @@ } }, "node_modules/redux": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/redux/-/redux-4.2.0.tgz", - "integrity": "sha512-oSBmcKKIuIR4ME29/AeNUnl5L+hvBq7OaJWzaptTQJAntaPvxIJqfnjbaEiCzzaIz+XmVILfqAM3Ob0aXLPfjA==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/redux/-/redux-4.2.1.tgz", + "integrity": "sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w==", "dependencies": { "@babel/runtime": "^7.9.2" } @@ -6515,9 +6941,9 @@ } }, "node_modules/regenerator-runtime": { - "version": "0.13.11", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz", - "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==" + "version": "0.14.1", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz", + "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==" }, "node_modules/regenerator-transform": { "version": "0.15.2", @@ -6593,11 +7019,11 @@ } }, "node_modules/resolve": { - "version": "1.22.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz", - "integrity": "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==", + "version": "1.22.8", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz", + "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==", "dependencies": { - "is-core-module": "^2.8.1", + "is-core-module": "^2.13.0", "path-parse": "^1.0.7", "supports-preserve-symlinks-flag": "^1.0.0" }, @@ -6620,7 +7046,7 @@ "node": ">=8" } }, - "node_modules/resolve-from": { + "node_modules/resolve-cwd/node_modules/resolve-from": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", @@ -6629,6 +7055,14 @@ "node": ">=8" } }, + "node_modules/resolve-from": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", + "engines": { + "node": ">=4" + } + }, "node_modules/reusify": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", @@ -6701,23 +7135,64 @@ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" }, "node_modules/safe-regex-test": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz", - "integrity": "sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz", + "integrity": "sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "get-intrinsic": "^1.2.4", + "has-symbols": "^1.0.3", + "isarray": "^2.0.5" + }, + "engines": { + "node": ">=0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ] + }, + "node_modules/safe-regex-test": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.3.tgz", + "integrity": "sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.1.3", + "call-bind": "^1.0.6", + "es-errors": "^1.3.0", "is-regex": "^1.1.4" }, + "engines": { + "node": ">= 0.4" + }, "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/sass": { - "version": "1.55.0", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.55.0.tgz", - "integrity": "sha512-Pk+PMy7OGLs9WaxZGJMn7S96dvlyVBwwtToX895WmCpAOr5YiJYEUJfiJidMuKb613z2xNWcXCHEuOvjZbqC6A==", + "version": "1.72.0", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.72.0.tgz", + "integrity": "sha512-Gpczt3WA56Ly0Mn8Sl21Vj94s1axi9hDIzDFn9Ph9x3C3p4nNyvsqJoQyVXKou6cBlfFWEgRW4rT8Tb4i3XnVA==", "dev": true, "dependencies": { "chokidar": ">=3.0.0 <4.0.0", @@ -6728,7 +7203,7 @@ "sass": "sass.js" }, "engines": { - "node": ">=12.0.0" + "node": ">=14.0.0" } }, "node_modules/sass-loader": { @@ -6830,6 +7305,7 @@ "version": "6.3.1", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "dev": true, "bin": { "semver": "bin/semver.js" } @@ -6906,14 +7382,18 @@ } }, "node_modules/side-channel": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", - "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz", + "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==", "dev": true, "dependencies": { - "call-bind": "^1.0.0", - "get-intrinsic": "^1.0.2", - "object-inspect": "^1.9.0" + "call-bind": "^1.0.7", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.4", + "object-inspect": "^1.13.1" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -6935,18 +7415,17 @@ "dev": true }, "node_modules/source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==", "engines": { "node": ">=0.10.0" } }, "node_modules/source-map-js": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz", - "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz", + "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==", "dev": true, "engines": { "node": ">=0.10.0" @@ -6962,20 +7441,36 @@ "source-map": "^0.6.0" } }, + "node_modules/source-map-support/node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/string.prototype.matchall": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.8.tgz", - "integrity": "sha512-6zOCOcJ+RJAQshcTvXPHoxoQGONa3e/Lqx90wUA+wEzX78sg5Bo+1tQo4N0pohS0erG9qtCqJDjNCQBjeWVxyg==", + "version": "4.0.11", + "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.11.tgz", + "integrity": "sha512-NUdh0aDavY2og7IbBPenWqR9exH+E26Sv8e0/eTe1tltDGZL+GtBkDAnnyBtmekfK6/Dq3MkcGtzXFEd1LQrtg==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4", - "get-intrinsic": "^1.1.3", + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.2", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.0.0", + "get-intrinsic": "^1.2.4", + "gopd": "^1.0.1", "has-symbols": "^1.0.3", - "internal-slot": "^1.0.3", - "regexp.prototype.flags": "^1.4.3", - "side-channel": "^1.0.4" + "internal-slot": "^1.0.7", + "regexp.prototype.flags": "^1.5.2", + "set-function-name": "^2.0.2", + "side-channel": "^1.0.6" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -7051,14 +7546,14 @@ } }, "node_modules/style-mod": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/style-mod/-/style-mod-4.0.0.tgz", - "integrity": "sha512-OPhtyEjyyN9x3nhPsu76f52yUGXiZcgvsrFVtvTkyGRQJ0XK+GPc6ov1z+lRpbeabka+MYEQxOYRnt5nF30aMw==" + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/style-mod/-/style-mod-4.1.2.tgz", + "integrity": "sha512-wnD1HyVqpJUI2+eKZ+eo1UwghftP6yuFheBqqe+bWCotBjC2K1YnteJILRMs3SM4V/0dLEW1SC27MWP5y+mwmw==" }, "node_modules/stylis": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.1.3.tgz", - "integrity": "sha512-GP6WDNWf+o403jrEp9c5jibKavrtLW+/qYGhFxFrG8maXhwTBI7gLLhiBb0o7uFccWN+EOS9aMO6cGHWAO07OA==" + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.2.0.tgz", + "integrity": "sha512-Orov6g6BB1sDfYgzWfTHDOxamtX1bE/zo104Dh9e6fqJ3PooipYyfJ0pUmrZO2wAvO8YbEyeFrkV91XTsGMSrw==" }, "node_modules/supports-color": { "version": "5.5.0", @@ -7082,6 +7577,11 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/tabbable": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-6.2.0.tgz", + "integrity": "sha512-Cat63mxsVJlzYvN51JmVXIgNoUokrIaT2zLclCXjRd8boZ0004U4KCs/sToJ75C6sdlByWxpYnb5Boif1VSFew==" + }, "node_modules/tapable": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz", @@ -7176,7 +7676,7 @@ "node_modules/to-fast-properties": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", - "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=", + "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==", "engines": { "node": ">=4" } @@ -7193,6 +7693,11 @@ "node": ">=8.0" } }, + "node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, "node_modules/type-check": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", @@ -7274,9 +7779,68 @@ "integrity": "sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", + "call-bind": "^1.0.7", + "es-errors": "^1.3.0", + "is-typed-array": "^1.1.13" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/typed-array-byte-length": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.1.tgz", + "integrity": "sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "for-each": "^0.3.3", + "gopd": "^1.0.1", + "has-proto": "^1.0.3", + "is-typed-array": "^1.1.13" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/typed-array-byte-offset": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.2.tgz", + "integrity": "sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==", + "dev": true, + "dependencies": { + "available-typed-arrays": "^1.0.7", + "call-bind": "^1.0.7", + "for-each": "^0.3.3", + "gopd": "^1.0.1", + "has-proto": "^1.0.3", + "is-typed-array": "^1.1.13" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/typed-array-length": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.5.tgz", + "integrity": "sha512-yMi0PlwuznKHxKmcpoOdeLwxBoVPkqZxd7q2FgMkmD3bNwvF5VW0+UlUQ1k1vmktTu4Yu13Q0RIxEP8+B+wloA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", "for-each": "^0.3.3", - "is-typed-array": "^1.1.9" + "gopd": "^1.0.1", + "has-proto": "^1.0.3", + "is-typed-array": "^1.1.13", + "possible-typed-array-names": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -7311,6 +7875,12 @@ "react": ">=15.0.0" } }, + "node_modules/undici-types": { + "version": "5.26.5", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", + "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==", + "devOptional": true + }, "node_modules/unicode-canonical-property-names-ecmascript": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz", @@ -7409,14 +7979,14 @@ "dev": true }, "node_modules/w3c-keyname": { - "version": "2.2.6", - "resolved": "https://registry.npmjs.org/w3c-keyname/-/w3c-keyname-2.2.6.tgz", - "integrity": "sha512-f+fciywl1SJEniZHD6H+kUO8gOnwIr7f4ijKA6+ZvJFjeGi1r4PDLl53Ayud9O/rk64RqgoQine0feoeOU0kXg==" + "version": "2.2.8", + "resolved": "https://registry.npmjs.org/w3c-keyname/-/w3c-keyname-2.2.8.tgz", + "integrity": "sha512-dpojBhNsCNN7T82Tm7k26A6G9ML3NkhDsnw9n/eoxSRlVBB4CEtIQ/KTCLI2Fwf3ataSXRhYFkQi3SlnFwPvPQ==" }, "node_modules/warning": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz", - "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/warning/-/warning-3.0.0.tgz", + "integrity": "sha512-jMBt6pUrKn5I+OGgtQ4YZLdhIeJmObddh6CsibPxyQ5yPZm1XExSyzC1LCNX7BzhxWgiHmizBWJTHJIjMjTQYQ==", "dependencies": { "loose-envify": "^1.0.0" } @@ -7550,12 +8120,44 @@ } }, "node_modules/webpack-sources": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz", - "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==", + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz", + "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==", + "dev": true, + "dependencies": { + "source-list-map": "^2.0.0", + "source-map": "~0.6.1" + } + }, + "node_modules/webpack-sources/node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", "dev": true, "engines": { - "node": ">=10.13.0" + "node": ">=0.10.0" + } + }, + "node_modules/webpack/node_modules/eslint-scope": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", + "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", + "dev": true, + "dependencies": { + "esrecurse": "^4.3.0", + "estraverse": "^4.1.1" + }, + "engines": { + "node": ">=8.0.0" + } + }, + "node_modules/webpack/node_modules/estraverse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", + "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", + "dev": true, + "engines": { + "node": ">=4.0" } }, "node_modules/webpack/node_modules/schema-utils": { @@ -7576,6 +8178,15 @@ "url": "https://opencollective.com/webpack" } }, + "node_modules/webpack/node_modules/webpack-sources": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz", + "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==", + "dev": true, + "engines": { + "node": ">=10.13.0" + } + }, "node_modules/which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", @@ -7668,21 +8279,21 @@ } }, "node_modules/wildcard": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz", - "integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.1.tgz", + "integrity": "sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==", "dev": true }, "node_modules/wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", "dev": true }, "node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", + "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", "dev": true }, "node_modules/yaml": { @@ -7714,12 +8325,13 @@ "dev": true }, "@ampproject/remapping": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz", - "integrity": "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz", + "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==", + "dev": true, "requires": { - "@jridgewell/gen-mapping": "^0.1.0", - "@jridgewell/trace-mapping": "^0.3.9" + "@jridgewell/gen-mapping": "^0.3.5", + "@jridgewell/trace-mapping": "^0.3.24" } }, "@babel/cli": { @@ -8915,20 +9527,20 @@ "dev": true }, "@babel/runtime": { - "version": "7.20.13", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.13.tgz", - "integrity": "sha512-gt3PKXs0DBoL9xCvOIIZ2NEqAGZqHjAnmVbfQtB620V0uReIQutpel14KcneZuer7UioY8ALKZ7iocavvzTNFA==", + "version": "7.24.1", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.1.tgz", + "integrity": "sha512-+BIznRzyqBf+2wCTxcKE3wDjfGeCoVE61KSHGpkzqrLi8qxqFwBeUFyId2cxkTmm55fzDGnm0+yCxaxygrLUnQ==", "requires": { - "regenerator-runtime": "^0.13.11" + "regenerator-runtime": "^0.14.0" } }, "@babel/runtime-corejs2": { - "version": "7.20.13", - "resolved": "https://registry.npmjs.org/@babel/runtime-corejs2/-/runtime-corejs2-7.20.13.tgz", - "integrity": "sha512-K2yRNithMJG4epI509n4ljPjogMhmYCB887iSD7rRecxWC9dkbfJZCPGj0BQaqG3d3Qkpb1SotEmyeMmtnvxhw==", + "version": "7.24.1", + "resolved": "https://registry.npmjs.org/@babel/runtime-corejs2/-/runtime-corejs2-7.24.1.tgz", + "integrity": "sha512-De0q0utpUPiXnc7+B7Ku86mJ0eDItC/v3uFa/lQkq63XnHyZiytDHeCIvechlnVwwpU2ChjGF7c3I+mBrTudwg==", "requires": { "core-js": "^2.6.12", - "regenerator-runtime": "^0.13.11" + "regenerator-runtime": "^0.14.0" } }, "@babel/template": { @@ -8969,85 +9581,86 @@ } }, "@codemirror/autocomplete": { - "version": "6.4.2", - "resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.4.2.tgz", - "integrity": "sha512-8WE2xp+D0MpWEv5lZ6zPW1/tf4AGb358T5GWYiKEuCP8MvFfT3tH2mIF9Y2yr2e3KbHuSvsVhosiEyqCpiJhZQ==", + "version": "6.15.0", + "resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.15.0.tgz", + "integrity": "sha512-G2Zm0mXznxz97JhaaOdoEG2cVupn4JjPaS4AcNvZzhOsnnG9YVN68VzfoUw6dYTsIxT6a/cmoFEN47KAWhXaOg==", "requires": { "@codemirror/language": "^6.0.0", "@codemirror/state": "^6.0.0", - "@codemirror/view": "^6.6.0", + "@codemirror/view": "^6.17.0", "@lezer/common": "^1.0.0" } }, "@codemirror/commands": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.2.1.tgz", - "integrity": "sha512-FFiNKGuHA5O8uC6IJE5apI5rT9gyjlw4whqy4vlcX0wE/myxL6P1s0upwDhY4HtMWLOwzwsp0ap3bjdQhvfDOA==", + "version": "6.3.3", + "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.3.3.tgz", + "integrity": "sha512-dO4hcF0fGT9tu1Pj1D2PvGvxjeGkbC6RGcZw6Qs74TH+Ed1gw98jmUgd2axWvIZEqTeTuFrg1lEB1KV6cK9h1A==", "requires": { "@codemirror/language": "^6.0.0", - "@codemirror/state": "^6.2.0", + "@codemirror/state": "^6.4.0", "@codemirror/view": "^6.0.0", - "@lezer/common": "^1.0.0" + "@lezer/common": "^1.1.0" } }, "@codemirror/lang-css": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/@codemirror/lang-css/-/lang-css-6.0.2.tgz", - "integrity": "sha512-4V4zmUOl2Glx0GWw0HiO1oGD4zvMlIQ3zx5hXOE6ipCjhohig2bhWRAasrZylH9pRNTcl1VMa59Lsl8lZWlTzw==", + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/@codemirror/lang-css/-/lang-css-6.2.1.tgz", + "integrity": "sha512-/UNWDNV5Viwi/1lpr/dIXJNWiwDxpw13I4pTUAsNxZdg6E0mI2kTQb0P2iHczg1Tu+H4EBgJR+hYhKiHKko7qg==", "requires": { "@codemirror/autocomplete": "^6.0.0", "@codemirror/language": "^6.0.0", "@codemirror/state": "^6.0.0", + "@lezer/common": "^1.0.2", "@lezer/css": "^1.0.0" } }, "@codemirror/lang-html": { - "version": "6.4.2", - "resolved": "https://registry.npmjs.org/@codemirror/lang-html/-/lang-html-6.4.2.tgz", - "integrity": "sha512-bqCBASkteKySwtIbiV/WCtGnn/khLRbbiV5TE+d9S9eQJD7BA4c5dTRm2b3bVmSpilff5EYxvB4PQaZzM/7cNw==", + "version": "6.4.8", + "resolved": "https://registry.npmjs.org/@codemirror/lang-html/-/lang-html-6.4.8.tgz", + "integrity": "sha512-tE2YK7wDlb9ZpAH6mpTPiYm6rhfdQKVDa5r9IwIFlwwgvVaKsCfuKKZoJGWsmMZIf3FQAuJ5CHMPLymOtg1hXw==", "requires": { "@codemirror/autocomplete": "^6.0.0", "@codemirror/lang-css": "^6.0.0", "@codemirror/lang-javascript": "^6.0.0", "@codemirror/language": "^6.4.0", "@codemirror/state": "^6.0.0", - "@codemirror/view": "^6.2.2", + "@codemirror/view": "^6.17.0", "@lezer/common": "^1.0.0", "@lezer/css": "^1.1.0", "@lezer/html": "^1.3.0" } }, "@codemirror/lang-javascript": { - "version": "6.1.4", - "resolved": "https://registry.npmjs.org/@codemirror/lang-javascript/-/lang-javascript-6.1.4.tgz", - "integrity": "sha512-OxLf7OfOZBTMRMi6BO/F72MNGmgOd9B0vetOLvHsDACFXayBzW8fm8aWnDM0yuy68wTK03MBf4HbjSBNRG5q7A==", + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/@codemirror/lang-javascript/-/lang-javascript-6.2.2.tgz", + "integrity": "sha512-VGQfY+FCc285AhWuwjYxQyUQcYurWlxdKYT4bqwr3Twnd5wP5WSeu52t4tvvuWmljT4EmgEgZCqSieokhtY8hg==", "requires": { "@codemirror/autocomplete": "^6.0.0", "@codemirror/language": "^6.6.0", "@codemirror/lint": "^6.0.0", "@codemirror/state": "^6.0.0", - "@codemirror/view": "^6.0.0", + "@codemirror/view": "^6.17.0", "@lezer/common": "^1.0.0", "@lezer/javascript": "^1.0.0" } }, "@codemirror/language": { - "version": "6.6.0", - "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.6.0.tgz", - "integrity": "sha512-cwUd6lzt3MfNYOobdjf14ZkLbJcnv4WtndYaoBkbor/vF+rCNguMPK0IRtvZJG4dsWiaWPcK8x1VijhvSxnstg==", + "version": "6.10.1", + "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.10.1.tgz", + "integrity": "sha512-5GrXzrhq6k+gL5fjkAwt90nYDmjlzTIJV8THnxNFtNKWotMIlzzN+CpqxqwXOECnUdOndmSeWntVrVcv5axWRQ==", "requires": { "@codemirror/state": "^6.0.0", - "@codemirror/view": "^6.0.0", - "@lezer/common": "^1.0.0", + "@codemirror/view": "^6.23.0", + "@lezer/common": "^1.1.0", "@lezer/highlight": "^1.0.0", "@lezer/lr": "^1.0.0", "style-mod": "^4.0.0" } }, "@codemirror/lint": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/@codemirror/lint/-/lint-6.1.1.tgz", - "integrity": "sha512-e+M543x0NVHGayNHQzLP4XByJsvbu/ojY6+0VF2Y4Uu66Rt1nADuxNflZwECLf7gS009smIsptSUa6bUj/U/rw==", + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@codemirror/lint/-/lint-6.5.0.tgz", + "integrity": "sha512-+5YyicIaaAZKU8K43IQi8TBy6mF6giGeWAH7N96Z5LC30Wm5JMjqxOYIE9mxwMG1NbhT2mA3l9hA4uuKUM3E5g==", "requires": { "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.0.0", @@ -9055,9 +9668,9 @@ } }, "@codemirror/search": { - "version": "6.2.3", - "resolved": "https://registry.npmjs.org/@codemirror/search/-/search-6.2.3.tgz", - "integrity": "sha512-V9n9233lopQhB1dyjsBK2Wc1i+8hcCqxl1wQ46c5HWWLePoe4FluV3TGHoZ04rBRlGjNyz9DTmpJErig8UE4jw==", + "version": "6.5.6", + "resolved": "https://registry.npmjs.org/@codemirror/search/-/search-6.5.6.tgz", + "integrity": "sha512-rpMgcsh7o0GuCDUXKPvww+muLA1pDJaFrpq/CCHtpQJYz8xopu4D1hPcKRoDD0YlF8gZaqTNIRa4VRBWyhyy7Q==", "requires": { "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.0.0", @@ -9065,14 +9678,14 @@ } }, "@codemirror/state": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.2.0.tgz", - "integrity": "sha512-69QXtcrsc3RYtOtd+GsvczJ319udtBf1PTrr2KbLWM/e2CXUPnh0Nz9AUo8WfhSQ7GeL8dPVNUmhQVgpmuaNGA==" + "version": "6.4.1", + "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.4.1.tgz", + "integrity": "sha512-QkEyUiLhsJoZkbumGZlswmAhA7CBU02Wrz7zvH4SrcifbsqwlXShVXg65f3v/ts57W3dqyamEriMhij1Z3Zz4A==" }, "@codemirror/theme-one-dark": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/@codemirror/theme-one-dark/-/theme-one-dark-6.1.1.tgz", - "integrity": "sha512-+CfzmScfJuD6uDF5bHJkAjWTQ2QAAHxODCPxUEgcImDYcJLT+4l5vLnBHmDVv46kCC5uUJGMrBJct2Z6JbvqyQ==", + "version": "6.1.2", + "resolved": "https://registry.npmjs.org/@codemirror/theme-one-dark/-/theme-one-dark-6.1.2.tgz", + "integrity": "sha512-F+sH0X16j/qFLMAfbciKTxVOwkdAS336b7AXTKOZhy8BR3eH/RelsnLgLFINrpST63mmN2OuwUt0W2ndUgYwUA==", "requires": { "@codemirror/language": "^6.0.0", "@codemirror/state": "^6.0.0", @@ -9081,12 +9694,12 @@ } }, "@codemirror/view": { - "version": "6.9.1", - "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.9.1.tgz", - "integrity": "sha512-bzfSjJn9dAADVpabLKWKNmMG4ibyTV2e3eOGowjElNPTdTkSbi6ixPYHm2u0ADcETfKsi2/R84Rkmi91dH9yEg==", + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.26.0.tgz", + "integrity": "sha512-nSSmzONpqsNzshPOxiKhK203R6BvABepugAe34QfQDbNDslyjkqBuKgrK5ZBvqNXpfxz5iLrlGTmEfhbQyH46A==", "requires": { - "@codemirror/state": "^6.1.4", - "style-mod": "^4.0.0", + "@codemirror/state": "^6.4.0", + "style-mod": "^4.1.0", "w3c-keyname": "^2.2.4" } }, @@ -9097,110 +9710,109 @@ "dev": true }, "@emotion/babel-plugin": { - "version": "11.10.5", - "resolved": "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.10.5.tgz", - "integrity": "sha512-xE7/hyLHJac7D2Ve9dKroBBZqBT7WuPQmWcq7HSGb84sUuP4mlOWoB8dvVfD9yk5DHkU1m6RW7xSoDtnQHNQeA==", + "version": "11.11.0", + "resolved": "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.11.0.tgz", + "integrity": "sha512-m4HEDZleaaCH+XgDDsPF15Ht6wTLsgDTeR3WYj9Q/k76JtWhrJjcP4+/XlG8LGT/Rol9qUfOIztXeA84ATpqPQ==", "requires": { "@babel/helper-module-imports": "^7.16.7", - "@babel/plugin-syntax-jsx": "^7.17.12", "@babel/runtime": "^7.18.3", - "@emotion/hash": "^0.9.0", - "@emotion/memoize": "^0.8.0", - "@emotion/serialize": "^1.1.1", + "@emotion/hash": "^0.9.1", + "@emotion/memoize": "^0.8.1", + "@emotion/serialize": "^1.1.2", "babel-plugin-macros": "^3.1.0", "convert-source-map": "^1.5.0", "escape-string-regexp": "^4.0.0", "find-root": "^1.1.0", "source-map": "^0.5.7", - "stylis": "4.1.3" + "stylis": "4.2.0" }, "dependencies": { + "convert-source-map": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz", + "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==" + }, "escape-string-regexp": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==" - }, - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==" } } }, "@emotion/cache": { - "version": "11.10.5", - "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.10.5.tgz", - "integrity": "sha512-dGYHWyzTdmK+f2+EnIGBpkz1lKc4Zbj2KHd4cX3Wi8/OWr5pKslNjc3yABKH4adRGCvSX4VDC0i04mrrq0aiRA==", + "version": "11.11.0", + "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.11.0.tgz", + "integrity": "sha512-P34z9ssTCBi3e9EI1ZsWpNHcfY1r09ZO0rZbRO2ob3ZQMnFI35jB536qoXbkdesr5EUhYi22anuEJuyxifaqAQ==", "requires": { - "@emotion/memoize": "^0.8.0", - "@emotion/sheet": "^1.2.1", - "@emotion/utils": "^1.2.0", - "@emotion/weak-memoize": "^0.3.0", - "stylis": "4.1.3" + "@emotion/memoize": "^0.8.1", + "@emotion/sheet": "^1.2.2", + "@emotion/utils": "^1.2.1", + "@emotion/weak-memoize": "^0.3.1", + "stylis": "4.2.0" } }, "@emotion/hash": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.9.0.tgz", - "integrity": "sha512-14FtKiHhy2QoPIzdTcvh//8OyBlknNs2nXRwIhG904opCby3l+9Xaf/wuPvICBF0rc1ZCNBd3nKe9cd2mecVkQ==" + "version": "0.9.1", + "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.9.1.tgz", + "integrity": "sha512-gJB6HLm5rYwSLI6PQa+X1t5CFGrv1J1TWG+sOyMCeKz2ojaj6Fnl/rZEspogG+cvqbt4AE/2eIyD2QfLKTBNlQ==" }, "@emotion/memoize": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.8.0.tgz", - "integrity": "sha512-G/YwXTkv7Den9mXDO7AhLWkE3q+I92B+VqAE+dYG4NGPaHZGvt3G8Q0p9vmE+sq7rTGphUbAvmQ9YpbfMQGGlA==" + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.8.1.tgz", + "integrity": "sha512-W2P2c/VRW1/1tLox0mVUalvnWXxavmv/Oum2aPsRcoDJuob75FC3Y8FbpfLwUegRcxINtGUMPq0tFCvYNTBXNA==" }, "@emotion/react": { - "version": "11.10.5", - "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.10.5.tgz", - "integrity": "sha512-TZs6235tCJ/7iF6/rvTaOH4oxQg2gMAcdHemjwLKIjKz4rRuYe1HJ2TQJKnAcRAfOUDdU8XoDadCe1rl72iv8A==", + "version": "11.11.4", + "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.11.4.tgz", + "integrity": "sha512-t8AjMlF0gHpvvxk5mAtCqR4vmxiGHCeJBaQO6gncUSdklELOgtwjerNY2yuJNfwnc6vi16U/+uMF+afIawJ9iw==", "requires": { "@babel/runtime": "^7.18.3", - "@emotion/babel-plugin": "^11.10.5", - "@emotion/cache": "^11.10.5", - "@emotion/serialize": "^1.1.1", - "@emotion/use-insertion-effect-with-fallbacks": "^1.0.0", - "@emotion/utils": "^1.2.0", - "@emotion/weak-memoize": "^0.3.0", + "@emotion/babel-plugin": "^11.11.0", + "@emotion/cache": "^11.11.0", + "@emotion/serialize": "^1.1.3", + "@emotion/use-insertion-effect-with-fallbacks": "^1.0.1", + "@emotion/utils": "^1.2.1", + "@emotion/weak-memoize": "^0.3.1", "hoist-non-react-statics": "^3.3.1" } }, "@emotion/serialize": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-1.1.1.tgz", - "integrity": "sha512-Zl/0LFggN7+L1liljxXdsVSVlg6E/Z/olVWpfxUTxOAmi8NU7YoeWeLfi1RmnB2TATHoaWwIBRoL+FvAJiTUQA==", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-1.1.3.tgz", + "integrity": "sha512-iD4D6QVZFDhcbH0RAG1uVu1CwVLMWUkCvAqqlewO/rxf8+87yIBAlt4+AxMiiKPLs5hFc0owNk/sLLAOROw3cA==", "requires": { - "@emotion/hash": "^0.9.0", - "@emotion/memoize": "^0.8.0", - "@emotion/unitless": "^0.8.0", - "@emotion/utils": "^1.2.0", + "@emotion/hash": "^0.9.1", + "@emotion/memoize": "^0.8.1", + "@emotion/unitless": "^0.8.1", + "@emotion/utils": "^1.2.1", "csstype": "^3.0.2" } }, "@emotion/sheet": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@emotion/sheet/-/sheet-1.2.1.tgz", - "integrity": "sha512-zxRBwl93sHMsOj4zs+OslQKg/uhF38MB+OMKoCrVuS0nyTkqnau+BM3WGEoOptg9Oz45T/aIGs1qbVAsEFo3nA==" + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/@emotion/sheet/-/sheet-1.2.2.tgz", + "integrity": "sha512-0QBtGvaqtWi+nx6doRwDdBIzhNdZrXUppvTM4dtZZWEGTXL/XE/yJxLMGlDT1Gt+UHH5IX1n+jkXyytE/av7OA==" }, "@emotion/unitless": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.8.0.tgz", - "integrity": "sha512-VINS5vEYAscRl2ZUDiT3uMPlrFQupiKgHz5AA4bCH1miKBg4qtwkim1qPmJj/4WG6TreYMY111rEFsjupcOKHw==" + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.8.1.tgz", + "integrity": "sha512-KOEGMu6dmJZtpadb476IsZBclKvILjopjUii3V+7MnXIQCYh8W3NgNcgwo21n9LXZX6EDIKvqfjYxXebDwxKmQ==" }, "@emotion/use-insertion-effect-with-fallbacks": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@emotion/use-insertion-effect-with-fallbacks/-/use-insertion-effect-with-fallbacks-1.0.0.tgz", - "integrity": "sha512-1eEgUGmkaljiBnRMTdksDV1W4kUnmwgp7X9G8B++9GYwl1lUdqSndSriIrTJ0N7LQaoauY9JJ2yhiOYK5+NI4A==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@emotion/use-insertion-effect-with-fallbacks/-/use-insertion-effect-with-fallbacks-1.0.1.tgz", + "integrity": "sha512-jT/qyKZ9rzLErtrjGgdkMBn2OP8wl0G3sQlBb3YPryvKHsjvINUhVaPFfP+fpBcOkmrVOVEEHQFJ7nbj2TH2gw==", "requires": {} }, "@emotion/utils": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@emotion/utils/-/utils-1.2.0.tgz", - "integrity": "sha512-sn3WH53Kzpw8oQ5mgMmIzzyAaH2ZqFEbozVVBSYp538E06OSE6ytOp7pRAjNQR+Q/orwqdQYJSe2m3hCOeznkw==" + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@emotion/utils/-/utils-1.2.1.tgz", + "integrity": "sha512-Y2tGf3I+XVnajdItskUCn6LX+VUDmP6lTL4fcqsXAv43dnlbZiuW4MWQW38rW/BVWSE7Q/7+XQocmpnRYILUmg==" }, "@emotion/weak-memoize": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.3.0.tgz", - "integrity": "sha512-AHPmaAx+RYfZz0eYu6Gviiagpmiyw98ySSlQvCUhVGDRtDFe4DBS0x1bSjdF3gqUDYOczB+yYvBTtEylYSdRhg==" + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.3.1.tgz", + "integrity": "sha512-EsBwpc7hBUJWAsNPBmJy4hxWx12v6bshQsldrVmjxJoc3isbxhOrF2IcCpaXxfvq03NwkI7sbsOLXbYuqF/8Ww==" }, "@eslint-community/eslint-utils": { "version": "4.4.0", @@ -9252,18 +9864,45 @@ "dev": true }, "@floating-ui/core": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.2.1.tgz", - "integrity": "sha512-LSqwPZkK3rYfD7GKoIeExXOyYx6Q1O4iqZWwIehDNuv3Dv425FIAE8PRwtAx1imEolFTHgBEcoFHm9MDnYgPCg==" + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.6.0.tgz", + "integrity": "sha512-PcF++MykgmTj3CIyOQbKA/hDzOAiqI3mhuoN44WRCopIs1sgoDoU4oty4Jtqaj/y3oDU6fnVSm4QG0a3t5i0+g==", + "requires": { + "@floating-ui/utils": "^0.2.1" + } }, "@floating-ui/dom": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.2.1.tgz", - "integrity": "sha512-Rt45SmRiV8eU+xXSB9t0uMYiQ/ZWGE/jumse2o3i5RGlyvcbqOF4q+1qBnzLE2kZ5JGhq0iMkcGXUKbFe7MpTA==", + "version": "1.6.3", + "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.6.3.tgz", + "integrity": "sha512-RnDthu3mzPlQ31Ss/BTwQ1zjzIhr3lk1gZB1OC56h/1vEtaXkESrOqL5fQVMfXpwGtRwX+YsZBdyHtJMQnkArw==", + "requires": { + "@floating-ui/core": "^1.0.0", + "@floating-ui/utils": "^0.2.0" + } + }, + "@floating-ui/react": { + "version": "0.26.12", + "resolved": "https://registry.npmjs.org/@floating-ui/react/-/react-0.26.12.tgz", + "integrity": "sha512-D09o62HrWdIkstF2kGekIKAC0/N/Dl6wo3CQsnLcOmO3LkW6Ik8uIb3kw8JYkwxNCcg+uJ2bpWUiIijTBep05w==", + "requires": { + "@floating-ui/react-dom": "^2.0.0", + "@floating-ui/utils": "^0.2.0", + "tabbable": "^6.0.0" + } + }, + "@floating-ui/react-dom": { + "version": "2.0.8", + "resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-2.0.8.tgz", + "integrity": "sha512-HOdqOt3R3OGeTKidaLvJKcgg75S6tibQ3Tif4eyd91QnIJWr0NLvoXFpJA/j8HqkFSL68GDca9AuyWEHlhyClw==", "requires": { - "@floating-ui/core": "^1.2.1" + "@floating-ui/dom": "^1.6.1" } }, + "@floating-ui/utils": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.1.tgz", + "integrity": "sha512-9TANp6GPoMtYzQdt54kfAyMmz1+osLlXdg2ENroU7zzrtflTLrrC/lgrIfaSe+Wu0b89GKccT7vxXA0MoAIO+Q==" + }, "@humanwhocodes/config-array": { "version": "0.11.13", "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.13.tgz", @@ -9288,12 +9927,14 @@ "dev": true }, "@jridgewell/gen-mapping": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz", - "integrity": "sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==", + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz", + "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==", + "dev": true, "requires": { - "@jridgewell/set-array": "^1.0.0", - "@jridgewell/sourcemap-codec": "^1.4.10" + "@jridgewell/set-array": "^1.2.1", + "@jridgewell/sourcemap-codec": "^1.4.10", + "@jridgewell/trace-mapping": "^0.3.24" } }, "@jridgewell/resolve-uri": { @@ -9302,9 +9943,10 @@ "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==" }, "@jridgewell/set-array": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.0.tgz", - "integrity": "sha512-SfJxIxNVYLTsKwzB3MoOQ1yxf4w/E6MdkvTgrgAt1bfxjSrLUoHMKrDOykwN14q65waezZIdqDneUIPh4/sKxg==" + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz", + "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==", + "dev": true }, "@jridgewell/source-map": { "version": "0.3.5", @@ -9344,50 +9986,52 @@ } }, "@lezer/common": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@lezer/common/-/common-1.0.2.tgz", - "integrity": "sha512-SVgiGtMnMnW3ActR8SXgsDhw7a0w0ChHSYAyAUxxrOiJ1OqYWEKk/xJd84tTSPo1mo6DXLObAJALNnd0Hrv7Ng==" + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@lezer/common/-/common-1.2.1.tgz", + "integrity": "sha512-yemX0ZD2xS/73llMZIK6KplkjIjf2EvAHcinDi/TfJ9hS25G0388+ClHt6/3but0oOxinTcQHJLDXh6w1crzFQ==" }, "@lezer/css": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@lezer/css/-/css-1.1.1.tgz", - "integrity": "sha512-mSjx+unLLapEqdOYDejnGBokB5+AiJKZVclmud0MKQOKx3DLJ5b5VTCstgDDknR6iIV4gVrN6euzsCnj0A2gQA==", + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/@lezer/css/-/css-1.1.8.tgz", + "integrity": "sha512-7JhxupKuMBaWQKjQoLtzhGj83DdnZY9MckEOG5+/iLKNK2ZJqKc6hf6uc0HjwCX7Qlok44jBNqZhHKDhEhZYLA==", "requires": { + "@lezer/common": "^1.2.0", "@lezer/highlight": "^1.0.0", "@lezer/lr": "^1.0.0" } }, "@lezer/highlight": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/@lezer/highlight/-/highlight-1.1.3.tgz", - "integrity": "sha512-3vLKLPThO4td43lYRBygmMY18JN3CPh9w+XS2j8WC30vR4yZeFG4z1iFe4jXE43NtGqe//zHW5q8ENLlHvz9gw==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@lezer/highlight/-/highlight-1.2.0.tgz", + "integrity": "sha512-WrS5Mw51sGrpqjlh3d4/fOwpEV2Hd3YOkp9DBt4k8XZQcoTHZFB7sx030A6OcahF4J1nDQAa3jXlTVVYH50IFA==", "requires": { "@lezer/common": "^1.0.0" } }, "@lezer/html": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/@lezer/html/-/html-1.3.3.tgz", - "integrity": "sha512-04Fyvu66DjV2EjhDIG1kfDdktn5Pfw56SXPrzKNQH5B2m7BDfc6bDsz+ZJG8dLS3kIPEKbyyq1Sm2/kjeG0+AA==", + "version": "1.3.9", + "resolved": "https://registry.npmjs.org/@lezer/html/-/html-1.3.9.tgz", + "integrity": "sha512-MXxeCMPyrcemSLGaTQEZx0dBUH0i+RPl8RN5GwMAzo53nTsd/Unc/t5ZxACeQoyPUM5/GkPLRUs2WliOImzkRA==", "requires": { - "@lezer/common": "^1.0.0", + "@lezer/common": "^1.2.0", "@lezer/highlight": "^1.0.0", "@lezer/lr": "^1.0.0" } }, "@lezer/javascript": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/@lezer/javascript/-/javascript-1.4.1.tgz", - "integrity": "sha512-Hqx36DJeYhKtdpc7wBYPR0XF56ZzIp0IkMO/zNNj80xcaFOV4Oj/P7TQc/8k2TxNhzl7tV5tXS8ZOCPbT4L3nA==", + "version": "1.4.13", + "resolved": "https://registry.npmjs.org/@lezer/javascript/-/javascript-1.4.13.tgz", + "integrity": "sha512-5IBr8LIO3xJdJH1e9aj/ZNLE4LSbdsx25wFmGRAZsj2zSmwAYjx26JyU/BYOCpRQlu1jcv1z3vy4NB9+UkfRow==", "requires": { + "@lezer/common": "^1.2.0", "@lezer/highlight": "^1.1.3", "@lezer/lr": "^1.3.0" } }, "@lezer/lr": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/@lezer/lr/-/lr-1.3.3.tgz", - "integrity": "sha512-JPQe3mwJlzEVqy67iQiiGozhcngbO8QBgpqZM6oL1Wj/dXckrEexpBLeFkq0edtW5IqnPRFxA24BHJni8Js69w==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@lezer/lr/-/lr-1.4.0.tgz", + "integrity": "sha512-Wst46p51km8gH0ZUmeNrtpRYmdlRHUpN1DQd3GFAyKANi8WVz8c2jHYTf1CVScFaCjQw1iO3ZZdqGDxQPRErTg==", "requires": { "@lezer/common": "^1.0.0" } @@ -9441,9 +10085,9 @@ "integrity": "sha512-/RVXdLvJxLg4QKvMoM5WlwNR9ViO9z8B/qPcc+C0Sa/teJY7QG7kJ441DwzOjMYEY7GmU4dj5EcGHIkKZiQZCA==" }, "@types/eslint": { - "version": "8.4.2", - "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.2.tgz", - "integrity": "sha512-Z1nseZON+GEnFjJc04sv4NSALGjhFwy6K0HXt7qsn5ArfAKtb63dXNJHf+1YW6IpOIYRBGUbu3GwJdj8DGnCjA==", + "version": "8.56.6", + "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.56.6.tgz", + "integrity": "sha512-ymwc+qb1XkjT/gfoQwxIeHZ6ixH23A+tCT2ADSA/DPVKzAjwYkTXBMCQ/f6fe4wEa85Lhp26VPeUxI7wMhAi7A==", "dev": true, "requires": { "@types/estree": "*", @@ -9451,9 +10095,9 @@ } }, "@types/eslint-scope": { - "version": "3.7.3", - "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.3.tgz", - "integrity": "sha512-PB3ldyrcnAicT35TWPs5IcwKD8S333HMaa2VVv4+wdvebJkjWuW/xESoB8IwRcog8HYVYamb1g/R31Qv5Bx03g==", + "version": "3.7.7", + "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz", + "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==", "dev": true, "requires": { "@types/eslint": "*", @@ -9467,40 +10111,43 @@ "dev": true }, "@types/hoist-non-react-statics": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz", - "integrity": "sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA==", + "version": "3.3.5", + "resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.5.tgz", + "integrity": "sha512-SbcrWzkKBw2cdwRTwQAswfpB9g9LJWfjtUeW/jvNwbhC8cpmmNYVePa+ncbUe0rGTQ7G3Ff6mYUN2VMfLVr+Sg==", "requires": { "@types/react": "*", "hoist-non-react-statics": "^3.3.0" } }, "@types/json-schema": { - "version": "7.0.11", - "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz", - "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==", + "version": "7.0.15", + "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz", + "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==", "dev": true }, "@types/node": { - "version": "17.0.31", - "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.31.tgz", - "integrity": "sha512-AR0x5HbXGqkEx9CadRH3EBYx/VkiUgZIhP4wvPn/+5KIsgpNoyFaRlVe0Zlx9gRtg8fA06a9tskE2MSN7TcG4Q==", - "devOptional": true + "version": "20.11.30", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.30.tgz", + "integrity": "sha512-dHM6ZxwlmuZaRmUPfv1p+KrdD1Dci04FbdEm/9wEMouFqxYoFl5aMkt0VMAUtYRQDyYvD41WJLukhq/ha3YuTw==", + "devOptional": true, + "requires": { + "undici-types": "~5.26.4" + } }, "@types/parse-json": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz", - "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==" + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.2.tgz", + "integrity": "sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw==" }, "@types/prop-types": { - "version": "15.7.5", - "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz", - "integrity": "sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==" + "version": "15.7.11", + "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.11.tgz", + "integrity": "sha512-ga8y9v9uyeiLdpKddhxYQkxNDrfvuPrlFb0N1qnZZByvcElJaXthF1UhvCh9TLWJBEHeNtdnbysW7Y6Uq8CVng==" }, "@types/react": { - "version": "18.0.8", - "resolved": "https://registry.npmjs.org/@types/react/-/react-18.0.8.tgz", - "integrity": "sha512-+j2hk9BzCOrrOSJASi5XiOyBbERk9jG5O73Ya4M0env5Ixi6vUNli4qy994AINcEF+1IEHISYFfIT4zwr++LKw==", + "version": "18.2.67", + "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.67.tgz", + "integrity": "sha512-vkIE2vTIMHQ/xL0rgmuoECBCkZFZeHr49HeWSc24AptMbNRo7pwSBvj73rlJJs9fGKj0koS+V7kQB1jHS0uCgw==", "requires": { "@types/prop-types": "*", "@types/scheduler": "*", @@ -9508,9 +10155,9 @@ } }, "@types/react-redux": { - "version": "7.1.24", - "resolved": "https://registry.npmjs.org/@types/react-redux/-/react-redux-7.1.24.tgz", - "integrity": "sha512-7FkurKcS1k0FHZEtdbbgN8Oc6b+stGSfZYjQGicofJ0j4U0qIn/jaSvnP2pLwZKiai3/17xqqxkkrxTgN8UNbQ==", + "version": "7.1.33", + "resolved": "https://registry.npmjs.org/@types/react-redux/-/react-redux-7.1.33.tgz", + "integrity": "sha512-NF8m5AjWCkert+fosDsN3hAlHzpjSiXlVy9EgQEmLoBhaNXbmyeGs/aj5dQzKuF+/q+S7JQagorGDW8pJ28Hmg==", "requires": { "@types/hoist-non-react-statics": "^3.3.0", "@types/react": "*", @@ -9519,22 +10166,22 @@ } }, "@types/react-transition-group": { - "version": "4.4.4", - "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.4.tgz", - "integrity": "sha512-7gAPz7anVK5xzbeQW9wFBDg7G++aPLAFY0QaSMOou9rJZpbuI58WAuJrgu+qR92l61grlnCUe7AFX8KGahAgug==", + "version": "4.4.10", + "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.10.tgz", + "integrity": "sha512-hT/+s0VQs2ojCX823m60m5f0sL5idt9SO6Tj6Dg+rdphGPIeJbJ6CxvBYkgkGKrYeDjvIpKTR38UzmtHJOGW3Q==", "requires": { "@types/react": "*" } }, "@types/scheduler": { - "version": "0.16.2", - "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.2.tgz", - "integrity": "sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==" + "version": "0.16.8", + "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.8.tgz", + "integrity": "sha512-WZLiwShhwLRmeV6zH+GkbOFT6Z6VklCItrDioxUnv+u4Ll+8vKeFySoFyK/0ctcRpOmwAicELfmys1sDc/Rw+A==" }, "@uiw/codemirror-extensions-basic-setup": { - "version": "4.19.9", - "resolved": "https://registry.npmjs.org/@uiw/codemirror-extensions-basic-setup/-/codemirror-extensions-basic-setup-4.19.9.tgz", - "integrity": "sha512-O4yAgVpD3Pon4t4+lwZ2MTGg2TeU/Jv8YzKS9ap4fP/WMTVrKmpdq+DOafbhZSlhmU0XGfQPPJ4WX6rtZgx3Rw==", + "version": "4.21.24", + "resolved": "https://registry.npmjs.org/@uiw/codemirror-extensions-basic-setup/-/codemirror-extensions-basic-setup-4.21.24.tgz", + "integrity": "sha512-TJYKlPxNAVJNclW1EGumhC7I02jpdMgBon4jZvb5Aju9+tUzS44IwORxUx8BD8ZtH2UHmYS+04rE3kLk/BtnCQ==", "requires": { "@codemirror/autocomplete": "^6.0.0", "@codemirror/commands": "^6.0.0", @@ -9546,15 +10193,15 @@ } }, "@uiw/react-codemirror": { - "version": "4.19.9", - "resolved": "https://registry.npmjs.org/@uiw/react-codemirror/-/react-codemirror-4.19.9.tgz", - "integrity": "sha512-U+A1fSfELMFFs5a+ZOPwCJKZMYaMy6QHOfNOOV7WhSveM7GYHT970GjTfs2dn1LlvhebwyK9ei0rCXZdsI9n9Q==", + "version": "4.21.24", + "resolved": "https://registry.npmjs.org/@uiw/react-codemirror/-/react-codemirror-4.21.24.tgz", + "integrity": "sha512-8zs5OuxbhikHocHBsVBMuW1vqlv4ccZAkt4rFwr7ebLP2Q6RwHsjpsR9GeGyAigAqonKRoeHugqF78UMrkaTgg==", "requires": { "@babel/runtime": "^7.18.6", "@codemirror/commands": "^6.1.0", "@codemirror/state": "^6.1.1", "@codemirror/theme-one-dark": "^6.0.0", - "@uiw/codemirror-extensions-basic-setup": "4.19.9", + "@uiw/codemirror-extensions-basic-setup": "4.21.24", "codemirror": "^6.0.0" } }, @@ -9826,9 +10473,9 @@ } }, "anymatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz", - "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==", + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", + "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", "dev": true, "requires": { "normalize-path": "^3.0.0", @@ -9842,25 +10489,26 @@ "dev": true }, "array-buffer-byte-length": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz", - "integrity": "sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz", + "integrity": "sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==", "dev": true, "requires": { - "call-bind": "^1.0.2", - "is-array-buffer": "^3.0.1" + "call-bind": "^1.0.5", + "is-array-buffer": "^3.0.4" } }, "array-includes": { - "version": "3.1.6", - "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.6.tgz", - "integrity": "sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==", + "version": "3.1.8", + "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.8.tgz", + "integrity": "sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==", "dev": true, "requires": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4", - "get-intrinsic": "^1.1.3", + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.2", + "es-object-atoms": "^1.0.0", + "get-intrinsic": "^1.2.4", "is-string": "^1.0.7" } }, @@ -9871,22 +10519,46 @@ "dev": true, "requires": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", "es-shim-unscopables": "^1.0.0" } }, - "array.prototype.tosorted": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.1.tgz", - "integrity": "sha512-pZYPXPRl2PqWcsUs6LOMn+1f1532nEoPTYowBtqLwAW+W8vSVhkIGnmOX1t/UQjD6YGI0vcD2B1U7ZFGQH9jnQ==", + "array.prototype.flatmap": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz", + "integrity": "sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==", "dev": true, "requires": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4", - "es-shim-unscopables": "^1.0.0", - "get-intrinsic": "^1.1.3" + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "es-shim-unscopables": "^1.0.0" + } + }, + "array.prototype.toreversed": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/array.prototype.toreversed/-/array.prototype.toreversed-1.1.2.tgz", + "integrity": "sha512-wwDCoT4Ck4Cz7sLtgUmzR5UV3YF5mFHUlbChCzZBQZ+0m2cl/DH3tKgvphv1nKgFsJ48oCSg6p91q2Vm0I/ZMA==", + "dev": true, + "requires": { + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "es-shim-unscopables": "^1.0.0" + } + }, + "array.prototype.tosorted": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.3.tgz", + "integrity": "sha512-/DdH4TiTmOKzyQbp/eadcCVexiCb36xJg7HshYOYJnNZFDj33GEv0P7GxsynpShhq4OLYJzbGcBDkLsDt7MnNg==", + "dev": true, + "requires": { + "call-bind": "^1.0.5", + "define-properties": "^1.2.1", + "es-abstract": "^1.22.3", + "es-errors": "^1.1.0", + "es-shim-unscopables": "^1.0.2" } }, "arraybuffer.prototype.slice": { @@ -9982,9 +10654,9 @@ "dev": true }, "binary-extensions": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", - "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz", + "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==", "dev": true }, "bootstrap-sass": { @@ -10060,9 +10732,9 @@ } }, "chokidar": { - "version": "3.5.3", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", - "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==", + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", + "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==", "dev": true, "requires": { "anymatch": "~3.1.2", @@ -10082,9 +10754,9 @@ "dev": true }, "classnames": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.3.2.tgz", - "integrity": "sha512-CSbhY4cFEJRe6/GQzIk5qXZ4Jeg5pcsP7b5peFSDpffpe1cqjASH/n9UTjBwOp6XpMSTwQ8Za2K5V02ueA7Tmw==" + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.5.1.tgz", + "integrity": "sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow==" }, "clone-deep": { "version": "4.0.1", @@ -10097,6 +10769,11 @@ "shallow-clone": "^3.0.0" } }, + "clsx": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.0.tgz", + "integrity": "sha512-m3iNNWpd9rl3jvvcBnu70ylMdrXt8Vlq4HYadnU5fwcOtvkSQWPmj7amUcDT2qYI7risszBjI5AUIUox9D16pg==" + }, "codemirror": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-6.0.1.tgz", @@ -10125,9 +10802,9 @@ "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==" }, "colorette": { - "version": "2.0.16", - "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.16.tgz", - "integrity": "sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==", + "version": "2.0.20", + "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz", + "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==", "dev": true }, "commander": { @@ -10145,16 +10822,14 @@ "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", "dev": true }, "convert-source-map": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz", - "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==", - "requires": { - "safe-buffer": "~5.1.1" - } + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", + "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", + "dev": true }, "copy-webpack-plugin": { "version": "11.0.0", @@ -10208,9 +10883,9 @@ } }, "crelt": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/crelt/-/crelt-1.0.5.tgz", - "integrity": "sha512-+BO9wPPi+DWTDcNYhr/W90myha8ptzftZT+LwcmUbbok0rcP/fequmFYCw8NMoH7pkAZQzU78b3kYrlua5a9eA==" + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/crelt/-/crelt-1.0.6.tgz", + "integrity": "sha512-VQ2MBenTq1fWZUH9DJNGti7kKv6EeAuYr3cLwxUWhIu1baTaXh4Ib5W2CqHVqib4/MqbYGJqiL3Zb8GJZr3l4g==" }, "cross-spawn": { "version": "7.0.3", @@ -10241,10 +10916,19 @@ "semver": "^7.3.5" }, "dependencies": { + "lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dev": true, + "requires": { + "yallist": "^4.0.0" + } + }, "schema-utils": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz", - "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz", + "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==", "dev": true, "requires": { "@types/json-schema": "^7.0.8", @@ -10253,13 +10937,19 @@ } }, "semver": { - "version": "7.5.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", - "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", + "version": "7.6.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz", + "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==", "dev": true, "requires": { "lru-cache": "^6.0.0" } + }, + "yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true } } }, @@ -10270,14 +10960,53 @@ "dev": true }, "csstype": { - "version": "3.0.11", - "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.11.tgz", - "integrity": "sha512-sa6P2wJ+CAbgyy4KFssIb/JNMLxFvKF1pCYCSXS8ZMuqZnMsrxqI2E5sPyoTpxoPU/gVZMzr2zjOfg8GIZOMsw==" + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz", + "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==" + }, + "data-view-buffer": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.1.tgz", + "integrity": "sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA==", + "dev": true, + "requires": { + "call-bind": "^1.0.6", + "es-errors": "^1.3.0", + "is-data-view": "^1.0.1" + } + }, + "data-view-byte-length": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.1.tgz", + "integrity": "sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ==", + "dev": true, + "requires": { + "call-bind": "^1.0.7", + "es-errors": "^1.3.0", + "is-data-view": "^1.0.1" + } + }, + "data-view-byte-offset": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.0.tgz", + "integrity": "sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==", + "dev": true, + "requires": { + "call-bind": "^1.0.6", + "es-errors": "^1.3.0", + "is-data-view": "^1.0.1" + } + }, + "date-fns": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-3.6.0.tgz", + "integrity": "sha512-fRHTG8g/Gif+kSh50gaGEdToemgfj74aRX3swtiouboip5JDLAyDE9F11nHMIcvOaXeOC6D7SpNhi7uFyB7Uww==" }, "debug": { "version": "4.3.4", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "dev": true, "requires": { "ms": "2.1.2" } @@ -10410,9 +11139,10 @@ "internal-slot": "^1.0.5", "is-array-buffer": "^3.0.2", "is-callable": "^1.2.7", - "is-negative-zero": "^2.0.2", + "is-data-view": "^1.0.1", + "is-negative-zero": "^2.0.3", "is-regex": "^1.1.4", - "is-shared-array-buffer": "^1.0.2", + "is-shared-array-buffer": "^1.0.3", "is-string": "^1.0.7", "is-typed-array": "^1.1.12", "is-weakref": "^1.0.2", @@ -10461,24 +11191,33 @@ "integrity": "sha512-cXLGjP0c4T3flZJKQSuziYoq7MlT+rnvfZjfp7h+I7K9BNX54kP9nyWvdbwjQ4u1iWbOL4u96fgeZLToQlZC7w==", "dev": true }, + "es-object-atoms": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.0.0.tgz", + "integrity": "sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==", + "dev": true, + "requires": { + "es-errors": "^1.3.0" + } + }, "es-set-tostringtag": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz", - "integrity": "sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.3.tgz", + "integrity": "sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==", "dev": true, "requires": { - "get-intrinsic": "^1.1.3", - "has": "^1.0.3", - "has-tostringtag": "^1.0.0" + "get-intrinsic": "^1.2.4", + "has-tostringtag": "^1.0.2", + "hasown": "^2.0.1" } }, "es-shim-unscopables": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz", - "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz", + "integrity": "sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==", "dev": true, "requires": { - "has": "^1.0.3" + "hasown": "^2.0.0" } }, "es-to-primitive": { @@ -10493,9 +11232,10 @@ } }, "escalade": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", - "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==" + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz", + "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==", + "dev": true }, "escape-string-regexp": { "version": "1.0.5", @@ -10624,9 +11364,9 @@ } }, "globals": { - "version": "13.20.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz", - "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==", + "version": "13.24.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz", + "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==", "dev": true, "requires": { "type-fest": "^0.20.2" @@ -10638,33 +11378,6 @@ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true }, - "locate-path": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", - "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", - "dev": true, - "requires": { - "p-locate": "^5.0.0" - } - }, - "p-limit": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", - "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", - "dev": true, - "requires": { - "yocto-queue": "^0.1.0" - } - }, - "p-locate": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", - "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", - "dev": true, - "requires": { - "p-limit": "^3.0.2" - } - }, "supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", @@ -10682,18 +11395,20 @@ "integrity": "sha512-73QQMKALArI8/7xGLNI/3LylrEYrlKZSb5C9+q3OtOewTnMQi5cT+aE9E41sLCmli3I9PGGmD1yiZydyo4FEPw==", "dev": true, "requires": { - "array-includes": "^3.1.6", - "array.prototype.flatmap": "^1.3.1", - "array.prototype.tosorted": "^1.1.1", + "array-includes": "^3.1.7", + "array.prototype.findlast": "^1.2.4", + "array.prototype.flatmap": "^1.3.2", + "array.prototype.toreversed": "^1.1.2", + "array.prototype.tosorted": "^1.1.3", "doctrine": "^2.1.0", "es-iterator-helpers": "^1.0.12", "estraverse": "^5.3.0", "jsx-ast-utils": "^2.4.1 || ^3.0.0", "minimatch": "^3.1.2", - "object.entries": "^1.1.6", - "object.fromentries": "^2.0.6", - "object.hasown": "^1.1.2", - "object.values": "^1.1.6", + "object.entries": "^1.1.7", + "object.fromentries": "^2.0.7", + "object.hasown": "^1.1.3", + "object.values": "^1.1.7", "prop-types": "^15.8.1", "resolve": "^2.0.0-next.4", "semver": "^6.3.1", @@ -10709,19 +11424,13 @@ "esutils": "^2.0.2" } }, - "estraverse": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", - "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", - "dev": true - }, "resolve": { - "version": "2.0.0-next.4", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.4.tgz", - "integrity": "sha512-iMDbmAWtfU+MHpxt/I5iWI7cY6YVEZUQ3MBgPQ++XD1PELuJHIl82xBmObyP2KyQmkNB2dsqF7seoQQiAn5yDQ==", + "version": "2.0.0-next.5", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.5.tgz", + "integrity": "sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==", "dev": true, "requires": { - "is-core-module": "^2.9.0", + "is-core-module": "^2.13.0", "path-parse": "^1.0.7", "supports-preserve-symlinks-flag": "^1.0.0" } @@ -10729,13 +11438,13 @@ } }, "eslint-scope": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", - "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", + "version": "7.2.2", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", + "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", "dev": true, "requires": { "esrecurse": "^4.3.0", - "estraverse": "^4.1.1" + "estraverse": "^5.2.0" } }, "eslint-visitor-keys": { @@ -10762,14 +11471,6 @@ "dev": true, "requires": { "estraverse": "^5.1.0" - }, - "dependencies": { - "estraverse": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", - "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", - "dev": true - } } }, "esrecurse": { @@ -10779,20 +11480,12 @@ "dev": true, "requires": { "estraverse": "^5.2.0" - }, - "dependencies": { - "estraverse": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", - "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", - "dev": true - } } }, "estraverse": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", - "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", "dev": true }, "esutils": { @@ -10838,15 +11531,15 @@ "dev": true }, "fastest-levenshtein": { - "version": "1.0.12", - "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz", - "integrity": "sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow==", + "version": "1.0.16", + "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz", + "integrity": "sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==", "dev": true }, "fastq": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz", - "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==", + "version": "1.17.1", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz", + "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==", "dev": true, "requires": { "reusify": "^1.0.4" @@ -10872,9 +11565,9 @@ }, "dependencies": { "schema-utils": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz", - "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz", + "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==", "dev": true, "requires": { "@types/json-schema": "^7.0.8", @@ -10884,6 +11577,14 @@ } } }, + "file-selector": { + "version": "0.1.19", + "resolved": "https://registry.npmjs.org/file-selector/-/file-selector-0.1.19.tgz", + "integrity": "sha512-kCWw3+Aai8Uox+5tHCNgMFaUdgidxvMnLWO6fM5sZ0hA2wlHP5/DHGF0ECe84BiB95qdJbKNEJhWKVDvMN+JDQ==", + "requires": { + "tslib": "^2.0.1" + } + }, "fill-range": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", @@ -10969,12 +11670,12 @@ "integrity": "sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==" }, "find-up": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", + "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", "dev": true, "requires": { - "locate-path": "^5.0.0", + "locate-path": "^6.0.0", "path-exists": "^4.0.0" } }, @@ -10985,19 +11686,20 @@ "dev": true }, "flat-cache": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz", - "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz", + "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==", "dev": true, "requires": { - "flatted": "^3.1.0", + "flatted": "^3.2.9", + "keyv": "^4.5.3", "rimraf": "^3.0.2" } }, "flatted": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz", - "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz", + "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==", "dev": true }, "font-awesome": { @@ -11023,13 +11725,13 @@ "fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", "dev": true }, "fsevents": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", - "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", "dev": true, "optional": true }, @@ -11079,20 +11781,34 @@ "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==", "dev": true, "requires": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.1.1" + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "has-proto": "^1.0.1", + "has-symbols": "^1.0.3", + "hasown": "^2.0.0" + } + }, + "get-symbol-description": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.2.tgz", + "integrity": "sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==", + "dev": true, + "requires": { + "call-bind": "^1.0.5", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.4" } }, "glob": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz", - "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==", + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", "dev": true, "requires": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", "inherits": "2", - "minimatch": "^3.0.4", + "minimatch": "^3.1.1", "once": "^1.3.0", "path-is-absolute": "^1.0.0" } @@ -11115,7 +11831,8 @@ "globals": { "version": "11.12.0", "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", - "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==" + "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", + "dev": true }, "globalthis": { "version": "1.0.3", @@ -11168,14 +11885,6 @@ "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", "dev": true }, - "has": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", - "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", - "requires": { - "function-bind": "^1.1.1" - } - }, "has-bigints": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz", @@ -11188,18 +11897,18 @@ "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==" }, "has-property-descriptors": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz", - "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", + "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", "dev": true, "requires": { - "get-intrinsic": "^1.1.1" + "es-define-property": "^1.0.0" } }, "has-proto": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz", - "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz", + "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==", "dev": true }, "has-symbols": { @@ -11209,12 +11918,20 @@ "dev": true }, "has-tostringtag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz", - "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz", + "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==", "dev": true, "requires": { - "has-symbols": "^1.0.2" + "has-symbols": "^1.0.3" + } + }, + "hasown": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", + "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", + "requires": { + "function-bind": "^1.1.2" } }, "hasown": { @@ -11248,9 +11965,9 @@ "dev": true }, "immutable": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.1.0.tgz", - "integrity": "sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==", + "version": "4.3.5", + "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.5.tgz", + "integrity": "sha512-8eabxkth9gZatlwl5TBuJnCsoTADlL6ftEr7A4qgdaTsPyreilDSnUk57SO+jfKcNtxPa22U5KK6DSeAYhpBJw==", "dev": true }, "import-fresh": { @@ -11260,13 +11977,6 @@ "requires": { "parent-module": "^1.0.0", "resolve-from": "^4.0.0" - }, - "dependencies": { - "resolve-from": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", - "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==" - } } }, "import-local": { @@ -11277,6 +11987,54 @@ "requires": { "pkg-dir": "^4.2.0", "resolve-cwd": "^3.0.0" + }, + "dependencies": { + "find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "dev": true, + "requires": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + } + }, + "locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "dev": true, + "requires": { + "p-locate": "^4.1.0" + } + }, + "p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "dev": true, + "requires": { + "p-try": "^2.0.0" + } + }, + "p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "dev": true, + "requires": { + "p-limit": "^2.2.0" + } + }, + "pkg-dir": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", + "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", + "dev": true, + "requires": { + "find-up": "^4.0.0" + } + } } }, "imurmurhash": { @@ -11288,7 +12046,7 @@ "inflight": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", "dev": true, "requires": { "once": "^1.3.0", @@ -11302,13 +12060,13 @@ "dev": true }, "internal-slot": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.5.tgz", - "integrity": "sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.7.tgz", + "integrity": "sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==", "dev": true, "requires": { - "get-intrinsic": "^1.2.0", - "has": "^1.0.3", + "es-errors": "^1.3.0", + "hasown": "^2.0.0", "side-channel": "^1.0.4" } }, @@ -11327,14 +12085,13 @@ } }, "is-array-buffer": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz", - "integrity": "sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==", + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.4.tgz", + "integrity": "sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==", "dev": true, "requires": { "call-bind": "^1.0.2", - "get-intrinsic": "^1.2.0", - "is-typed-array": "^1.1.10" + "get-intrinsic": "^1.2.1" } }, "is-arrayish": { @@ -11386,11 +12143,20 @@ "dev": true }, "is-core-module": { - "version": "2.9.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz", - "integrity": "sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==", + "version": "2.13.1", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz", + "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==", + "requires": { + "hasown": "^2.0.0" + } + }, + "is-data-view": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.1.tgz", + "integrity": "sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==", + "dev": true, "requires": { - "has": "^1.0.3" + "is-typed-array": "^1.1.13" } }, "is-date-object": { @@ -11405,7 +12171,7 @@ "is-extglob": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", + "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", "dev": true }, "is-finalizationregistry": { @@ -11442,9 +12208,9 @@ "dev": true }, "is-negative-zero": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz", - "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.3.tgz", + "integrity": "sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==", "dev": true }, "is-number": { @@ -11494,12 +12260,12 @@ "dev": true }, "is-shared-array-buffer": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz", - "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.3.tgz", + "integrity": "sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==", "dev": true, "requires": { - "call-bind": "^1.0.2" + "call-bind": "^1.0.7" } }, "is-string": { @@ -11563,13 +12329,13 @@ "isexe": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", "dev": true }, "isobject": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==", "dev": true }, "iterator.prototype": { @@ -11614,9 +12380,9 @@ } }, "jquery": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", - "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==" + "version": "3.7.1", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz", + "integrity": "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==" }, "js-cookie": { "version": "2.2.1", @@ -11640,7 +12406,8 @@ "jsesc": { "version": "2.5.2", "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", - "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==" + "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", + "dev": true }, "json-parse-even-better-errors": { "version": "2.3.1", @@ -11662,16 +12429,19 @@ "json5": { "version": "2.2.3", "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", - "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==" + "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", + "dev": true }, "jsx-ast-utils": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.3.tgz", - "integrity": "sha512-fYQHZTZ8jSfmWZ0iyzfwiU4WDX4HpHbMCZ3gPlWYiCl3BoeOTsqKBqnTVfH2rYT7eP5c3sVbeSPHnnJOaTrWiw==", + "version": "3.3.5", + "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz", + "integrity": "sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==", "dev": true, "requires": { - "array-includes": "^3.1.5", - "object.assign": "^4.1.3" + "array-includes": "^3.1.6", + "array.prototype.flat": "^1.3.1", + "object.assign": "^4.1.4", + "object.values": "^1.1.6" } }, "keycode": { @@ -11679,6 +12449,15 @@ "resolved": "https://registry.npmjs.org/keycode/-/keycode-2.2.1.tgz", "integrity": "sha512-Rdgz9Hl9Iv4QKi8b0OlCRQEzp4AgVxyCtz5S/+VIHezDmrDhkp2N2TqBWOLz0/gbeREXOOiI9/4b8BY9uw2vFg==" }, + "keyv": { + "version": "4.5.4", + "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", + "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", + "dev": true, + "requires": { + "json-buffer": "3.0.1" + } + }, "kind-of": { "version": "6.0.3", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", @@ -11686,9 +12465,9 @@ "dev": true }, "klona": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.5.tgz", - "integrity": "sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ==", + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.6.tgz", + "integrity": "sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==", "dev": true }, "levn": { @@ -11724,12 +12503,12 @@ } }, "locate-path": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", + "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", "dev": true, "requires": { - "p-locate": "^4.1.0" + "p-locate": "^5.0.0" } }, "lodash": { @@ -11758,12 +12537,12 @@ } }, "lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", + "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", "dev": true, "requires": { - "yallist": "^4.0.0" + "yallist": "^3.0.2" } }, "make-dir": { @@ -11838,25 +12617,15 @@ }, "dependencies": { "schema-utils": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz", - "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz", + "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==", "dev": true, "requires": { "@types/json-schema": "^7.0.8", "ajv": "^6.12.5", "ajv-keywords": "^3.5.2" } - }, - "webpack-sources": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz", - "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==", - "dev": true, - "requires": { - "source-list-map": "^2.0.0", - "source-map": "~0.6.1" - } } } }, @@ -11872,12 +12641,13 @@ "ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true }, "nanoid": { - "version": "3.3.4", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz", - "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==", + "version": "3.3.7", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz", + "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==", "dev": true }, "natural-compare": { @@ -11906,7 +12676,7 @@ "object-assign": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" + "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==" }, "object-inspect": { "version": "1.13.1", @@ -11921,64 +12691,65 @@ "dev": true }, "object.assign": { - "version": "4.1.4", - "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz", - "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==", + "version": "4.1.5", + "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.5.tgz", + "integrity": "sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==", "dev": true, "requires": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", + "call-bind": "^1.0.5", + "define-properties": "^1.2.1", "has-symbols": "^1.0.3", "object-keys": "^1.1.1" } }, "object.entries": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.6.tgz", - "integrity": "sha512-leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w==", + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.8.tgz", + "integrity": "sha512-cmopxi8VwRIAw/fkijJohSfpef5PdN0pMQJN6VC/ZKvn0LIknWD8KtgY6KlQdEc4tIjcQ3HxSMmnvtzIscdaYQ==", "dev": true, "requires": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-object-atoms": "^1.0.0" } }, "object.fromentries": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.6.tgz", - "integrity": "sha512-VciD13dswC4j1Xt5394WR4MzmAQmlgN72phd/riNp9vtD7tp4QQWJ0R4wvclXcafgcYK8veHRed2W6XeGBvcfg==", + "version": "2.0.8", + "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.8.tgz", + "integrity": "sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==", "dev": true, "requires": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.2", + "es-object-atoms": "^1.0.0" } }, "object.hasown": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.2.tgz", - "integrity": "sha512-B5UIT3J1W+WuWIU55h0mjlwaqxiE5vYENJXIXZ4VFe05pNYrkKuK0U/6aFcb0pKywYJh7IhfoqUfKVmrJJHZHw==", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.3.tgz", + "integrity": "sha512-fFI4VcYpRHvSLXxP7yiZOMAd331cPfd2p7PFDVbgUsYOfCT3tICVqXWngbjr4m49OvsBwUBQ6O2uQoJvy3RexA==", "dev": true, "requires": { - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" } }, "object.values": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz", - "integrity": "sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.2.0.tgz", + "integrity": "sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ==", "dev": true, "requires": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-object-atoms": "^1.0.0" } }, "once": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", "dev": true, "requires": { "wrappy": "1" @@ -11999,21 +12770,21 @@ } }, "p-limit": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", "dev": true, "requires": { - "p-try": "^2.0.0" + "yocto-queue": "^0.1.0" } }, "p-locate": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", + "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", "dev": true, "requires": { - "p-limit": "^2.2.0" + "p-limit": "^3.0.2" } }, "p-try": { @@ -12050,7 +12821,7 @@ "path-is-absolute": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", + "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", "dev": true }, "path-key": { @@ -12087,12 +12858,63 @@ "dev": true }, "pkg-dir": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", - "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-7.0.0.tgz", + "integrity": "sha512-Ie9z/WINcxxLp27BKOCHGde4ITq9UklYKDzVo1nhk5sqGEXU3FpkwP5GM2voTGJkGd9B3Otl+Q4uwSOeSUtOBA==", "dev": true, "requires": { - "find-up": "^4.0.0" + "find-up": "^6.3.0" + }, + "dependencies": { + "find-up": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-6.3.0.tgz", + "integrity": "sha512-v2ZsoEuVHYy8ZIlYqwPe/39Cy+cFDzp4dXPaxNvkEuouymu+2Jbz0PxpKarJHYJTmv2HWT3O382qY8l4jMWthw==", + "dev": true, + "requires": { + "locate-path": "^7.1.0", + "path-exists": "^5.0.0" + } + }, + "locate-path": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-7.2.0.tgz", + "integrity": "sha512-gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA==", + "dev": true, + "requires": { + "p-locate": "^6.0.0" + } + }, + "p-limit": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-4.0.0.tgz", + "integrity": "sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==", + "dev": true, + "requires": { + "yocto-queue": "^1.0.0" + } + }, + "p-locate": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-6.0.0.tgz", + "integrity": "sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw==", + "dev": true, + "requires": { + "p-limit": "^4.0.0" + } + }, + "path-exists": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-5.0.0.tgz", + "integrity": "sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ==", + "dev": true + }, + "yocto-queue": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.0.0.tgz", + "integrity": "sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==", + "dev": true + } } }, "popper.js": { @@ -12100,15 +12922,21 @@ "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz", "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==" }, + "possible-typed-array-names": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz", + "integrity": "sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==", + "dev": true + }, "postcss": { - "version": "8.4.18", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.18.tgz", - "integrity": "sha512-Wi8mWhncLJm11GATDaQKobXSNEYGUHeQLiQqDFG1qQ5UTDPTEvKw0Xt5NsTpktGTwLps3ByrWsBrG0rB8YQ9oA==", + "version": "8.4.38", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.38.tgz", + "integrity": "sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==", "dev": true, "requires": { - "nanoid": "^3.3.4", + "nanoid": "^3.3.7", "picocolors": "^1.0.0", - "source-map-js": "^1.0.2" + "source-map-js": "^1.2.0" } }, "postcss-modules-extract-imports": { @@ -12119,9 +12947,9 @@ "requires": {} }, "postcss-modules-local-by-default": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz", - "integrity": "sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.4.tgz", + "integrity": "sha512-L4QzMnOdVwRm1Qb8m4x8jsZzKAaPAgrUF1r/hjDR2Xj7R+8Zsf97jAlSQzWtKx5YNiNGN8QxmPFIc/sh+RQl+Q==", "dev": true, "requires": { "icss-utils": "^5.0.0", @@ -12130,9 +12958,9 @@ } }, "postcss-modules-scope": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz", - "integrity": "sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.1.1.tgz", + "integrity": "sha512-uZgqzdTleelWjzJY+Fhti6F3C9iF1JR/dODLs/JDefozYcKTBCdD8BIl6nNPbTbcLnGrk56hzwZC2DaGNvYjzA==", "dev": true, "requires": { "postcss-selector-parser": "^6.0.4" @@ -12148,9 +12976,9 @@ } }, "postcss-selector-parser": { - "version": "6.0.10", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz", - "integrity": "sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==", + "version": "6.0.16", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.16.tgz", + "integrity": "sha512-A0RVJrX+IUkVZbW3ClroRWurercFhieevHB38sr2+l9eUClMqome3LmEmnhlNy+5Mr2EYN6B2Kaw9wYdd+VHiw==", "dev": true, "requires": { "cssesc": "^3.0.0", @@ -12186,12 +13014,22 @@ "requires": { "react-is": "^16.3.2", "warning": "^4.0.0" + }, + "dependencies": { + "warning": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz", + "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==", + "requires": { + "loose-envify": "^1.0.0" + } + } } }, "punycode": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", - "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", + "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", "dev": true }, "queue-microtask": { @@ -12234,16 +13072,18 @@ "react-transition-group": "^2.0.0", "uncontrollable": "^7.0.2", "warning": "^3.0.0" - }, - "dependencies": { - "warning": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/warning/-/warning-3.0.0.tgz", - "integrity": "sha512-jMBt6pUrKn5I+OGgtQ4YZLdhIeJmObddh6CsibPxyQ5yPZm1XExSyzC1LCNX7BzhxWgiHmizBWJTHJIjMjTQYQ==", - "requires": { - "loose-envify": "^1.0.0" - } - } + } + }, + "react-datepicker": { + "version": "6.6.0", + "resolved": "https://registry.npmjs.org/react-datepicker/-/react-datepicker-6.6.0.tgz", + "integrity": "sha512-ERC0/Q4pPC9bNIcGUpdCbHc+oCxhkU3WI3UOGHkyJ3A9fqALCYpEmLc5S5xvAd7DuCDdbsyW97oRPM6pWWwjww==", + "requires": { + "@floating-ui/react": "^0.26.2", + "clsx": "^2.1.0", + "date-fns": "^3.3.1", + "prop-types": "^15.7.2", + "react-onclickoutside": "^6.13.0" } }, "react-dnd": { @@ -12275,6 +13115,16 @@ "scheduler": "^0.23.0" } }, + "react-dropzone": { + "version": "10.2.2", + "resolved": "https://registry.npmjs.org/react-dropzone/-/react-dropzone-10.2.2.tgz", + "integrity": "sha512-U5EKckXVt6IrEyhMMsgmHQiWTGLudhajPPG77KFSvgsMqNEHSyGpqWvOMc5+DhEah/vH4E1n+J5weBNLd5VtyA==", + "requires": { + "attr-accept": "^2.0.0", + "file-selector": "^0.1.12", + "prop-types": "^15.7.2" + } + }, "react-is": { "version": "16.13.1", "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", @@ -12285,6 +13135,12 @@ "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz", "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==" }, + "react-onclickoutside": { + "version": "6.13.0", + "resolved": "https://registry.npmjs.org/react-onclickoutside/-/react-onclickoutside-6.13.0.tgz", + "integrity": "sha512-ty8So6tcUpIb+ZE+1HAhbLROvAIJYyJe/1vRrrcmW+jLsaM+/powDRqxzo6hSh9CuRZGSL1Q8mvcF5WRD93a0A==", + "requires": {} + }, "react-overlays": { "version": "0.9.3", "resolved": "https://registry.npmjs.org/react-overlays/-/react-overlays-0.9.3.tgz", @@ -12296,16 +13152,6 @@ "prop-types-extra": "^1.0.1", "react-transition-group": "^2.2.1", "warning": "^3.0.0" - }, - "dependencies": { - "warning": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/warning/-/warning-3.0.0.tgz", - "integrity": "sha512-jMBt6pUrKn5I+OGgtQ4YZLdhIeJmObddh6CsibPxyQ5yPZm1XExSyzC1LCNX7BzhxWgiHmizBWJTHJIjMjTQYQ==", - "requires": { - "loose-envify": "^1.0.0" - } - } } }, "react-prop-types": { @@ -12314,22 +13160,12 @@ "integrity": "sha512-IyjsJhDX9JkoOV9wlmLaS7z+oxYoIWhfzDcFy7inwoAKTu+VcVNrVpPmLeioJ94y6GeDRsnwarG1py5qofFQMg==", "requires": { "warning": "^3.0.0" - }, - "dependencies": { - "warning": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/warning/-/warning-3.0.0.tgz", - "integrity": "sha512-jMBt6pUrKn5I+OGgtQ4YZLdhIeJmObddh6CsibPxyQ5yPZm1XExSyzC1LCNX7BzhxWgiHmizBWJTHJIjMjTQYQ==", - "requires": { - "loose-envify": "^1.0.0" - } - } } }, "react-redux": { - "version": "7.2.8", - "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-7.2.8.tgz", - "integrity": "sha512-6+uDjhs3PSIclqoCk0kd6iX74gzrGc3W5zcAjbrFgEdIjRSQObdIwfx80unTkVUYvbQ95Y8Av3OvFHq1w5EOUw==", + "version": "7.2.9", + "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-7.2.9.tgz", + "integrity": "sha512-Gx4L3uM182jEEayZfRbI/G11ZpYdNAnBs70lFVMNdHJI76XYtR+7m0MN+eAs7UHBPhWXcnFPaS+9owSCJQHNpQ==", "requires": { "@babel/runtime": "^7.15.4", "@types/react-redux": "^7.1.20", @@ -12347,9 +13183,9 @@ } }, "react-select": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/react-select/-/react-select-5.7.0.tgz", - "integrity": "sha512-lJGiMxCa3cqnUr2Jjtg9YHsaytiZqeNOKeibv6WF5zbK/fPegZ1hg3y/9P1RZVLhqBTs0PfqQLKuAACednYGhQ==", + "version": "5.8.0", + "resolved": "https://registry.npmjs.org/react-select/-/react-select-5.8.0.tgz", + "integrity": "sha512-TfjLDo58XrhP6VG5M/Mi56Us0Yt8X7xD6cDybC7yoRMUNm7BGO7qk8J0TLQOua/prb8vUOtsfnXZwfm30HGsAA==", "requires": { "@babel/runtime": "^7.12.0", "@emotion/cache": "^11.4.0", @@ -12414,9 +13250,9 @@ } }, "redux": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/redux/-/redux-4.2.0.tgz", - "integrity": "sha512-oSBmcKKIuIR4ME29/AeNUnl5L+hvBq7OaJWzaptTQJAntaPvxIJqfnjbaEiCzzaIz+XmVILfqAM3Ob0aXLPfjA==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/redux/-/redux-4.2.1.tgz", + "integrity": "sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w==", "requires": { "@babel/runtime": "^7.9.2" } @@ -12465,9 +13301,9 @@ } }, "regenerator-runtime": { - "version": "0.13.11", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz", - "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==" + "version": "0.14.1", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz", + "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==" }, "regenerator-transform": { "version": "0.15.2", @@ -12527,11 +13363,11 @@ "dev": true }, "resolve": { - "version": "1.22.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz", - "integrity": "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==", + "version": "1.22.8", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz", + "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==", "requires": { - "is-core-module": "^2.8.1", + "is-core-module": "^2.13.0", "path-parse": "^1.0.7", "supports-preserve-symlinks-flag": "^1.0.0" } @@ -12543,13 +13379,20 @@ "dev": true, "requires": { "resolve-from": "^5.0.0" + }, + "dependencies": { + "resolve-from": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", + "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", + "dev": true + } } }, "resolve-from": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", - "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", - "dev": true + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==" }, "reusify": { "version": "1.0.4", @@ -12598,15 +13441,33 @@ "integrity": "sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==", "dev": true, "requires": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.1.3", + "call-bind": "^1.0.7", + "get-intrinsic": "^1.2.4", + "has-symbols": "^1.0.3", + "isarray": "^2.0.5" + } + }, + "safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "dev": true + }, + "safe-regex-test": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.3.tgz", + "integrity": "sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==", + "dev": true, + "requires": { + "call-bind": "^1.0.6", + "es-errors": "^1.3.0", "is-regex": "^1.1.4" } }, "sass": { - "version": "1.55.0", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.55.0.tgz", - "integrity": "sha512-Pk+PMy7OGLs9WaxZGJMn7S96dvlyVBwwtToX895WmCpAOr5YiJYEUJfiJidMuKb613z2xNWcXCHEuOvjZbqC6A==", + "version": "1.72.0", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.72.0.tgz", + "integrity": "sha512-Gpczt3WA56Ly0Mn8Sl21Vj94s1axi9hDIzDFn9Ph9x3C3p4nNyvsqJoQyVXKou6cBlfFWEgRW4rT8Tb4i3XnVA==", "dev": true, "requires": { "chokidar": ">=3.0.0 <4.0.0", @@ -12676,7 +13537,8 @@ "semver": { "version": "6.3.1", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==" + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "dev": true }, "serialize-javascript": { "version": "6.0.1", @@ -12735,14 +13597,15 @@ "dev": true }, "side-channel": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", - "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz", + "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==", "dev": true, "requires": { - "call-bind": "^1.0.0", - "get-intrinsic": "^1.0.2", - "object-inspect": "^1.9.0" + "call-bind": "^1.0.7", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.4", + "object-inspect": "^1.13.1" } }, "slash": { @@ -12758,15 +13621,14 @@ "dev": true }, "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==" }, "source-map-js": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz", - "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz", + "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==", "dev": true }, "source-map-support": { @@ -12777,22 +13639,34 @@ "requires": { "buffer-from": "^1.0.0", "source-map": "^0.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } } }, "string.prototype.matchall": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.8.tgz", - "integrity": "sha512-6zOCOcJ+RJAQshcTvXPHoxoQGONa3e/Lqx90wUA+wEzX78sg5Bo+1tQo4N0pohS0erG9qtCqJDjNCQBjeWVxyg==", + "version": "4.0.11", + "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.11.tgz", + "integrity": "sha512-NUdh0aDavY2og7IbBPenWqR9exH+E26Sv8e0/eTe1tltDGZL+GtBkDAnnyBtmekfK6/Dq3MkcGtzXFEd1LQrtg==", "dev": true, "requires": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4", - "get-intrinsic": "^1.1.3", + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.2", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.0.0", + "get-intrinsic": "^1.2.4", + "gopd": "^1.0.1", "has-symbols": "^1.0.3", - "internal-slot": "^1.0.3", - "regexp.prototype.flags": "^1.4.3", - "side-channel": "^1.0.4" + "internal-slot": "^1.0.7", + "regexp.prototype.flags": "^1.5.2", + "set-function-name": "^2.0.2", + "side-channel": "^1.0.6" } }, "string.prototype.trim": { @@ -12844,14 +13718,14 @@ "dev": true }, "style-mod": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/style-mod/-/style-mod-4.0.0.tgz", - "integrity": "sha512-OPhtyEjyyN9x3nhPsu76f52yUGXiZcgvsrFVtvTkyGRQJ0XK+GPc6ov1z+lRpbeabka+MYEQxOYRnt5nF30aMw==" + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/style-mod/-/style-mod-4.1.2.tgz", + "integrity": "sha512-wnD1HyVqpJUI2+eKZ+eo1UwghftP6yuFheBqqe+bWCotBjC2K1YnteJILRMs3SM4V/0dLEW1SC27MWP5y+mwmw==" }, "stylis": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.1.3.tgz", - "integrity": "sha512-GP6WDNWf+o403jrEp9c5jibKavrtLW+/qYGhFxFrG8maXhwTBI7gLLhiBb0o7uFccWN+EOS9aMO6cGHWAO07OA==" + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.2.0.tgz", + "integrity": "sha512-Orov6g6BB1sDfYgzWfTHDOxamtX1bE/zo104Dh9e6fqJ3PooipYyfJ0pUmrZO2wAvO8YbEyeFrkV91XTsGMSrw==" }, "supports-color": { "version": "5.5.0", @@ -12866,6 +13740,11 @@ "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==" }, + "tabbable": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-6.2.0.tgz", + "integrity": "sha512-Cat63mxsVJlzYvN51JmVXIgNoUokrIaT2zLclCXjRd8boZ0004U4KCs/sToJ75C6sdlByWxpYnb5Boif1VSFew==" + }, "tapable": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz", @@ -12927,7 +13806,7 @@ "to-fast-properties": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", - "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=" + "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==" }, "to-regex-range": { "version": "5.0.1", @@ -12938,6 +13817,11 @@ "is-number": "^7.0.0" } }, + "tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, "type-check": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", @@ -12995,9 +13879,50 @@ "integrity": "sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==", "dev": true, "requires": { - "call-bind": "^1.0.2", + "call-bind": "^1.0.7", + "es-errors": "^1.3.0", + "is-typed-array": "^1.1.13" + } + }, + "typed-array-byte-length": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.1.tgz", + "integrity": "sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==", + "dev": true, + "requires": { + "call-bind": "^1.0.7", + "for-each": "^0.3.3", + "gopd": "^1.0.1", + "has-proto": "^1.0.3", + "is-typed-array": "^1.1.13" + } + }, + "typed-array-byte-offset": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.2.tgz", + "integrity": "sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==", + "dev": true, + "requires": { + "available-typed-arrays": "^1.0.7", + "call-bind": "^1.0.7", + "for-each": "^0.3.3", + "gopd": "^1.0.1", + "has-proto": "^1.0.3", + "is-typed-array": "^1.1.13" + } + }, + "typed-array-length": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.5.tgz", + "integrity": "sha512-yMi0PlwuznKHxKmcpoOdeLwxBoVPkqZxd7q2FgMkmD3bNwvF5VW0+UlUQ1k1vmktTu4Yu13Q0RIxEP8+B+wloA==", + "dev": true, + "requires": { + "call-bind": "^1.0.7", "for-each": "^0.3.3", - "is-typed-array": "^1.1.9" + "gopd": "^1.0.1", + "has-proto": "^1.0.3", + "is-typed-array": "^1.1.13", + "possible-typed-array-names": "^1.0.0" } }, "unbox-primitive": { @@ -13023,6 +13948,12 @@ "react-lifecycles-compat": "^3.0.4" } }, + "undici-types": { + "version": "5.26.5", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", + "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==", + "devOptional": true + }, "unicode-canonical-property-names-ecmascript": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz", @@ -13082,14 +14013,14 @@ "dev": true }, "w3c-keyname": { - "version": "2.2.6", - "resolved": "https://registry.npmjs.org/w3c-keyname/-/w3c-keyname-2.2.6.tgz", - "integrity": "sha512-f+fciywl1SJEniZHD6H+kUO8gOnwIr7f4ijKA6+ZvJFjeGi1r4PDLl53Ayud9O/rk64RqgoQine0feoeOU0kXg==" + "version": "2.2.8", + "resolved": "https://registry.npmjs.org/w3c-keyname/-/w3c-keyname-2.2.8.tgz", + "integrity": "sha512-dpojBhNsCNN7T82Tm7k26A6G9ML3NkhDsnw9n/eoxSRlVBB4CEtIQ/KTCLI2Fwf3ataSXRhYFkQi3SlnFwPvPQ==" }, "warning": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz", - "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/warning/-/warning-3.0.0.tgz", + "integrity": "sha512-jMBt6pUrKn5I+OGgtQ4YZLdhIeJmObddh6CsibPxyQ5yPZm1XExSyzC1LCNX7BzhxWgiHmizBWJTHJIjMjTQYQ==", "requires": { "loose-envify": "^1.0.0" } @@ -13136,6 +14067,22 @@ "webpack-sources": "^3.2.3" }, "dependencies": { + "eslint-scope": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", + "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", + "dev": true, + "requires": { + "esrecurse": "^4.3.0", + "estraverse": "^4.1.1" + } + }, + "estraverse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", + "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", + "dev": true + }, "schema-utils": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz", @@ -13146,6 +14093,12 @@ "ajv": "^6.12.5", "ajv-keywords": "^3.5.2" } + }, + "webpack-sources": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz", + "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==", + "dev": true } } }, @@ -13190,10 +14143,22 @@ } }, "webpack-sources": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz", - "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==", - "dev": true + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz", + "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==", + "dev": true, + "requires": { + "source-list-map": "^2.0.0", + "source-map": "~0.6.1" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } }, "which": { "version": "2.0.2", @@ -13271,13 +14236,13 @@ "wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", "dev": true }, "yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", + "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", "dev": true }, "yaml": { diff --git a/package.json b/package.json index c9ae26a0b1..ad6ee8cdf9 100644 --- a/package.json +++ b/package.json @@ -17,6 +17,7 @@ "@uiw/react-codemirror": "^4.19.9", "bootstrap-sass": "^3.4.1", "classnames": "^2.3.2", + "date-fns": "^3.6.0", "font-awesome": "4.7.0", "jquery": "^3.6.0", "js-cookie": "^2.2.1", @@ -25,9 +26,11 @@ "prop-types": "^15.7.2", "react": "^18.2.0", "react-bootstrap": "0.33.1", + "react-datepicker": "6.6.0", "react-dnd": "^16.0.1", "react-dnd-html5-backend": "^16.0.1", "react-dom": "^18.2.0", + "react-dropzone": "^10.0.0", "react-redux": "^7.2.4", "react-select": "^5.7.0", "redux": "^4.1.1", diff --git a/rdmo/accounts/serializers/v1.py b/rdmo/accounts/serializers/v1.py index cd7018c4a9..eeb6f1ddc5 100644 --- a/rdmo/accounts/serializers/v1.py +++ b/rdmo/accounts/serializers/v1.py @@ -72,7 +72,9 @@ class Meta: 'id', 'groups', 'role', - 'memberships' + 'memberships', + 'is_superuser', + 'is_staff' ] if settings.USER_API: fields += [ diff --git a/rdmo/accounts/viewsets.py b/rdmo/accounts/viewsets.py index b377dd08df..09604f146f 100644 --- a/rdmo/accounts/viewsets.py +++ b/rdmo/accounts/viewsets.py @@ -1,5 +1,8 @@ from django.contrib.auth import get_user_model +from rest_framework.decorators import action +from rest_framework.permissions import IsAuthenticated +from rest_framework.response import Response from rest_framework.viewsets import ReadOnlyModelViewSet from django_filters.rest_framework import DjangoFilterBackend @@ -40,3 +43,8 @@ def get_queryset(self): 'role__member', 'role__manager', 'role__editor', 'role__reviewer', 'memberships') + + @action(detail=False, permission_classes=(IsAuthenticated, )) + def current(self, request): + serializer = UserSerializer(request.user) + return Response(serializer.data) diff --git a/rdmo/core/assets/js/components/ButtonGroup.js b/rdmo/core/assets/js/components/ButtonGroup.js deleted file mode 100644 index 5460d627e1..0000000000 --- a/rdmo/core/assets/js/components/ButtonGroup.js +++ /dev/null @@ -1,38 +0,0 @@ -import React, { useState } from 'react' -import PropTypes from 'prop-types' - -const ButtonGroup = ({ buttons }) => { - const [activeButton, setActiveButton] = useState(buttons[0].type) - - const handleButtonClick = (buttonType, onClick) => { - setActiveButton(buttonType) - onClick && onClick() - } - - return ( -
- {buttons.map((button) => ( - - ))} -
- ) -} - -ButtonGroup.propTypes = { - buttons: PropTypes.arrayOf( - PropTypes.shape({ - label: PropTypes.string.isRequired, - type: PropTypes.string.isRequired, - onClick: PropTypes.func, - }) - ).isRequired, -} - -export default ButtonGroup diff --git a/rdmo/core/assets/js/components/FileUploadButton.js b/rdmo/core/assets/js/components/FileUploadButton.js new file mode 100644 index 0000000000..9837b634d9 --- /dev/null +++ b/rdmo/core/assets/js/components/FileUploadButton.js @@ -0,0 +1,32 @@ +import React from 'react' +import PropTypes from 'prop-types' +import { useDropzone } from 'react-dropzone' + +const FileUploadButton = ({ acceptedTypes, buttonProps, buttonLabel, onImportFile }) => { + const { getRootProps, getInputProps } = useDropzone({ + accept: acceptedTypes, + onDrop: acceptedFiles => { + if (acceptedFiles.length > 0) { + onImportFile(acceptedFiles[0]) + } + } + }) + + return ( +
+ + +
+ ) +} + +FileUploadButton.propTypes = { + acceptedTypes: PropTypes.arrayOf(PropTypes.string), + buttonProps: PropTypes.object, + buttonLabel: PropTypes.string.isRequired, + onImportFile: PropTypes.func.isRequired, +} + +export default FileUploadButton diff --git a/rdmo/core/assets/js/components/Modal.js b/rdmo/core/assets/js/components/Modal.js new file mode 100644 index 0000000000..a3f2cd70b8 --- /dev/null +++ b/rdmo/core/assets/js/components/Modal.js @@ -0,0 +1,40 @@ +import React from 'react' +import PropTypes from 'prop-types' +import { Modal as BootstrapModal } from 'react-bootstrap' + +const Modal = ({ bsSize, buttonLabel, buttonProps, title, show, onClose, onSave, children }) => { + return ( + + +

{title}

+ + + { children } + + + + { onSave ? + + : null + } + + + ) +} + +Modal.propTypes = { + bsSize: PropTypes.oneOf(['lg', 'large', 'sm', 'small']), + buttonLabel: PropTypes.string, + buttonProps: PropTypes.object, + children: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.node), PropTypes.node]).isRequired, + onClose: PropTypes.func.isRequired, + onSave: PropTypes.func, + show: PropTypes.bool.isRequired, + title: PropTypes.string.isRequired, +} + +export default Modal diff --git a/rdmo/core/assets/js/components/SearchField.js b/rdmo/core/assets/js/components/SearchField.js new file mode 100644 index 0000000000..1201bc0dd8 --- /dev/null +++ b/rdmo/core/assets/js/components/SearchField.js @@ -0,0 +1,56 @@ +import React from 'react' +import PropTypes from 'prop-types' + +const SearchField = ({ value, onChange, onSearch, placeholder }) => { + + const handleSearch = () => { + onSearch(value) + } + + const handleChange = (newValue) => { + onChange(newValue) + } + + const handleButtonClick = () => { + onChange('') + handleSearch() + } + + const handleKeyDown = (event) => { + if (event.key === 'Enter') { + handleSearch() + } + } + + return ( +
+
+ handleChange(e.target.value)} + onKeyDown={handleKeyDown} + /> + + + + +
+
+ ) +} + +SearchField.propTypes = { + value: PropTypes.string.isRequired, + onChange: PropTypes.func.isRequired, + onSearch: PropTypes.func.isRequired, + placeholder: PropTypes.string.isRequired, +} + +export default SearchField diff --git a/rdmo/core/assets/js/components/Select.js b/rdmo/core/assets/js/components/Select.js new file mode 100644 index 0000000000..246b54b261 --- /dev/null +++ b/rdmo/core/assets/js/components/Select.js @@ -0,0 +1,38 @@ +import React from 'react' +import PropTypes from 'prop-types' +import ReactSelect from 'react-select' + +const Select = ({ options, onChange, placeholder, value }) => { + const selectedOption = options.find(option => option.value === value) || null + const handleChange = (selected) => { + onChange(selected ? selected.value : null) + } + + return ( +
+ +
+ ) +} + +Select.propTypes = { + value: PropTypes.string, + options: PropTypes.arrayOf( + PropTypes.shape({ + value: PropTypes.string.isRequired, + label: PropTypes.string.isRequired + }) + ).isRequired, + onChange: PropTypes.func, + placeholder: PropTypes.string +} + +export default Select diff --git a/rdmo/core/assets/js/components/UploadDropZone.js b/rdmo/core/assets/js/components/UploadDropZone.js new file mode 100644 index 0000000000..d4f335f52b --- /dev/null +++ b/rdmo/core/assets/js/components/UploadDropZone.js @@ -0,0 +1,40 @@ +import React, { useState } from 'react' +import PropTypes from 'prop-types' +import { useDropzone } from 'react-dropzone' + +const UploadDropZone = ({ acceptedTypes, onImportFile }) => { + const [errorMessage, setErrorMessage] = useState('') + + const { getRootProps, getInputProps } = useDropzone({ + accept: acceptedTypes, + onDropAccepted: acceptedFiles => { + if (acceptedFiles.length > 0) { + onImportFile(acceptedFiles[0]) + setErrorMessage('') + } + }, + onDropRejected: rejectedFiles => { + console.log(rejectedFiles) + setErrorMessage(interpolate(gettext('%s has unsupported file type'), [rejectedFiles[0].path])) + } + }) + + return ( +
+
+ +

+ {gettext('Drag and drop a file here or click to select a file')} +

+ {errorMessage &&
{errorMessage}
} +
+
+ ) +} + +UploadDropZone.propTypes = { + acceptedTypes: PropTypes.arrayOf(PropTypes.string), + onImportFile: PropTypes.func.isRequired, +} + +export default UploadDropZone diff --git a/rdmo/core/assets/js/components/index.js b/rdmo/core/assets/js/components/index.js new file mode 100644 index 0000000000..b69b60e4cd --- /dev/null +++ b/rdmo/core/assets/js/components/index.js @@ -0,0 +1,7 @@ +export { default as FileUploadButton } from './FileUploadButton' +export { default as Link } from './Link' +export { default as LinkButton } from './LinkButton' +export { default as Modal } from './Modal' +export { default as UploadDropZone } from './UploadDropZone' +export { default as SearchField } from './SearchField' +export { default as Select } from './Select' diff --git a/rdmo/core/assets/js/hooks/index.js b/rdmo/core/assets/js/hooks/index.js new file mode 100644 index 0000000000..35876244a8 --- /dev/null +++ b/rdmo/core/assets/js/hooks/index.js @@ -0,0 +1,3 @@ +export { default as useFormattedDateTime } from './useFormattedDateTime' +export { default as useModal } from './useModal' +export { default as useScrollToTop } from './useScrollToTop' diff --git a/rdmo/core/assets/js/hooks/useFormattedDateTime.js b/rdmo/core/assets/js/hooks/useFormattedDateTime.js new file mode 100644 index 0000000000..4986a4dfcf --- /dev/null +++ b/rdmo/core/assets/js/hooks/useFormattedDateTime.js @@ -0,0 +1,20 @@ +import { format } from 'date-fns' +import { de, enUS } from 'date-fns/locale' + +const getLocaleObject = (language) => { + return language === 'de' ? de : enUS +} + +const FORMAT_STRINGS = { + en: 'MMM d, yyyy, h:mm a', + de: 'd. MMM yyyy, H:mm', +} + +export const useFormattedDateTime = (date, language) => { + const locale = getLocaleObject(language) + const formatString = language === 'de' ? FORMAT_STRINGS.de : FORMAT_STRINGS.en + + return format(new Date(date), formatString, { locale }) +} + +export default useFormattedDateTime diff --git a/rdmo/core/assets/js/hooks/useModal.js b/rdmo/core/assets/js/hooks/useModal.js new file mode 100644 index 0000000000..4846d0c6fe --- /dev/null +++ b/rdmo/core/assets/js/hooks/useModal.js @@ -0,0 +1,11 @@ +import { useState } from 'react' + +const useModal = () => { + const [show, setShow] = useState(false) + const open = () => setShow(true) + const close = () => setShow(false) + + return {show, open, close} +} + +export default useModal diff --git a/rdmo/core/assets/js/hooks/useScrollToTop.js b/rdmo/core/assets/js/hooks/useScrollToTop.js new file mode 100644 index 0000000000..16e600b80e --- /dev/null +++ b/rdmo/core/assets/js/hooks/useScrollToTop.js @@ -0,0 +1,22 @@ +import { useState, useEffect } from 'react' + +const useScrollToTop = () => { + const [showTopButton, setShowTopButton] = useState(false) + + useEffect(() => { + const handleScroll = () => { + setShowTopButton(window.pageYOffset > 100) + } + + window.addEventListener('scroll', handleScroll) + return () => window.removeEventListener('scroll', handleScroll) + }, []) + + const scrollToTop = () => { + window.scrollTo({ top: 0, behavior: 'smooth' }) + } + + return { showTopButton, scrollToTop } +} + +export default useScrollToTop diff --git a/rdmo/core/assets/js/utils/api.js b/rdmo/core/assets/js/utils/api.js new file mode 100644 index 0000000000..2f7b3724ff --- /dev/null +++ b/rdmo/core/assets/js/utils/api.js @@ -0,0 +1,15 @@ +const encodeParams = params => { + return Object.entries(params).map(item => { + const [key, value] = item + + if (Array.isArray(value)) { + return value.map(v => { + return encodeURIComponent(key) + '=' + encodeURIComponent(v) + }).join('&') + } else { + return encodeURIComponent(key) + '=' + encodeURIComponent(value) + } + }).join('&') +} + +export { encodeParams } diff --git a/rdmo/core/assets/js/utils/index.js b/rdmo/core/assets/js/utils/index.js new file mode 100644 index 0000000000..c2d32da182 --- /dev/null +++ b/rdmo/core/assets/js/utils/index.js @@ -0,0 +1,5 @@ +export * from './api' +export { default as baseUrl } from './baseUrl' +export { default as language } from './language' +export { default as siteId } from './siteId' +export { default as staticUrl } from './staticUrl' diff --git a/rdmo/core/assets/js/utils/language.js b/rdmo/core/assets/js/utils/language.js new file mode 100644 index 0000000000..58dc8a369e --- /dev/null +++ b/rdmo/core/assets/js/utils/language.js @@ -0,0 +1,2 @@ +// take the language from the of the django template +export default document.querySelector('meta[name="language"]').content diff --git a/rdmo/core/assets/js/utils/siteId.js b/rdmo/core/assets/js/utils/siteId.js new file mode 100644 index 0000000000..7b413b672e --- /dev/null +++ b/rdmo/core/assets/js/utils/siteId.js @@ -0,0 +1,2 @@ +// take the site_id from the of the django template +export default Number(document.querySelector('meta[name="site_id"]').content) diff --git a/rdmo/core/assets/js/utils/staticUrl.js b/rdmo/core/assets/js/utils/staticUrl.js new file mode 100644 index 0000000000..0a1323cb10 --- /dev/null +++ b/rdmo/core/assets/js/utils/staticUrl.js @@ -0,0 +1,2 @@ +// take the staticurl from the of the django template +export default document.querySelector('meta[name="staticurl"]').content.replace(/\/+$/, '') diff --git a/rdmo/core/templates/core/base_head.html b/rdmo/core/templates/core/base_head.html index 23f48f7074..d5e28ea95e 100644 --- a/rdmo/core/templates/core/base_head.html +++ b/rdmo/core/templates/core/base_head.html @@ -1,4 +1,7 @@ {% load static %} +{% load i18n %} +{% get_current_language as LANGUAGE_CODE %} + {{ request.site.name }} @@ -10,5 +13,6 @@ + diff --git a/rdmo/core/templates/core/projects_page.html b/rdmo/core/templates/core/projects_page.html new file mode 100644 index 0000000000..be3cc66d7f --- /dev/null +++ b/rdmo/core/templates/core/projects_page.html @@ -0,0 +1,13 @@ +{% extends 'core/base.html' %} + +{% block content %} + +
+
+
+ {% block page %}{% endblock %} +
+
+
+ +{% endblock %} diff --git a/rdmo/locale/de/LC_MESSAGES/djangojs.mo b/rdmo/locale/de/LC_MESSAGES/djangojs.mo index 8e73035179ff1ab266419fa08b4a92588e3d9008..0c4568ce10f965b91260e270451be30af069fb1d 100644 GIT binary patch literal 23839 zcmb`O37i~7y~jJ;ge!z2+;jp#0&FhAwIq;(B!rNIBoNMrlbzn(VP|JHbL7&8C!it- zJ{7s1g24-Xh=8C56(c?#!UGRH5KzPeR0N)=c=Eo#I=XvidN#YreDdFK*Y&TefBmbv zy1Mi9=xsh6@H=!w5F7xf?-&G^aDD!0#RkE^J~nDmHQr4xu>A=KL`02yuhDb;r9F4diI729|F~$sc<)V5|p0B zQ2jm|s(;;3?OW&4FLC?;RQs-l`@@ez^>Y)H{zqK+NhrI$;J6i;rFRTey%V79c>){* z7eNhC1l5jpQ28%~YVSv(%58)ycNbKB54!XpIz9_!uNNKv4AtJ(pxU_|PN8yRpu&ei z)ps0JeRHAeTM1QP7gT*!sB)LVqv1!O?ER37e-z4IPrLAMq4fL}O3!u&T08FzRbL2I z-$bZ#GhO;3$CXg+&Ox=a7pngCF8m%SJ=a3%`4m)rUxKRd0jPFA4pr`Xm;S2bHV0Y# zqoB%E`Vj&1s{QmpK=&u z1TTYU!6)ES#lOkg;hk_L;TxdzzXEe`)ZsS10#(mLFoH)+u<=*H6@;II(l_G>8@>{r zP54=OI-Gu_^{@BBw-LS>o&(1nW&Px>Q2MWhYVTj*8E^^4kbm9;6}}fPh9f5i0ZVmo z4wPMLkSQBH2+xDRhJA3(B%6LaRQ%SH(Frev>hJAPez5%%8y*W)&w8kOzwN?5cj0MM zZTdo}ak>$XQa&g@c@k>8f9c|1g1ZtPakR}h3hqL9EZiMVf;+)kQ2w+C?g1}=Dz_Rc z{q2tLhdUGgD3rh60_8uqLFu~#YTj;!d%zz{5jM3$Ei2rVAc}D!0|KHvMSF9K@x9 z55Vo=y>Ku1br=2tRR5lK;b&d=xA4s)g5V{Hiv?#KZ|B`xAyXl^6v}S5!adNcHQcDKa^d62sNJ1IsOUCe%o}~_Ur;> z*D+B2JJ4}FRK5-<`yLCmZp?ye_d=Jx63VaN4Aq{uLDhRTR6B2m@|(M%`uPBq-#p>? zJXF3{9d|m>mOsdG5>&l2q3m%Q+y`C+waAZyH#yFN z%6A^zAFhUK?-fw_Z-nx{FTj1_x8UCJXO4e{veT|JEXP2#H-zff5m0uS0i|aNlzqCO z>a9W5_ddt#pz?jz@vHDS!rz4&hmj}Q^u3_;Pk?IYbf|jHfNEbCR6QFUFNex^gX0}g z<-g_lW2pK1JD2_ksCMjdvTf%9Q2D1q*?lfleHS>Eq5AU<$7`UzD>ud;>J_D-!VyJwpp!{a7Hnodx%U7eLjw4yr#_z)A2EQ0@61RK353YWH8E#$}(`w%$Xa=EpRs_?a$# zA=EgZ4^?jwsy`P)>AeDKp5EkmJ5;{=93O=$|BU0yP<}UJj`hotQ2u+U3(s`nb6t3i z3tt5_&u@dO|1K!IY=&FI2cg>WFyxjQJOO2&ZBDWM+6iiX9|KkYp^hC;>&UTC`KLqq z$s8zqoafSepyo$ER6T2<>~x8XzY41SbuN4p)V#YDO8)~c{@d_i!jD6Z_aC9kZ8z7B z-!4$~jDymD6qNmrgBrj2Q02~rYDb@oUk_!U_rt^ChoJ0qAJlj}3|0PVD19$OD=+3S1381;@jE=W~yQC&LQ-5iG!kr&`_(mH*%c*a}_^m&4cK*>L%3 zHhddAlyI;Rp915d^nVbph4;Gn$*0@&8)23Bk&AeChZn<@@I@&7^A}rQ4^2EgL-9*k z)8Mu6D)?on`W7y=cDfh#5q<`q1s73h1>6Y7!oR?a;Qq_3{!3v<_zBnr{{|0(7t#pz z_flAguR!U!h(G7RuR*E~_C3?;DL|FG4-UXzK-GUHe-44SLDl=13!g}*6uuB110RB8 zpo}Vi-Up6^W8og~C^#CU$6WYM_)p|6gTEl3M(#!Qd(a~OyFXXPk6g?p za5AzR@+z_)ZMY7~Hal^x-+Pgl5T>O0_3-zz$S4~OM!0-`Cj2R67Z)%8+KAkP{1&+! z(eG9S_c!zVKNaDAZ-pTuzyBNZSL8Fudl3CJkL3fJzxr)Oy=&oih}M>eklkHdKFIa) z$U%f3f%@HmyaRa#*$L5a0&<+Wvd?L{{2yci@>S%+h<>jiS0M78BM|*QgnZsyagU{* zeYoBpz5riCzK>jp_}^1ptU-1})+2cYH#N_b^I#p(?|l|QC;SrfA4r#r6Skoa{l1Hg z;d+$`vDR>XCD$K!Va=zVkpbj>7bon6-0i{#!2d;-BVR*KM)cc&yd9Z^?1f(Qga60H z$6WAK$8+Gr$X3XAkR8dl5L`e>J@mvH*GhYO5{(~#3#`0MZ*x!|M_K zMiIUk{u}ZZ$OA|X*~8U;GuMwJA3?T3rXwB5rO2M-`8Ax2`~le=(QhAD_MJ8u z{1NU<+*wfP`1;+3Of*-?pLe;-zr+2IYmpa`uONpYXCV6RhK>W_w@t|2-*kB*@^0jl z$aBa-M86*+XCp5o`&0I3@aM=65d98DjzPYm!1!v|o2!QPQnfxXP_ERXeArzmMqzFJ zK%~TScR0QpUxWjd@;3AaUj>zq_IjnyuMV4IOFPiMAfcB9|)_F ztt>8GEQV(;TR_L6?!vmL8q6XhqN(MIz4kp0W+ff-SLCSIddrnycCM>0n3JpJisc^9 zYA~l*u13L}xaaW|N#%j{=1-U_Sj(mOYHYB}tEXtnoYEA!{->@@M@`rm z#9VnJSbaW}uCVAs7+o(q6Hk2-suF9+Q)%b8af0KG^Q(INas`=oQ zsH<2gMX(rQWs8(iT!goz55}J5B3$zuLZ&$`#x&nu`{w$}d^nxoH~*AMuE&gdzEU0t zb9RO3jaUN8m5`Qq^@X)E1&d5cmmJJx4w*lxZYVDFov?wp3nu6~kh(U_F=5kqbLE?A z)%#GA(>L2>Ha0g`#^Q4;70v9q>$KRVn`R^8#<^h9JR9K~m=4*BZH#TCz4i_BmHBWw zf811C#5UGmo950d6l+l>ut=I)^)ahh3f#Kj@+ii5SU${a#wO9lTovp0=1M&*^650E zAyyjCyErD92~AOPP#up0>7KSk#u2XXaaf&?1L{2i{HxYm;C5ry`lAT2NZNZw*k7kV z-GvH&S4F>0i@}0YHNy4sQFpFhteKn7QgibO7DnrX(^G>KoLu&Ha~ekN?3)m-@jv+8{)$?4tHWHwG}u8fQ7 ziY>sRTpxpAeKE|f$rXyZRmG?=x?XBZkgDd)Caxu?s%p+@;u>?7aKlQlXnnj<2^Q!2 zqhK+2FvQ0OOBh33OBM|yvm%7$uC98e66HICC3gE^VQi3GR$VGwTcW0=+Lq`~HCP(4 z!(pdWD6J{fa@u(iS1I>Y828`|zZvltMsGUMseM*DA_+AlRfA16gyp(c9tf64xk^{BgSSqVu-#fYD#9-9xT3rCKIek;-7YCE zOp|DZEmf`MYN#%V~SE?+Uva4Rs}+M$3E4Yn7qe8JNq)1RrvV-T*7KXVIT( zu!4occ+%PeYFQsD#%kk=;QvKe| z?5?M;I!UWWKB{(Ms9dQwebTCvRBKjF7Lz1nH8Us0SmN_xxx~8Fq=mG4Rl9gBO1)@X zlPltVQiN|RPHl1PQ#A8iEESD2t8HF&tZ8bs%`3g${%MP~ z>nXZ@_93@BF3>Q$+BPX&MdS2pTSUERnqO`6qP}^8C3!PvgB>Yt6f&IG4P%Du#wN^E z`a0&q;0nE!Gur5rGG^=+y6#K1>AX)KzG4kQMoZ1ewA#{*K%6j9A3wOOJ-hnAvcbd3cuaM#>o4bW&6M z)reH%+vJp^Hm&|~&TMaLP99>lnclRes+)ADtIq0LW*zB5=|M`zhna(AhOyPZe8CJ4 z^GRj_%+%SCM+h)`^x%X&P9!Ifu~eh{mVA&LJ0Zy&XmYztbFgk;GWTEi?4|vi#6uPajY{FdVvb|6i~7LKTw!1$M-${N_0$>Tjula^-&P+^ujKp79W^3m7I}lsiT#?1 z`R-Cf{!Zq{$VCel%}tsy=!wgI6H^)y}XqV1m^dQ%?--<&48i;n*4B zlnEz}JiB9l#A&qc>C$qf*K9{moHlXVNWHo5%`r~AT`YyALRW8%cl|mou5I2_+dxA@ znX$m@eq~)#F6kILz6#Cw^eNlgsFDYId$b`c^zatFZv*fA3%mv7oxWS{!rnq@L%n4O&uFEz94&@jKR6} z%H~acXt2<|@pI%@y{orah&F!=Rk59uD`FRx2kb!k3!EU&kYcV1hvT`*DqW_=u`e#* z-sr>;aRp%<5p!|u2y5bf z{;Ew^7e^fJhOy&nM%aQ%V4-mRZj4X4abrSTO>IkfXKvPG?bH|>T5B~%R&A^?T4PGu z(Hm3RRcc4jj#yG+NKHwmK~m6~Fd4wcl+X`jbF>@GBzmqL6xJFxm%XfD!Q4`frBYYP z$i-3dn8h)Pv$7()g3eo;BV6a>Y_9Wh*bPBr*cv~MOZ7O8Gs`RMO;q87iEu+9(rt(% z@k-dI4<`uJ`|TPW=IYfA^|hNf_R4=}XUxjfO!a+DMJ1h0MY`U$#MthpqHTXu5w^q4 z5vIqf$fV2ZNH83Q-1oT;*$PFsaQXpEm3YjQ}J#{Q!#E( zn`7*-rec#`rmK$qIGxiwaVl<}{fHy>So^xN#H;D9-gu#Dh;)w6?Xt>d2?uFN-TZFu zsFl`4e?N$G#}>oOyoS_NuQo--L1U<-NIb=p0yZix5Zfn8qO1=jT4q_xq?$5s^QH>l zU+7irtUkRk*C!pk{p5Q@zZKX}FKyn~)ypRyZdItcjR@a)u*C~pKAt@5Rn`dXQu1HC zq+;9`AMOroKKbb5eA8@Ct-r;3(vh~9$sql9mIiY48~ck5^htO4&6}z`ga)S*!!9Rw0<(LlhQ*xvz9{OgxXakx zsyxzZm*JNTACA2v^f7KOH3scG@^N+!`H-DI4Iwjkd`#>YaTR{f#5vr2@!|QAxvIsj zU4xO>Pp)F$-p_nV^`l;DP4nv8r(~9LjmRkFQnE@d%DJyiw7E{UZ|;MWIv<>9hvA0b zxQ$u%`xzpAI%k)^uv%azmSeI+wF(d0rKaysjP>0|C+6CJfr24sN7Vw}QQ>0>c5n7C zH%8`AO?Me~-S{eg!Ae1H9wcgPe=BT%12b;+uf{96GM}0x^W7$-BGWfuZCdA ztfqv$u@0*kRSq)G+cnfw)_$V5D;7__VKq?}9ek>9vA(vGyuyIR_wrLXdLR)%+hHF;tkc=pA7CBs<+|?B15a*O$=^PHz<5O z(RS{>t6Won3uP(JvUBSVk;IJNj^&pY=d*w~NwhS7Gjk#^fb%;eWJ z<{)p8+0!Owso0^w1wWV8EfyHgILZ@;3lK7Kk#oh zG7Z;SN^6oY(q=T%h0GSj=g*itLtZ|t+0z|t+`GGRG5yQcyWK+t<7F(9-8ri>U4-5Z zatHI9OLeJ;0Z0{i{; zx6NQD`cnlNYk&Nk{Z!FXp$5gDll%)q;#B$~<^; z(#IodyF1;Pb`QPgR42CF9N$|1`kep#qeFlDB3>tfVX0o*pu^277MbWzh;;HhiGv<@ zq}{2brEqCC9~~txky9^DN;Q9c>IanbARiUqwRK43Bi-GrCC1(*Q_*%YNJZGywmHJA zlBvkVN7Iq+7%Ls+h9VuMbH&^$e=v6{A8y#QZ8rdoZ_7DvtLm^bu?8nN+*5R174hFI ze^h1w)0t6rN7iJ{tMuoj|+`h?3K<;LG|^_BYv_(ZEV zAz02ap*c#<=XjTI5B!qDx8$oXj%xj3q0T6?iX|_<<8Q%+P%8CgFq~q3PiGx(I3@ko zc35TXU=628`gT5?a_-(ToFeJ>_QNR`uav_ps|V1OWj5RinTQhB{NR0L#8 zwW5MlqT&(p)d*VU@`$2{hzE!uO0g}XQUw)J`+MH~W8DwW`<k7{w^Ge^b={iKzY4F$p{31=t@o zfMTmpKnJq{)NZr-Yp9voXZ0hfmcBtdJp}rqz79}zN8u1l0Xv7my9nZG51ThcBT9ybE>Q zVf+4T^9<^^hAsX5TcGNlP&3}ECG)QXi)hdYuSVUwa@2qpqB>e(->)^F#9Z39paysX zbs;~a_HV!fX^(NJ4tpSDahG8PPDS-QJxD<>%$`CGY%}Vy zd=<4e-bOu^@1Y*kk5B{q3^ju%Py_$f+M|>G3ra%HA9QUg=tP;QDe8*qU?}Q@C8z<6 zM-8A1H6zzy3NEnk*PuG8K~3#*sPpbb4X_?N<8JdTChPgnY~$Q0z8HecntK2j;bxqK z`SdadAHoUvJx;-qseXGMj-(!)=G<7EgvD5gx}d0Z7C5G%&VK`z;%c=ADf~cT5{_ug z)nP5_fP{9=jmBB16Yj8je0%4vq&^*o;dazLzMzBVlNS$;!$*->cY%)n`P-l_WFeN| zJ`8G+bm-(a^ugiOS0D@79YW2_Psn7rq73J*!U~*;^{DUjGX3_YID-07)CJ^S_{L&1^<-pqx=hp}%0@jl-B2eOhPr}lPy?Kgx&=$^ z`-d@-`tzuPzl3_aUPWC%J?7y1K?+$E8g}&?x??W&8OT5P5FZTI?Z!*+EM{X42kE$} zeCYet=1$~pxsw=$E!kNEPe;{zpf0GN)q{oBP=wb6Sjnh2V2I(dE?qsQ;BnL%Xu{}N zpDq*Qa5%I6s4Q>cy`GVhv!7}Pz^ z!bBWu^-}Xj)58S5f70B6&8UBjdLNuHqq?yl{kt>@dNFiIjd&F5fGHS{*P{+xhRw0Y zd>J*seW)uwgqn$ysN*8K`xlgm3Di5G&Yy1%$DnqcNI}j;P5EN0--9~w2GoEyqdIs8 zo8w{BjGZ>4dieXbFgv4;A7G9_Jyp}~``JC1e|3C24I1Hnw&T;7NPRo1!~N!Q)PBF1 z@jd;4XPA9Z11d2mTYDAi0+yiGzyszJJ(+)v@I`BQ2US0aI?*?%0k~ey^?^9lfQwOA zG8J{=naGprZblvd4D$QpcA{qV2Dx1sPi@rUh0o11$E*ssK;c0S&Z6oqB#e3 zf?Lg1sHb5)CgBs<3SYDO5v%`f^~B!(_t~fyQm}|Z289yT6)ix$5pPAk374ZfSc7__ zJ%ZYAqt!Q|7U2u1fp14$@w?W30JZ;7s~VyTT_rpl+ zgyT{7@HW)UtU^usBdGmeKn-{+>Xy`-KVlyBPWk-pfD^F2p8t0#+(*MHoQuo*^7kJG z`uWa89q<9p!omIhU%lt?O6rXU`1Q%iFSM(}3j755Wp+ab^80|5sP<##r~>{Qfd1V! z3Ue^8(Epj-fTO7YVwMcDb}Uglrs9af&aK2bs1pZ<_%l?AGpXN;V=-c=|98ZAOru_l zGw?kOs-xbQ`6pb7Q>bsk4w!Jcf5p9V9`%hl8dHb)e_+hR5!ByBohPNpKduUOLHDBu z&}6v(n=u*H@nWl=9M1f!A%U}8f;Xd{`#RJ;+>MR#Bh=IJIqF`YMm=_oiv2av2K7S9 z!WbNEUWwYT++2t{-ZN{8nSU*&Ei^R3dekD?iz#>j+u#{Y$0X*zHTK3-9B1B$I)070 z0VAl_qRt<}Zny(=p+8x@YjC7gZr>MMlr9d_eIs`qE_)n^DwdwT{G^B z20j)w;EAXiyvf=ZV=VRMR$qq!>cKKTwCyGfNQNqGTA17>cMbV7*-lu{?j3T1{BdKs z{Jw3p(p1!~)Wx+Y_mKVM4RSrvc7wX%R=S_VRp&m#w@CxilAI-Pk+wuD`fo(r$K-`@ z$^YmIA;Mh>uM@wOg=vLKvj*=a&s%+^F7qNPA6SDZCDr71a)|6Ay0@CnKasD z-Yenl89v`6)5#+wj~pP{hLDco5{nmk{kwrA{P#bPx%-Bk+qk7}%ee|pBHt6%jC+;L zBjbtg_e(@8e-*itux#AFi8hb$at&{H@R?2YSZiTxOC`F^ZY#N&q>-!0-Q=HSAvr_z zcGR0rD|s53OdcSAC0~=ZWG}gqXq({^ew+T+%Azl+C$m&xyW0A9mr`j*z9qMiHAIh_ zR%|BGrpHFxLDGyYBXLCAg+A_n9AxD$a2gQ--g(i4R*Z&lS0`iG{@gW|y@>ta4 zq;0m3djjW>Eb=&6O8&UzQhAVkNygY0|G?EmkFd5|Nh=lTKm7N&%FmMZD%e(z$z-S1 zf56S;B|)TaxpnVIuUJ~$iv~1|JLMx$oPMqs4a(7kbjZK$hD*~ z$tS1Caq=|L_7k~@d_?XduMqF$7P($z(w*_u)pN@y&#NwT{m+%ELUltTT=sinVvEeByk{L=*Z5@ah zUN+yGmR8WHxb)gGrw{MLv@za*^i*$2dV0jP@(SOU=&dbxGbuS=ph&?va6pIbHI)Q0rdbHSp5ADUzS=P9({S)+_Fk\n" "Language-Team: RDMO \n" "Language: de\n" @@ -11,7 +11,31 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 2.4.2\n" +"X-Generator: Poedit 3.4.4\n" + +#: core/assets/js/components/Modal.js:16 +#: management/assets/js/components/common/Modals.js:16 +msgid "Close" +msgstr "Schließen" + +#: core/assets/js/components/Modal.js:20 +#: management/assets/js/components/common/Buttons.js:19 +msgid "Save" +msgstr "Speichern" + +#: core/assets/js/components/SearchAndFilter.js:42 +#: projects/assets/js/utils/translations.js:15 +msgid "Search" +msgstr "Suchen" + +#: core/assets/js/components/UploadDropZone.js:18 +#, javascript-format +msgid "%s has unsupported file type" +msgstr "%s hat einen nicht unterstützten Dateityp" + +#: core/assets/js/components/UploadDropZone.js:26 +msgid "Drag and drop a file here or click to select a file" +msgstr "Datei hierher ziehen oder klicken um Datei auszuwählen" #: management/assets/js/components/common/Buttons.js:6 #: management/assets/js/components/sidebar/ImportSidebar.js:27 @@ -35,10 +59,6 @@ msgstr "Kopieren" msgid "Copy and continue editing" msgstr "Kopieren und weiter bearbeiten" -#: management/assets/js/components/common/Buttons.js:19 -msgid "Save" -msgstr "Speichern" - #: management/assets/js/components/common/Buttons.js:19 msgid "Save and continue editing" msgstr "Speichern und weiter bearbeiten" @@ -88,10 +108,6 @@ msgstr "XML" msgid "XML (full)" msgstr "XML (komplett)" -#: management/assets/js/components/common/Modals.js:16 -msgid "Close" -msgstr "Schließen" - #: management/assets/js/components/edit/EditAttribute.js:37 #: management/assets/js/components/element/Attribute.js:31 msgid "This attribute is read only" @@ -112,8 +128,8 @@ msgstr "Neues Attribut erstellen" #: management/assets/js/components/edit/EditAttribute.js:53 #, javascript-format msgid "" -"This attribute will be added to the attribute " -"%s." +"This attribute will be added to the attribute %s." msgstr "" "Dieses Attribut wird dem Attribut %s " "hinzugefügt." @@ -132,8 +148,8 @@ msgstr "" #: management/assets/js/components/edit/EditAttribute.js:82 #, javascript-format msgid "" -"This attribute will be added to the condition %s." +"This attribute will be added to the condition %s." msgstr "" "Dieses Attribut wird der Bedingung %s " "hinzugefügt." @@ -183,8 +199,8 @@ msgstr "Neue Bedingung erstellen" #: management/assets/js/components/edit/EditCondition.js:57 #, javascript-format msgid "" -"This condition will be added to the option set " -"%s." +"This condition will be added to the option set %s." msgstr "" "Diese Bedingung wird dem Optionenset %s " "hinzugefügt." @@ -201,8 +217,8 @@ msgstr "" #: management/assets/js/components/edit/EditCondition.js:71 #, javascript-format msgid "" -"This condition will be added to the question set %s." +"This condition will be added to the question set %s." msgstr "" "Diese Bedingung wird dem Fragenset %s " "hinzugefügt." @@ -210,8 +226,8 @@ msgstr "" #: management/assets/js/components/edit/EditCondition.js:78 #, javascript-format msgid "" -"This condition will be added to the question " -"%s." +"This condition will be added to the question %s." msgstr "" "Diese Bedingung wird der Frage %s " "hinzugefügt." @@ -275,8 +291,8 @@ msgstr "Neues Optionenset erstellen" #: management/assets/js/components/edit/EditOptionSet.js:61 #, javascript-format msgid "" -"This option set will be added to the question " -"%s." +"This option set will be added to the question %s." msgstr "" "Dieser Optionenset wird der Frage %s " "hinzugefügt." @@ -311,8 +327,6 @@ msgstr "Fragenset: %s" #: management/assets/js/components/edit/EditPage.js:72 #: management/assets/js/components/edit/EditQuestionSet.js:72 -#, fuzzy -#| msgid "Add existing element" msgid "Add existing element" msgstr "Existierendes Element hinzufügen" @@ -381,8 +395,8 @@ msgstr "" #: management/assets/js/components/edit/EditQuestion.js:70 #, javascript-format msgid "" -"This question will be added to the question set %s." +"This question will be added to the question set %s." msgstr "" "Diese Frage wird dem Fragenset %s " "hinzugefügt." @@ -407,8 +421,8 @@ msgstr "Fragenset erstellen" #: management/assets/js/components/edit/EditQuestionSet.js:96 #, javascript-format msgid "" -"This question set will be added to the page " -"%s." +"This question set will be added to the page %s." msgstr "" "Dieser Fragenset wird der Seite %s " "hinzugefügt." @@ -1358,3 +1372,175 @@ msgstr "Alle abwählen" #: management/assets/js/components/sidebar/ImportSidebar.js:75 msgid "Set URI prefix for all elements" msgstr "URI-Präfix für alle Elemente festlegen" + +#: projects/assets/js/components/helper/ProjectFilters.js:31 +msgid "Filter by catalog" +msgstr "Nach Katalog filtern" + +#: projects/assets/js/components/helper/ProjectFilters.js:37 +msgid "Select catalog" +msgstr "Katalog auswählen" + +#: projects/assets/js/components/helper/ProjectFilters.js:44 +msgid "Filter by created date" +msgstr "Nach Erstellungsdatum filtern" + +#: projects/assets/js/components/helper/ProjectFilters.js:62 +#: projects/assets/js/components/helper/ProjectFilters.js:106 +msgid "Select start date" +msgstr "Startdatum wählen" + +#: projects/assets/js/components/helper/ProjectFilters.js:81 +#: projects/assets/js/components/helper/ProjectFilters.js:125 +msgid "Select end date" +msgstr "Enddatum wählen" + +#: projects/assets/js/components/helper/ProjectFilters.js:88 +msgid "Filter by last changed date" +msgstr "Nach Änderungsdatum filtern" + +#: projects/assets/js/components/helper/ProjectImport.js:12 +msgid "Import directly" +msgstr "Projekt direkt importieren" + +#: projects/assets/js/components/helper/ProjectImport.js:28 +#: projects/assets/js/utils/translations.js:8 +msgid "Import from file" +msgstr "Importieren aus Datei" + +#: projects/assets/js/components/helper/Table.js:52 +msgid "Scroll to top" +msgstr "Zum Seitenanfang" + +#: projects/assets/js/components/helper/Table.js:59 +#: projects/assets/js/utils/translations.js:10 +msgid "Load more" +msgstr "Mehr laden" + +#: projects/assets/js/components/helper/Table.js:62 +#: projects/assets/js/utils/translations.js:9 +msgid "Load all" +msgstr "Alles laden" + +#: projects/assets/js/components/main/Projects.js:23 +#: projects/assets/js/utils/translations.js:13 +msgid "Pending invitations" +msgstr "Ausstehende Einladungen" + +#: projects/assets/js/components/main/Projects.js:29 +#: projects/assets/js/utils/translations.js:7 +msgid "Import project" +msgstr "Projekt importieren" + +#: projects/assets/js/components/main/Projects.js:38 +#, javascript-format +msgid "%s of %s projects are displayed" +msgstr "%s von %s Projekten werden angezeigt" + +#: projects/assets/js/components/main/Projects.js:41 +#, javascript-format +msgid "%s of %s" +msgstr "%s von %s" + +#: projects/assets/js/components/main/Projects.js:55 +#: projects/assets/js/utils/translations.js:18 +msgid "View all projects" +msgstr "Alle Projekte ansehen" + +#: projects/assets/js/components/main/Projects.js:55 +#: projects/assets/js/utils/translations.js:19 +msgid "View my projects" +msgstr "Meine Projekte ansehen" + +#: projects/assets/js/components/main/Projects.js:56 +#: projects/assets/js/utils/translations.js:11 +msgid "My projects" +msgstr "Meine Projekte" + +#: projects/assets/js/components/main/Projects.js:56 +#: projects/assets/js/utils/translations.js:3 +msgid "All projects" +msgstr "Alle Projekte" + +#: projects/assets/js/utils/constants.js:6 +msgid "Name" +msgstr "Name" + +#: projects/assets/js/utils/constants.js:7 +msgid "Role" +msgstr "Rolle" + +#: projects/assets/js/utils/constants.js:8 +#: projects/assets/js/utils/constants.js:19 +msgid "Owner" +msgstr "Besitzer" + +#: projects/assets/js/utils/constants.js:9 +msgid "Progress" +msgstr "Fortschritt" + +#: projects/assets/js/utils/constants.js:10 +msgid "Created" +msgstr "Erstellt" + +#: projects/assets/js/utils/constants.js:11 +msgid "Last changed" +msgstr "Letzte Änderung" + +#: projects/assets/js/utils/constants.js:16 +msgid "Author" +msgstr "Autor" + +#: projects/assets/js/utils/constants.js:17 +msgid "Guest" +msgstr "Gast" + +#: projects/assets/js/utils/constants.js:18 +msgid "Manager" +msgstr "Manager" + +#: projects/assets/js/utils/translations.js:2 +msgid "Accept" +msgstr "Akzeptieren" + +#: projects/assets/js/utils/translations.js:4 +msgid "Decline" +msgstr "Ablehnen" + +#: projects/assets/js/utils/translations.js:5 +msgid "Filter" +msgstr "Filter" + +#: projects/assets/js/utils/translations.js:6 +msgid "Hide filters" +msgstr "Filter ausblenden" + +#: projects/assets/js/utils/translations.js:12 +msgid "New project" +msgstr "Neues Projekt" + +#: projects/assets/js/utils/translations.js:14 +msgid "Reset all filters" +msgstr "Alle Filter zurücksetzen" + +#: projects/assets/js/utils/translations.js:16 +msgid "Search projects" +msgstr "Projekte durchsuchen" + +#: projects/assets/js/utils/translations.js:17 +msgid "Show filters" +msgstr "Filter anzeigen" + +#, fuzzy +#~| msgid "Load More" +#~ msgid "Load More" +#~ msgstr "Mehr laden" + +#, fuzzy +#~| msgid "Load All" +#~ msgid "Load All" +#~ msgstr "Alles laden" + +#, fuzzy +#~ msgid "Direct import" +#~ msgstr "Projekt direkt importieren" diff --git a/rdmo/locale/es/LC_MESSAGES/djangojs.po b/rdmo/locale/es/LC_MESSAGES/djangojs.po index 2428e8d185..6608497d1c 100644 --- a/rdmo/locale/es/LC_MESSAGES/djangojs.po +++ b/rdmo/locale/es/LC_MESSAGES/djangojs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-12-09 10:45+0100\n" +"POT-Creation-Date: 2024-04-26 16:24+0200\n" "PO-Revision-Date: 2023-12-09 10:49+0100\n" "Last-Translator: DAVID MARTINEZ \n" "Language-Team: \n" @@ -18,6 +18,30 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 2.4.2\n" +#: core/assets/js/components/Modal.js:16 +#: management/assets/js/components/common/Modals.js:16 +msgid "Close" +msgstr "Cerrar" + +#: core/assets/js/components/Modal.js:20 +#: management/assets/js/components/common/Buttons.js:19 +msgid "Save" +msgstr "Guardar" + +#: core/assets/js/components/SearchAndFilter.js:42 +#: projects/assets/js/utils/translations.js:15 +msgid "Search" +msgstr "" + +#: core/assets/js/components/UploadDropZone.js:18 +#, javascript-format +msgid "%s has unsupported file type" +msgstr "" + +#: core/assets/js/components/UploadDropZone.js:26 +msgid "Drag and drop a file here or click to select a file" +msgstr "" + #: management/assets/js/components/common/Buttons.js:6 #: management/assets/js/components/sidebar/ImportSidebar.js:27 #: management/assets/js/components/sidebar/ImportSidebar.js:42 @@ -40,10 +64,6 @@ msgstr "Copiar" msgid "Copy and continue editing" msgstr "Copiar y seguir editando" -#: management/assets/js/components/common/Buttons.js:19 -msgid "Save" -msgstr "Guardar" - #: management/assets/js/components/common/Buttons.js:19 msgid "Save and continue editing" msgstr "Guardar y seguir editando" @@ -93,10 +113,6 @@ msgstr "XML" msgid "XML (full)" msgstr "XML (completo)" -#: management/assets/js/components/common/Modals.js:16 -msgid "Close" -msgstr "Cerrar" - #: management/assets/js/components/edit/EditAttribute.js:37 #: management/assets/js/components/element/Attribute.js:31 msgid "This attribute is read only" diff --git a/rdmo/locale/fr/LC_MESSAGES/djangojs.po b/rdmo/locale/fr/LC_MESSAGES/djangojs.po index 9b319d6724..bae97bac76 100644 --- a/rdmo/locale/fr/LC_MESSAGES/djangojs.po +++ b/rdmo/locale/fr/LC_MESSAGES/djangojs.po @@ -14,6 +14,25 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 3.1\n" +#: core/assets/js/components/Modal.js:16 +#: management/assets/js/components/common/Modals.js:16 +msgid "Close" +msgstr "Fermer" + +#: core/assets/js/components/SearchAndFilter.js:42 +#: projects/assets/js/utils/translations.js:15 +msgid "Search" +msgstr "" + +#: core/assets/js/components/UploadDropZone.js:18 +#, javascript-format +msgid "%s has unsupported file type" +msgstr "" + +#: core/assets/js/components/UploadDropZone.js:26 +msgid "Drag and drop a file here or click to select a file" +msgstr "" + #: management/assets/js/components/common/Buttons.js:6 #: management/assets/js/components/sidebar/ImportSidebar.js:27 #: management/assets/js/components/sidebar/ImportSidebar.js:42 @@ -89,10 +108,6 @@ msgstr "XML" msgid "XML (full)" msgstr "XML (complet)" -#: management/assets/js/components/common/Modals.js:16 -msgid "Close" -msgstr "Fermer" - #: management/assets/js/components/edit/EditAttribute.js:37 #: management/assets/js/components/element/Attribute.js:31 msgid "This attribute is read only" diff --git a/rdmo/locale/it/LC_MESSAGES/djangojs.po b/rdmo/locale/it/LC_MESSAGES/djangojs.po index 66166f7f8b..11a94f2c84 100644 --- a/rdmo/locale/it/LC_MESSAGES/djangojs.po +++ b/rdmo/locale/it/LC_MESSAGES/djangojs.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-12-09 10:33+0100\n" +"POT-Creation-Date: 2024-04-26 16:24+0200\n" "PO-Revision-Date: \n" "Last-Translator: Dario Pilori \n" "Language-Team: \n" @@ -13,6 +13,30 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 2.4.2\n" +#: core/assets/js/components/Modal.js:16 +#: management/assets/js/components/common/Modals.js:16 +msgid "Close" +msgstr "Chiudi" + +#: core/assets/js/components/Modal.js:20 +#: management/assets/js/components/common/Buttons.js:19 +msgid "Save" +msgstr "Salva" + +#: core/assets/js/components/SearchAndFilter.js:42 +#: projects/assets/js/utils/translations.js:15 +msgid "Search" +msgstr "" + +#: core/assets/js/components/UploadDropZone.js:18 +#, javascript-format +msgid "%s has unsupported file type" +msgstr "" + +#: core/assets/js/components/UploadDropZone.js:26 +msgid "Drag and drop a file here or click to select a file" +msgstr "" + #: management/assets/js/components/common/Buttons.js:6 #: management/assets/js/components/sidebar/ImportSidebar.js:27 #: management/assets/js/components/sidebar/ImportSidebar.js:42 @@ -35,10 +59,6 @@ msgstr "Copia" msgid "Copy and continue editing" msgstr "Copiare e continuare a modificare" -#: management/assets/js/components/common/Buttons.js:19 -msgid "Save" -msgstr "Salva" - #: management/assets/js/components/common/Buttons.js:19 msgid "Save and continue editing" msgstr "Salvare e continuare a modificare" @@ -88,10 +108,6 @@ msgstr "XML" msgid "XML (full)" msgstr "XML (completo)" -#: management/assets/js/components/common/Modals.js:16 -msgid "Close" -msgstr "Chiudi" - #: management/assets/js/components/edit/EditAttribute.js:37 #: management/assets/js/components/element/Attribute.js:31 msgid "This attribute is read only" diff --git a/rdmo/management/assets/js/store/configureStore.js b/rdmo/management/assets/js/store/configureStore.js index f96d73cc06..7f5e3cd224 100644 --- a/rdmo/management/assets/js/store/configureStore.js +++ b/rdmo/management/assets/js/store/configureStore.js @@ -40,19 +40,21 @@ export default function configureStore() { const updateConfigFromLocalStorage = () => { const ls = {...localStorage} Object.entries(ls).forEach(([lsPath, lsValue]) => { - const path = lsPath.replace('rdmo.management.config.', '') - let value - switch(lsValue) { - case 'true': - value = true - break - case 'false': - value = false - break - default: - value = lsValue + if (lsPath.startsWith('rdmo.management.config.')) { + const path = lsPath.replace('rdmo.management.config.', '') + let value + switch(lsValue) { + case 'true': + value = true + break + case 'false': + value = false + break + default: + value = lsValue + } + store.dispatch(configActions.updateConfig(path, value)) } - store.dispatch(configActions.updateConfig(path, value)) }) } diff --git a/rdmo/projects/assets/js/actions/actionTypes.js b/rdmo/projects/assets/js/actions/actionTypes.js new file mode 100644 index 0000000000..c879bf0e62 --- /dev/null +++ b/rdmo/projects/assets/js/actions/actionTypes.js @@ -0,0 +1,23 @@ +export const DELETE_CONFIG = 'config/deleteConfig' +export const FETCH_CURRENT_USER_ERROR = 'currentUser/fetchCurrentUserError' +export const FETCH_CURRENT_USER_INIT = 'currentUser/fetchCurrentUserInit' +export const FETCH_CURRENT_USER_SUCCESS = 'currentUser/fetchCurrentUserSuccess' +export const FETCH_PROJECTS_ERROR = 'projects/fetchProjectsError' +export const FETCH_PROJECTS_INIT = 'projects/fetchProjectsInit' +export const FETCH_PROJECTS_SUCCESS = 'projects/fetchProjectsSuccess' +export const FETCH_INVITATIONS_ERROR = 'projects/fetchInvitationsError' +export const FETCH_INVITATIONS_INIT = 'projects/fetchInvitationsInit' +export const FETCH_INVITATIONS_SUCCESS = 'projects/fetchInvitationsSuccess' +export const FETCH_CATALOGS_ERROR = 'projects/fetchCatalogsError' +export const FETCH_CATALOGS_INIT = 'projects/fetchCatalogsInit' +export const FETCH_CATALOGS_SUCCESS = 'projects/fetchCatalogsSuccess' +export const UPDATE_CONFIG = 'config/updateConfig' +export const UPLOAD_PROJECT_ERROR = 'import/uploadProjectError' +export const UPLOAD_PROJECT_INIT = 'import/uploadProjectInit' +export const UPLOAD_PROJECT_SUCCESS = 'import/uploadProjectSuccess' +export const FETCH_FILETYPES_ERROR = 'projects/fetchFileTypesError' +export const FETCH_FILETYPES_INIT = 'projects/fetchFileTypesInit' +export const FETCH_FILETYPES_SUCCESS = 'projects/fetchFileTypesSuccess' +export const FETCH_IMPORT_URLS_ERROR = 'projects/fetchImportUrlsError' +export const FETCH_IMPORT_URLS_INIT = 'projects/fetchImportUrlsInit' +export const FETCH_IMPORT_URLS_SUCCESS = 'projects/fetchImportUrlsSuccess' diff --git a/rdmo/projects/assets/js/actions/configActions.js b/rdmo/projects/assets/js/actions/configActions.js new file mode 100644 index 0000000000..11da6d3f84 --- /dev/null +++ b/rdmo/projects/assets/js/actions/configActions.js @@ -0,0 +1,9 @@ +import { DELETE_CONFIG, UPDATE_CONFIG } from './actionTypes' + +export function updateConfig(path, value) { + return {type: UPDATE_CONFIG, path, value} +} + +export function deleteConfig(path) { + return {type: DELETE_CONFIG, path} +} diff --git a/rdmo/projects/assets/js/actions/projectsActions.js b/rdmo/projects/assets/js/actions/projectsActions.js index 9abc09121f..e274799df8 100644 --- a/rdmo/projects/assets/js/actions/projectsActions.js +++ b/rdmo/projects/assets/js/actions/projectsActions.js @@ -1,11 +1,17 @@ - import ProjectsApi from '../api/ProjectsApi' -import { FETCH_PROJECTS_ERROR, FETCH_PROJECTS_INIT, FETCH_PROJECTS_SUCCESS } from './types' +import { FETCH_PROJECTS_ERROR, FETCH_PROJECTS_INIT, FETCH_PROJECTS_SUCCESS, + FETCH_INVITATIONS_ERROR, FETCH_INVITATIONS_INIT, FETCH_INVITATIONS_SUCCESS, + FETCH_CATALOGS_ERROR, FETCH_CATALOGS_INIT, FETCH_CATALOGS_SUCCESS, + FETCH_FILETYPES_ERROR, FETCH_FILETYPES_INIT, FETCH_FILETYPES_SUCCESS, + FETCH_IMPORT_URLS_ERROR, FETCH_IMPORT_URLS_INIT, FETCH_IMPORT_URLS_SUCCESS, + UPLOAD_PROJECT_ERROR, UPLOAD_PROJECT_INIT, UPLOAD_PROJECT_SUCCESS } + from './actionTypes' export function fetchAllProjects() { - return function(dispatch) { + return function(dispatch, getState) { + const params = getState().config.params dispatch(fetchProjectsInit()) - const action = (dispatch) => ProjectsApi.fetchProjects(true) + const action = (dispatch) => ProjectsApi.fetchProjects(params || {}) .then(projects => { dispatch(fetchProjectsSuccess({ projects }))}) @@ -25,3 +31,123 @@ export function fetchProjectsSuccess(projects) { export function fetchProjectsError(error) { return {type: FETCH_PROJECTS_ERROR, error} } + +export function fetchCatalogs() { + return function(dispatch) { + dispatch(fetchCatalogsInit()) + const action = (dispatch) => ProjectsApi.fetchCatalogs() + .then(catalogs => { + dispatch(fetchCatalogsSuccess({ catalogs }))}) + + return dispatch(action) + .catch(error => dispatch(fetchCatalogsError(error))) + } +} + +export function fetchCatalogsInit() { + return {type: FETCH_CATALOGS_INIT} +} + +export function fetchCatalogsSuccess(catalogs) { + return {type: FETCH_CATALOGS_SUCCESS, catalogs} +} + +export function fetchCatalogsError(error) { + return {type: FETCH_CATALOGS_ERROR, error} +} + +export function fetchAllowedFileTypes() { + return function(dispatch) { + dispatch(fetchAllowedFileTypesInit()) + const action = (dispatch) => ProjectsApi.fetchAllowedFileTypes() + .then(allowedTypes => { + dispatch(fetchAllowedFileTypesSuccess({ allowedTypes }))}) + + return dispatch(action) + .catch(error => dispatch(fetchAllowedFileTypesError(error))) + } +} + +export function fetchAllowedFileTypesInit() { + return {type: FETCH_FILETYPES_INIT} +} + +export function fetchAllowedFileTypesSuccess(allowedTypes) { + return {type: FETCH_FILETYPES_SUCCESS, allowedTypes} +} + +export function fetchAllowedFileTypesError(error) { + return {type: FETCH_FILETYPES_ERROR, error} +} + +export function fetchImportUrls() { + return function(dispatch) { + dispatch(fetchImportUrlsInit()) + const action = (dispatch) => ProjectsApi.fetchDirectImportUrls() + .then(importUrls => { + dispatch(fettchImportUrlsSuccess({ importUrls }))}) + + return dispatch(action) + .catch(error => dispatch(fetchImportUrlsError(error))) + } +} + +export function fetchImportUrlsInit() { + return {type: FETCH_IMPORT_URLS_INIT} +} + +export function fettchImportUrlsSuccess(importUrls) { + return {type: FETCH_IMPORT_URLS_SUCCESS, importUrls } +} + +export function fetchImportUrlsError(error) { + return {type: FETCH_IMPORT_URLS_ERROR, error} +} + +export function fetchInvitations() { + return function(dispatch) { + dispatch(fetchInvitationsInit()) + const action = (dispatch) => ProjectsApi.fetchInvites() + .then(invites => { + dispatch(fetchInvitationsSuccess({ invites }))}) + + return dispatch(action) + .catch(error => dispatch(fetchInvitationsError(error))) + } +} + +export function fetchInvitationsInit() { + return {type: FETCH_INVITATIONS_INIT} +} + +export function fetchInvitationsSuccess(invites) { + return {type: FETCH_INVITATIONS_SUCCESS, invites} +} + +export function fetchInvitationsError(error) { + return {type: FETCH_INVITATIONS_ERROR, error} +} + +export function uploadProject(url, file) { + return function(dispatch) { + dispatch(uploadProjectInit()) + + return ProjectsApi.uploadProject(url, file) + .then(project => dispatch(uploadProjectSuccess(project))) + .catch(error => { + dispatch(uploadProjectError(error)) + }) + } +} + +export function uploadProjectInit() { + return {type: UPLOAD_PROJECT_INIT} +} + +export function uploadProjectSuccess(project) { + return {type: UPLOAD_PROJECT_SUCCESS, project} +} + +export function uploadProjectError(error) { + return {type: UPLOAD_PROJECT_ERROR, error} +} diff --git a/rdmo/projects/assets/js/actions/types.js b/rdmo/projects/assets/js/actions/types.js deleted file mode 100644 index 0391ffaca7..0000000000 --- a/rdmo/projects/assets/js/actions/types.js +++ /dev/null @@ -1,3 +0,0 @@ -export const FETCH_PROJECTS_SUCCESS = 'projects/fetchProjectsSuccess' -export const FETCH_PROJECTS_ERROR = 'projects/fetchProjectsError' -export const FETCH_PROJECTS_INIT = 'projects/fetchProjectsInit' diff --git a/rdmo/projects/assets/js/actions/userActions.js b/rdmo/projects/assets/js/actions/userActions.js new file mode 100644 index 0000000000..6e26ef7688 --- /dev/null +++ b/rdmo/projects/assets/js/actions/userActions.js @@ -0,0 +1,30 @@ +import AccountsApi from '../api/AccountsApi' +import { + FETCH_CURRENT_USER_ERROR, + FETCH_CURRENT_USER_INIT, + FETCH_CURRENT_USER_SUCCESS } + from './actionTypes' + +export function fetchCurrentUser() { + return function(dispatch) { + dispatch(fetchCurrentUserInit()) + const action = (dispatch) => AccountsApi.fetchCurrentUser(true) + .then(currentUser => { + dispatch(fetchCurrentUserSuccess({ currentUser }))}) + + return dispatch(action) + .catch(error => dispatch(fetchCurrentUserError(error))) + } +} + +export function fetchCurrentUserInit() { + return {type: FETCH_CURRENT_USER_INIT} +} + +export function fetchCurrentUserSuccess(currentUser) { + return {type: FETCH_CURRENT_USER_SUCCESS, currentUser} +} + +export function fetchCurrentUserError(error) { + return {type: FETCH_CURRENT_USER_ERROR, error} +} diff --git a/rdmo/projects/assets/js/api/AccountsApi.js b/rdmo/projects/assets/js/api/AccountsApi.js new file mode 100644 index 0000000000..94e42a94ad --- /dev/null +++ b/rdmo/projects/assets/js/api/AccountsApi.js @@ -0,0 +1,9 @@ +import BaseApi from 'rdmo/core/assets/js/api/BaseApi' + +class AccountsApi extends BaseApi { + static fetchCurrentUser() { + return this.get('/api/v1/accounts/users/current/') + } +} + +export default AccountsApi diff --git a/rdmo/projects/assets/js/api/ProjectsApi.js b/rdmo/projects/assets/js/api/ProjectsApi.js index 62db2e8259..bb2eba0f43 100644 --- a/rdmo/projects/assets/js/api/ProjectsApi.js +++ b/rdmo/projects/assets/js/api/ProjectsApi.js @@ -1,11 +1,111 @@ +import Cookies from 'js-cookie' import BaseApi from 'rdmo/core/assets/js/api/BaseApi' +import { encodeParams } from 'rdmo/core/assets/js/utils/api' +import baseUrl from 'rdmo/core/assets/js/utils/baseUrl' class ProjectsApi extends BaseApi { - static fetchProjects() { - console.log('fetch ') - return this.get('/api/v1/projects/projects/') + static fetchProjects(params, fetchParams = {}) { + return fetch('/api/v1/projects/projects/?' + encodeParams(params), fetchParams).then(response => { + if (response.ok) { + return response.json() + } else { + throw new Error(response.statusText) + } + }) } + + static fetchCatalogs() { + return fetch('/api/v1/projects/catalogs/').then(response => { + if (response.ok) { + return response.json() + } else { + throw new Error(response.statusText) + } + }) + } + + static fetchAllowedFileTypes() { + return fetch('/api/v1/projects/projects/upload-accept/') + .then(response => { + if (response.ok) { + return response.text() + .then(text => { + try { + // Attempt to parse the text as JSON + const jsonData = JSON.parse(text) + // Check if the parsed data is an array + if (Array.isArray(jsonData)) { + return jsonData + } + } catch (error) { + // If JSON.parse fails, handle text as plain string below + } + + // If it's not a JSON array, process it as a string + const cleanedText = text.replace(/^"|"$/g, '') + return cleanedText ? cleanedText.split(',') : [] + }) + } else { + throw new Error(response.statusText) + } + }) + } + + static fetchDirectImportUrls() { + return fetch('/api/v1/projects/projects/imports/') + .then(response => { + if (response.ok) { + return response.json() + } else { + throw new Error(response.statusText) + } + }) + } + + static fetchInvites() { + return fetch('/api/v1/projects/invites/user') + .then(response => { + if (response.ok) { + return response.json() + } else { + throw new Error(response.statusText) + } + }) + } + + static uploadProject(url, file) { + var formData = new FormData() + formData.append('method', 'upload_file') + formData.append('uploaded_file', file) + return fetch(baseUrl + url, { + method: 'POST', + headers: { + 'X-CSRFToken': Cookies.get('csrftoken'), + }, + body: formData + }).catch(error => { + throw new Error(`API error: ${error.message}`) + }).then(response => { + if (response.ok) { + if (response.url) { + // open in new window: + // window.open(response.url, '_blank') + // open in same window: + window.location.href = response.url + } else { + throw new Error('Response does not contain a URL') + } + } else if (response.status == 400) { + return response.json().then(errors => { + throw new Error(`Validation error: ${JSON.stringify(errors)}`) + }) + } else { + throw new Error(`API error: ${response.statusText} (${response.status})`) + } + }) + } + } export default ProjectsApi diff --git a/rdmo/projects/assets/js/components/helper/PendingInvitations.js b/rdmo/projects/assets/js/components/helper/PendingInvitations.js new file mode 100644 index 0000000000..9290ccb32c --- /dev/null +++ b/rdmo/projects/assets/js/components/helper/PendingInvitations.js @@ -0,0 +1,35 @@ +import React from 'react' +import PropTypes from 'prop-types' +import { ROLE_LABELS } from '../../utils' + +const PendingInvitations = ({ invitations }) => { + + return ( + invitations?.map(item => ( +
+
+ {item.title} +
+
+ {ROLE_LABELS[item.role]} +
+
+ + +
+
+ )) + ) +} + +PendingInvitations.propTypes = { + invitations: PropTypes.arrayOf(PropTypes.shape({ + id: PropTypes.number.isRequired, + title: PropTypes.string.isRequired, + project: PropTypes.number.isRequired, + role: PropTypes.string.isRequired, + token: PropTypes.string.isRequired + })), +} + +export default PendingInvitations diff --git a/rdmo/projects/assets/js/components/helper/ProjectFilters.js b/rdmo/projects/assets/js/components/helper/ProjectFilters.js new file mode 100644 index 0000000000..70fa2012b8 --- /dev/null +++ b/rdmo/projects/assets/js/components/helper/ProjectFilters.js @@ -0,0 +1,158 @@ +import React from 'react' +import PropTypes from 'prop-types' + +import { get } from 'lodash' +import DatePicker from 'react-datepicker' +import { formatISO } from 'date-fns' + +import { Select } from 'rdmo/core/assets/js/components' +import useDatePicker from '../../hooks/useDatePicker' +import { language } from 'rdmo/core/assets/js/utils' + +const ProjectFilters = ({ catalogs, config, configActions, isManager, projectsActions }) => { + const { + dateRange, + dateFormat, + getLocale, + setStartDate, + setEndDate + } = useDatePicker() + + const catalogOptions = catalogs?.map(catalog => ({ value: catalog.id.toString(), label: catalog.title })) + const selectedCatalog = get(config, 'params.catalog', '') + const updateCatalogFilter = (value) => { + value ? configActions.updateConfig('params.catalog', value) : configActions.deleteConfig('params.catalog') + projectsActions.fetchAllProjects() + } + + return ( +
+
+
+
+ +
+ - - - -

- - {% blocktrans trimmed %} - {{ number_of_filtered_projects }} of {{ number_of_projects }} projects shown - {% endblocktrans %} - -

- - - {% if can_add_project %} - -

{% trans 'Import existing project' %}

- -
    -
  • -

    - {% trans 'Import from file' %} -

    - {% url 'project_create_import' as upload_url %} - {% include 'core/upload_form.html' with upload_url=upload_url %} -
    • - - {% if settings.PROJECT_IMPORTS_LIST %} -
  • -

    - {% trans 'Import directly' %} -

    -
    • - {% for key, label, class in settings.PROJECT_IMPORTS %} - {% if key in settings.PROJECT_IMPORTS_LIST %} -
  • - - {{ label }} - -
    • - {% endif %} - {% endfor %} - {% endif %} -
- - {% endif %} - - {% if invites %} - -

{% trans 'Pending invitations' %}

+ + {{ block.super }} +{% endblock %} - +{% block js %} + + -

- {% blocktrans trimmed %} - Click on one of the links to join the projects. - {% endblocktrans %} -

- {% endif %} + + + + {% endblock %} {% block page %} -

{% trans 'My Projects' %}

- - - - - - - - - - - - {% for project in projects %} - - - - - - - - {% endfor %} - -
{% trans 'Name' %}{% trans 'Progress' %}{% trans 'Role' %}{% trans 'Last changed' %}
- - {% for ancestor in project.get_ancestors %}{{ ancestor }} / {% endfor %} - {{ project.title }} - - - {% project_progress project %} - - {{ project.role|projects_role }} - - {{ project.last_changed }} - - {% has_perm 'projects.change_project_object' request.user project as can_change_project_object %} - {% has_perm 'projects.delete_project_object' request.user project as can_delete_project_object %} - - {% if can_change_project_object %} - - {% endif %} - - {% if can_delete_project_object %} - - {% endif %} -
+
- {% include 'projects/projects_pagination.html' %} - {% render_lang_template 'projects/overlays/projects_create_project' %} {% render_lang_template 'projects/overlays/projects_projects_table' %} {% render_lang_template 'projects/overlays/projects_import_project' %} diff --git a/rdmo/projects/templates/projects/site_projects.html b/rdmo/projects/templates/projects/site_projects.html deleted file mode 100644 index 73e0909abd..0000000000 --- a/rdmo/projects/templates/projects/site_projects.html +++ /dev/null @@ -1,99 +0,0 @@ -{% extends 'core/page.html' %} -{% load i18n %} -{% load static %} -{% load compress %} -{% load core_tags %} -{% load accounts_tags %} -{% load projects_tags %} - -{% block head %} - {% compress css %} - - {% endcompress %} -{% endblock %} - -{% block sidebar %} -

{% trans 'Filter projects' %}

- - - - -

{% trans 'Options' %}

- - - -{% endblock %} - -{% block page %} -

{% blocktrans trimmed with site=request.site %}All projects on {{ site }}{% endblocktrans %}

- - - - - - - - - - - - - {% for project in projects %} - - - - - - - - {% endfor %} - -
{% trans 'Name' %}{% trans 'Progress' %}{% trans 'Created' %}{% trans 'Last changed' %}
- - {% for ancestor in project.get_ancestors %}{{ ancestor }} / {% endfor %} - {{ project.title }} - - - {% project_progress project %} - - {{ project.created }} - - {{ project.last_changed }} - - - -
- - {% include 'projects/projects_pagination.html' %} -{% endblock %} diff --git a/rdmo/projects/tests/test_view_project.py b/rdmo/projects/tests/test_view_project.py index 6f277ed987..b43660cf14 100644 --- a/rdmo/projects/tests/test_view_project.py +++ b/rdmo/projects/tests/test_view_project.py @@ -5,8 +5,6 @@ from django.contrib.auth.models import Group, User from django.urls import reverse -from pytest_django.asserts import assertContains, assertNotContains, assertTemplateUsed - from rdmo.questions.models import Catalog from rdmo.views.models import View @@ -75,39 +73,17 @@ def test_list(db, client, username, password): if password: assert response.status_code == 200 - assertTemplateUsed(response, 'projects/projects.html') + # assertTemplateUsed(response, 'projects/projects.html') if username in ('site', 'api'): assert projects == [] - assert response.context['number_of_projects'] == len([]) - assertContains(response, 'View all projects on') - else: - user_projects_map = view_project_permission_map.get(username, []) - assert sorted(set(map(int, projects))) == user_projects_map - assert response.context['number_of_projects'] == len(user_projects_map) - assertNotContains(response, 'View all projects on') - else: - assert response.status_code == 302 - - -@pytest.mark.parametrize('username,password', users) -def test_site(db, client, username, password): - client.login(username=username, password=password) - - url = reverse('site_projects') - response = client.get(url) - - projects = re.findall(r'/projects/(\d+)/update/', response.content.decode()) - - if password: - if username in ('site', 'api'): - assert response.status_code == 200 - assertTemplateUsed(response, 'projects/site_projects.html') - user_projects_map = view_project_permission_map.get(username, []) - assert sorted(set(map(int, projects))) == user_projects_map - assert response.context['number_of_projects'] == len(user_projects_map) + # assert response.context['number_of_projects'] == len([]) + # assertContains(response, 'View all projects on') else: - assert response.status_code == 403 + # user_projects_map = view_project_permission_map.get(username, []) + assert sorted(set(map(int, projects))) == [] + # assert response.context['number_of_projects'] == len(user_projects_map) + # assertNotContains(response, 'View all projects on') else: assert response.status_code == 302 diff --git a/rdmo/projects/tests/test_viewset_catalog.py b/rdmo/projects/tests/test_viewset_catalog.py new file mode 100644 index 0000000000..f7a35d28e2 --- /dev/null +++ b/rdmo/projects/tests/test_viewset_catalog.py @@ -0,0 +1,34 @@ +import pytest + +from django.urls import reverse + +users = ( + ('owner', 'owner'), + ('manager', 'manager'), + ('author', 'author'), + ('guest', 'guest'), + ('api', 'api'), + ('user', 'user'), + ('site', 'site'), + ('anonymous', None), +) + +urlnames = { + 'list': 'v1-projects:catalog-list' +} + +catalog_id = 1 + + +@pytest.mark.parametrize('username,password', users) +def test_list(db, client, username, password): + client.login(username=username, password=password) + + url = reverse(urlnames['list']) + response = client.get(url) + + if password: + assert response.status_code == 200 + assert isinstance(response.json(), list) + else: + assert response.status_code == 401 diff --git a/rdmo/projects/tests/test_viewset_invite.py b/rdmo/projects/tests/test_viewset_invite.py index e95b2c6533..096fb3f8be 100644 --- a/rdmo/projects/tests/test_viewset_invite.py +++ b/rdmo/projects/tests/test_viewset_invite.py @@ -26,7 +26,8 @@ urlnames = { 'list': 'v1-projects:invite-list', - 'detail': 'v1-projects:invite-detail' + 'detail': 'v1-projects:invite-detail', + 'user': 'v1-projects:invite-user' } invites = [1, 2] @@ -112,3 +113,22 @@ def test_delete(db, client, username, password, invite_id): assert response.status_code == 405 else: assert response.status_code == 401 + + +@pytest.mark.parametrize('username,password', users) +def test_user(db, client, username, password): + client.login(username=username, password=password) + + url = reverse(urlnames['user']) + response = client.get(url) + + if password: + assert response.status_code == 200 + assert isinstance(response.json(), list) + + if username == 'user': + assert sorted([item['id'] for item in response.json()]) == [2] + else: + assert sorted([item['id'] for item in response.json()]) == [] + else: + assert response.status_code == 401 diff --git a/rdmo/projects/tests/test_viewset_project.py b/rdmo/projects/tests/test_viewset_project.py index 8e9d8b6371..11c56055c3 100644 --- a/rdmo/projects/tests/test_viewset_project.py +++ b/rdmo/projects/tests/test_viewset_project.py @@ -45,6 +45,8 @@ 'navigation': 'v1-projects:project-navigation', 'options': 'v1-projects:project-options', 'resolve': 'v1-projects:project-resolve', + 'upload_accept': 'v1-projects:project-upload-accept', + 'imports': 'v1-projects:project-imports' } projects = [1, 2, 3, 4, 5] @@ -359,3 +361,32 @@ def test_options_text_and_help(db, client, mocker): 'text_and_help': 'Simple answer 1' } ] + + +@pytest.mark.parametrize('username,password', users) +def test_upload_accept(db, client, username, password): + client.login(username=username, password=password) + + url = reverse(urlnames['upload_accept']) + response = client.get(url) + + if password: + assert response.status_code == 200 + assert response.json() == '.xml' + else: + assert response.status_code == 401 + + +@pytest.mark.parametrize('username,password', users) +def test_imports(db, client, username, password): + client.login(username=username, password=password) + + url = reverse(urlnames['imports']) + response = client.get(url) + + if password: + assert response.status_code == 200 + assert len(response.json()) == 1 + assert response.json()[0]['key'] == 'url' + else: + assert response.status_code == 401 diff --git a/rdmo/projects/urls/__init__.py b/rdmo/projects/urls/__init__.py index 0e1009480e..47472eeeaf 100644 --- a/rdmo/projects/urls/__init__.py +++ b/rdmo/projects/urls/__init__.py @@ -12,7 +12,6 @@ MembershipCreateView, MembershipDeleteView, MembershipUpdateView, - NewProjectsView, ProjectAnswersExportView, ProjectAnswersView, ProjectCancelView, @@ -35,7 +34,6 @@ ProjectUpdateViewsView, ProjectViewExportView, ProjectViewView, - SiteProjectsView, SnapshotCreateView, SnapshotRollbackView, SnapshotUpdateView, @@ -44,11 +42,6 @@ urlpatterns = [ re_path(r'^$', ProjectsView.as_view(), name='projects'), - re_path(r'^all/$', - SiteProjectsView.as_view(), name='site_projects'), - re_path(r'^new/$', - NewProjectsView.as_view(), name='new_projects'), - re_path(r'^create/$', ProjectCreateView.as_view(), name='project_create'), re_path(r'^join/(?P.+)/$', diff --git a/rdmo/projects/urls/v1.py b/rdmo/projects/urls/v1.py index 8f8f373a3d..a3ab70fa9d 100644 --- a/rdmo/projects/urls/v1.py +++ b/rdmo/projects/urls/v1.py @@ -3,6 +3,7 @@ from rest_framework_extensions.routers import ExtendedDefaultRouter from ..viewsets import ( + CatalogViewSet, IntegrationViewSet, InviteViewSet, IssueViewSet, @@ -43,7 +44,7 @@ router.register(r'issues', IssueViewSet, basename='issue') router.register(r'snapshots', SnapshotViewSet, basename='snapshot') router.register(r'values', ValueViewSet, basename='value') - +router.register(r'catalogs', CatalogViewSet, basename='catalog') urlpatterns = [ path('', include(router.urls)), diff --git a/rdmo/projects/views/__init__.py b/rdmo/projects/views/__init__.py index c05c5f61fa..f42a45b5ab 100644 --- a/rdmo/projects/views/__init__.py +++ b/rdmo/projects/views/__init__.py @@ -3,7 +3,6 @@ from .issue import IssueDetailView, IssueSendView, IssueUpdateView from .membership import MembershipCreateView, MembershipDeleteView, MembershipUpdateView from .project import ( - NewProjectsView, ProjectCancelView, ProjectDeleteView, ProjectDetailView, @@ -13,7 +12,6 @@ ProjectLeaveView, ProjectQuestionsView, ProjectsView, - SiteProjectsView, ) from .project_answers import ProjectAnswersExportView, ProjectAnswersView from .project_create import ProjectCreateImportView, ProjectCreateView diff --git a/rdmo/projects/views/project.py b/rdmo/projects/views/project.py index 0120139041..35402107e0 100644 --- a/rdmo/projects/views/project.py +++ b/rdmo/projects/views/project.py @@ -1,11 +1,9 @@ +import hashlib import logging from django.conf import settings from django.contrib.auth.mixins import LoginRequiredMixin -from django.core.exceptions import PermissionDenied -from django.db import models from django.db.models import F, OuterRef, Subquery -from django.db.models.functions import Coalesce, Greatest from django.forms import Form from django.http import Http404 from django.shortcuts import get_object_or_404, redirect @@ -16,9 +14,6 @@ from django.views.generic import DeleteView, DetailView, TemplateView from django.views.generic.edit import FormMixin -from django_filters.views import FilterView - -from rdmo.accounts.utils import is_site_manager from rdmo.core.plugins import get_plugin, get_plugins from rdmo.core.views import CSRFViewMixin, ObjectPermissionMixin, RedirectViewMixin from rdmo.questions.models import Catalog @@ -26,105 +21,23 @@ from rdmo.tasks.models import Task from rdmo.views.models import View -from ..filters import ProjectFilter -from ..models import Integration, Invite, Membership, Project, Value -from ..utils import get_upload_accept, set_context_querystring_with_filter_and_page +from ..models import Integration, Invite, Membership, Project +from ..utils import get_upload_accept logger = logging.getLogger(__name__) -# class NewProjectsView(LoginRequiredMixin, PermissionRedirectMixin, RulesPermissionRequiredMixin, -# CSRFViewMixin, TemplateView): -# template_name = 'projects/new_projects.html' - -# def has_permission(self): -# # Use test_rule from rules for permissions check -# return test_rule('projects.can_view_all_projects', self.request.user, self.request.site) - -class NewProjectsView(LoginRequiredMixin, CSRFViewMixin, TemplateView): - template_name = 'projects/new_projects.html' +class ProjectsView(LoginRequiredMixin, CSRFViewMixin, TemplateView): + template_name = 'projects/projects.html' # def has_permission(self): # # Use test_rule from rules for permissions check # return test_rule('projects.can_view_all_projects', self.request.user, self.request.site) + def render_to_response(self, context, **response_kwargs): + storeid = hashlib.sha256(self.request.session.session_key.encode()).hexdigest() -class ProjectsView(LoginRequiredMixin, FilterView): - template_name = 'projects/projects.html' - context_object_name = 'projects' - paginate_by = 20 - filterset_class = ProjectFilter - - def get_queryset(self): - # prepare projects queryset for this user - queryset = Project.objects.filter(user=self.request.user) - for instance in queryset: - queryset |= instance.get_descendants() - queryset = queryset.distinct() - - # prepare subquery for role - membership_subquery = models.Subquery( - Membership.objects.filter(project=models.OuterRef('pk'), user=self.request.user).values('role') - ) - queryset = queryset.annotate(role=membership_subquery) - - # prepare subquery for last_changed - last_changed_subquery = models.Subquery( - Value.objects.filter(project=models.OuterRef('pk')).order_by('-updated').values('updated')[:1] - ) - # the 'updated' field from a Project always returns a valid DateTime value - # when Greatest returns null, then Coalesce will return the value for 'updated' as a fall-back - # when Greatest returns a value, then Coalesce will return this value - queryset = queryset.annotate(last_changed=Coalesce(Greatest(last_changed_subquery, 'updated'), 'updated')) - - # order by last changed - queryset = queryset.order_by('-last_changed') - - return queryset - - def get_context_data(self, **kwargs): - context = super().get_context_data(**kwargs) - context['number_of_projects'] = self.get_queryset().count() - context['invites'] = Invite.objects.filter(user=self.request.user) - context['is_site_manager'] = is_site_manager(self.request.user) - context['number_of_filtered_projects'] = context["filter"].qs.count() - context['upload_accept'] = get_upload_accept() - context = set_context_querystring_with_filter_and_page(context) - return context - -class SiteProjectsView(LoginRequiredMixin, FilterView): - template_name = 'projects/site_projects.html' - context_object_name = 'projects' - paginate_by = 20 - filterset_class = ProjectFilter - model = Project - - def get_queryset(self): - if is_site_manager(self.request.user): - # prepare projects queryset for the site manager - queryset = Project.objects.filter_current_site() - - # prepare subquery for last_changed - last_changed_subquery = models.Subquery( - Value.objects.filter(project=models.OuterRef('pk')).order_by('-updated').values('updated')[:1] - ) - # the 'updated' field from a Project always returns a valid DateTime value - # when Greatest returns null, then Coalesce will return the value for 'updated' as a fall-back - # when Greatest returns a value, then Coalesce will return this value - queryset = queryset.annotate(last_changed=Coalesce(Greatest(last_changed_subquery, 'updated'), 'updated')) - - return queryset - else: - raise PermissionDenied() - - def get_context_data(self, **kwargs): - context = super().get_context_data(**kwargs) - context['number_of_projects'] = self.get_queryset().count() - context['number_of_filtered_projects'] = context["filter"].qs.count() - context = set_context_querystring_with_filter_and_page(context) - context['catalogs'] = Catalog.objects.filter_current_site() \ - .filter_group(self.request.user) \ - .filter_availability(self.request.user) - return context - + response = super().render_to_response(context, **response_kwargs) + response.set_cookie('storeid', storeid) + return response class ProjectDetailView(ObjectPermissionMixin, DetailView): model = Project diff --git a/rdmo/projects/viewsets.py b/rdmo/projects/viewsets.py index 11b9c296c6..35558fc562 100644 --- a/rdmo/projects/viewsets.py +++ b/rdmo/projects/viewsets.py @@ -8,6 +8,7 @@ from rest_framework.decorators import action from rest_framework.exceptions import NotFound from rest_framework.mixins import CreateModelMixin, ListModelMixin, RetrieveModelMixin, UpdateModelMixin +from rest_framework.permissions import IsAuthenticated from rest_framework.response import Response from rest_framework.reverse import reverse from rest_framework.viewsets import GenericViewSet, ModelViewSet, ReadOnlyModelViewSet @@ -19,11 +20,17 @@ from rdmo.core.permissions import HasModelPermission from rdmo.core.utils import human2bytes, return_file_response from rdmo.options.models import OptionSet -from rdmo.questions.models import Page, Question, QuestionSet +from rdmo.questions.models import Catalog, Page, Question, QuestionSet from rdmo.tasks.models import Task from rdmo.views.models import View -from .filters import SnapshotFilterBackend, ValueFilterBackend +from .filters import ( + ProjectDateFilterBackend, + ProjectOrderingFilter, + ProjectSearchFilterBackend, + SnapshotFilterBackend, + ValueFilterBackend, +) from .models import Continuation, Integration, Invite, Issue, Membership, Project, Snapshot, Value from .permissions import ( HasProjectPagePermission, @@ -48,18 +55,24 @@ ProjectSnapshotSerializer, ProjectValueSerializer, SnapshotSerializer, + UserInviteSerializer, ValueSerializer, ) -from .serializers.v1.overview import ProjectOverviewSerializer +from .serializers.v1.overview import CatalogSerializer, ProjectOverviewSerializer from .serializers.v1.page import PageSerializer -from .utils import check_conditions, send_invite_email +from .utils import check_conditions, get_upload_accept, send_invite_email class ProjectViewSet(ModelViewSet): permission_classes = (HasModelPermission | HasProjectsPermission, ) serializer_class = ProjectSerializer - filter_backends = (DjangoFilterBackend,) + filter_backends = ( + DjangoFilterBackend, + ProjectDateFilterBackend, + ProjectOrderingFilter, + ProjectSearchFilterBackend, + ) filterset_fields = ( 'title', 'user', @@ -67,9 +80,17 @@ class ProjectViewSet(ModelViewSet): 'catalog', 'catalog__uri' ) + ordering_fields = ( + 'title', + 'progress', + 'role', + 'owner', + 'updated', + 'created' + ) def get_queryset(self): - return Project.objects.filter_user(self.request.user).select_related('catalog') + return Project.objects.filter_user(self.request.user).distinct().select_related('catalog') @action(detail=True, permission_classes=(HasModelPermission | HasProjectPermission, )) def overview(self, request, pk=None): @@ -208,6 +229,19 @@ def progress(self, request, pk=None): 'ratio': ratio }) + @action(detail=False, url_path='upload-accept', permission_classes=(IsAuthenticated, )) + def upload_accept(self, request): + return Response(get_upload_accept()) + + @action(detail=False, permission_classes=(IsAuthenticated, )) + def imports(self, request): + return Response([{ + 'key': key, + 'label': label, + 'class_name': class_name, + 'href': reverse('project_create_import', args=[key]) + } for key, label, class_name in settings.PROJECT_IMPORTS if key in settings.PROJECT_IMPORTS_LIST] ) + def perform_create(self, serializer): project = serializer.save(site=get_current_site(self.request)) @@ -548,6 +582,11 @@ def get_queryset(self): def get_detail_permission_object(self, obj): return obj.project + @action(detail=False, permission_classes=(IsAuthenticated, )) + def user(self, request): + invites = Invite.objects.filter(user=self.request.user) + serializer = UserInviteSerializer(invites, many=True) + return Response(serializer.data) class IssueViewSet(ReadOnlyModelViewSet): permission_classes = (HasModelPermission | HasProjectsPermission, ) @@ -604,3 +643,15 @@ def file(self, request, pk=None): # if it didn't work return 404 raise NotFound() + + +class CatalogViewSet(ListModelMixin, GenericViewSet): + permission_classes = (IsAuthenticated, ) + + serializer_class = CatalogSerializer + + def get_queryset(self): + return Catalog.objects.filter_current_site() \ + .filter_group(self.request.user) \ + .filter_availability(self.request.user) \ + .order_by('-available', 'order') diff --git a/testing/config/settings/base.py b/testing/config/settings/base.py index 2d8720fcf3..0361001712 100644 --- a/testing/config/settings/base.py +++ b/testing/config/settings/base.py @@ -81,3 +81,9 @@ PROJECT_ISSUE_PROVIDERS = [ ('simple', _('Simple provider'), 'rdmo.projects.providers.SimpleIssueProvider') ] + +PROJECT_IMPORTS += [ + ('url', _('from URL'), 'rdmo.projects.imports.URLImport'), +] + +PROJECT_IMPORTS_LIST = ['url'] diff --git a/webpack/common.config.js b/webpack/common.config.js index b3b81deced..6cf830399f 100644 --- a/webpack/common.config.js +++ b/webpack/common.config.js @@ -73,7 +73,6 @@ module.exports = [ }, output: { filename: 'js/projects.js', - publicPath: '/static/projects/', path: path.resolve(__dirname, '../rdmo/projects/static/projects/'), } }) From 350e9c154eb7d1a9ad8d4910ca63fded19fa917e Mon Sep 17 00:00:00 2001 From: Claudia Malzer Date: Thu, 23 May 2024 11:51:35 +0200 Subject: [PATCH 029/504] try fix packge-lock --- package-lock.json | 3527 ++++++++++++++++----------------------------- 1 file changed, 1281 insertions(+), 2246 deletions(-) diff --git a/package-lock.json b/package-lock.json index 27f507832e..510d52f058 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,6 @@ { "name": "rdmo", + "version": "1.8.0", "lockfileVersion": 2, "requires": true, "packages": { @@ -12,7 +13,6 @@ "@uiw/react-codemirror": "^4.19.9", "bootstrap-sass": "^3.4.1", "classnames": "^2.3.2", - "date-fns": "^3.6.0", "font-awesome": "4.7.0", "jquery": "^3.6.0", "js-cookie": "^2.2.1", @@ -21,11 +21,9 @@ "prop-types": "^15.7.2", "react": "^18.2.0", "react-bootstrap": "0.33.1", - "react-datepicker": "6.6.0", "react-dnd": "^16.0.1", "react-dnd-html5-backend": "^16.0.1", "react-dom": "^18.2.0", - "react-dropzone": "^10.0.0", "react-redux": "^7.2.4", "react-select": "^5.7.0", "redux": "^4.1.1", @@ -61,13 +59,12 @@ } }, "node_modules/@ampproject/remapping": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz", - "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==", - "dev": true, + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz", + "integrity": "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==", "dependencies": { - "@jridgewell/gen-mapping": "^0.3.5", - "@jridgewell/trace-mapping": "^0.3.24" + "@jridgewell/gen-mapping": "^0.1.0", + "@jridgewell/trace-mapping": "^0.3.9" }, "engines": { "node": ">=6.0.0" @@ -1813,23 +1810,23 @@ "dev": true }, "node_modules/@babel/runtime": { - "version": "7.24.1", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.1.tgz", - "integrity": "sha512-+BIznRzyqBf+2wCTxcKE3wDjfGeCoVE61KSHGpkzqrLi8qxqFwBeUFyId2cxkTmm55fzDGnm0+yCxaxygrLUnQ==", + "version": "7.20.13", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.13.tgz", + "integrity": "sha512-gt3PKXs0DBoL9xCvOIIZ2NEqAGZqHjAnmVbfQtB620V0uReIQutpel14KcneZuer7UioY8ALKZ7iocavvzTNFA==", "dependencies": { - "regenerator-runtime": "^0.14.0" + "regenerator-runtime": "^0.13.11" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/runtime-corejs2": { - "version": "7.24.1", - "resolved": "https://registry.npmjs.org/@babel/runtime-corejs2/-/runtime-corejs2-7.24.1.tgz", - "integrity": "sha512-De0q0utpUPiXnc7+B7Ku86mJ0eDItC/v3uFa/lQkq63XnHyZiytDHeCIvechlnVwwpU2ChjGF7c3I+mBrTudwg==", + "version": "7.20.13", + "resolved": "https://registry.npmjs.org/@babel/runtime-corejs2/-/runtime-corejs2-7.20.13.tgz", + "integrity": "sha512-K2yRNithMJG4epI509n4ljPjogMhmYCB887iSD7rRecxWC9dkbfJZCPGj0BQaqG3d3Qkpb1SotEmyeMmtnvxhw==", "dependencies": { "core-js": "^2.6.12", - "regenerator-runtime": "^0.14.0" + "regenerator-runtime": "^0.13.11" }, "engines": { "node": ">=6.9.0" @@ -1882,13 +1879,13 @@ } }, "node_modules/@codemirror/autocomplete": { - "version": "6.15.0", - "resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.15.0.tgz", - "integrity": "sha512-G2Zm0mXznxz97JhaaOdoEG2cVupn4JjPaS4AcNvZzhOsnnG9YVN68VzfoUw6dYTsIxT6a/cmoFEN47KAWhXaOg==", + "version": "6.4.2", + "resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.4.2.tgz", + "integrity": "sha512-8WE2xp+D0MpWEv5lZ6zPW1/tf4AGb358T5GWYiKEuCP8MvFfT3tH2mIF9Y2yr2e3KbHuSvsVhosiEyqCpiJhZQ==", "dependencies": { "@codemirror/language": "^6.0.0", "@codemirror/state": "^6.0.0", - "@codemirror/view": "^6.17.0", + "@codemirror/view": "^6.6.0", "@lezer/common": "^1.0.0" }, "peerDependencies": { @@ -1899,75 +1896,74 @@ } }, "node_modules/@codemirror/commands": { - "version": "6.3.3", - "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.3.3.tgz", - "integrity": "sha512-dO4hcF0fGT9tu1Pj1D2PvGvxjeGkbC6RGcZw6Qs74TH+Ed1gw98jmUgd2axWvIZEqTeTuFrg1lEB1KV6cK9h1A==", + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.2.1.tgz", + "integrity": "sha512-FFiNKGuHA5O8uC6IJE5apI5rT9gyjlw4whqy4vlcX0wE/myxL6P1s0upwDhY4HtMWLOwzwsp0ap3bjdQhvfDOA==", "dependencies": { "@codemirror/language": "^6.0.0", - "@codemirror/state": "^6.4.0", + "@codemirror/state": "^6.2.0", "@codemirror/view": "^6.0.0", - "@lezer/common": "^1.1.0" + "@lezer/common": "^1.0.0" } }, "node_modules/@codemirror/lang-css": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@codemirror/lang-css/-/lang-css-6.2.1.tgz", - "integrity": "sha512-/UNWDNV5Viwi/1lpr/dIXJNWiwDxpw13I4pTUAsNxZdg6E0mI2kTQb0P2iHczg1Tu+H4EBgJR+hYhKiHKko7qg==", + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/@codemirror/lang-css/-/lang-css-6.0.2.tgz", + "integrity": "sha512-4V4zmUOl2Glx0GWw0HiO1oGD4zvMlIQ3zx5hXOE6ipCjhohig2bhWRAasrZylH9pRNTcl1VMa59Lsl8lZWlTzw==", "dependencies": { "@codemirror/autocomplete": "^6.0.0", "@codemirror/language": "^6.0.0", "@codemirror/state": "^6.0.0", - "@lezer/common": "^1.0.2", "@lezer/css": "^1.0.0" } }, "node_modules/@codemirror/lang-html": { - "version": "6.4.8", - "resolved": "https://registry.npmjs.org/@codemirror/lang-html/-/lang-html-6.4.8.tgz", - "integrity": "sha512-tE2YK7wDlb9ZpAH6mpTPiYm6rhfdQKVDa5r9IwIFlwwgvVaKsCfuKKZoJGWsmMZIf3FQAuJ5CHMPLymOtg1hXw==", + "version": "6.4.2", + "resolved": "https://registry.npmjs.org/@codemirror/lang-html/-/lang-html-6.4.2.tgz", + "integrity": "sha512-bqCBASkteKySwtIbiV/WCtGnn/khLRbbiV5TE+d9S9eQJD7BA4c5dTRm2b3bVmSpilff5EYxvB4PQaZzM/7cNw==", "dependencies": { "@codemirror/autocomplete": "^6.0.0", "@codemirror/lang-css": "^6.0.0", "@codemirror/lang-javascript": "^6.0.0", "@codemirror/language": "^6.4.0", "@codemirror/state": "^6.0.0", - "@codemirror/view": "^6.17.0", + "@codemirror/view": "^6.2.2", "@lezer/common": "^1.0.0", "@lezer/css": "^1.1.0", "@lezer/html": "^1.3.0" } }, "node_modules/@codemirror/lang-javascript": { - "version": "6.2.2", - "resolved": "https://registry.npmjs.org/@codemirror/lang-javascript/-/lang-javascript-6.2.2.tgz", - "integrity": "sha512-VGQfY+FCc285AhWuwjYxQyUQcYurWlxdKYT4bqwr3Twnd5wP5WSeu52t4tvvuWmljT4EmgEgZCqSieokhtY8hg==", + "version": "6.1.4", + "resolved": "https://registry.npmjs.org/@codemirror/lang-javascript/-/lang-javascript-6.1.4.tgz", + "integrity": "sha512-OxLf7OfOZBTMRMi6BO/F72MNGmgOd9B0vetOLvHsDACFXayBzW8fm8aWnDM0yuy68wTK03MBf4HbjSBNRG5q7A==", "dependencies": { "@codemirror/autocomplete": "^6.0.0", "@codemirror/language": "^6.6.0", "@codemirror/lint": "^6.0.0", "@codemirror/state": "^6.0.0", - "@codemirror/view": "^6.17.0", + "@codemirror/view": "^6.0.0", "@lezer/common": "^1.0.0", "@lezer/javascript": "^1.0.0" } }, "node_modules/@codemirror/language": { - "version": "6.10.1", - "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.10.1.tgz", - "integrity": "sha512-5GrXzrhq6k+gL5fjkAwt90nYDmjlzTIJV8THnxNFtNKWotMIlzzN+CpqxqwXOECnUdOndmSeWntVrVcv5axWRQ==", + "version": "6.6.0", + "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.6.0.tgz", + "integrity": "sha512-cwUd6lzt3MfNYOobdjf14ZkLbJcnv4WtndYaoBkbor/vF+rCNguMPK0IRtvZJG4dsWiaWPcK8x1VijhvSxnstg==", "dependencies": { "@codemirror/state": "^6.0.0", - "@codemirror/view": "^6.23.0", - "@lezer/common": "^1.1.0", + "@codemirror/view": "^6.0.0", + "@lezer/common": "^1.0.0", "@lezer/highlight": "^1.0.0", "@lezer/lr": "^1.0.0", "style-mod": "^4.0.0" } }, "node_modules/@codemirror/lint": { - "version": "6.5.0", - "resolved": "https://registry.npmjs.org/@codemirror/lint/-/lint-6.5.0.tgz", - "integrity": "sha512-+5YyicIaaAZKU8K43IQi8TBy6mF6giGeWAH7N96Z5LC30Wm5JMjqxOYIE9mxwMG1NbhT2mA3l9hA4uuKUM3E5g==", + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/@codemirror/lint/-/lint-6.1.1.tgz", + "integrity": "sha512-e+M543x0NVHGayNHQzLP4XByJsvbu/ojY6+0VF2Y4Uu66Rt1nADuxNflZwECLf7gS009smIsptSUa6bUj/U/rw==", "dependencies": { "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.0.0", @@ -1975,9 +1971,9 @@ } }, "node_modules/@codemirror/search": { - "version": "6.5.6", - "resolved": "https://registry.npmjs.org/@codemirror/search/-/search-6.5.6.tgz", - "integrity": "sha512-rpMgcsh7o0GuCDUXKPvww+muLA1pDJaFrpq/CCHtpQJYz8xopu4D1hPcKRoDD0YlF8gZaqTNIRa4VRBWyhyy7Q==", + "version": "6.2.3", + "resolved": "https://registry.npmjs.org/@codemirror/search/-/search-6.2.3.tgz", + "integrity": "sha512-V9n9233lopQhB1dyjsBK2Wc1i+8hcCqxl1wQ46c5HWWLePoe4FluV3TGHoZ04rBRlGjNyz9DTmpJErig8UE4jw==", "dependencies": { "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.0.0", @@ -1985,14 +1981,14 @@ } }, "node_modules/@codemirror/state": { - "version": "6.4.1", - "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.4.1.tgz", - "integrity": "sha512-QkEyUiLhsJoZkbumGZlswmAhA7CBU02Wrz7zvH4SrcifbsqwlXShVXg65f3v/ts57W3dqyamEriMhij1Z3Zz4A==" + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.2.0.tgz", + "integrity": "sha512-69QXtcrsc3RYtOtd+GsvczJ319udtBf1PTrr2KbLWM/e2CXUPnh0Nz9AUo8WfhSQ7GeL8dPVNUmhQVgpmuaNGA==" }, "node_modules/@codemirror/theme-one-dark": { - "version": "6.1.2", - "resolved": "https://registry.npmjs.org/@codemirror/theme-one-dark/-/theme-one-dark-6.1.2.tgz", - "integrity": "sha512-F+sH0X16j/qFLMAfbciKTxVOwkdAS336b7AXTKOZhy8BR3eH/RelsnLgLFINrpST63mmN2OuwUt0W2ndUgYwUA==", + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/@codemirror/theme-one-dark/-/theme-one-dark-6.1.1.tgz", + "integrity": "sha512-+CfzmScfJuD6uDF5bHJkAjWTQ2QAAHxODCPxUEgcImDYcJLT+4l5vLnBHmDVv46kCC5uUJGMrBJct2Z6JbvqyQ==", "dependencies": { "@codemirror/language": "^6.0.0", "@codemirror/state": "^6.0.0", @@ -2001,12 +1997,12 @@ } }, "node_modules/@codemirror/view": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.26.0.tgz", - "integrity": "sha512-nSSmzONpqsNzshPOxiKhK203R6BvABepugAe34QfQDbNDslyjkqBuKgrK5ZBvqNXpfxz5iLrlGTmEfhbQyH46A==", + "version": "6.9.1", + "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.9.1.tgz", + "integrity": "sha512-bzfSjJn9dAADVpabLKWKNmMG4ibyTV2e3eOGowjElNPTdTkSbi6ixPYHm2u0ADcETfKsi2/R84Rkmi91dH9yEg==", "dependencies": { - "@codemirror/state": "^6.4.0", - "style-mod": "^4.1.0", + "@codemirror/state": "^6.1.4", + "style-mod": "^4.0.0", "w3c-keyname": "^2.2.4" } }, @@ -2020,28 +2016,27 @@ } }, "node_modules/@emotion/babel-plugin": { - "version": "11.11.0", - "resolved": "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.11.0.tgz", - "integrity": "sha512-m4HEDZleaaCH+XgDDsPF15Ht6wTLsgDTeR3WYj9Q/k76JtWhrJjcP4+/XlG8LGT/Rol9qUfOIztXeA84ATpqPQ==", + "version": "11.10.5", + "resolved": "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.10.5.tgz", + "integrity": "sha512-xE7/hyLHJac7D2Ve9dKroBBZqBT7WuPQmWcq7HSGb84sUuP4mlOWoB8dvVfD9yk5DHkU1m6RW7xSoDtnQHNQeA==", "dependencies": { "@babel/helper-module-imports": "^7.16.7", + "@babel/plugin-syntax-jsx": "^7.17.12", "@babel/runtime": "^7.18.3", - "@emotion/hash": "^0.9.1", - "@emotion/memoize": "^0.8.1", - "@emotion/serialize": "^1.1.2", + "@emotion/hash": "^0.9.0", + "@emotion/memoize": "^0.8.0", + "@emotion/serialize": "^1.1.1", "babel-plugin-macros": "^3.1.0", "convert-source-map": "^1.5.0", "escape-string-regexp": "^4.0.0", "find-root": "^1.1.0", "source-map": "^0.5.7", - "stylis": "4.2.0" + "stylis": "4.1.3" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" } }, - "node_modules/@emotion/babel-plugin/node_modules/convert-source-map": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz", - "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==" - }, "node_modules/@emotion/babel-plugin/node_modules/escape-string-regexp": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", @@ -2053,90 +2048,102 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/@emotion/babel-plugin/node_modules/source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==", + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/@emotion/cache": { - "version": "11.11.0", - "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.11.0.tgz", - "integrity": "sha512-P34z9ssTCBi3e9EI1ZsWpNHcfY1r09ZO0rZbRO2ob3ZQMnFI35jB536qoXbkdesr5EUhYi22anuEJuyxifaqAQ==", + "version": "11.10.5", + "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.10.5.tgz", + "integrity": "sha512-dGYHWyzTdmK+f2+EnIGBpkz1lKc4Zbj2KHd4cX3Wi8/OWr5pKslNjc3yABKH4adRGCvSX4VDC0i04mrrq0aiRA==", "dependencies": { - "@emotion/memoize": "^0.8.1", - "@emotion/sheet": "^1.2.2", - "@emotion/utils": "^1.2.1", - "@emotion/weak-memoize": "^0.3.1", - "stylis": "4.2.0" + "@emotion/memoize": "^0.8.0", + "@emotion/sheet": "^1.2.1", + "@emotion/utils": "^1.2.0", + "@emotion/weak-memoize": "^0.3.0", + "stylis": "4.1.3" } }, "node_modules/@emotion/hash": { - "version": "0.9.1", - "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.9.1.tgz", - "integrity": "sha512-gJB6HLm5rYwSLI6PQa+X1t5CFGrv1J1TWG+sOyMCeKz2ojaj6Fnl/rZEspogG+cvqbt4AE/2eIyD2QfLKTBNlQ==" + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.9.0.tgz", + "integrity": "sha512-14FtKiHhy2QoPIzdTcvh//8OyBlknNs2nXRwIhG904opCby3l+9Xaf/wuPvICBF0rc1ZCNBd3nKe9cd2mecVkQ==" }, "node_modules/@emotion/memoize": { - "version": "0.8.1", - "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.8.1.tgz", - "integrity": "sha512-W2P2c/VRW1/1tLox0mVUalvnWXxavmv/Oum2aPsRcoDJuob75FC3Y8FbpfLwUegRcxINtGUMPq0tFCvYNTBXNA==" + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.8.0.tgz", + "integrity": "sha512-G/YwXTkv7Den9mXDO7AhLWkE3q+I92B+VqAE+dYG4NGPaHZGvt3G8Q0p9vmE+sq7rTGphUbAvmQ9YpbfMQGGlA==" }, "node_modules/@emotion/react": { - "version": "11.11.4", - "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.11.4.tgz", - "integrity": "sha512-t8AjMlF0gHpvvxk5mAtCqR4vmxiGHCeJBaQO6gncUSdklELOgtwjerNY2yuJNfwnc6vi16U/+uMF+afIawJ9iw==", + "version": "11.10.5", + "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.10.5.tgz", + "integrity": "sha512-TZs6235tCJ/7iF6/rvTaOH4oxQg2gMAcdHemjwLKIjKz4rRuYe1HJ2TQJKnAcRAfOUDdU8XoDadCe1rl72iv8A==", "dependencies": { "@babel/runtime": "^7.18.3", - "@emotion/babel-plugin": "^11.11.0", - "@emotion/cache": "^11.11.0", - "@emotion/serialize": "^1.1.3", - "@emotion/use-insertion-effect-with-fallbacks": "^1.0.1", - "@emotion/utils": "^1.2.1", - "@emotion/weak-memoize": "^0.3.1", + "@emotion/babel-plugin": "^11.10.5", + "@emotion/cache": "^11.10.5", + "@emotion/serialize": "^1.1.1", + "@emotion/use-insertion-effect-with-fallbacks": "^1.0.0", + "@emotion/utils": "^1.2.0", + "@emotion/weak-memoize": "^0.3.0", "hoist-non-react-statics": "^3.3.1" }, "peerDependencies": { + "@babel/core": "^7.0.0", "react": ">=16.8.0" }, "peerDependenciesMeta": { + "@babel/core": { + "optional": true + }, "@types/react": { "optional": true } } }, "node_modules/@emotion/serialize": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-1.1.3.tgz", - "integrity": "sha512-iD4D6QVZFDhcbH0RAG1uVu1CwVLMWUkCvAqqlewO/rxf8+87yIBAlt4+AxMiiKPLs5hFc0owNk/sLLAOROw3cA==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-1.1.1.tgz", + "integrity": "sha512-Zl/0LFggN7+L1liljxXdsVSVlg6E/Z/olVWpfxUTxOAmi8NU7YoeWeLfi1RmnB2TATHoaWwIBRoL+FvAJiTUQA==", "dependencies": { - "@emotion/hash": "^0.9.1", - "@emotion/memoize": "^0.8.1", - "@emotion/unitless": "^0.8.1", - "@emotion/utils": "^1.2.1", + "@emotion/hash": "^0.9.0", + "@emotion/memoize": "^0.8.0", + "@emotion/unitless": "^0.8.0", + "@emotion/utils": "^1.2.0", "csstype": "^3.0.2" } }, "node_modules/@emotion/sheet": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/@emotion/sheet/-/sheet-1.2.2.tgz", - "integrity": "sha512-0QBtGvaqtWi+nx6doRwDdBIzhNdZrXUppvTM4dtZZWEGTXL/XE/yJxLMGlDT1Gt+UHH5IX1n+jkXyytE/av7OA==" + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@emotion/sheet/-/sheet-1.2.1.tgz", + "integrity": "sha512-zxRBwl93sHMsOj4zs+OslQKg/uhF38MB+OMKoCrVuS0nyTkqnau+BM3WGEoOptg9Oz45T/aIGs1qbVAsEFo3nA==" }, "node_modules/@emotion/unitless": { - "version": "0.8.1", - "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.8.1.tgz", - "integrity": "sha512-KOEGMu6dmJZtpadb476IsZBclKvILjopjUii3V+7MnXIQCYh8W3NgNcgwo21n9LXZX6EDIKvqfjYxXebDwxKmQ==" + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.8.0.tgz", + "integrity": "sha512-VINS5vEYAscRl2ZUDiT3uMPlrFQupiKgHz5AA4bCH1miKBg4qtwkim1qPmJj/4WG6TreYMY111rEFsjupcOKHw==" }, "node_modules/@emotion/use-insertion-effect-with-fallbacks": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@emotion/use-insertion-effect-with-fallbacks/-/use-insertion-effect-with-fallbacks-1.0.1.tgz", - "integrity": "sha512-jT/qyKZ9rzLErtrjGgdkMBn2OP8wl0G3sQlBb3YPryvKHsjvINUhVaPFfP+fpBcOkmrVOVEEHQFJ7nbj2TH2gw==", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@emotion/use-insertion-effect-with-fallbacks/-/use-insertion-effect-with-fallbacks-1.0.0.tgz", + "integrity": "sha512-1eEgUGmkaljiBnRMTdksDV1W4kUnmwgp7X9G8B++9GYwl1lUdqSndSriIrTJ0N7LQaoauY9JJ2yhiOYK5+NI4A==", "peerDependencies": { "react": ">=16.8.0" } }, "node_modules/@emotion/utils": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@emotion/utils/-/utils-1.2.1.tgz", - "integrity": "sha512-Y2tGf3I+XVnajdItskUCn6LX+VUDmP6lTL4fcqsXAv43dnlbZiuW4MWQW38rW/BVWSE7Q/7+XQocmpnRYILUmg==" + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@emotion/utils/-/utils-1.2.0.tgz", + "integrity": "sha512-sn3WH53Kzpw8oQ5mgMmIzzyAaH2ZqFEbozVVBSYp538E06OSE6ytOp7pRAjNQR+Q/orwqdQYJSe2m3hCOeznkw==" }, "node_modules/@emotion/weak-memoize": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.3.1.tgz", - "integrity": "sha512-EsBwpc7hBUJWAsNPBmJy4hxWx12v6bshQsldrVmjxJoc3isbxhOrF2IcCpaXxfvq03NwkI7sbsOLXbYuqF/8Ww==" + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.3.0.tgz", + "integrity": "sha512-AHPmaAx+RYfZz0eYu6Gviiagpmiyw98ySSlQvCUhVGDRtDFe4DBS0x1bSjdF3gqUDYOczB+yYvBTtEylYSdRhg==" }, "node_modules/@eslint-community/eslint-utils": { "version": "4.4.0", @@ -2210,53 +2217,18 @@ } }, "node_modules/@floating-ui/core": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.6.0.tgz", - "integrity": "sha512-PcF++MykgmTj3CIyOQbKA/hDzOAiqI3mhuoN44WRCopIs1sgoDoU4oty4Jtqaj/y3oDU6fnVSm4QG0a3t5i0+g==", - "dependencies": { - "@floating-ui/utils": "^0.2.1" - } + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.2.1.tgz", + "integrity": "sha512-LSqwPZkK3rYfD7GKoIeExXOyYx6Q1O4iqZWwIehDNuv3Dv425FIAE8PRwtAx1imEolFTHgBEcoFHm9MDnYgPCg==" }, "node_modules/@floating-ui/dom": { - "version": "1.6.3", - "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.6.3.tgz", - "integrity": "sha512-RnDthu3mzPlQ31Ss/BTwQ1zjzIhr3lk1gZB1OC56h/1vEtaXkESrOqL5fQVMfXpwGtRwX+YsZBdyHtJMQnkArw==", - "dependencies": { - "@floating-ui/core": "^1.0.0", - "@floating-ui/utils": "^0.2.0" - } - }, - "node_modules/@floating-ui/react": { - "version": "0.26.12", - "resolved": "https://registry.npmjs.org/@floating-ui/react/-/react-0.26.12.tgz", - "integrity": "sha512-D09o62HrWdIkstF2kGekIKAC0/N/Dl6wo3CQsnLcOmO3LkW6Ik8uIb3kw8JYkwxNCcg+uJ2bpWUiIijTBep05w==", - "dependencies": { - "@floating-ui/react-dom": "^2.0.0", - "@floating-ui/utils": "^0.2.0", - "tabbable": "^6.0.0" - }, - "peerDependencies": { - "react": ">=16.8.0", - "react-dom": ">=16.8.0" - } - }, - "node_modules/@floating-ui/react-dom": { - "version": "2.0.8", - "resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-2.0.8.tgz", - "integrity": "sha512-HOdqOt3R3OGeTKidaLvJKcgg75S6tibQ3Tif4eyd91QnIJWr0NLvoXFpJA/j8HqkFSL68GDca9AuyWEHlhyClw==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.2.1.tgz", + "integrity": "sha512-Rt45SmRiV8eU+xXSB9t0uMYiQ/ZWGE/jumse2o3i5RGlyvcbqOF4q+1qBnzLE2kZ5JGhq0iMkcGXUKbFe7MpTA==", "dependencies": { - "@floating-ui/dom": "^1.6.1" - }, - "peerDependencies": { - "react": ">=16.8.0", - "react-dom": ">=16.8.0" + "@floating-ui/core": "^1.2.1" } }, - "node_modules/@floating-ui/utils": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.1.tgz", - "integrity": "sha512-9TANp6GPoMtYzQdt54kfAyMmz1+osLlXdg2ENroU7zzrtflTLrrC/lgrIfaSe+Wu0b89GKccT7vxXA0MoAIO+Q==" - }, "node_modules/@humanwhocodes/config-array": { "version": "0.11.13", "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.13.tgz", @@ -2291,14 +2263,12 @@ "dev": true }, "node_modules/@jridgewell/gen-mapping": { - "version": "0.3.5", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz", - "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==", - "dev": true, + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz", + "integrity": "sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==", "dependencies": { - "@jridgewell/set-array": "^1.2.1", - "@jridgewell/sourcemap-codec": "^1.4.10", - "@jridgewell/trace-mapping": "^0.3.24" + "@jridgewell/set-array": "^1.0.0", + "@jridgewell/sourcemap-codec": "^1.4.10" }, "engines": { "node": ">=6.0.0" @@ -2313,10 +2283,9 @@ } }, "node_modules/@jridgewell/set-array": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz", - "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==", - "dev": true, + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.0.tgz", + "integrity": "sha512-SfJxIxNVYLTsKwzB3MoOQ1yxf4w/E6MdkvTgrgAt1bfxjSrLUoHMKrDOykwN14q65waezZIdqDneUIPh4/sKxg==", "engines": { "node": ">=6.0.0" } @@ -2360,52 +2329,50 @@ } }, "node_modules/@lezer/common": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@lezer/common/-/common-1.2.1.tgz", - "integrity": "sha512-yemX0ZD2xS/73llMZIK6KplkjIjf2EvAHcinDi/TfJ9hS25G0388+ClHt6/3but0oOxinTcQHJLDXh6w1crzFQ==" + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@lezer/common/-/common-1.0.2.tgz", + "integrity": "sha512-SVgiGtMnMnW3ActR8SXgsDhw7a0w0ChHSYAyAUxxrOiJ1OqYWEKk/xJd84tTSPo1mo6DXLObAJALNnd0Hrv7Ng==" }, "node_modules/@lezer/css": { - "version": "1.1.8", - "resolved": "https://registry.npmjs.org/@lezer/css/-/css-1.1.8.tgz", - "integrity": "sha512-7JhxupKuMBaWQKjQoLtzhGj83DdnZY9MckEOG5+/iLKNK2ZJqKc6hf6uc0HjwCX7Qlok44jBNqZhHKDhEhZYLA==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@lezer/css/-/css-1.1.1.tgz", + "integrity": "sha512-mSjx+unLLapEqdOYDejnGBokB5+AiJKZVclmud0MKQOKx3DLJ5b5VTCstgDDknR6iIV4gVrN6euzsCnj0A2gQA==", "dependencies": { - "@lezer/common": "^1.2.0", "@lezer/highlight": "^1.0.0", "@lezer/lr": "^1.0.0" } }, "node_modules/@lezer/highlight": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@lezer/highlight/-/highlight-1.2.0.tgz", - "integrity": "sha512-WrS5Mw51sGrpqjlh3d4/fOwpEV2Hd3YOkp9DBt4k8XZQcoTHZFB7sx030A6OcahF4J1nDQAa3jXlTVVYH50IFA==", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/@lezer/highlight/-/highlight-1.1.3.tgz", + "integrity": "sha512-3vLKLPThO4td43lYRBygmMY18JN3CPh9w+XS2j8WC30vR4yZeFG4z1iFe4jXE43NtGqe//zHW5q8ENLlHvz9gw==", "dependencies": { "@lezer/common": "^1.0.0" } }, "node_modules/@lezer/html": { - "version": "1.3.9", - "resolved": "https://registry.npmjs.org/@lezer/html/-/html-1.3.9.tgz", - "integrity": "sha512-MXxeCMPyrcemSLGaTQEZx0dBUH0i+RPl8RN5GwMAzo53nTsd/Unc/t5ZxACeQoyPUM5/GkPLRUs2WliOImzkRA==", + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/@lezer/html/-/html-1.3.3.tgz", + "integrity": "sha512-04Fyvu66DjV2EjhDIG1kfDdktn5Pfw56SXPrzKNQH5B2m7BDfc6bDsz+ZJG8dLS3kIPEKbyyq1Sm2/kjeG0+AA==", "dependencies": { - "@lezer/common": "^1.2.0", + "@lezer/common": "^1.0.0", "@lezer/highlight": "^1.0.0", "@lezer/lr": "^1.0.0" } }, "node_modules/@lezer/javascript": { - "version": "1.4.13", - "resolved": "https://registry.npmjs.org/@lezer/javascript/-/javascript-1.4.13.tgz", - "integrity": "sha512-5IBr8LIO3xJdJH1e9aj/ZNLE4LSbdsx25wFmGRAZsj2zSmwAYjx26JyU/BYOCpRQlu1jcv1z3vy4NB9+UkfRow==", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/@lezer/javascript/-/javascript-1.4.1.tgz", + "integrity": "sha512-Hqx36DJeYhKtdpc7wBYPR0XF56ZzIp0IkMO/zNNj80xcaFOV4Oj/P7TQc/8k2TxNhzl7tV5tXS8ZOCPbT4L3nA==", "dependencies": { - "@lezer/common": "^1.2.0", "@lezer/highlight": "^1.1.3", "@lezer/lr": "^1.3.0" } }, "node_modules/@lezer/lr": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/@lezer/lr/-/lr-1.4.0.tgz", - "integrity": "sha512-Wst46p51km8gH0ZUmeNrtpRYmdlRHUpN1DQd3GFAyKANi8WVz8c2jHYTf1CVScFaCjQw1iO3ZZdqGDxQPRErTg==", + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/@lezer/lr/-/lr-1.3.3.tgz", + "integrity": "sha512-JPQe3mwJlzEVqy67iQiiGozhcngbO8QBgpqZM6oL1Wj/dXckrEexpBLeFkq0edtW5IqnPRFxA24BHJni8Js69w==", "dependencies": { "@lezer/common": "^1.0.0" } @@ -2468,9 +2435,9 @@ "integrity": "sha512-/RVXdLvJxLg4QKvMoM5WlwNR9ViO9z8B/qPcc+C0Sa/teJY7QG7kJ441DwzOjMYEY7GmU4dj5EcGHIkKZiQZCA==" }, "node_modules/@types/eslint": { - "version": "8.56.6", - "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.56.6.tgz", - "integrity": "sha512-ymwc+qb1XkjT/gfoQwxIeHZ6ixH23A+tCT2ADSA/DPVKzAjwYkTXBMCQ/f6fe4wEa85Lhp26VPeUxI7wMhAi7A==", + "version": "8.4.2", + "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.2.tgz", + "integrity": "sha512-Z1nseZON+GEnFjJc04sv4NSALGjhFwy6K0HXt7qsn5ArfAKtb63dXNJHf+1YW6IpOIYRBGUbu3GwJdj8DGnCjA==", "dev": true, "dependencies": { "@types/estree": "*", @@ -2478,9 +2445,9 @@ } }, "node_modules/@types/eslint-scope": { - "version": "3.7.7", - "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz", - "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==", + "version": "3.7.3", + "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.3.tgz", + "integrity": "sha512-PB3ldyrcnAicT35TWPs5IcwKD8S333HMaa2VVv4+wdvebJkjWuW/xESoB8IwRcog8HYVYamb1g/R31Qv5Bx03g==", "dev": true, "dependencies": { "@types/eslint": "*", @@ -2494,43 +2461,40 @@ "dev": true }, "node_modules/@types/hoist-non-react-statics": { - "version": "3.3.5", - "resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.5.tgz", - "integrity": "sha512-SbcrWzkKBw2cdwRTwQAswfpB9g9LJWfjtUeW/jvNwbhC8cpmmNYVePa+ncbUe0rGTQ7G3Ff6mYUN2VMfLVr+Sg==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz", + "integrity": "sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA==", "dependencies": { "@types/react": "*", "hoist-non-react-statics": "^3.3.0" } }, "node_modules/@types/json-schema": { - "version": "7.0.15", - "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz", - "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==", + "version": "7.0.11", + "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz", + "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==", "dev": true }, "node_modules/@types/node": { - "version": "20.11.30", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.30.tgz", - "integrity": "sha512-dHM6ZxwlmuZaRmUPfv1p+KrdD1Dci04FbdEm/9wEMouFqxYoFl5aMkt0VMAUtYRQDyYvD41WJLukhq/ha3YuTw==", - "devOptional": true, - "dependencies": { - "undici-types": "~5.26.4" - } + "version": "17.0.31", + "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.31.tgz", + "integrity": "sha512-AR0x5HbXGqkEx9CadRH3EBYx/VkiUgZIhP4wvPn/+5KIsgpNoyFaRlVe0Zlx9gRtg8fA06a9tskE2MSN7TcG4Q==", + "devOptional": true }, "node_modules/@types/parse-json": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.2.tgz", - "integrity": "sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw==" + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz", + "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==" }, "node_modules/@types/prop-types": { - "version": "15.7.11", - "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.11.tgz", - "integrity": "sha512-ga8y9v9uyeiLdpKddhxYQkxNDrfvuPrlFb0N1qnZZByvcElJaXthF1UhvCh9TLWJBEHeNtdnbysW7Y6Uq8CVng==" + "version": "15.7.5", + "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz", + "integrity": "sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==" }, "node_modules/@types/react": { - "version": "18.2.67", - "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.67.tgz", - "integrity": "sha512-vkIE2vTIMHQ/xL0rgmuoECBCkZFZeHr49HeWSc24AptMbNRo7pwSBvj73rlJJs9fGKj0koS+V7kQB1jHS0uCgw==", + "version": "18.0.8", + "resolved": "https://registry.npmjs.org/@types/react/-/react-18.0.8.tgz", + "integrity": "sha512-+j2hk9BzCOrrOSJASi5XiOyBbERk9jG5O73Ya4M0env5Ixi6vUNli4qy994AINcEF+1IEHISYFfIT4zwr++LKw==", "dependencies": { "@types/prop-types": "*", "@types/scheduler": "*", @@ -2538,9 +2502,9 @@ } }, "node_modules/@types/react-redux": { - "version": "7.1.33", - "resolved": "https://registry.npmjs.org/@types/react-redux/-/react-redux-7.1.33.tgz", - "integrity": "sha512-NF8m5AjWCkert+fosDsN3hAlHzpjSiXlVy9EgQEmLoBhaNXbmyeGs/aj5dQzKuF+/q+S7JQagorGDW8pJ28Hmg==", + "version": "7.1.24", + "resolved": "https://registry.npmjs.org/@types/react-redux/-/react-redux-7.1.24.tgz", + "integrity": "sha512-7FkurKcS1k0FHZEtdbbgN8Oc6b+stGSfZYjQGicofJ0j4U0qIn/jaSvnP2pLwZKiai3/17xqqxkkrxTgN8UNbQ==", "dependencies": { "@types/hoist-non-react-statics": "^3.3.0", "@types/react": "*", @@ -2549,22 +2513,22 @@ } }, "node_modules/@types/react-transition-group": { - "version": "4.4.10", - "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.10.tgz", - "integrity": "sha512-hT/+s0VQs2ojCX823m60m5f0sL5idt9SO6Tj6Dg+rdphGPIeJbJ6CxvBYkgkGKrYeDjvIpKTR38UzmtHJOGW3Q==", + "version": "4.4.4", + "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.4.tgz", + "integrity": "sha512-7gAPz7anVK5xzbeQW9wFBDg7G++aPLAFY0QaSMOou9rJZpbuI58WAuJrgu+qR92l61grlnCUe7AFX8KGahAgug==", "dependencies": { "@types/react": "*" } }, "node_modules/@types/scheduler": { - "version": "0.16.8", - "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.8.tgz", - "integrity": "sha512-WZLiwShhwLRmeV6zH+GkbOFT6Z6VklCItrDioxUnv+u4Ll+8vKeFySoFyK/0ctcRpOmwAicELfmys1sDc/Rw+A==" + "version": "0.16.2", + "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.2.tgz", + "integrity": "sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==" }, "node_modules/@uiw/codemirror-extensions-basic-setup": { - "version": "4.21.24", - "resolved": "https://registry.npmjs.org/@uiw/codemirror-extensions-basic-setup/-/codemirror-extensions-basic-setup-4.21.24.tgz", - "integrity": "sha512-TJYKlPxNAVJNclW1EGumhC7I02jpdMgBon4jZvb5Aju9+tUzS44IwORxUx8BD8ZtH2UHmYS+04rE3kLk/BtnCQ==", + "version": "4.19.9", + "resolved": "https://registry.npmjs.org/@uiw/codemirror-extensions-basic-setup/-/codemirror-extensions-basic-setup-4.19.9.tgz", + "integrity": "sha512-O4yAgVpD3Pon4t4+lwZ2MTGg2TeU/Jv8YzKS9ap4fP/WMTVrKmpdq+DOafbhZSlhmU0XGfQPPJ4WX6rtZgx3Rw==", "dependencies": { "@codemirror/autocomplete": "^6.0.0", "@codemirror/commands": "^6.0.0", @@ -2574,9 +2538,6 @@ "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.0.0" }, - "funding": { - "url": "https://jaywcjlove.github.io/#/sponsor" - }, "peerDependencies": { "@codemirror/autocomplete": ">=6.0.0", "@codemirror/commands": ">=6.0.0", @@ -2588,20 +2549,17 @@ } }, "node_modules/@uiw/react-codemirror": { - "version": "4.21.24", - "resolved": "https://registry.npmjs.org/@uiw/react-codemirror/-/react-codemirror-4.21.24.tgz", - "integrity": "sha512-8zs5OuxbhikHocHBsVBMuW1vqlv4ccZAkt4rFwr7ebLP2Q6RwHsjpsR9GeGyAigAqonKRoeHugqF78UMrkaTgg==", + "version": "4.19.9", + "resolved": "https://registry.npmjs.org/@uiw/react-codemirror/-/react-codemirror-4.19.9.tgz", + "integrity": "sha512-U+A1fSfELMFFs5a+ZOPwCJKZMYaMy6QHOfNOOV7WhSveM7GYHT970GjTfs2dn1LlvhebwyK9ei0rCXZdsI9n9Q==", "dependencies": { "@babel/runtime": "^7.18.6", "@codemirror/commands": "^6.1.0", "@codemirror/state": "^6.1.1", "@codemirror/theme-one-dark": "^6.0.0", - "@uiw/codemirror-extensions-basic-setup": "4.21.24", + "@uiw/codemirror-extensions-basic-setup": "4.19.9", "codemirror": "^6.0.0" }, - "funding": { - "url": "https://jaywcjlove.github.io/#/sponsor" - }, "peerDependencies": { "@babel/runtime": ">=7.11.0", "@codemirror/state": ">=6.0.0", @@ -2935,9 +2893,9 @@ } }, "node_modules/anymatch": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", - "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz", + "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==", "dev": true, "dependencies": { "normalize-path": "^3.0.0", @@ -2954,32 +2912,28 @@ "dev": true }, "node_modules/array-buffer-byte-length": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz", - "integrity": "sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz", + "integrity": "sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==", "dev": true, "dependencies": { - "call-bind": "^1.0.5", - "is-array-buffer": "^3.0.4" - }, - "engines": { - "node": ">= 0.4" + "call-bind": "^1.0.2", + "is-array-buffer": "^3.0.1" }, "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/array-includes": { - "version": "3.1.8", - "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.8.tgz", - "integrity": "sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==", + "version": "3.1.6", + "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.6.tgz", + "integrity": "sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==", "dev": true, "dependencies": { - "call-bind": "^1.0.7", - "define-properties": "^1.2.1", - "es-abstract": "^1.23.2", - "es-object-atoms": "^1.0.0", - "get-intrinsic": "^1.2.4", + "call-bind": "^1.0.2", + "define-properties": "^1.1.4", + "es-abstract": "^1.20.4", + "get-intrinsic": "^1.1.3", "is-string": "^1.0.7" }, "engines": { @@ -2996,26 +2950,8 @@ "dev": true, "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1", - "es-shim-unscopables": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/array.prototype.flatmap": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz", - "integrity": "sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1", + "define-properties": "^1.1.4", + "es-abstract": "^1.20.4", "es-shim-unscopables": "^1.0.0" }, "engines": { @@ -3025,59 +2961,17 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/array.prototype.toreversed": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/array.prototype.toreversed/-/array.prototype.toreversed-1.1.2.tgz", - "integrity": "sha512-wwDCoT4Ck4Cz7sLtgUmzR5UV3YF5mFHUlbChCzZBQZ+0m2cl/DH3tKgvphv1nKgFsJ48oCSg6p91q2Vm0I/ZMA==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1", - "es-shim-unscopables": "^1.0.0" - } - }, "node_modules/array.prototype.tosorted": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.3.tgz", - "integrity": "sha512-/DdH4TiTmOKzyQbp/eadcCVexiCb36xJg7HshYOYJnNZFDj33GEv0P7GxsynpShhq4OLYJzbGcBDkLsDt7MnNg==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.5", - "define-properties": "^1.2.1", - "es-abstract": "^1.22.3", - "es-errors": "^1.1.0", - "es-shim-unscopables": "^1.0.2" - } - }, - "node_modules/arraybuffer.prototype.slice": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz", - "integrity": "sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.1.tgz", + "integrity": "sha512-pZYPXPRl2PqWcsUs6LOMn+1f1532nEoPTYowBtqLwAW+W8vSVhkIGnmOX1t/UQjD6YGI0vcD2B1U7ZFGQH9jnQ==", "dev": true, "dependencies": { - "array-buffer-byte-length": "^1.0.1", - "call-bind": "^1.0.5", - "define-properties": "^1.2.1", - "es-abstract": "^1.22.3", - "es-errors": "^1.2.1", - "get-intrinsic": "^1.2.3", - "is-array-buffer": "^3.0.4", - "is-shared-array-buffer": "^1.0.2" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/attr-accept": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/attr-accept/-/attr-accept-2.2.2.tgz", - "integrity": "sha512-7prDjvt9HmqiZ0cl5CRjtS84sEyhsHP2coDkaZKRKVfCDo9s7iw7ChVmar78Gu9pC4SoR/28wFu/G5JJhTnqEg==", - "engines": { - "node": ">=4" + "call-bind": "^1.0.2", + "define-properties": "^1.1.4", + "es-abstract": "^1.20.4", + "es-shim-unscopables": "^1.0.0", + "get-intrinsic": "^1.1.3" } }, "node_modules/arraybuffer.prototype.slice": { @@ -3111,13 +3005,10 @@ } }, "node_modules/available-typed-arrays": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz", - "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz", + "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==", "dev": true, - "dependencies": { - "possible-typed-array-names": "^1.0.0" - }, "engines": { "node": ">= 0.4" }, @@ -3211,15 +3102,12 @@ } }, "node_modules/binary-extensions": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz", - "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", + "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", "dev": true, "engines": { "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/bootstrap-sass": { @@ -3341,10 +3229,16 @@ } }, "node_modules/chokidar": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", - "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==", + "version": "3.5.3", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", + "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==", "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://paulmillr.com/funding/" + } + ], "dependencies": { "anymatch": "~3.1.2", "braces": "~3.0.2", @@ -3357,9 +3251,6 @@ "engines": { "node": ">= 8.10.0" }, - "funding": { - "url": "https://paulmillr.com/funding/" - }, "optionalDependencies": { "fsevents": "~2.3.2" } @@ -3374,9 +3265,9 @@ } }, "node_modules/classnames": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.5.1.tgz", - "integrity": "sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow==" + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.3.2.tgz", + "integrity": "sha512-CSbhY4cFEJRe6/GQzIk5qXZ4Jeg5pcsP7b5peFSDpffpe1cqjASH/n9UTjBwOp6XpMSTwQ8Za2K5V02ueA7Tmw==" }, "node_modules/clone-deep": { "version": "4.0.1", @@ -3392,14 +3283,6 @@ "node": ">=6" } }, - "node_modules/clsx": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.0.tgz", - "integrity": "sha512-m3iNNWpd9rl3jvvcBnu70ylMdrXt8Vlq4HYadnU5fwcOtvkSQWPmj7amUcDT2qYI7risszBjI5AUIUox9D16pg==", - "engines": { - "node": ">=6" - } - }, "node_modules/codemirror": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-6.0.1.tgz", @@ -3428,9 +3311,9 @@ "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==" }, "node_modules/colorette": { - "version": "2.0.20", - "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz", - "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==", + "version": "2.0.16", + "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.16.tgz", + "integrity": "sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==", "dev": true }, "node_modules/commander": { @@ -3451,14 +3334,16 @@ "node_modules/concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", "dev": true }, "node_modules/convert-source-map": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", - "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", - "dev": true + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz", + "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==", + "dependencies": { + "safe-buffer": "~5.1.1" + } }, "node_modules/copy-webpack-plugin": { "version": "11.0.0", @@ -3532,9 +3417,9 @@ } }, "node_modules/crelt": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/crelt/-/crelt-1.0.6.tgz", - "integrity": "sha512-VQ2MBenTq1fWZUH9DJNGti7kKv6EeAuYr3cLwxUWhIu1baTaXh4Ib5W2CqHVqib4/MqbYGJqiL3Zb8GJZr3l4g==" + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/crelt/-/crelt-1.0.5.tgz", + "integrity": "sha512-+BO9wPPi+DWTDcNYhr/W90myha8ptzftZT+LwcmUbbok0rcP/fequmFYCw8NMoH7pkAZQzU78b3kYrlua5a9eA==" }, "node_modules/cross-spawn": { "version": "7.0.3", @@ -3578,22 +3463,10 @@ "webpack": "^4.27.0 || ^5.0.0" } }, - "node_modules/css-loader/node_modules/lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/css-loader/node_modules/schema-utils": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz", - "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz", + "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==", "dev": true, "dependencies": { "@types/json-schema": "^7.0.8", @@ -3609,9 +3482,9 @@ } }, "node_modules/css-loader/node_modules/semver": { - "version": "7.6.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz", - "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dev": true, "dependencies": { "lru-cache": "^6.0.0" @@ -3623,12 +3496,6 @@ "node": ">=10" } }, - "node_modules/css-loader/node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true - }, "node_modules/cssesc": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz", @@ -3642,75 +3509,14 @@ } }, "node_modules/csstype": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz", - "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==" - }, - "node_modules/data-view-buffer": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.1.tgz", - "integrity": "sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.6", - "es-errors": "^1.3.0", - "is-data-view": "^1.0.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/data-view-byte-length": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.1.tgz", - "integrity": "sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.7", - "es-errors": "^1.3.0", - "is-data-view": "^1.0.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/data-view-byte-offset": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.0.tgz", - "integrity": "sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.6", - "es-errors": "^1.3.0", - "is-data-view": "^1.0.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/date-fns": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-3.6.0.tgz", - "integrity": "sha512-fRHTG8g/Gif+kSh50gaGEdToemgfj74aRX3swtiouboip5JDLAyDE9F11nHMIcvOaXeOC6D7SpNhi7uFyB7Uww==", - "funding": { - "type": "github", - "url": "https://github.com/sponsors/kossnocorp" - } + "version": "3.0.11", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.11.tgz", + "integrity": "sha512-sa6P2wJ+CAbgyy4KFssIb/JNMLxFvKF1pCYCSXS8ZMuqZnMsrxqI2E5sPyoTpxoPU/gVZMzr2zjOfg8GIZOMsw==" }, "node_modules/debug": { "version": "4.3.4", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "dev": true, "dependencies": { "ms": "2.1.2" }, @@ -3878,10 +3684,9 @@ "internal-slot": "^1.0.5", "is-array-buffer": "^3.0.2", "is-callable": "^1.2.7", - "is-data-view": "^1.0.1", - "is-negative-zero": "^2.0.3", + "is-negative-zero": "^2.0.2", "is-regex": "^1.1.4", - "is-shared-array-buffer": "^1.0.3", + "is-shared-array-buffer": "^1.0.2", "is-string": "^1.0.7", "is-typed-array": "^1.1.12", "is-weakref": "^1.0.2", @@ -3942,96 +3747,32 @@ "integrity": "sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==", "dev": true, "dependencies": { - "get-intrinsic": "^1.2.4" + "get-intrinsic": "^1.1.3", + "has": "^1.0.3", + "has-tostringtag": "^1.0.0" }, "engines": { "node": ">= 0.4" } }, - "node_modules/es-errors": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", - "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", + "node_modules/es-shim-unscopables": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz", + "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==", "dev": true, - "engines": { - "node": ">= 0.4" + "dependencies": { + "has": "^1.0.3" } }, - "node_modules/es-iterator-helpers": { - "version": "1.0.18", - "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.0.18.tgz", - "integrity": "sha512-scxAJaewsahbqTYrGKJihhViaM6DDZDDoucfvzNbK0pOren1g/daDQ3IAhzn+1G14rBG7w+i5N+qul60++zlKA==", + "node_modules/es-to-primitive": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", + "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", "dev": true, "dependencies": { - "call-bind": "^1.0.7", - "define-properties": "^1.2.1", - "es-abstract": "^1.23.0", - "es-errors": "^1.3.0", - "es-set-tostringtag": "^2.0.3", - "function-bind": "^1.1.2", - "get-intrinsic": "^1.2.4", - "globalthis": "^1.0.3", - "has-property-descriptors": "^1.0.2", - "has-proto": "^1.0.3", - "has-symbols": "^1.0.3", - "internal-slot": "^1.0.7", - "iterator.prototype": "^1.1.2", - "safe-array-concat": "^1.1.2" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/es-module-lexer": { - "version": "1.4.2", - "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.4.2.tgz", - "integrity": "sha512-7nOqkomXZEaxUDJw21XZNtRk739QvrPSoZoRtbsEfcii00vdzZUh6zh1CQwHhrib8MdEtJfv5rJiGeb4KuV/vw==", - "dev": true - }, - "node_modules/es-object-atoms": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.0.0.tgz", - "integrity": "sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==", - "dev": true, - "dependencies": { - "es-errors": "^1.3.0" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/es-set-tostringtag": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.3.tgz", - "integrity": "sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==", - "dev": true, - "dependencies": { - "get-intrinsic": "^1.2.4", - "has-tostringtag": "^1.0.2", - "hasown": "^2.0.1" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/es-shim-unscopables": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz", - "integrity": "sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==", - "dev": true, - "dependencies": { - "hasown": "^2.0.0" - } - }, - "node_modules/es-to-primitive": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", - "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", - "dev": true, - "dependencies": { - "is-callable": "^1.1.4", - "is-date-object": "^1.0.1", - "is-symbol": "^1.0.2" + "is-callable": "^1.1.4", + "is-date-object": "^1.0.1", + "is-symbol": "^1.0.2" }, "engines": { "node": ">= 0.4" @@ -4041,10 +3782,9 @@ } }, "node_modules/escalade": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz", - "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==", - "dev": true, + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", + "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", "engines": { "node": ">=6" } @@ -4118,20 +3858,18 @@ "integrity": "sha512-73QQMKALArI8/7xGLNI/3LylrEYrlKZSb5C9+q3OtOewTnMQi5cT+aE9E41sLCmli3I9PGGmD1yiZydyo4FEPw==", "dev": true, "dependencies": { - "array-includes": "^3.1.7", - "array.prototype.findlast": "^1.2.4", - "array.prototype.flatmap": "^1.3.2", - "array.prototype.toreversed": "^1.1.2", - "array.prototype.tosorted": "^1.1.3", + "array-includes": "^3.1.6", + "array.prototype.flatmap": "^1.3.1", + "array.prototype.tosorted": "^1.1.1", "doctrine": "^2.1.0", "es-iterator-helpers": "^1.0.12", "estraverse": "^5.3.0", "jsx-ast-utils": "^2.4.1 || ^3.0.0", "minimatch": "^3.1.2", - "object.entries": "^1.1.7", - "object.fromentries": "^2.0.7", - "object.hasown": "^1.1.3", - "object.values": "^1.1.7", + "object.entries": "^1.1.6", + "object.fromentries": "^2.0.6", + "object.hasown": "^1.1.2", + "object.values": "^1.1.6", "prop-types": "^15.8.1", "resolve": "^2.0.0-next.4", "semver": "^6.3.1", @@ -4156,13 +3894,22 @@ "node": ">=0.10.0" } }, + "node_modules/eslint-plugin-react/node_modules/estraverse": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", + "dev": true, + "engines": { + "node": ">=4.0" + } + }, "node_modules/eslint-plugin-react/node_modules/resolve": { - "version": "2.0.0-next.5", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.5.tgz", - "integrity": "sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==", + "version": "2.0.0-next.4", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.4.tgz", + "integrity": "sha512-iMDbmAWtfU+MHpxt/I5iWI7cY6YVEZUQ3MBgPQ++XD1PELuJHIl82xBmObyP2KyQmkNB2dsqF7seoQQiAn5yDQ==", "dev": true, "dependencies": { - "is-core-module": "^2.13.0", + "is-core-module": "^2.9.0", "path-parse": "^1.0.7", "supports-preserve-symlinks-flag": "^1.0.0" }, @@ -4174,19 +3921,16 @@ } }, "node_modules/eslint-scope": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", - "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", + "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", "dev": true, "dependencies": { "esrecurse": "^4.3.0", - "estraverse": "^5.2.0" + "estraverse": "^4.1.1" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" + "node": ">=8.0.0" } }, "node_modules/eslint-visitor-keys": { @@ -4316,9 +4060,9 @@ } }, "node_modules/eslint/node_modules/globals": { - "version": "13.24.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz", - "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==", + "version": "13.20.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz", + "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==", "dev": true, "dependencies": { "type-fest": "^0.20.2" @@ -4339,6 +4083,51 @@ "node": ">=8" } }, + "node_modules/eslint/node_modules/locate-path": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", + "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", + "dev": true, + "dependencies": { + "p-locate": "^5.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/eslint/node_modules/p-limit": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "dev": true, + "dependencies": { + "yocto-queue": "^0.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/eslint/node_modules/p-locate": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", + "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", + "dev": true, + "dependencies": { + "p-limit": "^3.0.2" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/eslint/node_modules/supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", @@ -4380,6 +4169,15 @@ "node": ">=0.10" } }, + "node_modules/esquery/node_modules/estraverse": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", + "dev": true, + "engines": { + "node": ">=4.0" + } + }, "node_modules/esrecurse": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", @@ -4392,7 +4190,7 @@ "node": ">=4.0" } }, - "node_modules/estraverse": { + "node_modules/esrecurse/node_modules/estraverse": { "version": "5.3.0", "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", @@ -4401,6 +4199,15 @@ "node": ">=4.0" } }, + "node_modules/estraverse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", + "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", + "dev": true, + "engines": { + "node": ">=4.0" + } + }, "node_modules/esutils": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", @@ -4453,18 +4260,15 @@ "dev": true }, "node_modules/fastest-levenshtein": { - "version": "1.0.16", - "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz", - "integrity": "sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==", - "dev": true, - "engines": { - "node": ">= 4.9.1" - } + "version": "1.0.12", + "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz", + "integrity": "sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow==", + "dev": true }, "node_modules/fastq": { - "version": "1.17.1", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz", - "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==", + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz", + "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==", "dev": true, "dependencies": { "reusify": "^1.0.4" @@ -4503,9 +4307,9 @@ } }, "node_modules/file-loader/node_modules/schema-utils": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz", - "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz", + "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==", "dev": true, "dependencies": { "@types/json-schema": "^7.0.8", @@ -4520,17 +4324,6 @@ "url": "https://opencollective.com/webpack" } }, - "node_modules/file-selector": { - "version": "0.1.19", - "resolved": "https://registry.npmjs.org/file-selector/-/file-selector-0.1.19.tgz", - "integrity": "sha512-kCWw3+Aai8Uox+5tHCNgMFaUdgidxvMnLWO6fM5sZ0hA2wlHP5/DHGF0ECe84BiB95qdJbKNEJhWKVDvMN+JDQ==", - "dependencies": { - "tslib": "^2.0.1" - }, - "engines": { - "node": ">= 10" - } - }, "node_modules/fill-range": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", @@ -4662,28 +4455,16 @@ "integrity": "sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==" }, "node_modules/find-up": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", - "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", "dev": true, "dependencies": { - "locate-path": "^6.0.0", + "locate-path": "^5.0.0", "path-exists": "^4.0.0" }, "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/flat": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz", - "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==", - "dev": true, - "bin": { - "flat": "cli.js" + "node": ">=8" } }, "node_modules/flat": { @@ -4696,13 +4477,12 @@ } }, "node_modules/flat-cache": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz", - "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==", + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz", + "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==", "dev": true, "dependencies": { - "flatted": "^3.2.9", - "keyv": "^4.5.3", + "flatted": "^3.1.0", "rimraf": "^3.0.2" }, "engines": { @@ -4710,9 +4490,9 @@ } }, "node_modules/flatted": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz", - "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==", + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz", + "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==", "dev": true }, "node_modules/font-awesome": { @@ -4741,13 +4521,13 @@ "node_modules/fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", "dev": true }, "node_modules/fsevents": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", - "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", + "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", "dev": true, "hasInstallScript": true, "optional": true, @@ -4797,7 +4577,6 @@ "version": "1.0.0-beta.2", "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", - "dev": true, "engines": { "node": ">=6.9.0" } @@ -4818,14 +4597,13 @@ } }, "node_modules/get-symbol-description": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.2.tgz", - "integrity": "sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz", + "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==", "dev": true, "dependencies": { - "call-bind": "^1.0.5", - "es-errors": "^1.3.0", - "get-intrinsic": "^1.2.4" + "call-bind": "^1.0.2", + "get-intrinsic": "^1.1.1" }, "engines": { "node": ">= 0.4" @@ -4835,15 +4613,15 @@ } }, "node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz", + "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==", "dev": true, "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", "inherits": "2", - "minimatch": "^3.1.1", + "minimatch": "^3.0.4", "once": "^1.3.0", "path-is-absolute": "^1.0.0" }, @@ -4876,7 +4654,6 @@ "version": "11.12.0", "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", - "dev": true, "engines": { "node": ">=4" } @@ -4951,6 +4728,17 @@ "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", "dev": true }, + "node_modules/has": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", + "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", + "dependencies": { + "function-bind": "^1.1.1" + }, + "engines": { + "node": ">= 0.4.0" + } + }, "node_modules/has-bigints": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz", @@ -4969,21 +4757,21 @@ } }, "node_modules/has-property-descriptors": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", - "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz", + "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==", "dev": true, "dependencies": { - "es-define-property": "^1.0.0" + "get-intrinsic": "^1.1.1" }, "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/has-proto": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz", - "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz", + "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==", "dev": true, "engines": { "node": ">= 0.4" @@ -5005,12 +4793,12 @@ } }, "node_modules/has-tostringtag": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz", - "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz", + "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==", "dev": true, "dependencies": { - "has-symbols": "^1.0.3" + "has-symbols": "^1.0.2" }, "engines": { "node": ">= 0.4" @@ -5061,9 +4849,9 @@ } }, "node_modules/immutable": { - "version": "4.3.5", - "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.5.tgz", - "integrity": "sha512-8eabxkth9gZatlwl5TBuJnCsoTADlL6ftEr7A4qgdaTsPyreilDSnUk57SO+jfKcNtxPa22U5KK6DSeAYhpBJw==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.1.0.tgz", + "integrity": "sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==", "dev": true }, "node_modules/import-fresh": { @@ -5081,6 +4869,14 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/import-fresh/node_modules/resolve-from": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", + "engines": { + "node": ">=4" + } + }, "node_modules/import-local": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz", @@ -5100,70 +4896,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/import-local/node_modules/find-up": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", - "dev": true, - "dependencies": { - "locate-path": "^5.0.0", - "path-exists": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/import-local/node_modules/locate-path": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", - "dev": true, - "dependencies": { - "p-locate": "^4.1.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/import-local/node_modules/p-limit": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", - "dev": true, - "dependencies": { - "p-try": "^2.0.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/import-local/node_modules/p-locate": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", - "dev": true, - "dependencies": { - "p-limit": "^2.2.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/import-local/node_modules/pkg-dir": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", - "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", - "dev": true, - "dependencies": { - "find-up": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/imurmurhash": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", @@ -5176,7 +4908,7 @@ "node_modules/inflight": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", + "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", "dev": true, "dependencies": { "once": "^1.3.0", @@ -5190,13 +4922,13 @@ "dev": true }, "node_modules/internal-slot": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.7.tgz", - "integrity": "sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.5.tgz", + "integrity": "sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==", "dev": true, "dependencies": { - "es-errors": "^1.3.0", - "hasown": "^2.0.0", + "get-intrinsic": "^1.2.0", + "has": "^1.0.3", "side-channel": "^1.0.4" }, "engines": { @@ -5221,16 +4953,14 @@ } }, "node_modules/is-array-buffer": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.4.tgz", - "integrity": "sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz", + "integrity": "sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "get-intrinsic": "^1.2.1" - }, - "engines": { - "node": ">= 0.4" + "get-intrinsic": "^1.2.0", + "is-typed-array": "^1.1.10" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -5309,26 +5039,11 @@ } }, "node_modules/is-core-module": { - "version": "2.13.1", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz", - "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==", - "dependencies": { - "hasown": "^2.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-data-view": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.1.tgz", - "integrity": "sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==", - "dev": true, + "version": "2.9.0", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz", + "integrity": "sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==", "dependencies": { - "is-typed-array": "^1.1.13" - }, - "engines": { - "node": ">= 0.4" + "has": "^1.0.3" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -5352,7 +5067,7 @@ "node_modules/is-extglob": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", + "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", "dev": true, "engines": { "node": ">=0.10.0" @@ -5407,9 +5122,9 @@ } }, "node_modules/is-negative-zero": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.3.tgz", - "integrity": "sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz", + "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==", "dev": true, "engines": { "node": ">= 0.4" @@ -5493,8 +5208,8 @@ "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz", "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==", "dev": true, - "engines": { - "node": ">= 0.4" + "dependencies": { + "call-bind": "^1.0.2" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -5588,13 +5303,13 @@ "node_modules/isexe": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", + "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", "dev": true }, "node_modules/isobject": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==", + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", "dev": true, "engines": { "node": ">=0.10.0" @@ -5652,9 +5367,9 @@ } }, "node_modules/jquery": { - "version": "3.7.1", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz", - "integrity": "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==" + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", + "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==" }, "node_modules/js-cookie": { "version": "2.2.1", @@ -5682,7 +5397,6 @@ "version": "2.5.2", "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", - "dev": true, "bin": { "jsesc": "bin/jsesc" }, @@ -5711,7 +5425,6 @@ "version": "2.2.3", "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", - "dev": true, "bin": { "json5": "lib/cli.js" }, @@ -5720,15 +5433,13 @@ } }, "node_modules/jsx-ast-utils": { - "version": "3.3.5", - "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz", - "integrity": "sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==", + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.3.tgz", + "integrity": "sha512-fYQHZTZ8jSfmWZ0iyzfwiU4WDX4HpHbMCZ3gPlWYiCl3BoeOTsqKBqnTVfH2rYT7eP5c3sVbeSPHnnJOaTrWiw==", "dev": true, "dependencies": { - "array-includes": "^3.1.6", - "array.prototype.flat": "^1.3.1", - "object.assign": "^4.1.4", - "object.values": "^1.1.6" + "array-includes": "^3.1.5", + "object.assign": "^4.1.3" }, "engines": { "node": ">=4.0" @@ -5739,15 +5450,6 @@ "resolved": "https://registry.npmjs.org/keycode/-/keycode-2.2.1.tgz", "integrity": "sha512-Rdgz9Hl9Iv4QKi8b0OlCRQEzp4AgVxyCtz5S/+VIHezDmrDhkp2N2TqBWOLz0/gbeREXOOiI9/4b8BY9uw2vFg==" }, - "node_modules/keyv": { - "version": "4.5.4", - "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", - "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", - "dev": true, - "dependencies": { - "json-buffer": "3.0.1" - } - }, "node_modules/kind-of": { "version": "6.0.3", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", @@ -5758,9 +5460,9 @@ } }, "node_modules/klona": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.6.tgz", - "integrity": "sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.5.tgz", + "integrity": "sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ==", "dev": true, "engines": { "node": ">= 8" @@ -5808,18 +5510,15 @@ } }, "node_modules/locate-path": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", - "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", "dev": true, "dependencies": { - "p-locate": "^5.0.0" + "p-locate": "^4.1.0" }, "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "node": ">=8" } }, "node_modules/lodash": { @@ -5851,12 +5550,15 @@ } }, "node_modules/lru-cache": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", - "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", "dev": true, "dependencies": { - "yallist": "^3.0.2" + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" } }, "node_modules/make-dir": { @@ -5957,9 +5659,9 @@ } }, "node_modules/mini-css-extract-plugin/node_modules/schema-utils": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz", - "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz", + "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==", "dev": true, "dependencies": { "@types/json-schema": "^7.0.8", @@ -5974,6 +5676,16 @@ "url": "https://opencollective.com/webpack" } }, + "node_modules/mini-css-extract-plugin/node_modules/webpack-sources": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz", + "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==", + "dev": true, + "dependencies": { + "source-list-map": "^2.0.0", + "source-map": "~0.6.1" + } + }, "node_modules/minimatch": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", @@ -5989,20 +5701,13 @@ "node_modules/ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, "node_modules/nanoid": { - "version": "3.3.7", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz", - "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==", + "version": "3.3.4", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz", + "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==", "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], "bin": { "nanoid": "bin/nanoid.cjs" }, @@ -6039,7 +5744,7 @@ "node_modules/object-assign": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", "engines": { "node": ">=0.10.0" } @@ -6063,13 +5768,13 @@ } }, "node_modules/object.assign": { - "version": "4.1.5", - "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.5.tgz", - "integrity": "sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==", + "version": "4.1.4", + "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz", + "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==", "dev": true, "dependencies": { - "call-bind": "^1.0.5", - "define-properties": "^1.2.1", + "call-bind": "^1.0.2", + "define-properties": "^1.1.4", "has-symbols": "^1.0.3", "object-keys": "^1.1.1" }, @@ -6081,29 +5786,28 @@ } }, "node_modules/object.entries": { - "version": "1.1.8", - "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.8.tgz", - "integrity": "sha512-cmopxi8VwRIAw/fkijJohSfpef5PdN0pMQJN6VC/ZKvn0LIknWD8KtgY6KlQdEc4tIjcQ3HxSMmnvtzIscdaYQ==", + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.6.tgz", + "integrity": "sha512-leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w==", "dev": true, "dependencies": { - "call-bind": "^1.0.7", - "define-properties": "^1.2.1", - "es-object-atoms": "^1.0.0" + "call-bind": "^1.0.2", + "define-properties": "^1.1.4", + "es-abstract": "^1.20.4" }, "engines": { "node": ">= 0.4" } }, "node_modules/object.fromentries": { - "version": "2.0.8", - "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.8.tgz", - "integrity": "sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==", + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.6.tgz", + "integrity": "sha512-VciD13dswC4j1Xt5394WR4MzmAQmlgN72phd/riNp9vtD7tp4QQWJ0R4wvclXcafgcYK8veHRed2W6XeGBvcfg==", "dev": true, "dependencies": { - "call-bind": "^1.0.7", - "define-properties": "^1.2.1", - "es-abstract": "^1.23.2", - "es-object-atoms": "^1.0.0" + "call-bind": "^1.0.2", + "define-properties": "^1.1.4", + "es-abstract": "^1.20.4" }, "engines": { "node": ">= 0.4" @@ -6113,27 +5817,27 @@ } }, "node_modules/object.hasown": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.3.tgz", - "integrity": "sha512-fFI4VcYpRHvSLXxP7yiZOMAd331cPfd2p7PFDVbgUsYOfCT3tICVqXWngbjr4m49OvsBwUBQ6O2uQoJvy3RexA==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.2.tgz", + "integrity": "sha512-B5UIT3J1W+WuWIU55h0mjlwaqxiE5vYENJXIXZ4VFe05pNYrkKuK0U/6aFcb0pKywYJh7IhfoqUfKVmrJJHZHw==", "dev": true, "dependencies": { - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1" + "define-properties": "^1.1.4", + "es-abstract": "^1.20.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/object.values": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.2.0.tgz", - "integrity": "sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ==", + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz", + "integrity": "sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==", "dev": true, "dependencies": { - "call-bind": "^1.0.7", - "define-properties": "^1.2.1", - "es-object-atoms": "^1.0.0" + "call-bind": "^1.0.2", + "define-properties": "^1.1.4", + "es-abstract": "^1.20.4" }, "engines": { "node": ">= 0.4" @@ -6145,7 +5849,7 @@ "node_modules/once": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", + "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "dev": true, "dependencies": { "wrappy": "1" @@ -6169,33 +5873,30 @@ } }, "node_modules/p-limit": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", - "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", "dev": true, "dependencies": { - "yocto-queue": "^0.1.0" + "p-try": "^2.0.0" }, "engines": { - "node": ">=10" + "node": ">=6" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/p-locate": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", - "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", "dev": true, "dependencies": { - "p-limit": "^3.0.2" + "p-limit": "^2.2.0" }, "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "node": ">=8" } }, "node_modules/p-try": { @@ -6247,7 +5948,7 @@ "node_modules/path-is-absolute": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", "dev": true, "engines": { "node": ">=0.10.0" @@ -6302,100 +6003,15 @@ } }, "node_modules/pkg-dir": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-7.0.0.tgz", - "integrity": "sha512-Ie9z/WINcxxLp27BKOCHGde4ITq9UklYKDzVo1nhk5sqGEXU3FpkwP5GM2voTGJkGd9B3Otl+Q4uwSOeSUtOBA==", - "dev": true, - "dependencies": { - "find-up": "^6.3.0" - }, - "engines": { - "node": ">=14.16" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/pkg-dir/node_modules/find-up": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-6.3.0.tgz", - "integrity": "sha512-v2ZsoEuVHYy8ZIlYqwPe/39Cy+cFDzp4dXPaxNvkEuouymu+2Jbz0PxpKarJHYJTmv2HWT3O382qY8l4jMWthw==", - "dev": true, - "dependencies": { - "locate-path": "^7.1.0", - "path-exists": "^5.0.0" - }, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/pkg-dir/node_modules/locate-path": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-7.2.0.tgz", - "integrity": "sha512-gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA==", - "dev": true, - "dependencies": { - "p-locate": "^6.0.0" - }, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/pkg-dir/node_modules/p-limit": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-4.0.0.tgz", - "integrity": "sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==", - "dev": true, - "dependencies": { - "yocto-queue": "^1.0.0" - }, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/pkg-dir/node_modules/p-locate": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-6.0.0.tgz", - "integrity": "sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", + "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", "dev": true, "dependencies": { - "p-limit": "^4.0.0" - }, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + "find-up": "^4.0.0" }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/pkg-dir/node_modules/path-exists": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-5.0.0.tgz", - "integrity": "sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ==", - "dev": true, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - } - }, - "node_modules/pkg-dir/node_modules/yocto-queue": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.0.0.tgz", - "integrity": "sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==", - "dev": true, "engines": { - "node": ">=12.20" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "node": ">=8" } }, "node_modules/popper.js": { @@ -6408,19 +6024,10 @@ "url": "https://opencollective.com/popperjs" } }, - "node_modules/possible-typed-array-names": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz", - "integrity": "sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==", - "dev": true, - "engines": { - "node": ">= 0.4" - } - }, "node_modules/postcss": { - "version": "8.4.38", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.38.tgz", - "integrity": "sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==", + "version": "8.4.18", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.18.tgz", + "integrity": "sha512-Wi8mWhncLJm11GATDaQKobXSNEYGUHeQLiQqDFG1qQ5UTDPTEvKw0Xt5NsTpktGTwLps3ByrWsBrG0rB8YQ9oA==", "dev": true, "funding": [ { @@ -6430,16 +6037,12 @@ { "type": "tidelift", "url": "https://tidelift.com/funding/github/npm/postcss" - }, - { - "type": "github", - "url": "https://github.com/sponsors/ai" } ], "dependencies": { - "nanoid": "^3.3.7", + "nanoid": "^3.3.4", "picocolors": "^1.0.0", - "source-map-js": "^1.2.0" + "source-map-js": "^1.0.2" }, "engines": { "node": "^10 || ^12 || >=14" @@ -6458,9 +6061,9 @@ } }, "node_modules/postcss-modules-local-by-default": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.4.tgz", - "integrity": "sha512-L4QzMnOdVwRm1Qb8m4x8jsZzKAaPAgrUF1r/hjDR2Xj7R+8Zsf97jAlSQzWtKx5YNiNGN8QxmPFIc/sh+RQl+Q==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz", + "integrity": "sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==", "dev": true, "dependencies": { "icss-utils": "^5.0.0", @@ -6475,9 +6078,9 @@ } }, "node_modules/postcss-modules-scope": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.1.1.tgz", - "integrity": "sha512-uZgqzdTleelWjzJY+Fhti6F3C9iF1JR/dODLs/JDefozYcKTBCdD8BIl6nNPbTbcLnGrk56hzwZC2DaGNvYjzA==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz", + "integrity": "sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==", "dev": true, "dependencies": { "postcss-selector-parser": "^6.0.4" @@ -6505,9 +6108,9 @@ } }, "node_modules/postcss-selector-parser": { - "version": "6.0.16", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.16.tgz", - "integrity": "sha512-A0RVJrX+IUkVZbW3ClroRWurercFhieevHB38sr2+l9eUClMqome3LmEmnhlNy+5Mr2EYN6B2Kaw9wYdd+VHiw==", + "version": "6.0.10", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz", + "integrity": "sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==", "dev": true, "dependencies": { "cssesc": "^3.0.0", @@ -6554,18 +6157,10 @@ "react": ">=0.14.0" } }, - "node_modules/prop-types-extra/node_modules/warning": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz", - "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==", - "dependencies": { - "loose-envify": "^1.0.0" - } - }, "node_modules/punycode": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", - "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", + "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", "dev": true, "engines": { "node": ">=6" @@ -6634,20 +6229,12 @@ "react-dom": ">=16.3.0" } }, - "node_modules/react-datepicker": { - "version": "6.6.0", - "resolved": "https://registry.npmjs.org/react-datepicker/-/react-datepicker-6.6.0.tgz", - "integrity": "sha512-ERC0/Q4pPC9bNIcGUpdCbHc+oCxhkU3WI3UOGHkyJ3A9fqALCYpEmLc5S5xvAd7DuCDdbsyW97oRPM6pWWwjww==", + "node_modules/react-bootstrap/node_modules/warning": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/warning/-/warning-3.0.0.tgz", + "integrity": "sha512-jMBt6pUrKn5I+OGgtQ4YZLdhIeJmObddh6CsibPxyQ5yPZm1XExSyzC1LCNX7BzhxWgiHmizBWJTHJIjMjTQYQ==", "dependencies": { - "@floating-ui/react": "^0.26.2", - "clsx": "^2.1.0", - "date-fns": "^3.3.1", - "prop-types": "^15.7.2", - "react-onclickoutside": "^6.13.0" - }, - "peerDependencies": { - "react": "^16.9.0 || ^17 || ^18", - "react-dom": "^16.9.0 || ^17 || ^18" + "loose-envify": "^1.0.0" } }, "node_modules/react-dnd": { @@ -6699,22 +6286,6 @@ "react": "^18.2.0" } }, - "node_modules/react-dropzone": { - "version": "10.2.2", - "resolved": "https://registry.npmjs.org/react-dropzone/-/react-dropzone-10.2.2.tgz", - "integrity": "sha512-U5EKckXVt6IrEyhMMsgmHQiWTGLudhajPPG77KFSvgsMqNEHSyGpqWvOMc5+DhEah/vH4E1n+J5weBNLd5VtyA==", - "dependencies": { - "attr-accept": "^2.0.0", - "file-selector": "^0.1.12", - "prop-types": "^15.7.2" - }, - "engines": { - "node": ">= 8" - }, - "peerDependencies": { - "react": ">= 16.8" - } - }, "node_modules/react-is": { "version": "16.13.1", "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", @@ -6725,19 +6296,6 @@ "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz", "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==" }, - "node_modules/react-onclickoutside": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/react-onclickoutside/-/react-onclickoutside-6.13.0.tgz", - "integrity": "sha512-ty8So6tcUpIb+ZE+1HAhbLROvAIJYyJe/1vRrrcmW+jLsaM+/powDRqxzo6hSh9CuRZGSL1Q8mvcF5WRD93a0A==", - "funding": { - "type": "individual", - "url": "https://github.com/Pomax/react-onclickoutside/blob/master/FUNDING.md" - }, - "peerDependencies": { - "react": "^15.5.x || ^16.x || ^17.x || ^18.x", - "react-dom": "^15.5.x || ^16.x || ^17.x || ^18.x" - } - }, "node_modules/react-overlays": { "version": "0.9.3", "resolved": "https://registry.npmjs.org/react-overlays/-/react-overlays-0.9.3.tgz", @@ -6755,6 +6313,14 @@ "react-dom": ">=16.3.0" } }, + "node_modules/react-overlays/node_modules/warning": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/warning/-/warning-3.0.0.tgz", + "integrity": "sha512-jMBt6pUrKn5I+OGgtQ4YZLdhIeJmObddh6CsibPxyQ5yPZm1XExSyzC1LCNX7BzhxWgiHmizBWJTHJIjMjTQYQ==", + "dependencies": { + "loose-envify": "^1.0.0" + } + }, "node_modules/react-prop-types": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/react-prop-types/-/react-prop-types-0.4.0.tgz", @@ -6766,10 +6332,18 @@ "react": ">=0.14.0" } }, + "node_modules/react-prop-types/node_modules/warning": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/warning/-/warning-3.0.0.tgz", + "integrity": "sha512-jMBt6pUrKn5I+OGgtQ4YZLdhIeJmObddh6CsibPxyQ5yPZm1XExSyzC1LCNX7BzhxWgiHmizBWJTHJIjMjTQYQ==", + "dependencies": { + "loose-envify": "^1.0.0" + } + }, "node_modules/react-redux": { - "version": "7.2.9", - "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-7.2.9.tgz", - "integrity": "sha512-Gx4L3uM182jEEayZfRbI/G11ZpYdNAnBs70lFVMNdHJI76XYtR+7m0MN+eAs7UHBPhWXcnFPaS+9owSCJQHNpQ==", + "version": "7.2.8", + "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-7.2.8.tgz", + "integrity": "sha512-6+uDjhs3PSIclqoCk0kd6iX74gzrGc3W5zcAjbrFgEdIjRSQObdIwfx80unTkVUYvbQ95Y8Av3OvFHq1w5EOUw==", "dependencies": { "@babel/runtime": "^7.15.4", "@types/react-redux": "^7.1.20", @@ -6796,9 +6370,9 @@ "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==" }, "node_modules/react-select": { - "version": "5.8.0", - "resolved": "https://registry.npmjs.org/react-select/-/react-select-5.8.0.tgz", - "integrity": "sha512-TfjLDo58XrhP6VG5M/Mi56Us0Yt8X7xD6cDybC7yoRMUNm7BGO7qk8J0TLQOua/prb8vUOtsfnXZwfm30HGsAA==", + "version": "5.7.0", + "resolved": "https://registry.npmjs.org/react-select/-/react-select-5.7.0.tgz", + "integrity": "sha512-lJGiMxCa3cqnUr2Jjtg9YHsaytiZqeNOKeibv6WF5zbK/fPegZ1hg3y/9P1RZVLhqBTs0PfqQLKuAACednYGhQ==", "dependencies": { "@babel/runtime": "^7.12.0", "@emotion/cache": "^11.4.0", @@ -6879,9 +6453,9 @@ } }, "node_modules/redux": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/redux/-/redux-4.2.1.tgz", - "integrity": "sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/redux/-/redux-4.2.0.tgz", + "integrity": "sha512-oSBmcKKIuIR4ME29/AeNUnl5L+hvBq7OaJWzaptTQJAntaPvxIJqfnjbaEiCzzaIz+XmVILfqAM3Ob0aXLPfjA==", "dependencies": { "@babel/runtime": "^7.9.2" } @@ -6941,9 +6515,9 @@ } }, "node_modules/regenerator-runtime": { - "version": "0.14.1", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz", - "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==" + "version": "0.13.11", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz", + "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==" }, "node_modules/regenerator-transform": { "version": "0.15.2", @@ -7019,11 +6593,11 @@ } }, "node_modules/resolve": { - "version": "1.22.8", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz", - "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==", + "version": "1.22.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz", + "integrity": "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==", "dependencies": { - "is-core-module": "^2.13.0", + "is-core-module": "^2.8.1", "path-parse": "^1.0.7", "supports-preserve-symlinks-flag": "^1.0.0" }, @@ -7046,7 +6620,7 @@ "node": ">=8" } }, - "node_modules/resolve-cwd/node_modules/resolve-from": { + "node_modules/resolve-from": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", @@ -7055,14 +6629,6 @@ "node": ">=8" } }, - "node_modules/resolve-from": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", - "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", - "engines": { - "node": ">=4" - } - }, "node_modules/reusify": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", @@ -7135,64 +6701,23 @@ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" }, "node_modules/safe-regex-test": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz", - "integrity": "sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.7", - "get-intrinsic": "^1.2.4", - "has-symbols": "^1.0.3", - "isarray": "^2.0.5" - }, - "engines": { - "node": ">=0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ] - }, - "node_modules/safe-regex-test": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.3.tgz", - "integrity": "sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz", + "integrity": "sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==", "dev": true, "dependencies": { - "call-bind": "^1.0.6", - "es-errors": "^1.3.0", + "call-bind": "^1.0.2", + "get-intrinsic": "^1.1.3", "is-regex": "^1.1.4" }, - "engines": { - "node": ">= 0.4" - }, "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/sass": { - "version": "1.72.0", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.72.0.tgz", - "integrity": "sha512-Gpczt3WA56Ly0Mn8Sl21Vj94s1axi9hDIzDFn9Ph9x3C3p4nNyvsqJoQyVXKou6cBlfFWEgRW4rT8Tb4i3XnVA==", + "version": "1.55.0", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.55.0.tgz", + "integrity": "sha512-Pk+PMy7OGLs9WaxZGJMn7S96dvlyVBwwtToX895WmCpAOr5YiJYEUJfiJidMuKb613z2xNWcXCHEuOvjZbqC6A==", "dev": true, "dependencies": { "chokidar": ">=3.0.0 <4.0.0", @@ -7203,7 +6728,7 @@ "sass": "sass.js" }, "engines": { - "node": ">=14.0.0" + "node": ">=12.0.0" } }, "node_modules/sass-loader": { @@ -7305,7 +6830,6 @@ "version": "6.3.1", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", - "dev": true, "bin": { "semver": "bin/semver.js" } @@ -7382,18 +6906,14 @@ } }, "node_modules/side-channel": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz", - "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", + "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", "dev": true, "dependencies": { - "call-bind": "^1.0.7", - "es-errors": "^1.3.0", - "get-intrinsic": "^1.2.4", - "object-inspect": "^1.13.1" - }, - "engines": { - "node": ">= 0.4" + "call-bind": "^1.0.0", + "get-intrinsic": "^1.0.2", + "object-inspect": "^1.9.0" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -7415,17 +6935,18 @@ "dev": true }, "node_modules/source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==", + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true, "engines": { "node": ">=0.10.0" } }, "node_modules/source-map-js": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz", - "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz", + "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==", "dev": true, "engines": { "node": ">=0.10.0" @@ -7441,36 +6962,20 @@ "source-map": "^0.6.0" } }, - "node_modules/source-map-support/node_modules/source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/string.prototype.matchall": { - "version": "4.0.11", - "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.11.tgz", - "integrity": "sha512-NUdh0aDavY2og7IbBPenWqR9exH+E26Sv8e0/eTe1tltDGZL+GtBkDAnnyBtmekfK6/Dq3MkcGtzXFEd1LQrtg==", + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.8.tgz", + "integrity": "sha512-6zOCOcJ+RJAQshcTvXPHoxoQGONa3e/Lqx90wUA+wEzX78sg5Bo+1tQo4N0pohS0erG9qtCqJDjNCQBjeWVxyg==", "dev": true, "dependencies": { - "call-bind": "^1.0.7", - "define-properties": "^1.2.1", - "es-abstract": "^1.23.2", - "es-errors": "^1.3.0", - "es-object-atoms": "^1.0.0", - "get-intrinsic": "^1.2.4", - "gopd": "^1.0.1", + "call-bind": "^1.0.2", + "define-properties": "^1.1.4", + "es-abstract": "^1.20.4", + "get-intrinsic": "^1.1.3", "has-symbols": "^1.0.3", - "internal-slot": "^1.0.7", - "regexp.prototype.flags": "^1.5.2", - "set-function-name": "^2.0.2", - "side-channel": "^1.0.6" - }, - "engines": { - "node": ">= 0.4" + "internal-slot": "^1.0.3", + "regexp.prototype.flags": "^1.4.3", + "side-channel": "^1.0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -7546,14 +7051,14 @@ } }, "node_modules/style-mod": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/style-mod/-/style-mod-4.1.2.tgz", - "integrity": "sha512-wnD1HyVqpJUI2+eKZ+eo1UwghftP6yuFheBqqe+bWCotBjC2K1YnteJILRMs3SM4V/0dLEW1SC27MWP5y+mwmw==" + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/style-mod/-/style-mod-4.0.0.tgz", + "integrity": "sha512-OPhtyEjyyN9x3nhPsu76f52yUGXiZcgvsrFVtvTkyGRQJ0XK+GPc6ov1z+lRpbeabka+MYEQxOYRnt5nF30aMw==" }, "node_modules/stylis": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.2.0.tgz", - "integrity": "sha512-Orov6g6BB1sDfYgzWfTHDOxamtX1bE/zo104Dh9e6fqJ3PooipYyfJ0pUmrZO2wAvO8YbEyeFrkV91XTsGMSrw==" + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.1.3.tgz", + "integrity": "sha512-GP6WDNWf+o403jrEp9c5jibKavrtLW+/qYGhFxFrG8maXhwTBI7gLLhiBb0o7uFccWN+EOS9aMO6cGHWAO07OA==" }, "node_modules/supports-color": { "version": "5.5.0", @@ -7577,11 +7082,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/tabbable": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-6.2.0.tgz", - "integrity": "sha512-Cat63mxsVJlzYvN51JmVXIgNoUokrIaT2zLclCXjRd8boZ0004U4KCs/sToJ75C6sdlByWxpYnb5Boif1VSFew==" - }, "node_modules/tapable": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz", @@ -7676,7 +7176,7 @@ "node_modules/to-fast-properties": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", - "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==", + "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=", "engines": { "node": ">=4" } @@ -7693,11 +7193,6 @@ "node": ">=8.0" } }, - "node_modules/tslib": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", - "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" - }, "node_modules/type-check": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", @@ -7779,68 +7274,9 @@ "integrity": "sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==", "dev": true, "dependencies": { - "call-bind": "^1.0.7", - "es-errors": "^1.3.0", - "is-typed-array": "^1.1.13" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/typed-array-byte-length": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.1.tgz", - "integrity": "sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.7", - "for-each": "^0.3.3", - "gopd": "^1.0.1", - "has-proto": "^1.0.3", - "is-typed-array": "^1.1.13" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/typed-array-byte-offset": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.2.tgz", - "integrity": "sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==", - "dev": true, - "dependencies": { - "available-typed-arrays": "^1.0.7", - "call-bind": "^1.0.7", - "for-each": "^0.3.3", - "gopd": "^1.0.1", - "has-proto": "^1.0.3", - "is-typed-array": "^1.1.13" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/typed-array-length": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.5.tgz", - "integrity": "sha512-yMi0PlwuznKHxKmcpoOdeLwxBoVPkqZxd7q2FgMkmD3bNwvF5VW0+UlUQ1k1vmktTu4Yu13Q0RIxEP8+B+wloA==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.7", + "call-bind": "^1.0.2", "for-each": "^0.3.3", - "gopd": "^1.0.1", - "has-proto": "^1.0.3", - "is-typed-array": "^1.1.13", - "possible-typed-array-names": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" + "is-typed-array": "^1.1.9" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -7875,12 +7311,6 @@ "react": ">=15.0.0" } }, - "node_modules/undici-types": { - "version": "5.26.5", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", - "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==", - "devOptional": true - }, "node_modules/unicode-canonical-property-names-ecmascript": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz", @@ -7979,14 +7409,14 @@ "dev": true }, "node_modules/w3c-keyname": { - "version": "2.2.8", - "resolved": "https://registry.npmjs.org/w3c-keyname/-/w3c-keyname-2.2.8.tgz", - "integrity": "sha512-dpojBhNsCNN7T82Tm7k26A6G9ML3NkhDsnw9n/eoxSRlVBB4CEtIQ/KTCLI2Fwf3ataSXRhYFkQi3SlnFwPvPQ==" + "version": "2.2.6", + "resolved": "https://registry.npmjs.org/w3c-keyname/-/w3c-keyname-2.2.6.tgz", + "integrity": "sha512-f+fciywl1SJEniZHD6H+kUO8gOnwIr7f4ijKA6+ZvJFjeGi1r4PDLl53Ayud9O/rk64RqgoQine0feoeOU0kXg==" }, "node_modules/warning": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/warning/-/warning-3.0.0.tgz", - "integrity": "sha512-jMBt6pUrKn5I+OGgtQ4YZLdhIeJmObddh6CsibPxyQ5yPZm1XExSyzC1LCNX7BzhxWgiHmizBWJTHJIjMjTQYQ==", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz", + "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==", "dependencies": { "loose-envify": "^1.0.0" } @@ -8120,44 +7550,12 @@ } }, "node_modules/webpack-sources": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz", - "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==", - "dev": true, - "dependencies": { - "source-list-map": "^2.0.0", - "source-map": "~0.6.1" - } - }, - "node_modules/webpack-sources/node_modules/source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/webpack/node_modules/eslint-scope": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", - "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", - "dev": true, - "dependencies": { - "esrecurse": "^4.3.0", - "estraverse": "^4.1.1" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/webpack/node_modules/estraverse": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", - "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz", + "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==", "dev": true, "engines": { - "node": ">=4.0" + "node": ">=10.13.0" } }, "node_modules/webpack/node_modules/schema-utils": { @@ -8178,15 +7576,6 @@ "url": "https://opencollective.com/webpack" } }, - "node_modules/webpack/node_modules/webpack-sources": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz", - "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==", - "dev": true, - "engines": { - "node": ">=10.13.0" - } - }, "node_modules/which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", @@ -8279,21 +7668,21 @@ } }, "node_modules/wildcard": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.1.tgz", - "integrity": "sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz", + "integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==", "dev": true }, "node_modules/wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", "dev": true }, "node_modules/yallist": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", - "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", "dev": true }, "node_modules/yaml": { @@ -8325,13 +7714,12 @@ "dev": true }, "@ampproject/remapping": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz", - "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==", - "dev": true, + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz", + "integrity": "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==", "requires": { - "@jridgewell/gen-mapping": "^0.3.5", - "@jridgewell/trace-mapping": "^0.3.24" + "@jridgewell/gen-mapping": "^0.1.0", + "@jridgewell/trace-mapping": "^0.3.9" } }, "@babel/cli": { @@ -9527,20 +8915,20 @@ "dev": true }, "@babel/runtime": { - "version": "7.24.1", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.1.tgz", - "integrity": "sha512-+BIznRzyqBf+2wCTxcKE3wDjfGeCoVE61KSHGpkzqrLi8qxqFwBeUFyId2cxkTmm55fzDGnm0+yCxaxygrLUnQ==", + "version": "7.20.13", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.13.tgz", + "integrity": "sha512-gt3PKXs0DBoL9xCvOIIZ2NEqAGZqHjAnmVbfQtB620V0uReIQutpel14KcneZuer7UioY8ALKZ7iocavvzTNFA==", "requires": { - "regenerator-runtime": "^0.14.0" + "regenerator-runtime": "^0.13.11" } }, "@babel/runtime-corejs2": { - "version": "7.24.1", - "resolved": "https://registry.npmjs.org/@babel/runtime-corejs2/-/runtime-corejs2-7.24.1.tgz", - "integrity": "sha512-De0q0utpUPiXnc7+B7Ku86mJ0eDItC/v3uFa/lQkq63XnHyZiytDHeCIvechlnVwwpU2ChjGF7c3I+mBrTudwg==", + "version": "7.20.13", + "resolved": "https://registry.npmjs.org/@babel/runtime-corejs2/-/runtime-corejs2-7.20.13.tgz", + "integrity": "sha512-K2yRNithMJG4epI509n4ljPjogMhmYCB887iSD7rRecxWC9dkbfJZCPGj0BQaqG3d3Qkpb1SotEmyeMmtnvxhw==", "requires": { "core-js": "^2.6.12", - "regenerator-runtime": "^0.14.0" + "regenerator-runtime": "^0.13.11" } }, "@babel/template": { @@ -9581,86 +8969,85 @@ } }, "@codemirror/autocomplete": { - "version": "6.15.0", - "resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.15.0.tgz", - "integrity": "sha512-G2Zm0mXznxz97JhaaOdoEG2cVupn4JjPaS4AcNvZzhOsnnG9YVN68VzfoUw6dYTsIxT6a/cmoFEN47KAWhXaOg==", + "version": "6.4.2", + "resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.4.2.tgz", + "integrity": "sha512-8WE2xp+D0MpWEv5lZ6zPW1/tf4AGb358T5GWYiKEuCP8MvFfT3tH2mIF9Y2yr2e3KbHuSvsVhosiEyqCpiJhZQ==", "requires": { "@codemirror/language": "^6.0.0", "@codemirror/state": "^6.0.0", - "@codemirror/view": "^6.17.0", + "@codemirror/view": "^6.6.0", "@lezer/common": "^1.0.0" } }, "@codemirror/commands": { - "version": "6.3.3", - "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.3.3.tgz", - "integrity": "sha512-dO4hcF0fGT9tu1Pj1D2PvGvxjeGkbC6RGcZw6Qs74TH+Ed1gw98jmUgd2axWvIZEqTeTuFrg1lEB1KV6cK9h1A==", + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.2.1.tgz", + "integrity": "sha512-FFiNKGuHA5O8uC6IJE5apI5rT9gyjlw4whqy4vlcX0wE/myxL6P1s0upwDhY4HtMWLOwzwsp0ap3bjdQhvfDOA==", "requires": { "@codemirror/language": "^6.0.0", - "@codemirror/state": "^6.4.0", + "@codemirror/state": "^6.2.0", "@codemirror/view": "^6.0.0", - "@lezer/common": "^1.1.0" + "@lezer/common": "^1.0.0" } }, "@codemirror/lang-css": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@codemirror/lang-css/-/lang-css-6.2.1.tgz", - "integrity": "sha512-/UNWDNV5Viwi/1lpr/dIXJNWiwDxpw13I4pTUAsNxZdg6E0mI2kTQb0P2iHczg1Tu+H4EBgJR+hYhKiHKko7qg==", + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/@codemirror/lang-css/-/lang-css-6.0.2.tgz", + "integrity": "sha512-4V4zmUOl2Glx0GWw0HiO1oGD4zvMlIQ3zx5hXOE6ipCjhohig2bhWRAasrZylH9pRNTcl1VMa59Lsl8lZWlTzw==", "requires": { "@codemirror/autocomplete": "^6.0.0", "@codemirror/language": "^6.0.0", "@codemirror/state": "^6.0.0", - "@lezer/common": "^1.0.2", "@lezer/css": "^1.0.0" } }, "@codemirror/lang-html": { - "version": "6.4.8", - "resolved": "https://registry.npmjs.org/@codemirror/lang-html/-/lang-html-6.4.8.tgz", - "integrity": "sha512-tE2YK7wDlb9ZpAH6mpTPiYm6rhfdQKVDa5r9IwIFlwwgvVaKsCfuKKZoJGWsmMZIf3FQAuJ5CHMPLymOtg1hXw==", + "version": "6.4.2", + "resolved": "https://registry.npmjs.org/@codemirror/lang-html/-/lang-html-6.4.2.tgz", + "integrity": "sha512-bqCBASkteKySwtIbiV/WCtGnn/khLRbbiV5TE+d9S9eQJD7BA4c5dTRm2b3bVmSpilff5EYxvB4PQaZzM/7cNw==", "requires": { "@codemirror/autocomplete": "^6.0.0", "@codemirror/lang-css": "^6.0.0", "@codemirror/lang-javascript": "^6.0.0", "@codemirror/language": "^6.4.0", "@codemirror/state": "^6.0.0", - "@codemirror/view": "^6.17.0", + "@codemirror/view": "^6.2.2", "@lezer/common": "^1.0.0", "@lezer/css": "^1.1.0", "@lezer/html": "^1.3.0" } }, "@codemirror/lang-javascript": { - "version": "6.2.2", - "resolved": "https://registry.npmjs.org/@codemirror/lang-javascript/-/lang-javascript-6.2.2.tgz", - "integrity": "sha512-VGQfY+FCc285AhWuwjYxQyUQcYurWlxdKYT4bqwr3Twnd5wP5WSeu52t4tvvuWmljT4EmgEgZCqSieokhtY8hg==", + "version": "6.1.4", + "resolved": "https://registry.npmjs.org/@codemirror/lang-javascript/-/lang-javascript-6.1.4.tgz", + "integrity": "sha512-OxLf7OfOZBTMRMi6BO/F72MNGmgOd9B0vetOLvHsDACFXayBzW8fm8aWnDM0yuy68wTK03MBf4HbjSBNRG5q7A==", "requires": { "@codemirror/autocomplete": "^6.0.0", "@codemirror/language": "^6.6.0", "@codemirror/lint": "^6.0.0", "@codemirror/state": "^6.0.0", - "@codemirror/view": "^6.17.0", + "@codemirror/view": "^6.0.0", "@lezer/common": "^1.0.0", "@lezer/javascript": "^1.0.0" } }, "@codemirror/language": { - "version": "6.10.1", - "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.10.1.tgz", - "integrity": "sha512-5GrXzrhq6k+gL5fjkAwt90nYDmjlzTIJV8THnxNFtNKWotMIlzzN+CpqxqwXOECnUdOndmSeWntVrVcv5axWRQ==", + "version": "6.6.0", + "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.6.0.tgz", + "integrity": "sha512-cwUd6lzt3MfNYOobdjf14ZkLbJcnv4WtndYaoBkbor/vF+rCNguMPK0IRtvZJG4dsWiaWPcK8x1VijhvSxnstg==", "requires": { "@codemirror/state": "^6.0.0", - "@codemirror/view": "^6.23.0", - "@lezer/common": "^1.1.0", + "@codemirror/view": "^6.0.0", + "@lezer/common": "^1.0.0", "@lezer/highlight": "^1.0.0", "@lezer/lr": "^1.0.0", "style-mod": "^4.0.0" } }, "@codemirror/lint": { - "version": "6.5.0", - "resolved": "https://registry.npmjs.org/@codemirror/lint/-/lint-6.5.0.tgz", - "integrity": "sha512-+5YyicIaaAZKU8K43IQi8TBy6mF6giGeWAH7N96Z5LC30Wm5JMjqxOYIE9mxwMG1NbhT2mA3l9hA4uuKUM3E5g==", + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/@codemirror/lint/-/lint-6.1.1.tgz", + "integrity": "sha512-e+M543x0NVHGayNHQzLP4XByJsvbu/ojY6+0VF2Y4Uu66Rt1nADuxNflZwECLf7gS009smIsptSUa6bUj/U/rw==", "requires": { "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.0.0", @@ -9668,9 +9055,9 @@ } }, "@codemirror/search": { - "version": "6.5.6", - "resolved": "https://registry.npmjs.org/@codemirror/search/-/search-6.5.6.tgz", - "integrity": "sha512-rpMgcsh7o0GuCDUXKPvww+muLA1pDJaFrpq/CCHtpQJYz8xopu4D1hPcKRoDD0YlF8gZaqTNIRa4VRBWyhyy7Q==", + "version": "6.2.3", + "resolved": "https://registry.npmjs.org/@codemirror/search/-/search-6.2.3.tgz", + "integrity": "sha512-V9n9233lopQhB1dyjsBK2Wc1i+8hcCqxl1wQ46c5HWWLePoe4FluV3TGHoZ04rBRlGjNyz9DTmpJErig8UE4jw==", "requires": { "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.0.0", @@ -9678,14 +9065,14 @@ } }, "@codemirror/state": { - "version": "6.4.1", - "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.4.1.tgz", - "integrity": "sha512-QkEyUiLhsJoZkbumGZlswmAhA7CBU02Wrz7zvH4SrcifbsqwlXShVXg65f3v/ts57W3dqyamEriMhij1Z3Zz4A==" + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.2.0.tgz", + "integrity": "sha512-69QXtcrsc3RYtOtd+GsvczJ319udtBf1PTrr2KbLWM/e2CXUPnh0Nz9AUo8WfhSQ7GeL8dPVNUmhQVgpmuaNGA==" }, "@codemirror/theme-one-dark": { - "version": "6.1.2", - "resolved": "https://registry.npmjs.org/@codemirror/theme-one-dark/-/theme-one-dark-6.1.2.tgz", - "integrity": "sha512-F+sH0X16j/qFLMAfbciKTxVOwkdAS336b7AXTKOZhy8BR3eH/RelsnLgLFINrpST63mmN2OuwUt0W2ndUgYwUA==", + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/@codemirror/theme-one-dark/-/theme-one-dark-6.1.1.tgz", + "integrity": "sha512-+CfzmScfJuD6uDF5bHJkAjWTQ2QAAHxODCPxUEgcImDYcJLT+4l5vLnBHmDVv46kCC5uUJGMrBJct2Z6JbvqyQ==", "requires": { "@codemirror/language": "^6.0.0", "@codemirror/state": "^6.0.0", @@ -9694,12 +9081,12 @@ } }, "@codemirror/view": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.26.0.tgz", - "integrity": "sha512-nSSmzONpqsNzshPOxiKhK203R6BvABepugAe34QfQDbNDslyjkqBuKgrK5ZBvqNXpfxz5iLrlGTmEfhbQyH46A==", + "version": "6.9.1", + "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.9.1.tgz", + "integrity": "sha512-bzfSjJn9dAADVpabLKWKNmMG4ibyTV2e3eOGowjElNPTdTkSbi6ixPYHm2u0ADcETfKsi2/R84Rkmi91dH9yEg==", "requires": { - "@codemirror/state": "^6.4.0", - "style-mod": "^4.1.0", + "@codemirror/state": "^6.1.4", + "style-mod": "^4.0.0", "w3c-keyname": "^2.2.4" } }, @@ -9710,109 +9097,110 @@ "dev": true }, "@emotion/babel-plugin": { - "version": "11.11.0", - "resolved": "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.11.0.tgz", - "integrity": "sha512-m4HEDZleaaCH+XgDDsPF15Ht6wTLsgDTeR3WYj9Q/k76JtWhrJjcP4+/XlG8LGT/Rol9qUfOIztXeA84ATpqPQ==", + "version": "11.10.5", + "resolved": "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.10.5.tgz", + "integrity": "sha512-xE7/hyLHJac7D2Ve9dKroBBZqBT7WuPQmWcq7HSGb84sUuP4mlOWoB8dvVfD9yk5DHkU1m6RW7xSoDtnQHNQeA==", "requires": { "@babel/helper-module-imports": "^7.16.7", + "@babel/plugin-syntax-jsx": "^7.17.12", "@babel/runtime": "^7.18.3", - "@emotion/hash": "^0.9.1", - "@emotion/memoize": "^0.8.1", - "@emotion/serialize": "^1.1.2", + "@emotion/hash": "^0.9.0", + "@emotion/memoize": "^0.8.0", + "@emotion/serialize": "^1.1.1", "babel-plugin-macros": "^3.1.0", "convert-source-map": "^1.5.0", "escape-string-regexp": "^4.0.0", "find-root": "^1.1.0", "source-map": "^0.5.7", - "stylis": "4.2.0" + "stylis": "4.1.3" }, "dependencies": { - "convert-source-map": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz", - "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==" - }, "escape-string-regexp": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==" + }, + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==" } } }, "@emotion/cache": { - "version": "11.11.0", - "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.11.0.tgz", - "integrity": "sha512-P34z9ssTCBi3e9EI1ZsWpNHcfY1r09ZO0rZbRO2ob3ZQMnFI35jB536qoXbkdesr5EUhYi22anuEJuyxifaqAQ==", + "version": "11.10.5", + "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.10.5.tgz", + "integrity": "sha512-dGYHWyzTdmK+f2+EnIGBpkz1lKc4Zbj2KHd4cX3Wi8/OWr5pKslNjc3yABKH4adRGCvSX4VDC0i04mrrq0aiRA==", "requires": { - "@emotion/memoize": "^0.8.1", - "@emotion/sheet": "^1.2.2", - "@emotion/utils": "^1.2.1", - "@emotion/weak-memoize": "^0.3.1", - "stylis": "4.2.0" + "@emotion/memoize": "^0.8.0", + "@emotion/sheet": "^1.2.1", + "@emotion/utils": "^1.2.0", + "@emotion/weak-memoize": "^0.3.0", + "stylis": "4.1.3" } }, "@emotion/hash": { - "version": "0.9.1", - "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.9.1.tgz", - "integrity": "sha512-gJB6HLm5rYwSLI6PQa+X1t5CFGrv1J1TWG+sOyMCeKz2ojaj6Fnl/rZEspogG+cvqbt4AE/2eIyD2QfLKTBNlQ==" + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.9.0.tgz", + "integrity": "sha512-14FtKiHhy2QoPIzdTcvh//8OyBlknNs2nXRwIhG904opCby3l+9Xaf/wuPvICBF0rc1ZCNBd3nKe9cd2mecVkQ==" }, "@emotion/memoize": { - "version": "0.8.1", - "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.8.1.tgz", - "integrity": "sha512-W2P2c/VRW1/1tLox0mVUalvnWXxavmv/Oum2aPsRcoDJuob75FC3Y8FbpfLwUegRcxINtGUMPq0tFCvYNTBXNA==" + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.8.0.tgz", + "integrity": "sha512-G/YwXTkv7Den9mXDO7AhLWkE3q+I92B+VqAE+dYG4NGPaHZGvt3G8Q0p9vmE+sq7rTGphUbAvmQ9YpbfMQGGlA==" }, "@emotion/react": { - "version": "11.11.4", - "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.11.4.tgz", - "integrity": "sha512-t8AjMlF0gHpvvxk5mAtCqR4vmxiGHCeJBaQO6gncUSdklELOgtwjerNY2yuJNfwnc6vi16U/+uMF+afIawJ9iw==", + "version": "11.10.5", + "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.10.5.tgz", + "integrity": "sha512-TZs6235tCJ/7iF6/rvTaOH4oxQg2gMAcdHemjwLKIjKz4rRuYe1HJ2TQJKnAcRAfOUDdU8XoDadCe1rl72iv8A==", "requires": { "@babel/runtime": "^7.18.3", - "@emotion/babel-plugin": "^11.11.0", - "@emotion/cache": "^11.11.0", - "@emotion/serialize": "^1.1.3", - "@emotion/use-insertion-effect-with-fallbacks": "^1.0.1", - "@emotion/utils": "^1.2.1", - "@emotion/weak-memoize": "^0.3.1", + "@emotion/babel-plugin": "^11.10.5", + "@emotion/cache": "^11.10.5", + "@emotion/serialize": "^1.1.1", + "@emotion/use-insertion-effect-with-fallbacks": "^1.0.0", + "@emotion/utils": "^1.2.0", + "@emotion/weak-memoize": "^0.3.0", "hoist-non-react-statics": "^3.3.1" } }, "@emotion/serialize": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-1.1.3.tgz", - "integrity": "sha512-iD4D6QVZFDhcbH0RAG1uVu1CwVLMWUkCvAqqlewO/rxf8+87yIBAlt4+AxMiiKPLs5hFc0owNk/sLLAOROw3cA==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-1.1.1.tgz", + "integrity": "sha512-Zl/0LFggN7+L1liljxXdsVSVlg6E/Z/olVWpfxUTxOAmi8NU7YoeWeLfi1RmnB2TATHoaWwIBRoL+FvAJiTUQA==", "requires": { - "@emotion/hash": "^0.9.1", - "@emotion/memoize": "^0.8.1", - "@emotion/unitless": "^0.8.1", - "@emotion/utils": "^1.2.1", + "@emotion/hash": "^0.9.0", + "@emotion/memoize": "^0.8.0", + "@emotion/unitless": "^0.8.0", + "@emotion/utils": "^1.2.0", "csstype": "^3.0.2" } }, "@emotion/sheet": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/@emotion/sheet/-/sheet-1.2.2.tgz", - "integrity": "sha512-0QBtGvaqtWi+nx6doRwDdBIzhNdZrXUppvTM4dtZZWEGTXL/XE/yJxLMGlDT1Gt+UHH5IX1n+jkXyytE/av7OA==" + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@emotion/sheet/-/sheet-1.2.1.tgz", + "integrity": "sha512-zxRBwl93sHMsOj4zs+OslQKg/uhF38MB+OMKoCrVuS0nyTkqnau+BM3WGEoOptg9Oz45T/aIGs1qbVAsEFo3nA==" }, "@emotion/unitless": { - "version": "0.8.1", - "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.8.1.tgz", - "integrity": "sha512-KOEGMu6dmJZtpadb476IsZBclKvILjopjUii3V+7MnXIQCYh8W3NgNcgwo21n9LXZX6EDIKvqfjYxXebDwxKmQ==" + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.8.0.tgz", + "integrity": "sha512-VINS5vEYAscRl2ZUDiT3uMPlrFQupiKgHz5AA4bCH1miKBg4qtwkim1qPmJj/4WG6TreYMY111rEFsjupcOKHw==" }, "@emotion/use-insertion-effect-with-fallbacks": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@emotion/use-insertion-effect-with-fallbacks/-/use-insertion-effect-with-fallbacks-1.0.1.tgz", - "integrity": "sha512-jT/qyKZ9rzLErtrjGgdkMBn2OP8wl0G3sQlBb3YPryvKHsjvINUhVaPFfP+fpBcOkmrVOVEEHQFJ7nbj2TH2gw==", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@emotion/use-insertion-effect-with-fallbacks/-/use-insertion-effect-with-fallbacks-1.0.0.tgz", + "integrity": "sha512-1eEgUGmkaljiBnRMTdksDV1W4kUnmwgp7X9G8B++9GYwl1lUdqSndSriIrTJ0N7LQaoauY9JJ2yhiOYK5+NI4A==", "requires": {} }, "@emotion/utils": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@emotion/utils/-/utils-1.2.1.tgz", - "integrity": "sha512-Y2tGf3I+XVnajdItskUCn6LX+VUDmP6lTL4fcqsXAv43dnlbZiuW4MWQW38rW/BVWSE7Q/7+XQocmpnRYILUmg==" + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@emotion/utils/-/utils-1.2.0.tgz", + "integrity": "sha512-sn3WH53Kzpw8oQ5mgMmIzzyAaH2ZqFEbozVVBSYp538E06OSE6ytOp7pRAjNQR+Q/orwqdQYJSe2m3hCOeznkw==" }, "@emotion/weak-memoize": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.3.1.tgz", - "integrity": "sha512-EsBwpc7hBUJWAsNPBmJy4hxWx12v6bshQsldrVmjxJoc3isbxhOrF2IcCpaXxfvq03NwkI7sbsOLXbYuqF/8Ww==" + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.3.0.tgz", + "integrity": "sha512-AHPmaAx+RYfZz0eYu6Gviiagpmiyw98ySSlQvCUhVGDRtDFe4DBS0x1bSjdF3gqUDYOczB+yYvBTtEylYSdRhg==" }, "@eslint-community/eslint-utils": { "version": "4.4.0", @@ -9864,45 +9252,18 @@ "dev": true }, "@floating-ui/core": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.6.0.tgz", - "integrity": "sha512-PcF++MykgmTj3CIyOQbKA/hDzOAiqI3mhuoN44WRCopIs1sgoDoU4oty4Jtqaj/y3oDU6fnVSm4QG0a3t5i0+g==", - "requires": { - "@floating-ui/utils": "^0.2.1" - } + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.2.1.tgz", + "integrity": "sha512-LSqwPZkK3rYfD7GKoIeExXOyYx6Q1O4iqZWwIehDNuv3Dv425FIAE8PRwtAx1imEolFTHgBEcoFHm9MDnYgPCg==" }, "@floating-ui/dom": { - "version": "1.6.3", - "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.6.3.tgz", - "integrity": "sha512-RnDthu3mzPlQ31Ss/BTwQ1zjzIhr3lk1gZB1OC56h/1vEtaXkESrOqL5fQVMfXpwGtRwX+YsZBdyHtJMQnkArw==", - "requires": { - "@floating-ui/core": "^1.0.0", - "@floating-ui/utils": "^0.2.0" - } - }, - "@floating-ui/react": { - "version": "0.26.12", - "resolved": "https://registry.npmjs.org/@floating-ui/react/-/react-0.26.12.tgz", - "integrity": "sha512-D09o62HrWdIkstF2kGekIKAC0/N/Dl6wo3CQsnLcOmO3LkW6Ik8uIb3kw8JYkwxNCcg+uJ2bpWUiIijTBep05w==", - "requires": { - "@floating-ui/react-dom": "^2.0.0", - "@floating-ui/utils": "^0.2.0", - "tabbable": "^6.0.0" - } - }, - "@floating-ui/react-dom": { - "version": "2.0.8", - "resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-2.0.8.tgz", - "integrity": "sha512-HOdqOt3R3OGeTKidaLvJKcgg75S6tibQ3Tif4eyd91QnIJWr0NLvoXFpJA/j8HqkFSL68GDca9AuyWEHlhyClw==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.2.1.tgz", + "integrity": "sha512-Rt45SmRiV8eU+xXSB9t0uMYiQ/ZWGE/jumse2o3i5RGlyvcbqOF4q+1qBnzLE2kZ5JGhq0iMkcGXUKbFe7MpTA==", "requires": { - "@floating-ui/dom": "^1.6.1" + "@floating-ui/core": "^1.2.1" } }, - "@floating-ui/utils": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.1.tgz", - "integrity": "sha512-9TANp6GPoMtYzQdt54kfAyMmz1+osLlXdg2ENroU7zzrtflTLrrC/lgrIfaSe+Wu0b89GKccT7vxXA0MoAIO+Q==" - }, "@humanwhocodes/config-array": { "version": "0.11.13", "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.13.tgz", @@ -9927,14 +9288,12 @@ "dev": true }, "@jridgewell/gen-mapping": { - "version": "0.3.5", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz", - "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==", - "dev": true, + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz", + "integrity": "sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==", "requires": { - "@jridgewell/set-array": "^1.2.1", - "@jridgewell/sourcemap-codec": "^1.4.10", - "@jridgewell/trace-mapping": "^0.3.24" + "@jridgewell/set-array": "^1.0.0", + "@jridgewell/sourcemap-codec": "^1.4.10" } }, "@jridgewell/resolve-uri": { @@ -9943,10 +9302,9 @@ "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==" }, "@jridgewell/set-array": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz", - "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==", - "dev": true + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.0.tgz", + "integrity": "sha512-SfJxIxNVYLTsKwzB3MoOQ1yxf4w/E6MdkvTgrgAt1bfxjSrLUoHMKrDOykwN14q65waezZIdqDneUIPh4/sKxg==" }, "@jridgewell/source-map": { "version": "0.3.5", @@ -9986,52 +9344,50 @@ } }, "@lezer/common": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@lezer/common/-/common-1.2.1.tgz", - "integrity": "sha512-yemX0ZD2xS/73llMZIK6KplkjIjf2EvAHcinDi/TfJ9hS25G0388+ClHt6/3but0oOxinTcQHJLDXh6w1crzFQ==" + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@lezer/common/-/common-1.0.2.tgz", + "integrity": "sha512-SVgiGtMnMnW3ActR8SXgsDhw7a0w0ChHSYAyAUxxrOiJ1OqYWEKk/xJd84tTSPo1mo6DXLObAJALNnd0Hrv7Ng==" }, "@lezer/css": { - "version": "1.1.8", - "resolved": "https://registry.npmjs.org/@lezer/css/-/css-1.1.8.tgz", - "integrity": "sha512-7JhxupKuMBaWQKjQoLtzhGj83DdnZY9MckEOG5+/iLKNK2ZJqKc6hf6uc0HjwCX7Qlok44jBNqZhHKDhEhZYLA==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@lezer/css/-/css-1.1.1.tgz", + "integrity": "sha512-mSjx+unLLapEqdOYDejnGBokB5+AiJKZVclmud0MKQOKx3DLJ5b5VTCstgDDknR6iIV4gVrN6euzsCnj0A2gQA==", "requires": { - "@lezer/common": "^1.2.0", "@lezer/highlight": "^1.0.0", "@lezer/lr": "^1.0.0" } }, "@lezer/highlight": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@lezer/highlight/-/highlight-1.2.0.tgz", - "integrity": "sha512-WrS5Mw51sGrpqjlh3d4/fOwpEV2Hd3YOkp9DBt4k8XZQcoTHZFB7sx030A6OcahF4J1nDQAa3jXlTVVYH50IFA==", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/@lezer/highlight/-/highlight-1.1.3.tgz", + "integrity": "sha512-3vLKLPThO4td43lYRBygmMY18JN3CPh9w+XS2j8WC30vR4yZeFG4z1iFe4jXE43NtGqe//zHW5q8ENLlHvz9gw==", "requires": { "@lezer/common": "^1.0.0" } }, "@lezer/html": { - "version": "1.3.9", - "resolved": "https://registry.npmjs.org/@lezer/html/-/html-1.3.9.tgz", - "integrity": "sha512-MXxeCMPyrcemSLGaTQEZx0dBUH0i+RPl8RN5GwMAzo53nTsd/Unc/t5ZxACeQoyPUM5/GkPLRUs2WliOImzkRA==", + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/@lezer/html/-/html-1.3.3.tgz", + "integrity": "sha512-04Fyvu66DjV2EjhDIG1kfDdktn5Pfw56SXPrzKNQH5B2m7BDfc6bDsz+ZJG8dLS3kIPEKbyyq1Sm2/kjeG0+AA==", "requires": { - "@lezer/common": "^1.2.0", + "@lezer/common": "^1.0.0", "@lezer/highlight": "^1.0.0", "@lezer/lr": "^1.0.0" } }, "@lezer/javascript": { - "version": "1.4.13", - "resolved": "https://registry.npmjs.org/@lezer/javascript/-/javascript-1.4.13.tgz", - "integrity": "sha512-5IBr8LIO3xJdJH1e9aj/ZNLE4LSbdsx25wFmGRAZsj2zSmwAYjx26JyU/BYOCpRQlu1jcv1z3vy4NB9+UkfRow==", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/@lezer/javascript/-/javascript-1.4.1.tgz", + "integrity": "sha512-Hqx36DJeYhKtdpc7wBYPR0XF56ZzIp0IkMO/zNNj80xcaFOV4Oj/P7TQc/8k2TxNhzl7tV5tXS8ZOCPbT4L3nA==", "requires": { - "@lezer/common": "^1.2.0", "@lezer/highlight": "^1.1.3", "@lezer/lr": "^1.3.0" } }, "@lezer/lr": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/@lezer/lr/-/lr-1.4.0.tgz", - "integrity": "sha512-Wst46p51km8gH0ZUmeNrtpRYmdlRHUpN1DQd3GFAyKANi8WVz8c2jHYTf1CVScFaCjQw1iO3ZZdqGDxQPRErTg==", + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/@lezer/lr/-/lr-1.3.3.tgz", + "integrity": "sha512-JPQe3mwJlzEVqy67iQiiGozhcngbO8QBgpqZM6oL1Wj/dXckrEexpBLeFkq0edtW5IqnPRFxA24BHJni8Js69w==", "requires": { "@lezer/common": "^1.0.0" } @@ -10085,9 +9441,9 @@ "integrity": "sha512-/RVXdLvJxLg4QKvMoM5WlwNR9ViO9z8B/qPcc+C0Sa/teJY7QG7kJ441DwzOjMYEY7GmU4dj5EcGHIkKZiQZCA==" }, "@types/eslint": { - "version": "8.56.6", - "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.56.6.tgz", - "integrity": "sha512-ymwc+qb1XkjT/gfoQwxIeHZ6ixH23A+tCT2ADSA/DPVKzAjwYkTXBMCQ/f6fe4wEa85Lhp26VPeUxI7wMhAi7A==", + "version": "8.4.2", + "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.2.tgz", + "integrity": "sha512-Z1nseZON+GEnFjJc04sv4NSALGjhFwy6K0HXt7qsn5ArfAKtb63dXNJHf+1YW6IpOIYRBGUbu3GwJdj8DGnCjA==", "dev": true, "requires": { "@types/estree": "*", @@ -10095,9 +9451,9 @@ } }, "@types/eslint-scope": { - "version": "3.7.7", - "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz", - "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==", + "version": "3.7.3", + "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.3.tgz", + "integrity": "sha512-PB3ldyrcnAicT35TWPs5IcwKD8S333HMaa2VVv4+wdvebJkjWuW/xESoB8IwRcog8HYVYamb1g/R31Qv5Bx03g==", "dev": true, "requires": { "@types/eslint": "*", @@ -10111,43 +9467,40 @@ "dev": true }, "@types/hoist-non-react-statics": { - "version": "3.3.5", - "resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.5.tgz", - "integrity": "sha512-SbcrWzkKBw2cdwRTwQAswfpB9g9LJWfjtUeW/jvNwbhC8cpmmNYVePa+ncbUe0rGTQ7G3Ff6mYUN2VMfLVr+Sg==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz", + "integrity": "sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA==", "requires": { "@types/react": "*", "hoist-non-react-statics": "^3.3.0" } }, "@types/json-schema": { - "version": "7.0.15", - "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz", - "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==", + "version": "7.0.11", + "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz", + "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==", "dev": true }, "@types/node": { - "version": "20.11.30", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.30.tgz", - "integrity": "sha512-dHM6ZxwlmuZaRmUPfv1p+KrdD1Dci04FbdEm/9wEMouFqxYoFl5aMkt0VMAUtYRQDyYvD41WJLukhq/ha3YuTw==", - "devOptional": true, - "requires": { - "undici-types": "~5.26.4" - } + "version": "17.0.31", + "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.31.tgz", + "integrity": "sha512-AR0x5HbXGqkEx9CadRH3EBYx/VkiUgZIhP4wvPn/+5KIsgpNoyFaRlVe0Zlx9gRtg8fA06a9tskE2MSN7TcG4Q==", + "devOptional": true }, "@types/parse-json": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.2.tgz", - "integrity": "sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw==" + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz", + "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==" }, "@types/prop-types": { - "version": "15.7.11", - "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.11.tgz", - "integrity": "sha512-ga8y9v9uyeiLdpKddhxYQkxNDrfvuPrlFb0N1qnZZByvcElJaXthF1UhvCh9TLWJBEHeNtdnbysW7Y6Uq8CVng==" + "version": "15.7.5", + "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz", + "integrity": "sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==" }, "@types/react": { - "version": "18.2.67", - "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.67.tgz", - "integrity": "sha512-vkIE2vTIMHQ/xL0rgmuoECBCkZFZeHr49HeWSc24AptMbNRo7pwSBvj73rlJJs9fGKj0koS+V7kQB1jHS0uCgw==", + "version": "18.0.8", + "resolved": "https://registry.npmjs.org/@types/react/-/react-18.0.8.tgz", + "integrity": "sha512-+j2hk9BzCOrrOSJASi5XiOyBbERk9jG5O73Ya4M0env5Ixi6vUNli4qy994AINcEF+1IEHISYFfIT4zwr++LKw==", "requires": { "@types/prop-types": "*", "@types/scheduler": "*", @@ -10155,9 +9508,9 @@ } }, "@types/react-redux": { - "version": "7.1.33", - "resolved": "https://registry.npmjs.org/@types/react-redux/-/react-redux-7.1.33.tgz", - "integrity": "sha512-NF8m5AjWCkert+fosDsN3hAlHzpjSiXlVy9EgQEmLoBhaNXbmyeGs/aj5dQzKuF+/q+S7JQagorGDW8pJ28Hmg==", + "version": "7.1.24", + "resolved": "https://registry.npmjs.org/@types/react-redux/-/react-redux-7.1.24.tgz", + "integrity": "sha512-7FkurKcS1k0FHZEtdbbgN8Oc6b+stGSfZYjQGicofJ0j4U0qIn/jaSvnP2pLwZKiai3/17xqqxkkrxTgN8UNbQ==", "requires": { "@types/hoist-non-react-statics": "^3.3.0", "@types/react": "*", @@ -10166,22 +9519,22 @@ } }, "@types/react-transition-group": { - "version": "4.4.10", - "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.10.tgz", - "integrity": "sha512-hT/+s0VQs2ojCX823m60m5f0sL5idt9SO6Tj6Dg+rdphGPIeJbJ6CxvBYkgkGKrYeDjvIpKTR38UzmtHJOGW3Q==", + "version": "4.4.4", + "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.4.tgz", + "integrity": "sha512-7gAPz7anVK5xzbeQW9wFBDg7G++aPLAFY0QaSMOou9rJZpbuI58WAuJrgu+qR92l61grlnCUe7AFX8KGahAgug==", "requires": { "@types/react": "*" } }, "@types/scheduler": { - "version": "0.16.8", - "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.8.tgz", - "integrity": "sha512-WZLiwShhwLRmeV6zH+GkbOFT6Z6VklCItrDioxUnv+u4Ll+8vKeFySoFyK/0ctcRpOmwAicELfmys1sDc/Rw+A==" + "version": "0.16.2", + "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.2.tgz", + "integrity": "sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==" }, "@uiw/codemirror-extensions-basic-setup": { - "version": "4.21.24", - "resolved": "https://registry.npmjs.org/@uiw/codemirror-extensions-basic-setup/-/codemirror-extensions-basic-setup-4.21.24.tgz", - "integrity": "sha512-TJYKlPxNAVJNclW1EGumhC7I02jpdMgBon4jZvb5Aju9+tUzS44IwORxUx8BD8ZtH2UHmYS+04rE3kLk/BtnCQ==", + "version": "4.19.9", + "resolved": "https://registry.npmjs.org/@uiw/codemirror-extensions-basic-setup/-/codemirror-extensions-basic-setup-4.19.9.tgz", + "integrity": "sha512-O4yAgVpD3Pon4t4+lwZ2MTGg2TeU/Jv8YzKS9ap4fP/WMTVrKmpdq+DOafbhZSlhmU0XGfQPPJ4WX6rtZgx3Rw==", "requires": { "@codemirror/autocomplete": "^6.0.0", "@codemirror/commands": "^6.0.0", @@ -10193,15 +9546,15 @@ } }, "@uiw/react-codemirror": { - "version": "4.21.24", - "resolved": "https://registry.npmjs.org/@uiw/react-codemirror/-/react-codemirror-4.21.24.tgz", - "integrity": "sha512-8zs5OuxbhikHocHBsVBMuW1vqlv4ccZAkt4rFwr7ebLP2Q6RwHsjpsR9GeGyAigAqonKRoeHugqF78UMrkaTgg==", + "version": "4.19.9", + "resolved": "https://registry.npmjs.org/@uiw/react-codemirror/-/react-codemirror-4.19.9.tgz", + "integrity": "sha512-U+A1fSfELMFFs5a+ZOPwCJKZMYaMy6QHOfNOOV7WhSveM7GYHT970GjTfs2dn1LlvhebwyK9ei0rCXZdsI9n9Q==", "requires": { "@babel/runtime": "^7.18.6", "@codemirror/commands": "^6.1.0", "@codemirror/state": "^6.1.1", "@codemirror/theme-one-dark": "^6.0.0", - "@uiw/codemirror-extensions-basic-setup": "4.21.24", + "@uiw/codemirror-extensions-basic-setup": "4.19.9", "codemirror": "^6.0.0" } }, @@ -10473,9 +9826,9 @@ } }, "anymatch": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", - "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz", + "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==", "dev": true, "requires": { "normalize-path": "^3.0.0", @@ -10489,26 +9842,25 @@ "dev": true }, "array-buffer-byte-length": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz", - "integrity": "sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz", + "integrity": "sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==", "dev": true, "requires": { - "call-bind": "^1.0.5", - "is-array-buffer": "^3.0.4" + "call-bind": "^1.0.2", + "is-array-buffer": "^3.0.1" } }, "array-includes": { - "version": "3.1.8", - "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.8.tgz", - "integrity": "sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==", + "version": "3.1.6", + "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.6.tgz", + "integrity": "sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==", "dev": true, "requires": { - "call-bind": "^1.0.7", - "define-properties": "^1.2.1", - "es-abstract": "^1.23.2", - "es-object-atoms": "^1.0.0", - "get-intrinsic": "^1.2.4", + "call-bind": "^1.0.2", + "define-properties": "^1.1.4", + "es-abstract": "^1.20.4", + "get-intrinsic": "^1.1.3", "is-string": "^1.0.7" } }, @@ -10519,46 +9871,22 @@ "dev": true, "requires": { "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1", - "es-shim-unscopables": "^1.0.0" - } - }, - "array.prototype.flatmap": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz", - "integrity": "sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1", - "es-shim-unscopables": "^1.0.0" - } - }, - "array.prototype.toreversed": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/array.prototype.toreversed/-/array.prototype.toreversed-1.1.2.tgz", - "integrity": "sha512-wwDCoT4Ck4Cz7sLtgUmzR5UV3YF5mFHUlbChCzZBQZ+0m2cl/DH3tKgvphv1nKgFsJ48oCSg6p91q2Vm0I/ZMA==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1", + "define-properties": "^1.1.4", + "es-abstract": "^1.20.4", "es-shim-unscopables": "^1.0.0" } }, "array.prototype.tosorted": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.3.tgz", - "integrity": "sha512-/DdH4TiTmOKzyQbp/eadcCVexiCb36xJg7HshYOYJnNZFDj33GEv0P7GxsynpShhq4OLYJzbGcBDkLsDt7MnNg==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.1.tgz", + "integrity": "sha512-pZYPXPRl2PqWcsUs6LOMn+1f1532nEoPTYowBtqLwAW+W8vSVhkIGnmOX1t/UQjD6YGI0vcD2B1U7ZFGQH9jnQ==", "dev": true, "requires": { - "call-bind": "^1.0.5", - "define-properties": "^1.2.1", - "es-abstract": "^1.22.3", - "es-errors": "^1.1.0", - "es-shim-unscopables": "^1.0.2" + "call-bind": "^1.0.2", + "define-properties": "^1.1.4", + "es-abstract": "^1.20.4", + "es-shim-unscopables": "^1.0.0", + "get-intrinsic": "^1.1.3" } }, "arraybuffer.prototype.slice": { @@ -10654,9 +9982,9 @@ "dev": true }, "binary-extensions": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz", - "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", + "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", "dev": true }, "bootstrap-sass": { @@ -10732,9 +10060,9 @@ } }, "chokidar": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", - "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==", + "version": "3.5.3", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", + "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==", "dev": true, "requires": { "anymatch": "~3.1.2", @@ -10754,9 +10082,9 @@ "dev": true }, "classnames": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.5.1.tgz", - "integrity": "sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow==" + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.3.2.tgz", + "integrity": "sha512-CSbhY4cFEJRe6/GQzIk5qXZ4Jeg5pcsP7b5peFSDpffpe1cqjASH/n9UTjBwOp6XpMSTwQ8Za2K5V02ueA7Tmw==" }, "clone-deep": { "version": "4.0.1", @@ -10769,11 +10097,6 @@ "shallow-clone": "^3.0.0" } }, - "clsx": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.0.tgz", - "integrity": "sha512-m3iNNWpd9rl3jvvcBnu70ylMdrXt8Vlq4HYadnU5fwcOtvkSQWPmj7amUcDT2qYI7risszBjI5AUIUox9D16pg==" - }, "codemirror": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-6.0.1.tgz", @@ -10802,9 +10125,9 @@ "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==" }, "colorette": { - "version": "2.0.20", - "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz", - "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==", + "version": "2.0.16", + "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.16.tgz", + "integrity": "sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==", "dev": true }, "commander": { @@ -10822,14 +10145,16 @@ "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", "dev": true }, "convert-source-map": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", - "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", - "dev": true + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz", + "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==", + "requires": { + "safe-buffer": "~5.1.1" + } }, "copy-webpack-plugin": { "version": "11.0.0", @@ -10883,9 +10208,9 @@ } }, "crelt": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/crelt/-/crelt-1.0.6.tgz", - "integrity": "sha512-VQ2MBenTq1fWZUH9DJNGti7kKv6EeAuYr3cLwxUWhIu1baTaXh4Ib5W2CqHVqib4/MqbYGJqiL3Zb8GJZr3l4g==" + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/crelt/-/crelt-1.0.5.tgz", + "integrity": "sha512-+BO9wPPi+DWTDcNYhr/W90myha8ptzftZT+LwcmUbbok0rcP/fequmFYCw8NMoH7pkAZQzU78b3kYrlua5a9eA==" }, "cross-spawn": { "version": "7.0.3", @@ -10916,19 +10241,10 @@ "semver": "^7.3.5" }, "dependencies": { - "lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, - "requires": { - "yallist": "^4.0.0" - } - }, "schema-utils": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz", - "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz", + "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==", "dev": true, "requires": { "@types/json-schema": "^7.0.8", @@ -10937,19 +10253,13 @@ } }, "semver": { - "version": "7.6.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz", - "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dev": true, "requires": { "lru-cache": "^6.0.0" } - }, - "yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true } } }, @@ -10960,53 +10270,14 @@ "dev": true }, "csstype": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz", - "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==" - }, - "data-view-buffer": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.1.tgz", - "integrity": "sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA==", - "dev": true, - "requires": { - "call-bind": "^1.0.6", - "es-errors": "^1.3.0", - "is-data-view": "^1.0.1" - } - }, - "data-view-byte-length": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.1.tgz", - "integrity": "sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ==", - "dev": true, - "requires": { - "call-bind": "^1.0.7", - "es-errors": "^1.3.0", - "is-data-view": "^1.0.1" - } - }, - "data-view-byte-offset": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.0.tgz", - "integrity": "sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==", - "dev": true, - "requires": { - "call-bind": "^1.0.6", - "es-errors": "^1.3.0", - "is-data-view": "^1.0.1" - } - }, - "date-fns": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-3.6.0.tgz", - "integrity": "sha512-fRHTG8g/Gif+kSh50gaGEdToemgfj74aRX3swtiouboip5JDLAyDE9F11nHMIcvOaXeOC6D7SpNhi7uFyB7Uww==" + "version": "3.0.11", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.11.tgz", + "integrity": "sha512-sa6P2wJ+CAbgyy4KFssIb/JNMLxFvKF1pCYCSXS8ZMuqZnMsrxqI2E5sPyoTpxoPU/gVZMzr2zjOfg8GIZOMsw==" }, "debug": { "version": "4.3.4", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "dev": true, "requires": { "ms": "2.1.2" } @@ -11139,10 +10410,9 @@ "internal-slot": "^1.0.5", "is-array-buffer": "^3.0.2", "is-callable": "^1.2.7", - "is-data-view": "^1.0.1", - "is-negative-zero": "^2.0.3", + "is-negative-zero": "^2.0.2", "is-regex": "^1.1.4", - "is-shared-array-buffer": "^1.0.3", + "is-shared-array-buffer": "^1.0.2", "is-string": "^1.0.7", "is-typed-array": "^1.1.12", "is-weakref": "^1.0.2", @@ -11191,33 +10461,24 @@ "integrity": "sha512-cXLGjP0c4T3flZJKQSuziYoq7MlT+rnvfZjfp7h+I7K9BNX54kP9nyWvdbwjQ4u1iWbOL4u96fgeZLToQlZC7w==", "dev": true }, - "es-object-atoms": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.0.0.tgz", - "integrity": "sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==", - "dev": true, - "requires": { - "es-errors": "^1.3.0" - } - }, "es-set-tostringtag": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.3.tgz", - "integrity": "sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz", + "integrity": "sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==", "dev": true, "requires": { - "get-intrinsic": "^1.2.4", - "has-tostringtag": "^1.0.2", - "hasown": "^2.0.1" + "get-intrinsic": "^1.1.3", + "has": "^1.0.3", + "has-tostringtag": "^1.0.0" } }, "es-shim-unscopables": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz", - "integrity": "sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz", + "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==", "dev": true, "requires": { - "hasown": "^2.0.0" + "has": "^1.0.3" } }, "es-to-primitive": { @@ -11232,10 +10493,9 @@ } }, "escalade": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz", - "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==", - "dev": true + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", + "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==" }, "escape-string-regexp": { "version": "1.0.5", @@ -11364,9 +10624,9 @@ } }, "globals": { - "version": "13.24.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz", - "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==", + "version": "13.20.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz", + "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==", "dev": true, "requires": { "type-fest": "^0.20.2" @@ -11378,6 +10638,33 @@ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true }, + "locate-path": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", + "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", + "dev": true, + "requires": { + "p-locate": "^5.0.0" + } + }, + "p-limit": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "dev": true, + "requires": { + "yocto-queue": "^0.1.0" + } + }, + "p-locate": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", + "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", + "dev": true, + "requires": { + "p-limit": "^3.0.2" + } + }, "supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", @@ -11395,20 +10682,18 @@ "integrity": "sha512-73QQMKALArI8/7xGLNI/3LylrEYrlKZSb5C9+q3OtOewTnMQi5cT+aE9E41sLCmli3I9PGGmD1yiZydyo4FEPw==", "dev": true, "requires": { - "array-includes": "^3.1.7", - "array.prototype.findlast": "^1.2.4", - "array.prototype.flatmap": "^1.3.2", - "array.prototype.toreversed": "^1.1.2", - "array.prototype.tosorted": "^1.1.3", + "array-includes": "^3.1.6", + "array.prototype.flatmap": "^1.3.1", + "array.prototype.tosorted": "^1.1.1", "doctrine": "^2.1.0", "es-iterator-helpers": "^1.0.12", "estraverse": "^5.3.0", "jsx-ast-utils": "^2.4.1 || ^3.0.0", "minimatch": "^3.1.2", - "object.entries": "^1.1.7", - "object.fromentries": "^2.0.7", - "object.hasown": "^1.1.3", - "object.values": "^1.1.7", + "object.entries": "^1.1.6", + "object.fromentries": "^2.0.6", + "object.hasown": "^1.1.2", + "object.values": "^1.1.6", "prop-types": "^15.8.1", "resolve": "^2.0.0-next.4", "semver": "^6.3.1", @@ -11424,13 +10709,19 @@ "esutils": "^2.0.2" } }, + "estraverse": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", + "dev": true + }, "resolve": { - "version": "2.0.0-next.5", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.5.tgz", - "integrity": "sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==", + "version": "2.0.0-next.4", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.4.tgz", + "integrity": "sha512-iMDbmAWtfU+MHpxt/I5iWI7cY6YVEZUQ3MBgPQ++XD1PELuJHIl82xBmObyP2KyQmkNB2dsqF7seoQQiAn5yDQ==", "dev": true, "requires": { - "is-core-module": "^2.13.0", + "is-core-module": "^2.9.0", "path-parse": "^1.0.7", "supports-preserve-symlinks-flag": "^1.0.0" } @@ -11438,13 +10729,13 @@ } }, "eslint-scope": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", - "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", + "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", "dev": true, "requires": { "esrecurse": "^4.3.0", - "estraverse": "^5.2.0" + "estraverse": "^4.1.1" } }, "eslint-visitor-keys": { @@ -11471,6 +10762,14 @@ "dev": true, "requires": { "estraverse": "^5.1.0" + }, + "dependencies": { + "estraverse": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", + "dev": true + } } }, "esrecurse": { @@ -11480,12 +10779,20 @@ "dev": true, "requires": { "estraverse": "^5.2.0" + }, + "dependencies": { + "estraverse": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", + "dev": true + } } }, "estraverse": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", - "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", + "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", "dev": true }, "esutils": { @@ -11531,15 +10838,15 @@ "dev": true }, "fastest-levenshtein": { - "version": "1.0.16", - "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz", - "integrity": "sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==", + "version": "1.0.12", + "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz", + "integrity": "sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow==", "dev": true }, "fastq": { - "version": "1.17.1", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz", - "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==", + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz", + "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==", "dev": true, "requires": { "reusify": "^1.0.4" @@ -11565,9 +10872,9 @@ }, "dependencies": { "schema-utils": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz", - "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz", + "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==", "dev": true, "requires": { "@types/json-schema": "^7.0.8", @@ -11577,14 +10884,6 @@ } } }, - "file-selector": { - "version": "0.1.19", - "resolved": "https://registry.npmjs.org/file-selector/-/file-selector-0.1.19.tgz", - "integrity": "sha512-kCWw3+Aai8Uox+5tHCNgMFaUdgidxvMnLWO6fM5sZ0hA2wlHP5/DHGF0ECe84BiB95qdJbKNEJhWKVDvMN+JDQ==", - "requires": { - "tslib": "^2.0.1" - } - }, "fill-range": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", @@ -11670,12 +10969,12 @@ "integrity": "sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==" }, "find-up": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", - "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", "dev": true, "requires": { - "locate-path": "^6.0.0", + "locate-path": "^5.0.0", "path-exists": "^4.0.0" } }, @@ -11686,20 +10985,19 @@ "dev": true }, "flat-cache": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz", - "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==", + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz", + "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==", "dev": true, "requires": { - "flatted": "^3.2.9", - "keyv": "^4.5.3", + "flatted": "^3.1.0", "rimraf": "^3.0.2" } }, "flatted": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz", - "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==", + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz", + "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==", "dev": true }, "font-awesome": { @@ -11725,13 +11023,13 @@ "fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", "dev": true }, "fsevents": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", - "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", + "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", "dev": true, "optional": true }, @@ -11781,34 +11079,20 @@ "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==", "dev": true, "requires": { - "es-errors": "^1.3.0", - "function-bind": "^1.1.2", - "has-proto": "^1.0.1", - "has-symbols": "^1.0.3", - "hasown": "^2.0.0" - } - }, - "get-symbol-description": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.2.tgz", - "integrity": "sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==", - "dev": true, - "requires": { - "call-bind": "^1.0.5", - "es-errors": "^1.3.0", - "get-intrinsic": "^1.2.4" + "call-bind": "^1.0.2", + "get-intrinsic": "^1.1.1" } }, "glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz", + "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==", "dev": true, "requires": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", "inherits": "2", - "minimatch": "^3.1.1", + "minimatch": "^3.0.4", "once": "^1.3.0", "path-is-absolute": "^1.0.0" } @@ -11831,8 +11115,7 @@ "globals": { "version": "11.12.0", "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", - "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", - "dev": true + "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==" }, "globalthis": { "version": "1.0.3", @@ -11885,6 +11168,14 @@ "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", "dev": true }, + "has": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", + "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", + "requires": { + "function-bind": "^1.1.1" + } + }, "has-bigints": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz", @@ -11897,18 +11188,18 @@ "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==" }, "has-property-descriptors": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", - "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz", + "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==", "dev": true, "requires": { - "es-define-property": "^1.0.0" + "get-intrinsic": "^1.1.1" } }, "has-proto": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz", - "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz", + "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==", "dev": true }, "has-symbols": { @@ -11918,20 +11209,12 @@ "dev": true }, "has-tostringtag": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz", - "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz", + "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==", "dev": true, "requires": { - "has-symbols": "^1.0.3" - } - }, - "hasown": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", - "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", - "requires": { - "function-bind": "^1.1.2" + "has-symbols": "^1.0.2" } }, "hasown": { @@ -11965,9 +11248,9 @@ "dev": true }, "immutable": { - "version": "4.3.5", - "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.5.tgz", - "integrity": "sha512-8eabxkth9gZatlwl5TBuJnCsoTADlL6ftEr7A4qgdaTsPyreilDSnUk57SO+jfKcNtxPa22U5KK6DSeAYhpBJw==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.1.0.tgz", + "integrity": "sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==", "dev": true }, "import-fresh": { @@ -11977,6 +11260,13 @@ "requires": { "parent-module": "^1.0.0", "resolve-from": "^4.0.0" + }, + "dependencies": { + "resolve-from": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==" + } } }, "import-local": { @@ -11987,54 +11277,6 @@ "requires": { "pkg-dir": "^4.2.0", "resolve-cwd": "^3.0.0" - }, - "dependencies": { - "find-up": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", - "dev": true, - "requires": { - "locate-path": "^5.0.0", - "path-exists": "^4.0.0" - } - }, - "locate-path": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", - "dev": true, - "requires": { - "p-locate": "^4.1.0" - } - }, - "p-limit": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", - "dev": true, - "requires": { - "p-try": "^2.0.0" - } - }, - "p-locate": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", - "dev": true, - "requires": { - "p-limit": "^2.2.0" - } - }, - "pkg-dir": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", - "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", - "dev": true, - "requires": { - "find-up": "^4.0.0" - } - } } }, "imurmurhash": { @@ -12046,7 +11288,7 @@ "inflight": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", + "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", "dev": true, "requires": { "once": "^1.3.0", @@ -12060,13 +11302,13 @@ "dev": true }, "internal-slot": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.7.tgz", - "integrity": "sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.5.tgz", + "integrity": "sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==", "dev": true, "requires": { - "es-errors": "^1.3.0", - "hasown": "^2.0.0", + "get-intrinsic": "^1.2.0", + "has": "^1.0.3", "side-channel": "^1.0.4" } }, @@ -12085,13 +11327,14 @@ } }, "is-array-buffer": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.4.tgz", - "integrity": "sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz", + "integrity": "sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==", "dev": true, "requires": { "call-bind": "^1.0.2", - "get-intrinsic": "^1.2.1" + "get-intrinsic": "^1.2.0", + "is-typed-array": "^1.1.10" } }, "is-arrayish": { @@ -12143,20 +11386,11 @@ "dev": true }, "is-core-module": { - "version": "2.13.1", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz", - "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==", - "requires": { - "hasown": "^2.0.0" - } - }, - "is-data-view": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.1.tgz", - "integrity": "sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==", - "dev": true, + "version": "2.9.0", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz", + "integrity": "sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==", "requires": { - "is-typed-array": "^1.1.13" + "has": "^1.0.3" } }, "is-date-object": { @@ -12171,7 +11405,7 @@ "is-extglob": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", + "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", "dev": true }, "is-finalizationregistry": { @@ -12208,9 +11442,9 @@ "dev": true }, "is-negative-zero": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.3.tgz", - "integrity": "sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz", + "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==", "dev": true }, "is-number": { @@ -12260,12 +11494,12 @@ "dev": true }, "is-shared-array-buffer": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.3.tgz", - "integrity": "sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz", + "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==", "dev": true, "requires": { - "call-bind": "^1.0.7" + "call-bind": "^1.0.2" } }, "is-string": { @@ -12329,13 +11563,13 @@ "isexe": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", + "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", "dev": true }, "isobject": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==", + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", "dev": true }, "iterator.prototype": { @@ -12380,9 +11614,9 @@ } }, "jquery": { - "version": "3.7.1", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz", - "integrity": "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==" + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", + "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==" }, "js-cookie": { "version": "2.2.1", @@ -12406,8 +11640,7 @@ "jsesc": { "version": "2.5.2", "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", - "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", - "dev": true + "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==" }, "json-parse-even-better-errors": { "version": "2.3.1", @@ -12429,19 +11662,16 @@ "json5": { "version": "2.2.3", "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", - "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", - "dev": true + "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==" }, "jsx-ast-utils": { - "version": "3.3.5", - "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz", - "integrity": "sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==", + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.3.tgz", + "integrity": "sha512-fYQHZTZ8jSfmWZ0iyzfwiU4WDX4HpHbMCZ3gPlWYiCl3BoeOTsqKBqnTVfH2rYT7eP5c3sVbeSPHnnJOaTrWiw==", "dev": true, "requires": { - "array-includes": "^3.1.6", - "array.prototype.flat": "^1.3.1", - "object.assign": "^4.1.4", - "object.values": "^1.1.6" + "array-includes": "^3.1.5", + "object.assign": "^4.1.3" } }, "keycode": { @@ -12449,15 +11679,6 @@ "resolved": "https://registry.npmjs.org/keycode/-/keycode-2.2.1.tgz", "integrity": "sha512-Rdgz9Hl9Iv4QKi8b0OlCRQEzp4AgVxyCtz5S/+VIHezDmrDhkp2N2TqBWOLz0/gbeREXOOiI9/4b8BY9uw2vFg==" }, - "keyv": { - "version": "4.5.4", - "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", - "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", - "dev": true, - "requires": { - "json-buffer": "3.0.1" - } - }, "kind-of": { "version": "6.0.3", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", @@ -12465,9 +11686,9 @@ "dev": true }, "klona": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.6.tgz", - "integrity": "sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.5.tgz", + "integrity": "sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ==", "dev": true }, "levn": { @@ -12503,12 +11724,12 @@ } }, "locate-path": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", - "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", "dev": true, "requires": { - "p-locate": "^5.0.0" + "p-locate": "^4.1.0" } }, "lodash": { @@ -12537,12 +11758,12 @@ } }, "lru-cache": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", - "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", "dev": true, "requires": { - "yallist": "^3.0.2" + "yallist": "^4.0.0" } }, "make-dir": { @@ -12617,15 +11838,25 @@ }, "dependencies": { "schema-utils": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz", - "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz", + "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==", "dev": true, "requires": { "@types/json-schema": "^7.0.8", "ajv": "^6.12.5", "ajv-keywords": "^3.5.2" } + }, + "webpack-sources": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz", + "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==", + "dev": true, + "requires": { + "source-list-map": "^2.0.0", + "source-map": "~0.6.1" + } } } }, @@ -12641,13 +11872,12 @@ "ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, "nanoid": { - "version": "3.3.7", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz", - "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==", + "version": "3.3.4", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz", + "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==", "dev": true }, "natural-compare": { @@ -12676,7 +11906,7 @@ "object-assign": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==" + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" }, "object-inspect": { "version": "1.13.1", @@ -12691,65 +11921,64 @@ "dev": true }, "object.assign": { - "version": "4.1.5", - "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.5.tgz", - "integrity": "sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==", + "version": "4.1.4", + "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz", + "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==", "dev": true, "requires": { - "call-bind": "^1.0.5", - "define-properties": "^1.2.1", + "call-bind": "^1.0.2", + "define-properties": "^1.1.4", "has-symbols": "^1.0.3", "object-keys": "^1.1.1" } }, "object.entries": { - "version": "1.1.8", - "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.8.tgz", - "integrity": "sha512-cmopxi8VwRIAw/fkijJohSfpef5PdN0pMQJN6VC/ZKvn0LIknWD8KtgY6KlQdEc4tIjcQ3HxSMmnvtzIscdaYQ==", + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.6.tgz", + "integrity": "sha512-leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w==", "dev": true, "requires": { - "call-bind": "^1.0.7", - "define-properties": "^1.2.1", - "es-object-atoms": "^1.0.0" + "call-bind": "^1.0.2", + "define-properties": "^1.1.4", + "es-abstract": "^1.20.4" } }, "object.fromentries": { - "version": "2.0.8", - "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.8.tgz", - "integrity": "sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==", + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.6.tgz", + "integrity": "sha512-VciD13dswC4j1Xt5394WR4MzmAQmlgN72phd/riNp9vtD7tp4QQWJ0R4wvclXcafgcYK8veHRed2W6XeGBvcfg==", "dev": true, "requires": { - "call-bind": "^1.0.7", - "define-properties": "^1.2.1", - "es-abstract": "^1.23.2", - "es-object-atoms": "^1.0.0" + "call-bind": "^1.0.2", + "define-properties": "^1.1.4", + "es-abstract": "^1.20.4" } }, "object.hasown": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.3.tgz", - "integrity": "sha512-fFI4VcYpRHvSLXxP7yiZOMAd331cPfd2p7PFDVbgUsYOfCT3tICVqXWngbjr4m49OvsBwUBQ6O2uQoJvy3RexA==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.2.tgz", + "integrity": "sha512-B5UIT3J1W+WuWIU55h0mjlwaqxiE5vYENJXIXZ4VFe05pNYrkKuK0U/6aFcb0pKywYJh7IhfoqUfKVmrJJHZHw==", "dev": true, "requires": { - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1" + "define-properties": "^1.1.4", + "es-abstract": "^1.20.4" } }, "object.values": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.2.0.tgz", - "integrity": "sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ==", + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz", + "integrity": "sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==", "dev": true, "requires": { - "call-bind": "^1.0.7", - "define-properties": "^1.2.1", - "es-object-atoms": "^1.0.0" + "call-bind": "^1.0.2", + "define-properties": "^1.1.4", + "es-abstract": "^1.20.4" } }, "once": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", + "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "dev": true, "requires": { "wrappy": "1" @@ -12770,21 +11999,21 @@ } }, "p-limit": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", - "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", "dev": true, "requires": { - "yocto-queue": "^0.1.0" + "p-try": "^2.0.0" } }, "p-locate": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", - "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", "dev": true, "requires": { - "p-limit": "^3.0.2" + "p-limit": "^2.2.0" } }, "p-try": { @@ -12821,7 +12050,7 @@ "path-is-absolute": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", "dev": true }, "path-key": { @@ -12858,63 +12087,12 @@ "dev": true }, "pkg-dir": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-7.0.0.tgz", - "integrity": "sha512-Ie9z/WINcxxLp27BKOCHGde4ITq9UklYKDzVo1nhk5sqGEXU3FpkwP5GM2voTGJkGd9B3Otl+Q4uwSOeSUtOBA==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", + "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", "dev": true, "requires": { - "find-up": "^6.3.0" - }, - "dependencies": { - "find-up": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-6.3.0.tgz", - "integrity": "sha512-v2ZsoEuVHYy8ZIlYqwPe/39Cy+cFDzp4dXPaxNvkEuouymu+2Jbz0PxpKarJHYJTmv2HWT3O382qY8l4jMWthw==", - "dev": true, - "requires": { - "locate-path": "^7.1.0", - "path-exists": "^5.0.0" - } - }, - "locate-path": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-7.2.0.tgz", - "integrity": "sha512-gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA==", - "dev": true, - "requires": { - "p-locate": "^6.0.0" - } - }, - "p-limit": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-4.0.0.tgz", - "integrity": "sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==", - "dev": true, - "requires": { - "yocto-queue": "^1.0.0" - } - }, - "p-locate": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-6.0.0.tgz", - "integrity": "sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw==", - "dev": true, - "requires": { - "p-limit": "^4.0.0" - } - }, - "path-exists": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-5.0.0.tgz", - "integrity": "sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ==", - "dev": true - }, - "yocto-queue": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.0.0.tgz", - "integrity": "sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==", - "dev": true - } + "find-up": "^4.0.0" } }, "popper.js": { @@ -12922,21 +12100,15 @@ "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz", "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==" }, - "possible-typed-array-names": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz", - "integrity": "sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==", - "dev": true - }, "postcss": { - "version": "8.4.38", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.38.tgz", - "integrity": "sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==", + "version": "8.4.18", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.18.tgz", + "integrity": "sha512-Wi8mWhncLJm11GATDaQKobXSNEYGUHeQLiQqDFG1qQ5UTDPTEvKw0Xt5NsTpktGTwLps3ByrWsBrG0rB8YQ9oA==", "dev": true, "requires": { - "nanoid": "^3.3.7", + "nanoid": "^3.3.4", "picocolors": "^1.0.0", - "source-map-js": "^1.2.0" + "source-map-js": "^1.0.2" } }, "postcss-modules-extract-imports": { @@ -12947,9 +12119,9 @@ "requires": {} }, "postcss-modules-local-by-default": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.4.tgz", - "integrity": "sha512-L4QzMnOdVwRm1Qb8m4x8jsZzKAaPAgrUF1r/hjDR2Xj7R+8Zsf97jAlSQzWtKx5YNiNGN8QxmPFIc/sh+RQl+Q==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz", + "integrity": "sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==", "dev": true, "requires": { "icss-utils": "^5.0.0", @@ -12958,9 +12130,9 @@ } }, "postcss-modules-scope": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.1.1.tgz", - "integrity": "sha512-uZgqzdTleelWjzJY+Fhti6F3C9iF1JR/dODLs/JDefozYcKTBCdD8BIl6nNPbTbcLnGrk56hzwZC2DaGNvYjzA==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz", + "integrity": "sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==", "dev": true, "requires": { "postcss-selector-parser": "^6.0.4" @@ -12976,9 +12148,9 @@ } }, "postcss-selector-parser": { - "version": "6.0.16", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.16.tgz", - "integrity": "sha512-A0RVJrX+IUkVZbW3ClroRWurercFhieevHB38sr2+l9eUClMqome3LmEmnhlNy+5Mr2EYN6B2Kaw9wYdd+VHiw==", + "version": "6.0.10", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz", + "integrity": "sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==", "dev": true, "requires": { "cssesc": "^3.0.0", @@ -13014,22 +12186,12 @@ "requires": { "react-is": "^16.3.2", "warning": "^4.0.0" - }, - "dependencies": { - "warning": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz", - "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==", - "requires": { - "loose-envify": "^1.0.0" - } - } } }, "punycode": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", - "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", + "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", "dev": true }, "queue-microtask": { @@ -13072,18 +12234,16 @@ "react-transition-group": "^2.0.0", "uncontrollable": "^7.0.2", "warning": "^3.0.0" - } - }, - "react-datepicker": { - "version": "6.6.0", - "resolved": "https://registry.npmjs.org/react-datepicker/-/react-datepicker-6.6.0.tgz", - "integrity": "sha512-ERC0/Q4pPC9bNIcGUpdCbHc+oCxhkU3WI3UOGHkyJ3A9fqALCYpEmLc5S5xvAd7DuCDdbsyW97oRPM6pWWwjww==", - "requires": { - "@floating-ui/react": "^0.26.2", - "clsx": "^2.1.0", - "date-fns": "^3.3.1", - "prop-types": "^15.7.2", - "react-onclickoutside": "^6.13.0" + }, + "dependencies": { + "warning": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/warning/-/warning-3.0.0.tgz", + "integrity": "sha512-jMBt6pUrKn5I+OGgtQ4YZLdhIeJmObddh6CsibPxyQ5yPZm1XExSyzC1LCNX7BzhxWgiHmizBWJTHJIjMjTQYQ==", + "requires": { + "loose-envify": "^1.0.0" + } + } } }, "react-dnd": { @@ -13115,16 +12275,6 @@ "scheduler": "^0.23.0" } }, - "react-dropzone": { - "version": "10.2.2", - "resolved": "https://registry.npmjs.org/react-dropzone/-/react-dropzone-10.2.2.tgz", - "integrity": "sha512-U5EKckXVt6IrEyhMMsgmHQiWTGLudhajPPG77KFSvgsMqNEHSyGpqWvOMc5+DhEah/vH4E1n+J5weBNLd5VtyA==", - "requires": { - "attr-accept": "^2.0.0", - "file-selector": "^0.1.12", - "prop-types": "^15.7.2" - } - }, "react-is": { "version": "16.13.1", "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", @@ -13135,12 +12285,6 @@ "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz", "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==" }, - "react-onclickoutside": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/react-onclickoutside/-/react-onclickoutside-6.13.0.tgz", - "integrity": "sha512-ty8So6tcUpIb+ZE+1HAhbLROvAIJYyJe/1vRrrcmW+jLsaM+/powDRqxzo6hSh9CuRZGSL1Q8mvcF5WRD93a0A==", - "requires": {} - }, "react-overlays": { "version": "0.9.3", "resolved": "https://registry.npmjs.org/react-overlays/-/react-overlays-0.9.3.tgz", @@ -13152,6 +12296,16 @@ "prop-types-extra": "^1.0.1", "react-transition-group": "^2.2.1", "warning": "^3.0.0" + }, + "dependencies": { + "warning": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/warning/-/warning-3.0.0.tgz", + "integrity": "sha512-jMBt6pUrKn5I+OGgtQ4YZLdhIeJmObddh6CsibPxyQ5yPZm1XExSyzC1LCNX7BzhxWgiHmizBWJTHJIjMjTQYQ==", + "requires": { + "loose-envify": "^1.0.0" + } + } } }, "react-prop-types": { @@ -13160,12 +12314,22 @@ "integrity": "sha512-IyjsJhDX9JkoOV9wlmLaS7z+oxYoIWhfzDcFy7inwoAKTu+VcVNrVpPmLeioJ94y6GeDRsnwarG1py5qofFQMg==", "requires": { "warning": "^3.0.0" + }, + "dependencies": { + "warning": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/warning/-/warning-3.0.0.tgz", + "integrity": "sha512-jMBt6pUrKn5I+OGgtQ4YZLdhIeJmObddh6CsibPxyQ5yPZm1XExSyzC1LCNX7BzhxWgiHmizBWJTHJIjMjTQYQ==", + "requires": { + "loose-envify": "^1.0.0" + } + } } }, "react-redux": { - "version": "7.2.9", - "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-7.2.9.tgz", - "integrity": "sha512-Gx4L3uM182jEEayZfRbI/G11ZpYdNAnBs70lFVMNdHJI76XYtR+7m0MN+eAs7UHBPhWXcnFPaS+9owSCJQHNpQ==", + "version": "7.2.8", + "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-7.2.8.tgz", + "integrity": "sha512-6+uDjhs3PSIclqoCk0kd6iX74gzrGc3W5zcAjbrFgEdIjRSQObdIwfx80unTkVUYvbQ95Y8Av3OvFHq1w5EOUw==", "requires": { "@babel/runtime": "^7.15.4", "@types/react-redux": "^7.1.20", @@ -13183,9 +12347,9 @@ } }, "react-select": { - "version": "5.8.0", - "resolved": "https://registry.npmjs.org/react-select/-/react-select-5.8.0.tgz", - "integrity": "sha512-TfjLDo58XrhP6VG5M/Mi56Us0Yt8X7xD6cDybC7yoRMUNm7BGO7qk8J0TLQOua/prb8vUOtsfnXZwfm30HGsAA==", + "version": "5.7.0", + "resolved": "https://registry.npmjs.org/react-select/-/react-select-5.7.0.tgz", + "integrity": "sha512-lJGiMxCa3cqnUr2Jjtg9YHsaytiZqeNOKeibv6WF5zbK/fPegZ1hg3y/9P1RZVLhqBTs0PfqQLKuAACednYGhQ==", "requires": { "@babel/runtime": "^7.12.0", "@emotion/cache": "^11.4.0", @@ -13250,9 +12414,9 @@ } }, "redux": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/redux/-/redux-4.2.1.tgz", - "integrity": "sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/redux/-/redux-4.2.0.tgz", + "integrity": "sha512-oSBmcKKIuIR4ME29/AeNUnl5L+hvBq7OaJWzaptTQJAntaPvxIJqfnjbaEiCzzaIz+XmVILfqAM3Ob0aXLPfjA==", "requires": { "@babel/runtime": "^7.9.2" } @@ -13301,9 +12465,9 @@ } }, "regenerator-runtime": { - "version": "0.14.1", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz", - "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==" + "version": "0.13.11", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz", + "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==" }, "regenerator-transform": { "version": "0.15.2", @@ -13363,11 +12527,11 @@ "dev": true }, "resolve": { - "version": "1.22.8", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz", - "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==", + "version": "1.22.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz", + "integrity": "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==", "requires": { - "is-core-module": "^2.13.0", + "is-core-module": "^2.8.1", "path-parse": "^1.0.7", "supports-preserve-symlinks-flag": "^1.0.0" } @@ -13379,20 +12543,13 @@ "dev": true, "requires": { "resolve-from": "^5.0.0" - }, - "dependencies": { - "resolve-from": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", - "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", - "dev": true - } } }, "resolve-from": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", - "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==" + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", + "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", + "dev": true }, "reusify": { "version": "1.0.4", @@ -13441,33 +12598,15 @@ "integrity": "sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==", "dev": true, "requires": { - "call-bind": "^1.0.7", - "get-intrinsic": "^1.2.4", - "has-symbols": "^1.0.3", - "isarray": "^2.0.5" - } - }, - "safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", - "dev": true - }, - "safe-regex-test": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.3.tgz", - "integrity": "sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==", - "dev": true, - "requires": { - "call-bind": "^1.0.6", - "es-errors": "^1.3.0", + "call-bind": "^1.0.2", + "get-intrinsic": "^1.1.3", "is-regex": "^1.1.4" } }, "sass": { - "version": "1.72.0", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.72.0.tgz", - "integrity": "sha512-Gpczt3WA56Ly0Mn8Sl21Vj94s1axi9hDIzDFn9Ph9x3C3p4nNyvsqJoQyVXKou6cBlfFWEgRW4rT8Tb4i3XnVA==", + "version": "1.55.0", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.55.0.tgz", + "integrity": "sha512-Pk+PMy7OGLs9WaxZGJMn7S96dvlyVBwwtToX895WmCpAOr5YiJYEUJfiJidMuKb613z2xNWcXCHEuOvjZbqC6A==", "dev": true, "requires": { "chokidar": ">=3.0.0 <4.0.0", @@ -13537,8 +12676,7 @@ "semver": { "version": "6.3.1", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", - "dev": true + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==" }, "serialize-javascript": { "version": "6.0.1", @@ -13597,15 +12735,14 @@ "dev": true }, "side-channel": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz", - "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", + "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", "dev": true, "requires": { - "call-bind": "^1.0.7", - "es-errors": "^1.3.0", - "get-intrinsic": "^1.2.4", - "object-inspect": "^1.13.1" + "call-bind": "^1.0.0", + "get-intrinsic": "^1.0.2", + "object-inspect": "^1.9.0" } }, "slash": { @@ -13621,14 +12758,15 @@ "dev": true }, "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==" + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true }, "source-map-js": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz", - "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz", + "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==", "dev": true }, "source-map-support": { @@ -13639,34 +12777,22 @@ "requires": { "buffer-from": "^1.0.0", "source-map": "^0.6.0" - }, - "dependencies": { - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - } } }, "string.prototype.matchall": { - "version": "4.0.11", - "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.11.tgz", - "integrity": "sha512-NUdh0aDavY2og7IbBPenWqR9exH+E26Sv8e0/eTe1tltDGZL+GtBkDAnnyBtmekfK6/Dq3MkcGtzXFEd1LQrtg==", + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.8.tgz", + "integrity": "sha512-6zOCOcJ+RJAQshcTvXPHoxoQGONa3e/Lqx90wUA+wEzX78sg5Bo+1tQo4N0pohS0erG9qtCqJDjNCQBjeWVxyg==", "dev": true, "requires": { - "call-bind": "^1.0.7", - "define-properties": "^1.2.1", - "es-abstract": "^1.23.2", - "es-errors": "^1.3.0", - "es-object-atoms": "^1.0.0", - "get-intrinsic": "^1.2.4", - "gopd": "^1.0.1", + "call-bind": "^1.0.2", + "define-properties": "^1.1.4", + "es-abstract": "^1.20.4", + "get-intrinsic": "^1.1.3", "has-symbols": "^1.0.3", - "internal-slot": "^1.0.7", - "regexp.prototype.flags": "^1.5.2", - "set-function-name": "^2.0.2", - "side-channel": "^1.0.6" + "internal-slot": "^1.0.3", + "regexp.prototype.flags": "^1.4.3", + "side-channel": "^1.0.4" } }, "string.prototype.trim": { @@ -13718,14 +12844,14 @@ "dev": true }, "style-mod": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/style-mod/-/style-mod-4.1.2.tgz", - "integrity": "sha512-wnD1HyVqpJUI2+eKZ+eo1UwghftP6yuFheBqqe+bWCotBjC2K1YnteJILRMs3SM4V/0dLEW1SC27MWP5y+mwmw==" + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/style-mod/-/style-mod-4.0.0.tgz", + "integrity": "sha512-OPhtyEjyyN9x3nhPsu76f52yUGXiZcgvsrFVtvTkyGRQJ0XK+GPc6ov1z+lRpbeabka+MYEQxOYRnt5nF30aMw==" }, "stylis": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.2.0.tgz", - "integrity": "sha512-Orov6g6BB1sDfYgzWfTHDOxamtX1bE/zo104Dh9e6fqJ3PooipYyfJ0pUmrZO2wAvO8YbEyeFrkV91XTsGMSrw==" + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.1.3.tgz", + "integrity": "sha512-GP6WDNWf+o403jrEp9c5jibKavrtLW+/qYGhFxFrG8maXhwTBI7gLLhiBb0o7uFccWN+EOS9aMO6cGHWAO07OA==" }, "supports-color": { "version": "5.5.0", @@ -13740,11 +12866,6 @@ "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==" }, - "tabbable": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-6.2.0.tgz", - "integrity": "sha512-Cat63mxsVJlzYvN51JmVXIgNoUokrIaT2zLclCXjRd8boZ0004U4KCs/sToJ75C6sdlByWxpYnb5Boif1VSFew==" - }, "tapable": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz", @@ -13806,7 +12927,7 @@ "to-fast-properties": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", - "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==" + "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=" }, "to-regex-range": { "version": "5.0.1", @@ -13817,11 +12938,6 @@ "is-number": "^7.0.0" } }, - "tslib": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", - "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" - }, "type-check": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", @@ -13879,50 +12995,9 @@ "integrity": "sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==", "dev": true, "requires": { - "call-bind": "^1.0.7", - "es-errors": "^1.3.0", - "is-typed-array": "^1.1.13" - } - }, - "typed-array-byte-length": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.1.tgz", - "integrity": "sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==", - "dev": true, - "requires": { - "call-bind": "^1.0.7", - "for-each": "^0.3.3", - "gopd": "^1.0.1", - "has-proto": "^1.0.3", - "is-typed-array": "^1.1.13" - } - }, - "typed-array-byte-offset": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.2.tgz", - "integrity": "sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==", - "dev": true, - "requires": { - "available-typed-arrays": "^1.0.7", - "call-bind": "^1.0.7", - "for-each": "^0.3.3", - "gopd": "^1.0.1", - "has-proto": "^1.0.3", - "is-typed-array": "^1.1.13" - } - }, - "typed-array-length": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.5.tgz", - "integrity": "sha512-yMi0PlwuznKHxKmcpoOdeLwxBoVPkqZxd7q2FgMkmD3bNwvF5VW0+UlUQ1k1vmktTu4Yu13Q0RIxEP8+B+wloA==", - "dev": true, - "requires": { - "call-bind": "^1.0.7", + "call-bind": "^1.0.2", "for-each": "^0.3.3", - "gopd": "^1.0.1", - "has-proto": "^1.0.3", - "is-typed-array": "^1.1.13", - "possible-typed-array-names": "^1.0.0" + "is-typed-array": "^1.1.9" } }, "unbox-primitive": { @@ -13948,12 +13023,6 @@ "react-lifecycles-compat": "^3.0.4" } }, - "undici-types": { - "version": "5.26.5", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", - "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==", - "devOptional": true - }, "unicode-canonical-property-names-ecmascript": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz", @@ -14013,14 +13082,14 @@ "dev": true }, "w3c-keyname": { - "version": "2.2.8", - "resolved": "https://registry.npmjs.org/w3c-keyname/-/w3c-keyname-2.2.8.tgz", - "integrity": "sha512-dpojBhNsCNN7T82Tm7k26A6G9ML3NkhDsnw9n/eoxSRlVBB4CEtIQ/KTCLI2Fwf3ataSXRhYFkQi3SlnFwPvPQ==" + "version": "2.2.6", + "resolved": "https://registry.npmjs.org/w3c-keyname/-/w3c-keyname-2.2.6.tgz", + "integrity": "sha512-f+fciywl1SJEniZHD6H+kUO8gOnwIr7f4ijKA6+ZvJFjeGi1r4PDLl53Ayud9O/rk64RqgoQine0feoeOU0kXg==" }, "warning": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/warning/-/warning-3.0.0.tgz", - "integrity": "sha512-jMBt6pUrKn5I+OGgtQ4YZLdhIeJmObddh6CsibPxyQ5yPZm1XExSyzC1LCNX7BzhxWgiHmizBWJTHJIjMjTQYQ==", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz", + "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==", "requires": { "loose-envify": "^1.0.0" } @@ -14067,22 +13136,6 @@ "webpack-sources": "^3.2.3" }, "dependencies": { - "eslint-scope": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", - "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", - "dev": true, - "requires": { - "esrecurse": "^4.3.0", - "estraverse": "^4.1.1" - } - }, - "estraverse": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", - "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", - "dev": true - }, "schema-utils": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz", @@ -14093,12 +13146,6 @@ "ajv": "^6.12.5", "ajv-keywords": "^3.5.2" } - }, - "webpack-sources": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz", - "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==", - "dev": true } } }, @@ -14143,22 +13190,10 @@ } }, "webpack-sources": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz", - "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==", - "dev": true, - "requires": { - "source-list-map": "^2.0.0", - "source-map": "~0.6.1" - }, - "dependencies": { - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - } - } + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz", + "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==", + "dev": true }, "which": { "version": "2.0.2", @@ -14236,13 +13271,13 @@ "wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", "dev": true }, "yallist": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", - "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", "dev": true }, "yaml": { From 258ac3532be07bc926cd89bdc2a5bcc4e0780b6c Mon Sep 17 00:00:00 2001 From: David Wallace Date: Fri, 17 May 2024 16:06:51 +0200 Subject: [PATCH 030/504] js: fix copy attribute #995 Signed-off-by: David Wallace --- .../management/assets/js/actions/elementActions.js | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/rdmo/management/assets/js/actions/elementActions.js b/rdmo/management/assets/js/actions/elementActions.js index 9a0e85b4ce..543abc9b7b 100644 --- a/rdmo/management/assets/js/actions/elementActions.js +++ b/rdmo/management/assets/js/actions/elementActions.js @@ -235,9 +235,19 @@ export function fetchElement(elementType, elementId, elementAction=null) { QuestionsApi.fetchQuestions('index'), TasksApi.fetchTasks('index'), ]).then(([element, attributes, conditions, pages, questionsets, - questions, tasks]) => ({ + questions, tasks]) => { + if (elementAction == 'copy') { + delete element.conditions + delete element.pages + delete element.questionsets + delete element.questions + delete element.tasks + } + + return { element, attributes, conditions, pages, questionsets, questions, tasks - })) + } + }) } break From f39f23c526e2d12fe5caa2bd020fea71ee0bb147 Mon Sep 17 00:00:00 2001 From: David Wallace Date: Tue, 21 May 2024 16:23:58 +0200 Subject: [PATCH 031/504] js: fix copy action element for optionsets, options and conditions Signed-off-by: David Wallace --- .../assets/js/actions/elementActions.js | 27 ++++++++++++++----- 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/rdmo/management/assets/js/actions/elementActions.js b/rdmo/management/assets/js/actions/elementActions.js index 543abc9b7b..2b1e00a189 100644 --- a/rdmo/management/assets/js/actions/elementActions.js +++ b/rdmo/management/assets/js/actions/elementActions.js @@ -261,9 +261,14 @@ export function fetchElement(elementType, elementId, elementAction=null) { ConditionsApi.fetchConditions('index'), OptionsApi.fetchOptions('index'), QuestionsApi.fetchQuestions('index') - ]).then(([element, conditions, options, questions]) => ({ - element, conditions, options, questions - })) + ]).then(([element, conditions, options, questions]) => { + if (elementAction == 'copy') { + delete element.questions + } + return { + element, conditions, options, questions + } + }) } break @@ -275,6 +280,7 @@ export function fetchElement(elementType, elementId, elementAction=null) { ]).then(([element, optionsets, conditions]) => { if (elementAction == 'copy') { delete element.optionsets + delete element.conditions } return { element, optionsets, conditions @@ -293,9 +299,18 @@ export function fetchElement(elementType, elementId, elementAction=null) { QuestionsApi.fetchQuestions('index'), TasksApi.fetchTasks('index'), ]).then(([element, attributes, optionsets, options, - pages, questionsets, questions, tasks]) => ({ - element, attributes, optionsets, options, pages, questionsets, questions, tasks - })) + pages, questionsets, questions, tasks]) => { + if (elementAction == 'copy') { + delete element.optionsets + delete element.pages + delete element.questionsets + delete element.questions + delete element.tasks + } + return { + element, attributes, optionsets, options, pages, questionsets, questions, tasks + } + }) break case 'tasks': From 9e6bc68acb89ae752f809b4a809bcc891d618634 Mon Sep 17 00:00:00 2001 From: Jochen Klar Date: Mon, 3 Jun 2024 17:53:15 +0200 Subject: [PATCH 032/504] Fix css --- rdmo/projects/assets/scss/projects.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rdmo/projects/assets/scss/projects.scss b/rdmo/projects/assets/scss/projects.scss index 72262b5e19..dbe1811707 100644 --- a/rdmo/projects/assets/scss/projects.scss +++ b/rdmo/projects/assets/scss/projects.scss @@ -186,7 +186,7 @@ a.disabled { } .projects-header-buttons { - @media (min-width: $screen-md-max) { + @media (min-width: $screen-sm-max) { display: flex; gap: 20px; } @@ -195,7 +195,7 @@ a.disabled { padding: 0; padding-bottom: 15px; - @media (max-width: $screen-md-max) { + @media (max-width: $screen-sm-max) { display: block; padding-bottom: 10px; } From 209eec12fc36de7cb26824009f74bd862ae06f34 Mon Sep 17 00:00:00 2001 From: Jochen Klar Date: Mon, 3 Jun 2024 17:50:16 +0200 Subject: [PATCH 033/504] Add StoreIdViewMixin and add samesite to storeid cookie (#904) --- rdmo/core/views.py | 13 +++++++++++++ rdmo/management/views.py | 12 ++---------- rdmo/projects/views/project.py | 15 +++------------ 3 files changed, 18 insertions(+), 22 deletions(-) diff --git a/rdmo/core/views.py b/rdmo/core/views.py index 3ec0ec2a47..d43b017a71 100644 --- a/rdmo/core/views.py +++ b/rdmo/core/views.py @@ -1,3 +1,4 @@ +import hashlib import logging from django.conf import settings @@ -83,6 +84,18 @@ def get(self, request, *args, **kwargs): return super().get(self, request, *args, **kwargs) +class StoreIdViewMixin(View): + + def render_to_response(self, context, **response_kwargs): + response = super().render_to_response(context, **response_kwargs) + response.set_cookie('storeid', self.get_store_id(), samesite='Lax') + return response + + def get_store_id(self): + session_key = self.request.session.session_key or 'anonymous' + return hashlib.sha256(session_key.encode()).hexdigest() + + class RedirectViewMixin(View): def post(self, request, *args, **kwargs): diff --git a/rdmo/management/views.py b/rdmo/management/views.py index c4bbd062a7..82a9bc1a28 100644 --- a/rdmo/management/views.py +++ b/rdmo/management/views.py @@ -1,4 +1,3 @@ -import hashlib import logging from django.contrib.auth.mixins import LoginRequiredMixin @@ -7,22 +6,15 @@ from rules import test_rule from rules.contrib.views import PermissionRequiredMixin as RulesPermissionRequiredMixin -from rdmo.core.views import CSRFViewMixin, PermissionRedirectMixin +from rdmo.core.views import CSRFViewMixin, PermissionRedirectMixin, StoreIdViewMixin logger = logging.getLogger(__name__) class ManagementView(LoginRequiredMixin, PermissionRedirectMixin, RulesPermissionRequiredMixin, - CSRFViewMixin, TemplateView): + CSRFViewMixin, StoreIdViewMixin, TemplateView): template_name = 'management/management.html' def has_permission(self): # Use test_rule from rules for permissions check return test_rule('management.can_view_management', self.request.user, self.request.site) - - def render_to_response(self, context, **response_kwargs): - storeid = hashlib.sha256(self.request.session.session_key.encode()).hexdigest() - - response = super().render_to_response(context, **response_kwargs) - response.set_cookie('storeid', storeid) - return response diff --git a/rdmo/projects/views/project.py b/rdmo/projects/views/project.py index 35402107e0..1485ac52c6 100644 --- a/rdmo/projects/views/project.py +++ b/rdmo/projects/views/project.py @@ -1,4 +1,3 @@ -import hashlib import logging from django.conf import settings @@ -15,7 +14,7 @@ from django.views.generic.edit import FormMixin from rdmo.core.plugins import get_plugin, get_plugins -from rdmo.core.views import CSRFViewMixin, ObjectPermissionMixin, RedirectViewMixin +from rdmo.core.views import CSRFViewMixin, ObjectPermissionMixin, RedirectViewMixin, StoreIdViewMixin from rdmo.questions.models import Catalog from rdmo.questions.utils import get_widgets from rdmo.tasks.models import Task @@ -26,18 +25,10 @@ logger = logging.getLogger(__name__) -class ProjectsView(LoginRequiredMixin, CSRFViewMixin, TemplateView): - template_name = 'projects/projects.html' - # def has_permission(self): - # # Use test_rule from rules for permissions check - # return test_rule('projects.can_view_all_projects', self.request.user, self.request.site) - def render_to_response(self, context, **response_kwargs): - storeid = hashlib.sha256(self.request.session.session_key.encode()).hexdigest() +class ProjectsView(LoginRequiredMixin, CSRFViewMixin, StoreIdViewMixin, TemplateView): + template_name = 'projects/projects.html' - response = super().render_to_response(context, **response_kwargs) - response.set_cookie('storeid', storeid) - return response class ProjectDetailView(ObjectPermissionMixin, DetailView): model = Project From c6010407beed39d4dea5f2b22e3c8e1a2427f2a0 Mon Sep 17 00:00:00 2001 From: Jochen Klar Date: Mon, 3 Jun 2024 18:16:35 +0200 Subject: [PATCH 034/504] Remove add site/user from Role admin (#943) --- rdmo/accounts/admin.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/rdmo/accounts/admin.py b/rdmo/accounts/admin.py index 1cfede8540..475e92be7b 100644 --- a/rdmo/accounts/admin.py +++ b/rdmo/accounts/admin.py @@ -30,6 +30,8 @@ class RoleAdmin(admin.ModelAdmin): list_display = ('user', 'email', 'members', 'managers', 'editors', 'reviewers') + readonly_fields = ('user', ) + def get_queryset(self, request): return Role.objects.prefetch_related( 'member', 'manager', 'editor', 'reviewer').annotate( @@ -37,6 +39,15 @@ def get_queryset(self, request): sites_count=Value(Site.objects.count()) ) + def get_form(self, request, obj=None, **kwargs): + form = super().get_form(request, obj, **kwargs) + form.base_fields['member'].widget.can_add_related = False + form.base_fields['manager'].widget.can_add_related = False + form.base_fields['editor'].widget.can_add_related = False + form.base_fields['reviewer'].widget.can_add_related = False + + return form + @staticmethod def render_all_sites_or_join(obj, field_name: str) -> str: if getattr(obj, f'{field_name}__count', 0) == obj.sites_count: From 6b633df65357ad3cdb3a601a3c5fe7de86f86110 Mon Sep 17 00:00:00 2001 From: Jochen Klar Date: Tue, 4 Jun 2024 09:53:54 +0200 Subject: [PATCH 035/504] Add distinct to roles count and rename get_sites_for_role --- rdmo/accounts/admin.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/rdmo/accounts/admin.py b/rdmo/accounts/admin.py index 475e92be7b..8d65fb1f57 100644 --- a/rdmo/accounts/admin.py +++ b/rdmo/accounts/admin.py @@ -35,7 +35,10 @@ class RoleAdmin(admin.ModelAdmin): def get_queryset(self, request): return Role.objects.prefetch_related( 'member', 'manager', 'editor', 'reviewer').annotate( - Count('member'), Count('manager'), Count('editor'), Count('reviewer'), + Count('member', distinct=True), + Count('manager', distinct=True), + Count('editor', distinct=True), + Count('reviewer', distinct=True), sites_count=Value(Site.objects.count()) ) @@ -49,7 +52,7 @@ def get_form(self, request, obj=None, **kwargs): return form @staticmethod - def render_all_sites_or_join(obj, field_name: str) -> str: + def get_sites_for_role(obj, field_name: str) -> str: if getattr(obj, f'{field_name}__count', 0) == obj.sites_count: return 'all Sites' return ', '.join([site.domain for site in getattr(obj, field_name).all()]) @@ -58,13 +61,13 @@ def email(self, obj): return obj.user.email def members(self, obj): - return self.render_all_sites_or_join(obj, 'member') + return self.get_sites_for_role(obj, 'member') def managers(self, obj): - return self.render_all_sites_or_join(obj, 'manager') + return self.get_sites_for_role(obj, 'manager') def editors(self, obj): - return self.render_all_sites_or_join(obj, 'editor') + return self.get_sites_for_role(obj, 'editor') def reviewers(self, obj): - return self.render_all_sites_or_join(obj, 'reviewer') + return self.get_sites_for_role(obj, 'reviewer') From aae2428790feeaaaafbe4cec3a1358f760065038 Mon Sep 17 00:00:00 2001 From: David Wallace Date: Thu, 14 Dec 2023 09:16:50 +0100 Subject: [PATCH 036/504] tests: add example users to core test_views --- rdmo/core/tests/test_views.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/rdmo/core/tests/test_views.py b/rdmo/core/tests/test_views.py index 77869e9526..1f48fc19c1 100644 --- a/rdmo/core/tests/test_views.py +++ b/rdmo/core/tests/test_views.py @@ -7,6 +7,8 @@ ('reviewer', 'reviewer'), ('user', 'user'), ('api', 'api'), + ('example-editor', 'example-editor'), + ('example-reviewer', 'example-reviewer'), ) @@ -57,7 +59,7 @@ def test_i18n_switcher(db, client): def test_can_view_management(db, client, username, password): client.login(username=username, password=password) response = client.get(reverse('management')) - if username in ('editor', 'reviewer', 'api'): + if username in ('editor', 'reviewer', 'api', 'example-editor', 'example-reviewer'): assert response.status_code == 200 else: assert response.status_code == 403 From c43bb7b23d20ad421ac03b21e1ca8a7187ffd035 Mon Sep 17 00:00:00 2001 From: David Wallace Date: Thu, 14 Dec 2023 09:42:04 +0100 Subject: [PATCH 037/504] chore: add new CanToggleElementCurrentSite permission class and rules --- rdmo/core/permissions.py | 23 +++++++++++++++++++++++ rdmo/management/rules.py | 22 ++++++++++++++++++---- 2 files changed, 41 insertions(+), 4 deletions(-) diff --git a/rdmo/core/permissions.py b/rdmo/core/permissions.py index 6cdc1b5662..7a9f58d0e2 100644 --- a/rdmo/core/permissions.py +++ b/rdmo/core/permissions.py @@ -1,5 +1,7 @@ import logging +from django.core.exceptions import FieldDoesNotExist + from rest_framework.permissions import DjangoModelPermissions, DjangoObjectPermissions logger = logging.getLogger(__name__) @@ -74,3 +76,24 @@ def has_permission(self, request, view): return True else: return False + + +class CanToggleElementCurrentSite(DjangoModelPermissions): + + perms_map = { + 'GET': ['%(app_label)s.view_%(model_name)s'], + 'PUT': ['%(app_label)s.change_%(model_name)s_toggle_own_site'], + } + + @log_result + def has_permission(self, request, view): + + try: + # check for existence of field sites + queryset = self._queryset(view) + model_cls = queryset.model + model_cls._meta.get_field('sites') + except FieldDoesNotExist: + return False + + return super().has_permission(request, view) diff --git a/rdmo/management/rules.py b/rdmo/management/rules.py index 3014306cfe..0659eecb64 100644 --- a/rdmo/management/rules.py +++ b/rdmo/management/rules.py @@ -1,5 +1,7 @@ import logging +from django.contrib.sites.models import Site + import rules from rules.predicates import is_authenticated, is_superuser @@ -13,16 +15,19 @@ def is_editor(user) -> bool: @rules.predicate -def is_editor_for_current_site(user, site) -> bool: +def is_editor_for_current_site(user) -> bool: ''' Checks if any editor role exists for the user ''' if not is_editor(user): return False # if the user is not an editor, return False - return user.role.editor.filter(pk=site.pk).exists() + current_site = Site.objects.get_current() + return user.role.editor.filter(id=current_site.id).exists() @rules.predicate def is_element_editor(user, obj) -> bool: ''' Checks if the user is an editor for the sites to which this element is editable ''' + if obj is None: + return False if obj.id is None: # for _add_object permissions # if the element does not exist yet, it can be created by all users with an editor role @@ -43,16 +48,19 @@ def is_reviewer(user) -> bool: @rules.predicate -def is_reviewer_for_current_site(user, site) -> bool: +def is_reviewer_for_current_site(user) -> bool: ''' Checks if any reviewer role exists for the user ''' if not is_reviewer(user): return False # if the user is not an reviewer, return False - return user.role.reviewer.filter(pk=site.pk).exists() + current_site = Site.objects.get_current() + return user.role.reviewer.filter(id=current_site.id).exists() @rules.predicate def is_element_reviewer(user, obj) -> bool: ''' Checks if the user is an reviewer for the sites to which this element is editable ''' + if obj is None: + return False # if the element has no editors, it is reviewable by all reviewers if not obj.editors.exists(): @@ -144,6 +152,8 @@ def is_legacy_reviewer(user) -> bool: rules.add_perm('tasks.add_task_object', is_element_editor) rules.add_perm('tasks.change_task_object', is_element_editor) rules.add_perm('tasks.delete_task_object', is_element_editor) +# toggle current site field perm +rules.add_perm('tasks.change_task_toggle_own_site', is_element_editor | is_editor_for_current_site) # Model Permissions for views rules.add_perm('views.view_view', is_editor | is_reviewer) @@ -154,6 +164,8 @@ def is_legacy_reviewer(user) -> bool: rules.add_perm('views.add_view_object', is_element_editor) rules.add_perm('views.change_view_object', is_element_editor) rules.add_perm('views.delete_view_object', is_element_editor) +# toggle current site field perm +rules.add_perm('views.change_view_toggle_own_site', is_element_editor | is_editor_for_current_site) # Model permissions for catalogs rules.add_perm('questions.view_catalog', is_editor | is_reviewer) @@ -164,6 +176,8 @@ def is_legacy_reviewer(user) -> bool: rules.add_perm('questions.add_catalog_object', is_element_editor) rules.add_perm('questions.change_catalog_object', is_element_editor) rules.add_perm('questions.delete_catalog_object', is_element_editor) +# toggle current site field perm +rules.add_perm('questions.change_catalog_toggle_own_site', is_element_editor | is_editor_for_current_site) # Model permissions for sections rules.add_perm('questions.view_section', is_editor | is_reviewer) From 70b202e2f23927eb95a4e0aff67ed2a9d62823bc Mon Sep 17 00:00:00 2001 From: David Wallace Date: Thu, 14 Dec 2023 09:43:26 +0100 Subject: [PATCH 038/504] chore: add ElementToggleCurrentSiteViewSetMixin class --- rdmo/management/viewsets.py | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/rdmo/management/viewsets.py b/rdmo/management/viewsets.py index 36c625dc85..7870bfec54 100644 --- a/rdmo/management/viewsets.py +++ b/rdmo/management/viewsets.py @@ -1,14 +1,17 @@ import logging +from django.contrib.sites.shortcuts import get_current_site from django.utils.translation import gettext_lazy as _ from rest_framework import viewsets +from rest_framework.decorators import action from rest_framework.permissions import IsAuthenticated from rest_framework.response import Response from rest_framework.serializers import ValidationError from rdmo.conditions.models import Condition from rdmo.core.imports import handle_uploaded_file +from rdmo.core.permissions import CanToggleElementCurrentSite from rdmo.core.utils import get_model_field_meta, is_truthy from rdmo.core.xml import convert_elements, flat_xml_to_elements, order_elements, read_xml_file from rdmo.domain.models import Attribute @@ -110,3 +113,37 @@ def create(self, request, *args, **kwargs): # step 4: return the list of elements return Response(elements) + + +class ElementToggleCurrentSiteViewSetMixin(viewsets.GenericViewSet): + permission_classes = (CanToggleElementCurrentSite, ) + serializer_class = None + viewset_class = None + + def get_queryset(self): + # needed to pass to the has_permission method + viewset_class = self.viewset_class + viewset_class.action = self.action + return viewset_class.get_queryset(viewset_class) + + @action(detail=True, methods=['put'], url_path="add-site") + def add_site(self, request, pk=None): + obj = self.get_object() + current_site = get_current_site(request) + has_current_site = obj.sites.filter(id=current_site.id).exists() + if request.method.lower() == 'put' and not has_current_site: + obj.sites.add(current_site) + # need to return obj element for ElementSucces reducer? + serializer = self.serializer_class(obj, context={'request': request}) + return Response(serializer.data) + + @action(detail=True, methods=['put'], url_path="remove-site") + def remove_site(self, request, pk=None): + obj = self.get_object() + current_site = get_current_site(request) + has_current_site = obj.sites.filter(id=current_site.id).exists() + if request.method.lower() == 'put' and has_current_site: + obj.sites.remove(current_site) + # need to return obj element for ElementSucces reducer? + serializer = self.serializer_class(obj, context={'request': request}) + return Response(serializer.data) From 0a2c48527f335369b2dd0ec59de3da1a4726f568 Mon Sep 17 00:00:00 2001 From: David Wallace Date: Thu, 14 Dec 2023 09:45:03 +0100 Subject: [PATCH 039/504] feat: #825 add toggle button for element.sites endpoints components and tests --- rdmo/core/tests/__init__.py | 29 ++++++++++++++++++- .../assets/js/actions/elementActions.js | 16 +++++----- rdmo/management/assets/js/api/QuestionsApi.js | 8 +++-- rdmo/management/assets/js/api/TasksApi.js | 8 +++-- rdmo/management/assets/js/api/ViewsApi.js | 8 +++-- .../assets/js/components/common/Links.js | 22 +++++++++++++- .../assets/js/components/element/Catalog.js | 9 ++++-- .../assets/js/components/element/Task.js | 8 ++++- .../assets/js/components/element/View.js | 8 ++++- .../tests/test_viewset_catalog_multisite.py | 28 ++++++++++++++++++ rdmo/questions/urls/v1.py | 3 +- rdmo/questions/viewsets.py | 6 ++++ .../tests/test_viewset_task_multisite.py | 29 +++++++++++++++++++ rdmo/tasks/urls/v1.py | 3 +- rdmo/tasks/viewsets.py | 5 ++++ .../tests/test_viewset_view_multisite.py | 28 ++++++++++++++++++ rdmo/views/urls/v1.py | 3 +- rdmo/views/viewsets.py | 6 ++++ 18 files changed, 204 insertions(+), 23 deletions(-) diff --git a/rdmo/core/tests/__init__.py b/rdmo/core/tests/__init__.py index 943cba0608..bbf4a01c02 100644 --- a/rdmo/core/tests/__init__.py +++ b/rdmo/core/tests/__init__.py @@ -59,7 +59,15 @@ 'bar-user': 404, 'bar-reviewer': 403, 'bar-editor': 204, 'user': 404, 'example-reviewer': 403, 'example-editor': 204, 'anonymous': 401, 'reviewer': 403, 'editor': 204, - } + }, + 'toggle-site': { + # foo-editor is not permitted to apply own site(foo.com) in test run(example.com) + 'foo-user': 403, 'foo-reviewer': 403, 'foo-editor': 403, + # bar-editor is not permitted to apply own site(bar.com) in test run(example.com) + 'bar-user': 403, 'bar-reviewer': 403, 'bar-editor': 403, + 'user': 403, 'example-reviewer': 403, 'example-editor': 200, + 'anonymous': 401, 'reviewer': 403, 'editor': 200, + }, } @@ -115,6 +123,25 @@ 'example-reviewer': 404, 'example-editor': 404, } }, + 'toggle-site': { + 'all-element': { + # foo-editor can not apply own site(foo.com) in test run(example.com) + 'foo-reviewer': 403, 'foo-editor': 403, + # bar-editor can not apply own site(bar.com) in test run(example.com) + 'bar-reviewer': 403, 'bar-editor': 403, + 'example-reviewer': 403, 'example-editor': 200, + }, + 'foo-element': { + 'foo-reviewer': 403, 'foo-editor': 403, + 'bar-reviewer': 403, 'bar-editor': 403, + 'example-reviewer': 403, 'example-editor': 200, + }, + 'bar-element': { + 'foo-reviewer': 403, 'foo-editor': 403, + 'bar-reviewer': 403, 'bar-editor': 403, + 'example-reviewer': 403, 'example-editor': 200, + } + } } diff --git a/rdmo/management/assets/js/actions/elementActions.js b/rdmo/management/assets/js/actions/elementActions.js index 2b1e00a189..b17100e69a 100644 --- a/rdmo/management/assets/js/actions/elementActions.js +++ b/rdmo/management/assets/js/actions/elementActions.js @@ -367,14 +367,15 @@ export function fetchElementError(error) { // store element -export function storeElement(elementType, element, back) { +export function storeElement(elementType, element, back, elementAction=null) { return function(dispatch, getState) { - dispatch(storeElementInit(element)) + + dispatch(storeElementInit(element, elementAction)) let action switch (elementType) { case 'catalogs': - action = () => QuestionsApi.storeCatalog(element) + action = () => QuestionsApi.storeCatalog(element, elementAction) break case 'sections': @@ -410,11 +411,11 @@ export function storeElement(elementType, element, back) { break case 'tasks': - action = () => TasksApi.storeTask(element) + action = () => TasksApi.storeTask(element, elementAction) break case 'views': - action = () => ViewsApi.storeView(element) + action = () => ViewsApi.storeView(element, elementAction) break } @@ -431,8 +432,8 @@ export function storeElement(elementType, element, back) { } } -export function storeElementInit(element) { - return {type: 'elements/storeElementInit', element} +export function storeElementInit(element, elementAction) { + return {type: 'elements/storeElementInit', element, elementAction} } export function storeElementSuccess(element) { @@ -599,7 +600,6 @@ export function deleteElement(elementType, element) { case 'catalogs': action = () => QuestionsApi.deleteCatalog(element) break - case 'sections': action = () => QuestionsApi.deleteSection(element) break diff --git a/rdmo/management/assets/js/api/QuestionsApi.js b/rdmo/management/assets/js/api/QuestionsApi.js index 2a3b6f99c9..5d4911bc18 100644 --- a/rdmo/management/assets/js/api/QuestionsApi.js +++ b/rdmo/management/assets/js/api/QuestionsApi.js @@ -17,11 +17,15 @@ class QuestionsApi extends BaseApi { return this.get(url) } - static storeCatalog(catalog) { + static storeCatalog(catalog, action) { if (isNil(catalog.id)) { return this.post('/api/v1/questions/catalogs/', catalog) } else { - return this.put(`/api/v1/questions/catalogs/${catalog.id}/`, catalog) + let url = `/api/v1/questions/catalogs/${catalog.id}/` + if (['add-site', 'remove-site'].includes(action)) { + url = `/api/v1/questions/catalog-toggle-site/${catalog.id}/${action}/` + } + return this.put(url, catalog) } } diff --git a/rdmo/management/assets/js/api/TasksApi.js b/rdmo/management/assets/js/api/TasksApi.js index b6a1d0f949..817e09901e 100644 --- a/rdmo/management/assets/js/api/TasksApi.js +++ b/rdmo/management/assets/js/api/TasksApi.js @@ -14,11 +14,15 @@ class TasksApi extends BaseApi { return this.get(`/api/v1/tasks/tasks/${id}/`) } - static storeTask(task) { + static storeTask(task, action) { if (isNil(task.id)) { return this.post('/api/v1/tasks/tasks/', task) } else { - return this.put(`/api/v1/tasks/tasks/${task.id}/`, task) + let url = `/api/v1/tasks/tasks/${task.id}/` + if (['add-site', 'remove-site'].includes(action)) { + url = `/api/v1/tasks/task-toggle-site/${task.id}/${action}/` + } + return this.put(url, task) } } diff --git a/rdmo/management/assets/js/api/ViewsApi.js b/rdmo/management/assets/js/api/ViewsApi.js index 02a11b7da3..26c20fa15e 100644 --- a/rdmo/management/assets/js/api/ViewsApi.js +++ b/rdmo/management/assets/js/api/ViewsApi.js @@ -14,11 +14,15 @@ class ViewsApi extends BaseApi { return this.get(`/api/v1/views/views/${id}/`) } - static storeView(view) { + static storeView(view, action) { if (isNil(view.id)) { return this.post('/api/v1/views/views/', view) } else { - return this.put(`/api/v1/views/views/${view.id}/`, view) + let url= `/api/v1/views/views/${view.id}/` + if (['add-site', 'remove-site'].includes(action)) { + url = `/api/v1/views/view-toggle-site/${view.id}/${action}/` + } + return this.put(url, view) } } diff --git a/rdmo/management/assets/js/components/common/Links.js b/rdmo/management/assets/js/components/common/Links.js index 8f816dd64a..d23df53050 100644 --- a/rdmo/management/assets/js/components/common/Links.js +++ b/rdmo/management/assets/js/components/common/Links.js @@ -103,6 +103,26 @@ LockedLink.propTypes = { disabled: PropTypes.bool } +const ToggleCurrentSiteLink = ({ has_current_site, locked, onClick, disabled }) => { + const className = classNames({ + 'element-btn-link fa': true, + 'fa-plus-square-o': !has_current_site, + 'fa-minus-square-o': has_current_site, + }) + const title = has_current_site ? gettext('Remove your site'): gettext('Add your site') + + return +} + +ToggleCurrentSiteLink.propTypes = { + has_current_site: PropTypes.bool.isRequired, + locked: PropTypes.bool.isRequired, + onClick: PropTypes.func.isRequired, + disabled: PropTypes.bool +} + + const ShowElementsLink = ({ showElements, show, onClick }) => { const className = classNames({ 'element-btn-link fa': true, @@ -242,5 +262,5 @@ ShowLink.propTypes = { onClick: PropTypes.func.isRequired } -export { EditLink, CopyLink, AddLink, AvailableLink, LockedLink, ShowElementsLink, +export { EditLink, CopyLink, AddLink, AvailableLink, ToggleCurrentSiteLink, LockedLink, ShowElementsLink, NestedLink, ExportLink, ExtendLink, CodeLink, ErrorLink, WarningLink, ShowLink } diff --git a/rdmo/management/assets/js/components/element/Catalog.js b/rdmo/management/assets/js/components/element/Catalog.js index 24bcd5d8b1..b80f136193 100644 --- a/rdmo/management/assets/js/components/element/Catalog.js +++ b/rdmo/management/assets/js/components/element/Catalog.js @@ -6,7 +6,7 @@ import { filterElement } from '../../utils/filter' import { buildPath } from '../../utils/location' import { ElementErrors } from '../common/Errors' -import { EditLink, CopyLink, AddLink, AvailableLink, LockedLink, NestedLink, +import { EditLink, CopyLink, AddLink, AvailableLink, ToggleCurrentSiteLink, LockedLink, NestedLink, ExportLink, CodeLink } from '../common/Links' import { ReadOnlyIcon } from '../common/Icons' @@ -26,12 +26,17 @@ const Catalog = ({ config, catalog, elementActions, display='list', const toggleAvailable = () => elementActions.storeElement('catalogs', {...catalog, available: !catalog.available }) const toggleLocked = () => elementActions.storeElement('catalogs', {...catalog, locked: !catalog.locked }) - + const addCurrentSite = () => elementActions.storeElement('catalogs', catalog, null, 'add-site') + const removeCurrentSite = () => elementActions.storeElement('catalogs', catalog, null, 'remove-site') + let has_current_site = config.settings.multisite ? catalog.sites.includes(config.currentSite.id) : true const createSection = () => elementActions.createElement('sections', { catalog }) const elementNode = (
+ diff --git a/rdmo/management/assets/js/components/element/Task.js b/rdmo/management/assets/js/components/element/Task.js index d95ec65bfe..46db08146f 100644 --- a/rdmo/management/assets/js/components/element/Task.js +++ b/rdmo/management/assets/js/components/element/Task.js @@ -6,7 +6,7 @@ import { filterElement } from '../../utils/filter' import { buildPath } from '../../utils/location' import { ElementErrors } from '../common/Errors' -import { EditLink, CopyLink, AvailableLink, LockedLink, ExportLink, CodeLink } from '../common/Links' +import { EditLink, CopyLink, AvailableLink, LockedLink, ExportLink, CodeLink, ToggleCurrentSiteLink } from '../common/Links' import { ReadOnlyIcon } from '../common/Icons' const Task = ({ config, task, elementActions, filter=false, filterSites=false, filterEditors=false }) => { @@ -21,6 +21,9 @@ const Task = ({ config, task, elementActions, filter=false, filterSites=false, f const fetchCopy = () => elementActions.fetchElement('tasks', task.id, 'copy') const toggleAvailable = () => elementActions.storeElement('tasks', {...task, available: !task.available }) const toggleLocked = () => elementActions.storeElement('tasks', {...task, locked: !task.locked }) + const addCurrentSite = () => elementActions.storeElement('tasks', task, null, 'add-site') + const removeCurrentSite = () => elementActions.storeElement('tasks', task, null, 'remove-site') + let has_current_site = config.settings.multisite ? task.sites.includes(config.currentSite.id) : true const fetchCondition = (index) => elementActions.fetchElement('conditions', task.conditions[index]) @@ -28,6 +31,9 @@ const Task = ({ config, task, elementActions, filter=false, filterSites=false, f
  • + diff --git a/rdmo/management/assets/js/components/element/View.js b/rdmo/management/assets/js/components/element/View.js index 3805929ac8..a40fd51b1e 100644 --- a/rdmo/management/assets/js/components/element/View.js +++ b/rdmo/management/assets/js/components/element/View.js @@ -5,7 +5,7 @@ import { filterElement } from '../../utils/filter' import { buildPath } from '../../utils/location' import { ElementErrors } from '../common/Errors' -import { EditLink, CopyLink, AvailableLink, LockedLink, ExportLink, CodeLink } from '../common/Links' +import { EditLink, CopyLink, AvailableLink, LockedLink, ExportLink, CodeLink, ToggleCurrentSiteLink } from '../common/Links' import { ReadOnlyIcon } from '../common/Icons' const View = ({ config, view, elementActions, filter=false, filterSites=false, filterEditors=false }) => { @@ -20,11 +20,17 @@ const View = ({ config, view, elementActions, filter=false, filterSites=false, f const fetchCopy = () => elementActions.fetchElement('views', view.id, 'copy') const toggleAvailable = () => elementActions.storeElement('views', {...view, available: !view.available }) const toggleLocked = () => elementActions.storeElement('views', {...view, locked: !view.locked }) + const addCurrentSite = () => elementActions.storeElement('views', view, null, 'add-site') + const removeCurrentSite = () => elementActions.storeElement('views', view, null, 'remove-site') + let has_current_site = config.settings.multisite ? view.sites.includes(config.currentSite.id) : true return showElement && (
  • + diff --git a/rdmo/questions/tests/test_viewset_catalog_multisite.py b/rdmo/questions/tests/test_viewset_catalog_multisite.py index 1a69aff5af..52dca17ec7 100644 --- a/rdmo/questions/tests/test_viewset_catalog_multisite.py +++ b/rdmo/questions/tests/test_viewset_catalog_multisite.py @@ -2,6 +2,7 @@ import pytest +from django.contrib.sites.models import Site from django.urls import reverse from ...core.tests import get_obj_perms_status_code @@ -10,6 +11,9 @@ from ..models import Catalog from .test_viewset_catalog import export_formats, urlnames +urlnames['catalog-toggle-site-add-site'] = 'v1-questions:catalog-toggle-site-add-site' +urlnames['catalog-toggle-site-remove-site'] = 'v1-questions:catalog-toggle-site-remove-site' + @pytest.mark.parametrize('username,password', users) def test_list(db, client, username, password): @@ -206,3 +210,27 @@ def test_detail_export(db, client, username, password, export_format): assert root.tag == 'rdmo' for child in root: assert child.tag in ['catalog', 'section', 'page', 'questionset', 'question'] + + +@pytest.mark.parametrize('username,password', users) +@pytest.mark.parametrize('add_or_remove, has_current_site_check', [('add', True), ('remove', False)]) +def test_update_catalog_toggle_site(db, client, username, password, add_or_remove, has_current_site_check): + client.login(username=username, password=password) + instances = Catalog.objects.all() + current_site = Site.objects.get_current() + + for instance in instances: + before_has_current_site = instance.sites.filter(id=current_site.id).exists() + + url = reverse(urlnames[f'catalog-toggle-site-{add_or_remove}-site'], kwargs={'pk': instance.pk}) + + response = client.put(url, {}, content_type='application/json') + assert response.status_code == get_obj_perms_status_code(instance, username, 'toggle-site'), response.json() + instance.refresh_from_db() + after_has_current_site = instance.sites.filter(id=current_site.id).exists() + if response.status_code == 200: + # check if instance now has the current site or not + assert after_has_current_site is has_current_site_check + else: + # check that the instance was not updated + assert after_has_current_site is before_has_current_site diff --git a/rdmo/questions/urls/v1.py b/rdmo/questions/urls/v1.py index d200a4fcc7..38195eb060 100644 --- a/rdmo/questions/urls/v1.py +++ b/rdmo/questions/urls/v1.py @@ -3,6 +3,7 @@ from rest_framework import routers from ..viewsets import ( + CatalogToggleCurrentSiteViewSet, CatalogViewSet, PageViewSet, QuestionSetViewSet, @@ -16,13 +17,13 @@ router = routers.DefaultRouter() router.register(r'catalogs', CatalogViewSet, basename='catalog') +router.register(r'catalog-toggle-site', CatalogToggleCurrentSiteViewSet, basename='catalog-toggle-site') router.register(r'sections', SectionViewSet, basename='section') router.register(r'pages', PageViewSet, basename='page') router.register(r'questionsets', QuestionSetViewSet, basename='questionset') router.register(r'questions', QuestionViewSet, basename='question') router.register(r'widgettypes', WidgetTypeViewSet, basename='widgettype') router.register(r'valuetypes', ValueTypeViewSet, basename='valuetype') - urlpatterns = [ path('', include(router.urls)), ] diff --git a/rdmo/questions/viewsets.py b/rdmo/questions/viewsets.py index 33da3dc1de..d5ee110b54 100644 --- a/rdmo/questions/viewsets.py +++ b/rdmo/questions/viewsets.py @@ -13,6 +13,7 @@ from rdmo.core.permissions import HasModelPermission, HasObjectPermission from rdmo.core.utils import is_truthy, render_to_format from rdmo.core.views import ChoicesViewSet +from rdmo.management.viewsets import ElementToggleCurrentSiteViewSetMixin from .models import Catalog, Page, Question, QuestionSet, Section from .renderers import CatalogRenderer, PageRenderer, QuestionRenderer, QuestionSetRenderer, SectionRenderer @@ -117,6 +118,11 @@ def get_export_renderer_context(self, request): } +class CatalogToggleCurrentSiteViewSet(ElementToggleCurrentSiteViewSetMixin): + serializer_class = CatalogSerializer + viewset_class = CatalogViewSet + + class SectionViewSet(ModelViewSet): permission_classes = (HasModelPermission | HasObjectPermission, ) serializer_class = SectionSerializer diff --git a/rdmo/tasks/tests/test_viewset_task_multisite.py b/rdmo/tasks/tests/test_viewset_task_multisite.py index 2a1ee40f60..b0605721c2 100644 --- a/rdmo/tasks/tests/test_viewset_task_multisite.py +++ b/rdmo/tasks/tests/test_viewset_task_multisite.py @@ -2,6 +2,7 @@ import pytest +from django.contrib.sites.models import Site from django.urls import reverse from ...core.tests import get_obj_perms_status_code @@ -10,6 +11,9 @@ from ..models import Task from .test_viewset_task import export_formats, urlnames +urlnames['task-toggle-site-add-site'] = 'v1-tasks:task-toggle-site-add-site' +urlnames['task-toggle-site-remove-site'] = 'v1-tasks:task-toggle-site-remove-site' + @pytest.mark.parametrize('username,password', users) def test_list(db, client, username, password): @@ -132,3 +136,28 @@ def test_detail_export(db, client, username, password, export_format): assert root.tag == 'rdmo' for child in root: assert child.tag in ['task'] + + + +@pytest.mark.parametrize('username,password', users) +@pytest.mark.parametrize('add_or_remove, has_current_site_check', [('add', True), ('remove', False)]) +def test_update_task_toggle_site(db, client, username, password, add_or_remove, has_current_site_check): + client.login(username=username, password=password) + instances = Task.objects.all() + current_site = Site.objects.get_current() + + for instance in instances: + before_has_current_site = instance.sites.filter(id=current_site.id).exists() + + url = reverse(urlnames[f'task-toggle-site-{add_or_remove}-site'], kwargs={'pk': instance.pk}) + + response = client.put(url, {}, content_type='application/json') + assert response.status_code == get_obj_perms_status_code(instance, username, 'toggle-site'), response.json() + instance.refresh_from_db() + after_has_current_site = instance.sites.filter(id=current_site.id).exists() + if response.status_code == 200: + # check if instance now has the current site or not + assert after_has_current_site is has_current_site_check + else: + # check that the instance was not updated + assert after_has_current_site is before_has_current_site diff --git a/rdmo/tasks/urls/v1.py b/rdmo/tasks/urls/v1.py index 46c65577e4..836bcd5437 100644 --- a/rdmo/tasks/urls/v1.py +++ b/rdmo/tasks/urls/v1.py @@ -2,12 +2,13 @@ from rest_framework import routers -from ..viewsets import TaskViewSet +from ..viewsets import TaskToggleCurrentSiteViewSet, TaskViewSet app_name = 'v1-tasks' router = routers.DefaultRouter() router.register(r'tasks', TaskViewSet, basename='task') +router.register(r'task-toggle-site', TaskToggleCurrentSiteViewSet, basename='task-toggle-site') urlpatterns = [ path('', include(router.urls)), diff --git a/rdmo/tasks/viewsets.py b/rdmo/tasks/viewsets.py index 57c79e1718..c4007ffe45 100644 --- a/rdmo/tasks/viewsets.py +++ b/rdmo/tasks/viewsets.py @@ -10,6 +10,7 @@ from rdmo.core.filters import SearchFilter from rdmo.core.permissions import HasModelPermission, HasObjectPermission from rdmo.core.utils import is_truthy, render_to_format +from rdmo.management.viewsets import ElementToggleCurrentSiteViewSetMixin from .models import Task from .renderers import TaskRenderer @@ -74,3 +75,7 @@ def get_export_renderer_context(self, request): 'attributes': full or is_truthy(request.GET.get('attributes')), 'options': full or is_truthy(request.GET.get('options')) } + +class TaskToggleCurrentSiteViewSet(ElementToggleCurrentSiteViewSetMixin): + serializer_class = TaskSerializer + viewset_class = TaskViewSet diff --git a/rdmo/views/tests/test_viewset_view_multisite.py b/rdmo/views/tests/test_viewset_view_multisite.py index 31be9c2fbe..31d27b27b3 100644 --- a/rdmo/views/tests/test_viewset_view_multisite.py +++ b/rdmo/views/tests/test_viewset_view_multisite.py @@ -2,6 +2,7 @@ import pytest +from django.contrib.sites.models import Site from django.urls import reverse from ...core.tests import get_obj_perms_status_code @@ -10,6 +11,9 @@ from ..models import View from .test_viewset_view import export_formats, urlnames +urlnames['view-toggle-site-add-site'] = 'v1-views:view-toggle-site-add-site' +urlnames['view-toggle-site-remove-site'] = 'v1-views:view-toggle-site-remove-site' + @pytest.mark.parametrize('username,password', users) def test_list(db, client, username, password): @@ -124,3 +128,27 @@ def test_detail_export(db, client, username, password, export_format): assert root.tag == 'rdmo' for child in root: assert child.tag in ['view'] + + +@pytest.mark.parametrize('username,password', users) +@pytest.mark.parametrize('add_or_remove, has_current_site_check', [('add', True), ('remove', False)]) +def test_update_view_toggle_site(db, client, username, password, add_or_remove, has_current_site_check): + client.login(username=username, password=password) + instances = View.objects.all() + current_site = Site.objects.get_current() + + for instance in instances: + before_has_current_site = instance.sites.filter(id=current_site.id).exists() + + url = reverse(urlnames[f'view-toggle-site-{add_or_remove}-site'], kwargs={'pk': instance.pk}) + + response = client.put(url, {}, content_type='application/json') + assert response.status_code == get_obj_perms_status_code(instance, username, 'toggle-site'), response.json() + instance.refresh_from_db() + after_has_current_site = instance.sites.filter(id=current_site.id).exists() + if response.status_code == 200: + # check if instance now has the current site or not + assert after_has_current_site is has_current_site_check + else: + # check that the instance was not updated + assert after_has_current_site is before_has_current_site diff --git a/rdmo/views/urls/v1.py b/rdmo/views/urls/v1.py index 28658b4c80..4c70d8cab9 100644 --- a/rdmo/views/urls/v1.py +++ b/rdmo/views/urls/v1.py @@ -2,12 +2,13 @@ from rest_framework import routers -from ..viewsets import ViewViewSet +from ..viewsets import ViewToggleCurrentSiteViewSet, ViewViewSet app_name = 'v1-views' router = routers.DefaultRouter() router.register(r'views', ViewViewSet, basename='view') +router.register(r'view-toggle-site', ViewToggleCurrentSiteViewSet, basename='view-toggle-site') urlpatterns = [ path('', include(router.urls)), diff --git a/rdmo/views/viewsets.py b/rdmo/views/viewsets.py index 51054a52ad..1a84de8cf1 100644 --- a/rdmo/views/viewsets.py +++ b/rdmo/views/viewsets.py @@ -10,6 +10,7 @@ from rdmo.core.filters import SearchFilter from rdmo.core.permissions import HasModelPermission, HasObjectPermission from rdmo.core.utils import render_to_format +from rdmo.management.viewsets import ElementToggleCurrentSiteViewSetMixin from .models import View from .renderers import ViewRenderer @@ -65,3 +66,8 @@ def detail_export(self, request, pk=None, export_format='xml'): 'views': [self.get_object()] } ) + + +class ViewToggleCurrentSiteViewSet(ElementToggleCurrentSiteViewSetMixin): + serializer_class = ViewSerializer + viewset_class = ViewViewSet From 1cbc935e8942baf7440802e23496b97659fa8e10 Mon Sep 17 00:00:00 2001 From: David Wallace Date: Mon, 12 Feb 2024 11:46:43 +0100 Subject: [PATCH 040/504] chore: refactor ElementToggleCurrentSiteViewSetMixin into ViewSet action mixins, makes urls part of api/v1 --- rdmo/management/viewsets.py | 17 ++++------------- .../tests/test_viewset_catalog_multisite.py | 6 +++--- rdmo/questions/urls/v1.py | 2 -- rdmo/questions/viewsets.py | 7 +------ rdmo/tasks/tests/test_viewset_task_multisite.py | 6 +++--- rdmo/tasks/urls/v1.py | 3 +-- rdmo/tasks/viewsets.py | 6 +----- rdmo/views/tests/test_viewset_view_multisite.py | 6 +++--- rdmo/views/urls/v1.py | 3 +-- rdmo/views/viewsets.py | 7 +------ 10 files changed, 18 insertions(+), 45 deletions(-) diff --git a/rdmo/management/viewsets.py b/rdmo/management/viewsets.py index 7870bfec54..b0e9264e95 100644 --- a/rdmo/management/viewsets.py +++ b/rdmo/management/viewsets.py @@ -115,18 +115,9 @@ def create(self, request, *args, **kwargs): return Response(elements) -class ElementToggleCurrentSiteViewSetMixin(viewsets.GenericViewSet): - permission_classes = (CanToggleElementCurrentSite, ) - serializer_class = None - viewset_class = None - - def get_queryset(self): - # needed to pass to the has_permission method - viewset_class = self.viewset_class - viewset_class.action = self.action - return viewset_class.get_queryset(viewset_class) - - @action(detail=True, methods=['put'], url_path="add-site") +class ElementToggleCurrentSiteViewSetMixin: + + @action(detail=True, methods=['put'], url_path="add-site", permission_classes=[CanToggleElementCurrentSite]) def add_site(self, request, pk=None): obj = self.get_object() current_site = get_current_site(request) @@ -137,7 +128,7 @@ def add_site(self, request, pk=None): serializer = self.serializer_class(obj, context={'request': request}) return Response(serializer.data) - @action(detail=True, methods=['put'], url_path="remove-site") + @action(detail=True, methods=['put'], url_path="remove-site", permission_classes=[CanToggleElementCurrentSite]) def remove_site(self, request, pk=None): obj = self.get_object() current_site = get_current_site(request) diff --git a/rdmo/questions/tests/test_viewset_catalog_multisite.py b/rdmo/questions/tests/test_viewset_catalog_multisite.py index 52dca17ec7..943c7341a3 100644 --- a/rdmo/questions/tests/test_viewset_catalog_multisite.py +++ b/rdmo/questions/tests/test_viewset_catalog_multisite.py @@ -11,8 +11,8 @@ from ..models import Catalog from .test_viewset_catalog import export_formats, urlnames -urlnames['catalog-toggle-site-add-site'] = 'v1-questions:catalog-toggle-site-add-site' -urlnames['catalog-toggle-site-remove-site'] = 'v1-questions:catalog-toggle-site-remove-site' +urlnames['catalog-add-site'] = 'v1-questions:catalog-add-site' +urlnames['catalog-remove-site'] = 'v1-questions:catalog-remove-site' @pytest.mark.parametrize('username,password', users) @@ -222,7 +222,7 @@ def test_update_catalog_toggle_site(db, client, username, password, add_or_remov for instance in instances: before_has_current_site = instance.sites.filter(id=current_site.id).exists() - url = reverse(urlnames[f'catalog-toggle-site-{add_or_remove}-site'], kwargs={'pk': instance.pk}) + url = reverse(urlnames[f'catalog-{add_or_remove}-site'], kwargs={'pk': instance.pk}) response = client.put(url, {}, content_type='application/json') assert response.status_code == get_obj_perms_status_code(instance, username, 'toggle-site'), response.json() diff --git a/rdmo/questions/urls/v1.py b/rdmo/questions/urls/v1.py index 38195eb060..c6faacff18 100644 --- a/rdmo/questions/urls/v1.py +++ b/rdmo/questions/urls/v1.py @@ -3,7 +3,6 @@ from rest_framework import routers from ..viewsets import ( - CatalogToggleCurrentSiteViewSet, CatalogViewSet, PageViewSet, QuestionSetViewSet, @@ -17,7 +16,6 @@ router = routers.DefaultRouter() router.register(r'catalogs', CatalogViewSet, basename='catalog') -router.register(r'catalog-toggle-site', CatalogToggleCurrentSiteViewSet, basename='catalog-toggle-site') router.register(r'sections', SectionViewSet, basename='section') router.register(r'pages', PageViewSet, basename='page') router.register(r'questionsets', QuestionSetViewSet, basename='questionset') diff --git a/rdmo/questions/viewsets.py b/rdmo/questions/viewsets.py index d5ee110b54..e5b364642e 100644 --- a/rdmo/questions/viewsets.py +++ b/rdmo/questions/viewsets.py @@ -43,7 +43,7 @@ from .utils import get_widget_type_choices -class CatalogViewSet(ModelViewSet): +class CatalogViewSet(ElementToggleCurrentSiteViewSetMixin, ModelViewSet): permission_classes = (HasModelPermission | HasObjectPermission,) serializer_class = CatalogSerializer @@ -118,11 +118,6 @@ def get_export_renderer_context(self, request): } -class CatalogToggleCurrentSiteViewSet(ElementToggleCurrentSiteViewSetMixin): - serializer_class = CatalogSerializer - viewset_class = CatalogViewSet - - class SectionViewSet(ModelViewSet): permission_classes = (HasModelPermission | HasObjectPermission, ) serializer_class = SectionSerializer diff --git a/rdmo/tasks/tests/test_viewset_task_multisite.py b/rdmo/tasks/tests/test_viewset_task_multisite.py index b0605721c2..262a433119 100644 --- a/rdmo/tasks/tests/test_viewset_task_multisite.py +++ b/rdmo/tasks/tests/test_viewset_task_multisite.py @@ -11,8 +11,8 @@ from ..models import Task from .test_viewset_task import export_formats, urlnames -urlnames['task-toggle-site-add-site'] = 'v1-tasks:task-toggle-site-add-site' -urlnames['task-toggle-site-remove-site'] = 'v1-tasks:task-toggle-site-remove-site' +urlnames['task-add-site'] = 'v1-tasks:task-add-site' +urlnames['task-remove-site'] = 'v1-tasks:task-remove-site' @pytest.mark.parametrize('username,password', users) @@ -149,7 +149,7 @@ def test_update_task_toggle_site(db, client, username, password, add_or_remove, for instance in instances: before_has_current_site = instance.sites.filter(id=current_site.id).exists() - url = reverse(urlnames[f'task-toggle-site-{add_or_remove}-site'], kwargs={'pk': instance.pk}) + url = reverse(urlnames[f'task-{add_or_remove}-site'], kwargs={'pk': instance.pk}) response = client.put(url, {}, content_type='application/json') assert response.status_code == get_obj_perms_status_code(instance, username, 'toggle-site'), response.json() diff --git a/rdmo/tasks/urls/v1.py b/rdmo/tasks/urls/v1.py index 836bcd5437..46c65577e4 100644 --- a/rdmo/tasks/urls/v1.py +++ b/rdmo/tasks/urls/v1.py @@ -2,13 +2,12 @@ from rest_framework import routers -from ..viewsets import TaskToggleCurrentSiteViewSet, TaskViewSet +from ..viewsets import TaskViewSet app_name = 'v1-tasks' router = routers.DefaultRouter() router.register(r'tasks', TaskViewSet, basename='task') -router.register(r'task-toggle-site', TaskToggleCurrentSiteViewSet, basename='task-toggle-site') urlpatterns = [ path('', include(router.urls)), diff --git a/rdmo/tasks/viewsets.py b/rdmo/tasks/viewsets.py index c4007ffe45..826693d6a6 100644 --- a/rdmo/tasks/viewsets.py +++ b/rdmo/tasks/viewsets.py @@ -18,7 +18,7 @@ from .serializers.v1 import TaskIndexSerializer, TaskSerializer -class TaskViewSet(ModelViewSet): +class TaskViewSet(ElementToggleCurrentSiteViewSetMixin, ModelViewSet): permission_classes = (HasModelPermission | HasObjectPermission, ) serializer_class = TaskSerializer queryset = Task.objects.select_related('start_attribute', 'end_attribute') \ @@ -75,7 +75,3 @@ def get_export_renderer_context(self, request): 'attributes': full or is_truthy(request.GET.get('attributes')), 'options': full or is_truthy(request.GET.get('options')) } - -class TaskToggleCurrentSiteViewSet(ElementToggleCurrentSiteViewSetMixin): - serializer_class = TaskSerializer - viewset_class = TaskViewSet diff --git a/rdmo/views/tests/test_viewset_view_multisite.py b/rdmo/views/tests/test_viewset_view_multisite.py index 31d27b27b3..2501cd434a 100644 --- a/rdmo/views/tests/test_viewset_view_multisite.py +++ b/rdmo/views/tests/test_viewset_view_multisite.py @@ -11,8 +11,8 @@ from ..models import View from .test_viewset_view import export_formats, urlnames -urlnames['view-toggle-site-add-site'] = 'v1-views:view-toggle-site-add-site' -urlnames['view-toggle-site-remove-site'] = 'v1-views:view-toggle-site-remove-site' +urlnames['view-add-site'] = 'v1-views:view-add-site' +urlnames['view-remove-site'] = 'v1-views:view-remove-site' @pytest.mark.parametrize('username,password', users) @@ -140,7 +140,7 @@ def test_update_view_toggle_site(db, client, username, password, add_or_remove, for instance in instances: before_has_current_site = instance.sites.filter(id=current_site.id).exists() - url = reverse(urlnames[f'view-toggle-site-{add_or_remove}-site'], kwargs={'pk': instance.pk}) + url = reverse(urlnames[f'view-{add_or_remove}-site'], kwargs={'pk': instance.pk}) response = client.put(url, {}, content_type='application/json') assert response.status_code == get_obj_perms_status_code(instance, username, 'toggle-site'), response.json() diff --git a/rdmo/views/urls/v1.py b/rdmo/views/urls/v1.py index 4c70d8cab9..28658b4c80 100644 --- a/rdmo/views/urls/v1.py +++ b/rdmo/views/urls/v1.py @@ -2,13 +2,12 @@ from rest_framework import routers -from ..viewsets import ViewToggleCurrentSiteViewSet, ViewViewSet +from ..viewsets import ViewViewSet app_name = 'v1-views' router = routers.DefaultRouter() router.register(r'views', ViewViewSet, basename='view') -router.register(r'view-toggle-site', ViewToggleCurrentSiteViewSet, basename='view-toggle-site') urlpatterns = [ path('', include(router.urls)), diff --git a/rdmo/views/viewsets.py b/rdmo/views/viewsets.py index 1a84de8cf1..52b2809571 100644 --- a/rdmo/views/viewsets.py +++ b/rdmo/views/viewsets.py @@ -18,7 +18,7 @@ from .serializers.v1 import ViewIndexSerializer, ViewSerializer -class ViewViewSet(ModelViewSet): +class ViewViewSet(ElementToggleCurrentSiteViewSetMixin, ModelViewSet): permission_classes = (HasModelPermission | HasObjectPermission, ) serializer_class = ViewSerializer queryset = View.objects.prefetch_related('catalogs', 'sites', 'editors', 'groups') \ @@ -66,8 +66,3 @@ def detail_export(self, request, pk=None, export_format='xml'): 'views': [self.get_object()] } ) - - -class ViewToggleCurrentSiteViewSet(ElementToggleCurrentSiteViewSetMixin): - serializer_class = ViewSerializer - viewset_class = ViewViewSet From 84ebca08300a53d4a353b1c90e962e9535a6f58f Mon Sep 17 00:00:00 2001 From: David Wallace Date: Mon, 12 Feb 2024 16:37:14 +0100 Subject: [PATCH 041/504] chore: refactor endpoint to toggle-site --- rdmo/management/viewsets.py | 19 +++++-------------- .../tests/test_viewset_catalog_multisite.py | 10 +++++++--- .../tests/test_viewset_task_multisite.py | 10 +++++++--- .../tests/test_viewset_view_multisite.py | 11 +++++++---- 4 files changed, 26 insertions(+), 24 deletions(-) diff --git a/rdmo/management/viewsets.py b/rdmo/management/viewsets.py index b0e9264e95..08743a5de9 100644 --- a/rdmo/management/viewsets.py +++ b/rdmo/management/viewsets.py @@ -117,24 +117,15 @@ def create(self, request, *args, **kwargs): class ElementToggleCurrentSiteViewSetMixin: - @action(detail=True, methods=['put'], url_path="add-site", permission_classes=[CanToggleElementCurrentSite]) - def add_site(self, request, pk=None): + @action(detail=True, methods=['put'], url_path="toggle-site", permission_classes=[CanToggleElementCurrentSite]) + def toggle_site(self, request, pk=None): obj = self.get_object() current_site = get_current_site(request) has_current_site = obj.sites.filter(id=current_site.id).exists() - if request.method.lower() == 'put' and not has_current_site: - obj.sites.add(current_site) - # need to return obj element for ElementSucces reducer? - serializer = self.serializer_class(obj, context={'request': request}) - return Response(serializer.data) - - @action(detail=True, methods=['put'], url_path="remove-site", permission_classes=[CanToggleElementCurrentSite]) - def remove_site(self, request, pk=None): - obj = self.get_object() - current_site = get_current_site(request) - has_current_site = obj.sites.filter(id=current_site.id).exists() - if request.method.lower() == 'put' and has_current_site: + if has_current_site: obj.sites.remove(current_site) + else: + obj.sites.add(current_site) # need to return obj element for ElementSucces reducer? serializer = self.serializer_class(obj, context={'request': request}) return Response(serializer.data) diff --git a/rdmo/questions/tests/test_viewset_catalog_multisite.py b/rdmo/questions/tests/test_viewset_catalog_multisite.py index 943c7341a3..79ffb760cc 100644 --- a/rdmo/questions/tests/test_viewset_catalog_multisite.py +++ b/rdmo/questions/tests/test_viewset_catalog_multisite.py @@ -11,8 +11,7 @@ from ..models import Catalog from .test_viewset_catalog import export_formats, urlnames -urlnames['catalog-add-site'] = 'v1-questions:catalog-add-site' -urlnames['catalog-remove-site'] = 'v1-questions:catalog-remove-site' +urlnames['catalog-toggle-site'] = 'v1-questions:catalog-toggle-site' @pytest.mark.parametrize('username,password', users) @@ -220,9 +219,14 @@ def test_update_catalog_toggle_site(db, client, username, password, add_or_remov current_site = Site.objects.get_current() for instance in instances: + if add_or_remove == 'add': + instance.sites.remove(current_site) + elif add_or_remove == 'remove': + instance.sites.add(current_site) + before_has_current_site = instance.sites.filter(id=current_site.id).exists() - url = reverse(urlnames[f'catalog-{add_or_remove}-site'], kwargs={'pk': instance.pk}) + url = reverse(urlnames['catalog-toggle-site'], kwargs={'pk': instance.pk}) response = client.put(url, {}, content_type='application/json') assert response.status_code == get_obj_perms_status_code(instance, username, 'toggle-site'), response.json() diff --git a/rdmo/tasks/tests/test_viewset_task_multisite.py b/rdmo/tasks/tests/test_viewset_task_multisite.py index 262a433119..5fdedaac1f 100644 --- a/rdmo/tasks/tests/test_viewset_task_multisite.py +++ b/rdmo/tasks/tests/test_viewset_task_multisite.py @@ -11,8 +11,7 @@ from ..models import Task from .test_viewset_task import export_formats, urlnames -urlnames['task-add-site'] = 'v1-tasks:task-add-site' -urlnames['task-remove-site'] = 'v1-tasks:task-remove-site' +urlnames['task-toggle-site'] = 'v1-tasks:task-toggle-site' @pytest.mark.parametrize('username,password', users) @@ -147,9 +146,14 @@ def test_update_task_toggle_site(db, client, username, password, add_or_remove, current_site = Site.objects.get_current() for instance in instances: + if add_or_remove == 'add': + instance.sites.remove(current_site) + elif add_or_remove == 'remove': + instance.sites.add(current_site) + before_has_current_site = instance.sites.filter(id=current_site.id).exists() - url = reverse(urlnames[f'task-{add_or_remove}-site'], kwargs={'pk': instance.pk}) + url = reverse(urlnames['task-toggle-site'], kwargs={'pk': instance.pk}) response = client.put(url, {}, content_type='application/json') assert response.status_code == get_obj_perms_status_code(instance, username, 'toggle-site'), response.json() diff --git a/rdmo/views/tests/test_viewset_view_multisite.py b/rdmo/views/tests/test_viewset_view_multisite.py index 2501cd434a..e66fdd0c3c 100644 --- a/rdmo/views/tests/test_viewset_view_multisite.py +++ b/rdmo/views/tests/test_viewset_view_multisite.py @@ -11,9 +11,7 @@ from ..models import View from .test_viewset_view import export_formats, urlnames -urlnames['view-add-site'] = 'v1-views:view-add-site' -urlnames['view-remove-site'] = 'v1-views:view-remove-site' - +urlnames['view-toggle-site'] = 'v1-views:view-toggle-site' @pytest.mark.parametrize('username,password', users) def test_list(db, client, username, password): @@ -138,9 +136,14 @@ def test_update_view_toggle_site(db, client, username, password, add_or_remove, current_site = Site.objects.get_current() for instance in instances: + if add_or_remove == 'add': + instance.sites.remove(current_site) + elif add_or_remove == 'remove': + instance.sites.add(current_site) + before_has_current_site = instance.sites.filter(id=current_site.id).exists() - url = reverse(urlnames[f'view-{add_or_remove}-site'], kwargs={'pk': instance.pk}) + url = reverse(urlnames['view-toggle-site'], kwargs={'pk': instance.pk}) response = client.put(url, {}, content_type='application/json') assert response.status_code == get_obj_perms_status_code(instance, username, 'toggle-site'), response.json() From 23759bd9a80f7635b87cf2b4a344b5d572606cbd Mon Sep 17 00:00:00 2001 From: David Wallace Date: Mon, 12 Feb 2024 16:43:59 +0100 Subject: [PATCH 042/504] js: refactor toggle site put call in MultiSiteApi and storeElement elementAction --- .../assets/js/actions/elementActions.js | 19 ++++++++++++++++--- rdmo/management/assets/js/api/MultiSiteApi.js | 13 +++++++++++++ rdmo/management/assets/js/api/QuestionsApi.js | 8 ++------ rdmo/management/assets/js/api/TasksApi.js | 8 ++------ rdmo/management/assets/js/api/ViewsApi.js | 5 +---- 5 files changed, 34 insertions(+), 19 deletions(-) create mode 100644 rdmo/management/assets/js/api/MultiSiteApi.js diff --git a/rdmo/management/assets/js/actions/elementActions.js b/rdmo/management/assets/js/actions/elementActions.js index b17100e69a..2ca2b7f70a 100644 --- a/rdmo/management/assets/js/actions/elementActions.js +++ b/rdmo/management/assets/js/actions/elementActions.js @@ -6,6 +6,7 @@ import OptionsApi from '../api/OptionsApi' import QuestionsApi from '../api/QuestionsApi' import TasksApi from '../api/TasksApi' import ViewsApi from '../api/ViewsApi' +import MultiSiteApi from '../api/MultiSiteApi' import ConditionsFactory from '../factories/ConditionsFactory' import DomainFactory from '../factories/DomainFactory' @@ -375,7 +376,11 @@ export function storeElement(elementType, element, back, elementAction=null) { let action switch (elementType) { case 'catalogs': - action = () => QuestionsApi.storeCatalog(element, elementAction) + if (isNil(elementAction)) { + action = () => QuestionsApi.storeCatalog(element) + } else { + action = () => MultiSiteApi.UpdateElementAction(element, elementAction) + } break case 'sections': @@ -411,11 +416,19 @@ export function storeElement(elementType, element, back, elementAction=null) { break case 'tasks': - action = () => TasksApi.storeTask(element, elementAction) + if (isNil(elementAction)) { + action = () => TasksApi.storeTask(element, elementAction) + } else { + action = () => MultiSiteApi.UpdateElementAction(element, elementAction) + } break case 'views': - action = () => ViewsApi.storeView(element, elementAction) + if (isNil(elementAction)) { + action = () => ViewsApi.storeView(element, elementAction) + } else { + action = () => MultiSiteApi.UpdateElementAction(element, elementAction) + } break } diff --git a/rdmo/management/assets/js/api/MultiSiteApi.js b/rdmo/management/assets/js/api/MultiSiteApi.js new file mode 100644 index 0000000000..93c5debb82 --- /dev/null +++ b/rdmo/management/assets/js/api/MultiSiteApi.js @@ -0,0 +1,13 @@ + +import BaseApi from 'rdmo/core/assets/js/api/BaseApi' + +class MultiSiteApi extends BaseApi { + + static UpdateElementAction(element, action) { + const model_api_path = element.model.replace('.', '/').concat('s') + let url = `/api/v1/${model_api_path}/${element.id}/${action}/` + console.log('UpdateElementAction', url, element, action, this) + return this.put(url, element) + } + } +export default MultiSiteApi diff --git a/rdmo/management/assets/js/api/QuestionsApi.js b/rdmo/management/assets/js/api/QuestionsApi.js index 5d4911bc18..2a3b6f99c9 100644 --- a/rdmo/management/assets/js/api/QuestionsApi.js +++ b/rdmo/management/assets/js/api/QuestionsApi.js @@ -17,15 +17,11 @@ class QuestionsApi extends BaseApi { return this.get(url) } - static storeCatalog(catalog, action) { + static storeCatalog(catalog) { if (isNil(catalog.id)) { return this.post('/api/v1/questions/catalogs/', catalog) } else { - let url = `/api/v1/questions/catalogs/${catalog.id}/` - if (['add-site', 'remove-site'].includes(action)) { - url = `/api/v1/questions/catalog-toggle-site/${catalog.id}/${action}/` - } - return this.put(url, catalog) + return this.put(`/api/v1/questions/catalogs/${catalog.id}/`, catalog) } } diff --git a/rdmo/management/assets/js/api/TasksApi.js b/rdmo/management/assets/js/api/TasksApi.js index 817e09901e..b6a1d0f949 100644 --- a/rdmo/management/assets/js/api/TasksApi.js +++ b/rdmo/management/assets/js/api/TasksApi.js @@ -14,15 +14,11 @@ class TasksApi extends BaseApi { return this.get(`/api/v1/tasks/tasks/${id}/`) } - static storeTask(task, action) { + static storeTask(task) { if (isNil(task.id)) { return this.post('/api/v1/tasks/tasks/', task) } else { - let url = `/api/v1/tasks/tasks/${task.id}/` - if (['add-site', 'remove-site'].includes(action)) { - url = `/api/v1/tasks/task-toggle-site/${task.id}/${action}/` - } - return this.put(url, task) + return this.put(`/api/v1/tasks/tasks/${task.id}/`, task) } } diff --git a/rdmo/management/assets/js/api/ViewsApi.js b/rdmo/management/assets/js/api/ViewsApi.js index 26c20fa15e..be29e94a70 100644 --- a/rdmo/management/assets/js/api/ViewsApi.js +++ b/rdmo/management/assets/js/api/ViewsApi.js @@ -14,14 +14,11 @@ class ViewsApi extends BaseApi { return this.get(`/api/v1/views/views/${id}/`) } - static storeView(view, action) { + static storeView(view) { if (isNil(view.id)) { return this.post('/api/v1/views/views/', view) } else { let url= `/api/v1/views/views/${view.id}/` - if (['add-site', 'remove-site'].includes(action)) { - url = `/api/v1/views/view-toggle-site/${view.id}/${action}/` - } return this.put(url, view) } } From 866aa54232e91006ecf494ebca6ba5de7dda29cf Mon Sep 17 00:00:00 2001 From: David Wallace Date: Mon, 12 Feb 2024 16:44:30 +0100 Subject: [PATCH 043/504] js: fix show/hide for ToggleCurrentSiteLink --- rdmo/management/assets/js/components/common/Links.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rdmo/management/assets/js/components/common/Links.js b/rdmo/management/assets/js/components/common/Links.js index d23df53050..c013fb0a65 100644 --- a/rdmo/management/assets/js/components/common/Links.js +++ b/rdmo/management/assets/js/components/common/Links.js @@ -103,7 +103,7 @@ LockedLink.propTypes = { disabled: PropTypes.bool } -const ToggleCurrentSiteLink = ({ has_current_site, locked, onClick, disabled }) => { +const ToggleCurrentSiteLink = ({ has_current_site, locked, onClick, show }) => { const className = classNames({ 'element-btn-link fa': true, 'fa-plus-square-o': !has_current_site, @@ -111,15 +111,15 @@ const ToggleCurrentSiteLink = ({ has_current_site, locked, onClick, disabled }) }) const title = has_current_site ? gettext('Remove your site'): gettext('Add your site') - return + return show && } ToggleCurrentSiteLink.propTypes = { has_current_site: PropTypes.bool.isRequired, locked: PropTypes.bool.isRequired, onClick: PropTypes.func.isRequired, - disabled: PropTypes.bool + show: PropTypes.bool } From 1ebb78c9f1a2731518d745f98f725dd61cc399e0 Mon Sep 17 00:00:00 2001 From: David Wallace Date: Mon, 12 Feb 2024 16:45:24 +0100 Subject: [PATCH 044/504] js: include toggleCurrentSite action in element components --- rdmo/management/assets/js/components/element/Catalog.js | 8 +++----- rdmo/management/assets/js/components/element/Task.js | 6 ++---- rdmo/management/assets/js/components/element/View.js | 6 ++---- 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/rdmo/management/assets/js/components/element/Catalog.js b/rdmo/management/assets/js/components/element/Catalog.js index b80f136193..6a39f47416 100644 --- a/rdmo/management/assets/js/components/element/Catalog.js +++ b/rdmo/management/assets/js/components/element/Catalog.js @@ -26,17 +26,15 @@ const Catalog = ({ config, catalog, elementActions, display='list', const toggleAvailable = () => elementActions.storeElement('catalogs', {...catalog, available: !catalog.available }) const toggleLocked = () => elementActions.storeElement('catalogs', {...catalog, locked: !catalog.locked }) - const addCurrentSite = () => elementActions.storeElement('catalogs', catalog, null, 'add-site') - const removeCurrentSite = () => elementActions.storeElement('catalogs', catalog, null, 'remove-site') + const toggleCurrentSite = () => elementActions.storeElement('catalogs', catalog, null, 'toggle-site') let has_current_site = config.settings.multisite ? catalog.sites.includes(config.currentSite.id) : true const createSection = () => elementActions.createElement('sections', { catalog }) const elementNode = (
    - + diff --git a/rdmo/management/assets/js/components/element/Task.js b/rdmo/management/assets/js/components/element/Task.js index 46db08146f..013d48b4d9 100644 --- a/rdmo/management/assets/js/components/element/Task.js +++ b/rdmo/management/assets/js/components/element/Task.js @@ -21,8 +21,7 @@ const Task = ({ config, task, elementActions, filter=false, filterSites=false, f const fetchCopy = () => elementActions.fetchElement('tasks', task.id, 'copy') const toggleAvailable = () => elementActions.storeElement('tasks', {...task, available: !task.available }) const toggleLocked = () => elementActions.storeElement('tasks', {...task, locked: !task.locked }) - const addCurrentSite = () => elementActions.storeElement('tasks', task, null, 'add-site') - const removeCurrentSite = () => elementActions.storeElement('tasks', task, null, 'remove-site') + const toggleCurrentSite = () => elementActions.storeElement('tasks', task, null, 'toggle-site') let has_current_site = config.settings.multisite ? task.sites.includes(config.currentSite.id) : true const fetchCondition = (index) => elementActions.fetchElement('conditions', task.conditions[index]) @@ -32,8 +31,7 @@ const Task = ({ config, task, elementActions, filter=false, filterSites=false, f
    + onClick={toggleCurrentSite} show={config.settings.multisite}/> diff --git a/rdmo/management/assets/js/components/element/View.js b/rdmo/management/assets/js/components/element/View.js index a40fd51b1e..ec5ac37ab7 100644 --- a/rdmo/management/assets/js/components/element/View.js +++ b/rdmo/management/assets/js/components/element/View.js @@ -20,8 +20,7 @@ const View = ({ config, view, elementActions, filter=false, filterSites=false, f const fetchCopy = () => elementActions.fetchElement('views', view.id, 'copy') const toggleAvailable = () => elementActions.storeElement('views', {...view, available: !view.available }) const toggleLocked = () => elementActions.storeElement('views', {...view, locked: !view.locked }) - const addCurrentSite = () => elementActions.storeElement('views', view, null, 'add-site') - const removeCurrentSite = () => elementActions.storeElement('views', view, null, 'remove-site') + const toggleCurrentSite = () => elementActions.storeElement('views', view, null, 'toggle-site') let has_current_site = config.settings.multisite ? view.sites.includes(config.currentSite.id) : true return showElement && ( @@ -29,8 +28,7 @@ const View = ({ config, view, elementActions, filter=false, filterSites=false, f
    + onClick={toggleCurrentSite} show={config.settings.multisite}/> From 4ee6cf517c764a1ee78d1d3a5af928de018b1a60 Mon Sep 17 00:00:00 2001 From: David Wallace Date: Mon, 12 Feb 2024 17:32:00 +0100 Subject: [PATCH 045/504] js: remove console.log --- rdmo/management/assets/js/api/MultiSiteApi.js | 1 - 1 file changed, 1 deletion(-) diff --git a/rdmo/management/assets/js/api/MultiSiteApi.js b/rdmo/management/assets/js/api/MultiSiteApi.js index 93c5debb82..3a3dde42af 100644 --- a/rdmo/management/assets/js/api/MultiSiteApi.js +++ b/rdmo/management/assets/js/api/MultiSiteApi.js @@ -6,7 +6,6 @@ class MultiSiteApi extends BaseApi { static UpdateElementAction(element, action) { const model_api_path = element.model.replace('.', '/').concat('s') let url = `/api/v1/${model_api_path}/${element.id}/${action}/` - console.log('UpdateElementAction', url, element, action, this) return this.put(url, element) } } From 92b76eab3ac8fd6044daec19516fc26e5f3d0542 Mon Sep 17 00:00:00 2001 From: David Wallace Date: Mon, 12 Feb 2024 17:33:41 +0100 Subject: [PATCH 046/504] chore: rename rule to toggle_site, remove is_element_editor and use settings.SITE_ID --- rdmo/core/permissions.py | 3 +-- rdmo/management/rules.py | 14 ++++++-------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/rdmo/core/permissions.py b/rdmo/core/permissions.py index 7a9f58d0e2..a36b358fe4 100644 --- a/rdmo/core/permissions.py +++ b/rdmo/core/permissions.py @@ -81,8 +81,7 @@ def has_permission(self, request, view): class CanToggleElementCurrentSite(DjangoModelPermissions): perms_map = { - 'GET': ['%(app_label)s.view_%(model_name)s'], - 'PUT': ['%(app_label)s.change_%(model_name)s_toggle_own_site'], + 'PUT': ['%(app_label)s.change_%(model_name)s_toggle_site'], } @log_result diff --git a/rdmo/management/rules.py b/rdmo/management/rules.py index 0659eecb64..c951560e4f 100644 --- a/rdmo/management/rules.py +++ b/rdmo/management/rules.py @@ -1,6 +1,6 @@ import logging -from django.contrib.sites.models import Site +from django.conf import settings import rules from rules.predicates import is_authenticated, is_superuser @@ -19,8 +19,7 @@ def is_editor_for_current_site(user) -> bool: ''' Checks if any editor role exists for the user ''' if not is_editor(user): return False # if the user is not an editor, return False - current_site = Site.objects.get_current() - return user.role.editor.filter(id=current_site.id).exists() + return user.role.editor.filter(id=settings.SITE_ID).exists() @rules.predicate @@ -52,8 +51,7 @@ def is_reviewer_for_current_site(user) -> bool: ''' Checks if any reviewer role exists for the user ''' if not is_reviewer(user): return False # if the user is not an reviewer, return False - current_site = Site.objects.get_current() - return user.role.reviewer.filter(id=current_site.id).exists() + return user.role.reviewer.filter(id=settings.SITE_ID).exists() @rules.predicate @@ -153,7 +151,7 @@ def is_legacy_reviewer(user) -> bool: rules.add_perm('tasks.change_task_object', is_element_editor) rules.add_perm('tasks.delete_task_object', is_element_editor) # toggle current site field perm -rules.add_perm('tasks.change_task_toggle_own_site', is_element_editor | is_editor_for_current_site) +rules.add_perm('tasks.change_task_toggle_site', is_editor_for_current_site) # Model Permissions for views rules.add_perm('views.view_view', is_editor | is_reviewer) @@ -165,7 +163,7 @@ def is_legacy_reviewer(user) -> bool: rules.add_perm('views.change_view_object', is_element_editor) rules.add_perm('views.delete_view_object', is_element_editor) # toggle current site field perm -rules.add_perm('views.change_view_toggle_own_site', is_element_editor | is_editor_for_current_site) +rules.add_perm('views.change_view_toggle_site', is_editor_for_current_site) # Model permissions for catalogs rules.add_perm('questions.view_catalog', is_editor | is_reviewer) @@ -177,7 +175,7 @@ def is_legacy_reviewer(user) -> bool: rules.add_perm('questions.change_catalog_object', is_element_editor) rules.add_perm('questions.delete_catalog_object', is_element_editor) # toggle current site field perm -rules.add_perm('questions.change_catalog_toggle_own_site', is_element_editor | is_editor_for_current_site) +rules.add_perm('questions.change_catalog_toggle_site', is_editor_for_current_site) # Model permissions for sections rules.add_perm('questions.view_section', is_editor | is_reviewer) From d528546a26a7a68a584bc7ac5f9813b7abf0aade Mon Sep 17 00:00:00 2001 From: David Wallace Date: Wed, 15 May 2024 16:16:01 +0200 Subject: [PATCH 047/504] chore: refactor storeElement signature Signed-off-by: David Wallace --- .../assets/js/actions/elementActions.js | 27 +++++-------------- rdmo/management/assets/js/api/MultiSiteApi.js | 12 --------- .../assets/js/components/edit/EditCatalog.js | 2 +- .../assets/js/components/edit/EditTask.js | 2 +- .../assets/js/components/edit/EditView.js | 2 +- 5 files changed, 10 insertions(+), 35 deletions(-) delete mode 100644 rdmo/management/assets/js/api/MultiSiteApi.js diff --git a/rdmo/management/assets/js/actions/elementActions.js b/rdmo/management/assets/js/actions/elementActions.js index 2ca2b7f70a..361506a6da 100644 --- a/rdmo/management/assets/js/actions/elementActions.js +++ b/rdmo/management/assets/js/actions/elementActions.js @@ -6,7 +6,6 @@ import OptionsApi from '../api/OptionsApi' import QuestionsApi from '../api/QuestionsApi' import TasksApi from '../api/TasksApi' import ViewsApi from '../api/ViewsApi' -import MultiSiteApi from '../api/MultiSiteApi' import ConditionsFactory from '../factories/ConditionsFactory' import DomainFactory from '../factories/DomainFactory' @@ -368,7 +367,7 @@ export function fetchElementError(error) { // store element -export function storeElement(elementType, element, back, elementAction=null) { +export function storeElement(elementType, element, elementAction, back) { return function(dispatch, getState) { dispatch(storeElementInit(element, elementAction)) @@ -376,11 +375,7 @@ export function storeElement(elementType, element, back, elementAction=null) { let action switch (elementType) { case 'catalogs': - if (isNil(elementAction)) { - action = () => QuestionsApi.storeCatalog(element) - } else { - action = () => MultiSiteApi.UpdateElementAction(element, elementAction) - } + action = () => QuestionsApi.storeCatalog(element, elementAction) break case 'sections': @@ -416,19 +411,11 @@ export function storeElement(elementType, element, back, elementAction=null) { break case 'tasks': - if (isNil(elementAction)) { - action = () => TasksApi.storeTask(element, elementAction) - } else { - action = () => MultiSiteApi.UpdateElementAction(element, elementAction) - } + action = () => TasksApi.storeTask(element, elementAction) break case 'views': - if (isNil(elementAction)) { - action = () => ViewsApi.storeView(element, elementAction) - } else { - action = () => MultiSiteApi.UpdateElementAction(element, elementAction) - } + action = () => ViewsApi.storeView(element, elementAction) break } @@ -691,9 +678,9 @@ export function dropElement(dragElement, dropElement, mode) { const element = {...getState().elements.element} const { dragParent, dropParent } = moveElement(element, dragElement, dropElement, mode) - dispatch(storeElement(elementTypes[dragParent.model], dragParent)) - if (!isNil(dropParent)) { - dispatch(storeElement(elementTypes[dropParent.model], dropParent)) + dispatch(storeElement(elementTypes[dragParent.model], dragParent, null, false)) + if (!isNil(dropParent)) { + dispatch(storeElement(elementTypes[dropParent.model], dropParent, null, false)) } } } diff --git a/rdmo/management/assets/js/api/MultiSiteApi.js b/rdmo/management/assets/js/api/MultiSiteApi.js deleted file mode 100644 index 3a3dde42af..0000000000 --- a/rdmo/management/assets/js/api/MultiSiteApi.js +++ /dev/null @@ -1,12 +0,0 @@ - -import BaseApi from 'rdmo/core/assets/js/api/BaseApi' - -class MultiSiteApi extends BaseApi { - - static UpdateElementAction(element, action) { - const model_api_path = element.model.replace('.', '/').concat('s') - let url = `/api/v1/${model_api_path}/${element.id}/${action}/` - return this.put(url, element) - } - } -export default MultiSiteApi diff --git a/rdmo/management/assets/js/components/edit/EditCatalog.js b/rdmo/management/assets/js/components/edit/EditCatalog.js index 9d688694ac..883f431c60 100644 --- a/rdmo/management/assets/js/components/edit/EditCatalog.js +++ b/rdmo/management/assets/js/components/edit/EditCatalog.js @@ -25,7 +25,7 @@ const EditCatalog = ({ config, catalog, elements, elementActions }) => { const { elementAction, sections } = elements const updateCatalog = (key, value) => elementActions.updateElement(catalog, {[key]: value}) - const storeCatalog = (back) => elementActions.storeElement('catalogs', catalog, back) + const storeCatalog = (back) => elementActions.storeElement('catalogs', catalog, elementAction, back) const deleteCatalog = () => elementActions.deleteElement('catalogs', catalog) const editSection = (value) => elementActions.fetchElement('sections', value.section) diff --git a/rdmo/management/assets/js/components/edit/EditTask.js b/rdmo/management/assets/js/components/edit/EditTask.js index 551e039cc6..ba66dfe603 100644 --- a/rdmo/management/assets/js/components/edit/EditTask.js +++ b/rdmo/management/assets/js/components/edit/EditTask.js @@ -25,7 +25,7 @@ const EditTask = ({ config, task, elements, elementActions}) => { const { elementAction, attributes, catalogs, conditions } = elements const updateTask = (key, value) => elementActions.updateElement(task, {[key]: value}) - const storeTask = (back) => elementActions.storeElement('tasks', task, back) + const storeTask = (back) => elementActions.storeElement('tasks', task, elementAction, back) const deleteTask = () => elementActions.deleteElement('tasks', task) const editCondition = (condition) => elementActions.fetchElement('conditions', condition) diff --git a/rdmo/management/assets/js/components/edit/EditView.js b/rdmo/management/assets/js/components/edit/EditView.js index ae5bfb2986..416d450263 100644 --- a/rdmo/management/assets/js/components/edit/EditView.js +++ b/rdmo/management/assets/js/components/edit/EditView.js @@ -25,7 +25,7 @@ const EditView = ({ config, view, elements, elementActions }) => { const { elementAction, catalogs } = elements const updateView = (key, value) => elementActions.updateElement(view, {[key]: value}) - const storeView = (back) => elementActions.storeElement('views', view, back) + const storeView = (back) => elementActions.storeElement('views', view, elementAction, back) const deleteView = () => elementActions.deleteElement('views', view) const [showDeleteModal, openDeleteModal, closeDeleteModal] = useDeleteModal() From f49c7168cf45d8e5922592f98d6d3551f7c430b4 Mon Sep 17 00:00:00 2001 From: David Wallace Date: Wed, 15 May 2024 16:18:07 +0200 Subject: [PATCH 048/504] chore: add action to methods in Api classes and remove MultiSiteApi Signed-off-by: David Wallace --- rdmo/management/assets/js/api/QuestionsApi.js | 5 +++-- rdmo/management/assets/js/api/TasksApi.js | 5 +++-- rdmo/management/assets/js/api/ViewsApi.js | 6 +++--- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/rdmo/management/assets/js/api/QuestionsApi.js b/rdmo/management/assets/js/api/QuestionsApi.js index 2a3b6f99c9..ca8895b96b 100644 --- a/rdmo/management/assets/js/api/QuestionsApi.js +++ b/rdmo/management/assets/js/api/QuestionsApi.js @@ -17,11 +17,12 @@ class QuestionsApi extends BaseApi { return this.get(url) } - static storeCatalog(catalog) { + static storeCatalog(catalog, action) { if (isNil(catalog.id)) { return this.post('/api/v1/questions/catalogs/', catalog) } else { - return this.put(`/api/v1/questions/catalogs/${catalog.id}/`, catalog) + const actionPath = isNil(action) ? '' : `${action}/` + return this.put(`/api/v1/questions/catalogs/${catalog.id}/${actionPath}`, catalog) } } diff --git a/rdmo/management/assets/js/api/TasksApi.js b/rdmo/management/assets/js/api/TasksApi.js index b6a1d0f949..513d42de8b 100644 --- a/rdmo/management/assets/js/api/TasksApi.js +++ b/rdmo/management/assets/js/api/TasksApi.js @@ -14,11 +14,12 @@ class TasksApi extends BaseApi { return this.get(`/api/v1/tasks/tasks/${id}/`) } - static storeTask(task) { + static storeTask(task, action) { if (isNil(task.id)) { return this.post('/api/v1/tasks/tasks/', task) } else { - return this.put(`/api/v1/tasks/tasks/${task.id}/`, task) + const actionPath = isNil(action) ? '' : `${action}/` + return this.put(`/api/v1/tasks/tasks/${task.id}/${actionPath}`, task) } } diff --git a/rdmo/management/assets/js/api/ViewsApi.js b/rdmo/management/assets/js/api/ViewsApi.js index be29e94a70..f9174cafb0 100644 --- a/rdmo/management/assets/js/api/ViewsApi.js +++ b/rdmo/management/assets/js/api/ViewsApi.js @@ -14,12 +14,12 @@ class ViewsApi extends BaseApi { return this.get(`/api/v1/views/views/${id}/`) } - static storeView(view) { + static storeView(view, action) { if (isNil(view.id)) { return this.post('/api/v1/views/views/', view) } else { - let url= `/api/v1/views/views/${view.id}/` - return this.put(url, view) + const actionPath = isNil(action) ? '' : `${action}/` + return this.put(`/api/v1/views/views/${view.id}/${actionPath}`, view) } } From 67d3bf87f09d05ca2559a85cc464d26fb6fba2c4 Mon Sep 17 00:00:00 2001 From: David Wallace Date: Wed, 15 May 2024 16:31:09 +0200 Subject: [PATCH 049/504] chore: update element components with signature for storeElements and rename hasCurrentSite Signed-off-by: David Wallace --- .../assets/js/components/element/Catalog.js | 15 +++++++++------ .../assets/js/components/element/Task.js | 13 +++++++------ .../assets/js/components/element/View.js | 13 +++++++------ 3 files changed, 23 insertions(+), 18 deletions(-) diff --git a/rdmo/management/assets/js/components/element/Catalog.js b/rdmo/management/assets/js/components/element/Catalog.js index 6a39f47416..d54d16ae6e 100644 --- a/rdmo/management/assets/js/components/element/Catalog.js +++ b/rdmo/management/assets/js/components/element/Catalog.js @@ -24,17 +24,20 @@ const Catalog = ({ config, catalog, elementActions, display='list', const fetchCopy = () => elementActions.fetchElement('catalogs', catalog.id, 'copy') const fetchNested = () => elementActions.fetchElement('catalogs', catalog.id, 'nested') - const toggleAvailable = () => elementActions.storeElement('catalogs', {...catalog, available: !catalog.available }) - const toggleLocked = () => elementActions.storeElement('catalogs', {...catalog, locked: !catalog.locked }) - const toggleCurrentSite = () => elementActions.storeElement('catalogs', catalog, null, 'toggle-site') - let has_current_site = config.settings.multisite ? catalog.sites.includes(config.currentSite.id) : true + const toggleAvailable = () => elementActions.storeElement('catalogs', {...catalog, available: !catalog.available }, null, false) + const toggleLocked = () => elementActions.storeElement('catalogs', {...catalog, locked: !catalog.locked }, null, false) + + const toggleCurrentSite = () => elementActions.storeElement('catalogs', catalog, 'toggle-site', false) + const createSection = () => elementActions.createElement('sections', { catalog }) const elementNode = (
    - + diff --git a/rdmo/management/assets/js/components/element/Task.js b/rdmo/management/assets/js/components/element/Task.js index 013d48b4d9..339e3371a5 100644 --- a/rdmo/management/assets/js/components/element/Task.js +++ b/rdmo/management/assets/js/components/element/Task.js @@ -19,10 +19,9 @@ const Task = ({ config, task, elementActions, filter=false, filterSites=false, f const fetchEdit = () => elementActions.fetchElement('tasks', task.id) const fetchCopy = () => elementActions.fetchElement('tasks', task.id, 'copy') - const toggleAvailable = () => elementActions.storeElement('tasks', {...task, available: !task.available }) - const toggleLocked = () => elementActions.storeElement('tasks', {...task, locked: !task.locked }) - const toggleCurrentSite = () => elementActions.storeElement('tasks', task, null, 'toggle-site') - let has_current_site = config.settings.multisite ? task.sites.includes(config.currentSite.id) : true + const toggleAvailable = () => elementActions.storeElement('tasks', {...task, available: !task.available }, null, false) + const toggleLocked = () => elementActions.storeElement('tasks', {...task, locked: !task.locked }, null, false) + const toggleCurrentSite = () => elementActions.storeElement('tasks', task, 'toggle-site', false) const fetchCondition = (index) => elementActions.fetchElement('conditions', task.conditions[index]) @@ -30,8 +29,10 @@ const Task = ({ config, task, elementActions, filter=false, filterSites=false, f
  • - + diff --git a/rdmo/management/assets/js/components/element/View.js b/rdmo/management/assets/js/components/element/View.js index ec5ac37ab7..56976fa786 100644 --- a/rdmo/management/assets/js/components/element/View.js +++ b/rdmo/management/assets/js/components/element/View.js @@ -18,17 +18,18 @@ const View = ({ config, view, elementActions, filter=false, filterSites=false, f const fetchEdit = () => elementActions.fetchElement('views', view.id) const fetchCopy = () => elementActions.fetchElement('views', view.id, 'copy') - const toggleAvailable = () => elementActions.storeElement('views', {...view, available: !view.available }) - const toggleLocked = () => elementActions.storeElement('views', {...view, locked: !view.locked }) - const toggleCurrentSite = () => elementActions.storeElement('views', view, null, 'toggle-site') - let has_current_site = config.settings.multisite ? view.sites.includes(config.currentSite.id) : true + const toggleAvailable = () => elementActions.storeElement('views', {...view, available: !view.available }, null, false) + const toggleLocked = () => elementActions.storeElement('views', {...view, locked: !view.locked }, null, false) + const toggleCurrentSite = () => elementActions.storeElement('views', view, 'toggle-site', false) return showElement && (
  • - + From a6378d7ab2dd6112a52c107b86ecfa992b79e309 Mon Sep 17 00:00:00 2001 From: David Wallace Date: Wed, 15 May 2024 16:31:48 +0200 Subject: [PATCH 050/504] chore: rename to hasCurrentSite Signed-off-by: David Wallace --- rdmo/management/assets/js/components/common/Links.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/rdmo/management/assets/js/components/common/Links.js b/rdmo/management/assets/js/components/common/Links.js index c013fb0a65..461d690fb5 100644 --- a/rdmo/management/assets/js/components/common/Links.js +++ b/rdmo/management/assets/js/components/common/Links.js @@ -103,20 +103,20 @@ LockedLink.propTypes = { disabled: PropTypes.bool } -const ToggleCurrentSiteLink = ({ has_current_site, locked, onClick, show }) => { +const ToggleCurrentSiteLink = ({ hasCurrentSite, locked, onClick, show }) => { const className = classNames({ 'element-btn-link fa': true, - 'fa-plus-square-o': !has_current_site, - 'fa-minus-square-o': has_current_site, + 'fa-plus-square-o': !hasCurrentSite, + 'fa-minus-square-o': hasCurrentSite, }) - const title = has_current_site ? gettext('Remove your site'): gettext('Add your site') + const title = hasCurrentSite ? gettext('Remove your site'): gettext('Add your site') return show && } ToggleCurrentSiteLink.propTypes = { - has_current_site: PropTypes.bool.isRequired, + hasCurrentSite: PropTypes.bool.isRequired, locked: PropTypes.bool.isRequired, onClick: PropTypes.func.isRequired, show: PropTypes.bool From fa0d396b8985da0c1b3f6ac8ffe322a5098aafde Mon Sep 17 00:00:00 2001 From: David Wallace Date: Wed, 15 May 2024 16:32:32 +0200 Subject: [PATCH 051/504] chore: add element-button class to ReadOnlyIcon for margin-left Signed-off-by: David Wallace --- rdmo/management/assets/js/components/common/Icons.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rdmo/management/assets/js/components/common/Icons.js b/rdmo/management/assets/js/components/common/Icons.js index 6456be6de4..afb21d8460 100644 --- a/rdmo/management/assets/js/components/common/Icons.js +++ b/rdmo/management/assets/js/components/common/Icons.js @@ -3,7 +3,7 @@ import PropTypes from 'prop-types' const ReadOnlyIcon = ({ title, show }) => { return show && ( - + ) } From 78b0d179051d1719037964ad4813ac4d47291203 Mon Sep 17 00:00:00 2001 From: David Wallace Date: Wed, 15 May 2024 16:36:16 +0200 Subject: [PATCH 052/504] chore: only return super in CanToggleElementCurrentSite.has_permission Signed-off-by: David Wallace --- rdmo/core/permissions.py | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/rdmo/core/permissions.py b/rdmo/core/permissions.py index a36b358fe4..cd6402de35 100644 --- a/rdmo/core/permissions.py +++ b/rdmo/core/permissions.py @@ -1,7 +1,5 @@ import logging -from django.core.exceptions import FieldDoesNotExist - from rest_framework.permissions import DjangoModelPermissions, DjangoObjectPermissions logger = logging.getLogger(__name__) @@ -86,13 +84,4 @@ class CanToggleElementCurrentSite(DjangoModelPermissions): @log_result def has_permission(self, request, view): - - try: - # check for existence of field sites - queryset = self._queryset(view) - model_cls = queryset.model - model_cls._meta.get_field('sites') - except FieldDoesNotExist: - return False - return super().has_permission(request, view) From d37a33cb68662680552e8ea49ac5840b2eadb59b Mon Sep 17 00:00:00 2001 From: David Wallace Date: Wed, 15 May 2024 16:37:01 +0200 Subject: [PATCH 053/504] chore: remove unused logger from management/rules Signed-off-by: David Wallace --- rdmo/management/rules.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/rdmo/management/rules.py b/rdmo/management/rules.py index c951560e4f..7d71fc2420 100644 --- a/rdmo/management/rules.py +++ b/rdmo/management/rules.py @@ -1,12 +1,8 @@ -import logging - from django.conf import settings import rules from rules.predicates import is_authenticated, is_superuser -logger = logging.getLogger(__name__) - @rules.predicate def is_editor(user) -> bool: From 637e88cfa0824491f37290d67de032e05e8b8913 Mon Sep 17 00:00:00 2001 From: David Wallace Date: Wed, 15 May 2024 16:50:17 +0200 Subject: [PATCH 054/504] chore: update signature for storeElement in edit components Signed-off-by: David Wallace --- rdmo/management/assets/js/components/edit/EditAttribute.js | 2 +- rdmo/management/assets/js/components/edit/EditCondition.js | 2 +- rdmo/management/assets/js/components/edit/EditOption.js | 2 +- rdmo/management/assets/js/components/edit/EditOptionSet.js | 2 +- rdmo/management/assets/js/components/edit/EditPage.js | 2 +- rdmo/management/assets/js/components/edit/EditQuestion.js | 2 +- rdmo/management/assets/js/components/edit/EditSection.js | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/rdmo/management/assets/js/components/edit/EditAttribute.js b/rdmo/management/assets/js/components/edit/EditAttribute.js index 8355caf91c..304444cca0 100644 --- a/rdmo/management/assets/js/components/edit/EditAttribute.js +++ b/rdmo/management/assets/js/components/edit/EditAttribute.js @@ -23,7 +23,7 @@ const EditAttribute = ({ config, attribute, elements, elementActions }) => { const editAttribute = (attribute) => elementActions.fetchElement('attributes', attribute) const updateAttribute = (key, value) => elementActions.updateElement(attribute, {[key]: value}) - const storeAttribute = (back) => elementActions.storeElement('attributes', attribute, back) + const storeAttribute = (back) => elementActions.storeElement('attributes', attribute, elementAction, back) const deleteAttribute = () => elementActions.deleteElement('attributes', attribute) const [showDeleteModal, openDeleteModal, closeDeleteModal] = useDeleteModal() diff --git a/rdmo/management/assets/js/components/edit/EditCondition.js b/rdmo/management/assets/js/components/edit/EditCondition.js index 8cffeb4b13..6f990441fa 100644 --- a/rdmo/management/assets/js/components/edit/EditCondition.js +++ b/rdmo/management/assets/js/components/edit/EditCondition.js @@ -22,7 +22,7 @@ const EditCondition = ({ config, condition, elements, elementActions }) => { const { elementAction, parent, attributes, options } = elements const updateCondition = (key, value) => elementActions.updateElement(condition, {[key]: value}) - const storeCondition = (back) => elementActions.storeElement('conditions', condition, back) + const storeCondition = (back) => elementActions.storeElement('conditions', condition, elementAction, back) const deleteCondition = () => elementActions.deleteElement('conditions', condition) const editAttribute = (attribute) => elementActions.fetchElement('attributes', attribute) diff --git a/rdmo/management/assets/js/components/edit/EditOption.js b/rdmo/management/assets/js/components/edit/EditOption.js index 08c865deca..23776667a0 100644 --- a/rdmo/management/assets/js/components/edit/EditOption.js +++ b/rdmo/management/assets/js/components/edit/EditOption.js @@ -24,7 +24,7 @@ const EditOption = ({ config, option, elements, elementActions }) => { const { elementAction, parent } = elements const updateOption = (key, value) => elementActions.updateElement(option, {[key]: value}) - const storeOption = (back) => elementActions.storeElement('options', option, back) + const storeOption = (back) => elementActions.storeElement('options', option, elementAction, back) const deleteOption = () => elementActions.deleteElement('options', option) const [showDeleteModal, openDeleteModal, closeDeleteModal] = useDeleteModal() diff --git a/rdmo/management/assets/js/components/edit/EditOptionSet.js b/rdmo/management/assets/js/components/edit/EditOptionSet.js index 1ac9da2128..f8d3e09265 100644 --- a/rdmo/management/assets/js/components/edit/EditOptionSet.js +++ b/rdmo/management/assets/js/components/edit/EditOptionSet.js @@ -25,7 +25,7 @@ const EditOptionSet = ({ config, optionset, elements, elementActions }) => { const { elementAction, parent, conditions, options } = elements const updateOptionSet = (key, value) => elementActions.updateElement(optionset, {[key]: value}) - const storeOptionSet = (back) => elementActions.storeElement('optionsets', optionset, back) + const storeOptionSet = (back) => elementActions.storeElement('optionsets', optionset, elementAction, back) const deleteOptionSet = () => elementActions.deleteElement('optionsets', optionset) const editOption = (value) => elementActions.fetchElement('options', value.option) diff --git a/rdmo/management/assets/js/components/edit/EditPage.js b/rdmo/management/assets/js/components/edit/EditPage.js index 6064b6f2c5..7cb8d8cbb8 100644 --- a/rdmo/management/assets/js/components/edit/EditPage.js +++ b/rdmo/management/assets/js/components/edit/EditPage.js @@ -45,7 +45,7 @@ const EditPage = ({ config, page, elements, elementActions }) => { elementActions.updateElement(page, { [key]: value }) } } - const storePage = (back) => elementActions.storeElement('pages', page, back) + const storePage = (back) => elementActions.storeElement('pages', page, elementAction, back) const deletePage = () => elementActions.deleteElement('pages', page) const editElement = (value) => { diff --git a/rdmo/management/assets/js/components/edit/EditQuestion.js b/rdmo/management/assets/js/components/edit/EditQuestion.js index 38159af56b..41a6277876 100644 --- a/rdmo/management/assets/js/components/edit/EditQuestion.js +++ b/rdmo/management/assets/js/components/edit/EditQuestion.js @@ -24,7 +24,7 @@ const EditQuestion = ({ config, question, elements, elementActions}) => { const { elementAction, parent, attributes, optionsets, options, conditions } = elements const updateQuestion = (key, value) => elementActions.updateElement(question, {[key]: value}) - const storeQuestion = (back) => elementActions.storeElement('questions', question, back) + const storeQuestion = (back) => elementActions.storeElement('questions', question, elementAction, back) const deleteQuestion = () => elementActions.deleteElement('questions', question) const editOptionSet = (optionset) => elementActions.fetchElement('optionsets', optionset) diff --git a/rdmo/management/assets/js/components/edit/EditSection.js b/rdmo/management/assets/js/components/edit/EditSection.js index 4c55d368c0..562618dc14 100644 --- a/rdmo/management/assets/js/components/edit/EditSection.js +++ b/rdmo/management/assets/js/components/edit/EditSection.js @@ -24,7 +24,7 @@ const EditSection = ({ config, section, elements, elementActions }) => { const { elementAction, parent, pages } = elements const updateSection = (key, value) => elementActions.updateElement(section, {[key]: value}) - const storeSection = (back) => elementActions.storeElement('sections', section, back) + const storeSection = (back) => elementActions.storeElement('sections', section, elementAction, back) const deleteSection = () => elementActions.deleteElement('sections', section) const editPage = (value) => elementActions.fetchElement('pages', value.page) From 827befa27023e84cdd3f2f55c35c8b6236e6f2e1 Mon Sep 17 00:00:00 2001 From: David Wallace Date: Thu, 16 May 2024 10:07:35 +0200 Subject: [PATCH 055/504] chore: update signature for storeElement to use default parameters Signed-off-by: David Wallace --- rdmo/management/assets/js/actions/elementActions.js | 6 +++--- rdmo/management/assets/js/components/element/Catalog.js | 6 +++--- rdmo/management/assets/js/components/element/Task.js | 6 +++--- rdmo/management/assets/js/components/element/View.js | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/rdmo/management/assets/js/actions/elementActions.js b/rdmo/management/assets/js/actions/elementActions.js index 361506a6da..7cd1934c32 100644 --- a/rdmo/management/assets/js/actions/elementActions.js +++ b/rdmo/management/assets/js/actions/elementActions.js @@ -367,7 +367,7 @@ export function fetchElementError(error) { // store element -export function storeElement(elementType, element, elementAction, back) { +export function storeElement(elementType, element, elementAction = null, back = false) { return function(dispatch, getState) { dispatch(storeElementInit(element, elementAction)) @@ -678,9 +678,9 @@ export function dropElement(dragElement, dropElement, mode) { const element = {...getState().elements.element} const { dragParent, dropParent } = moveElement(element, dragElement, dropElement, mode) - dispatch(storeElement(elementTypes[dragParent.model], dragParent, null, false)) + dispatch(storeElement(elementTypes[dragParent.model], dragParent)) if (!isNil(dropParent)) { - dispatch(storeElement(elementTypes[dropParent.model], dropParent, null, false)) + dispatch(storeElement(elementTypes[dropParent.model], dropParent)) } } } diff --git a/rdmo/management/assets/js/components/element/Catalog.js b/rdmo/management/assets/js/components/element/Catalog.js index d54d16ae6e..3f8fabc7ef 100644 --- a/rdmo/management/assets/js/components/element/Catalog.js +++ b/rdmo/management/assets/js/components/element/Catalog.js @@ -24,10 +24,10 @@ const Catalog = ({ config, catalog, elementActions, display='list', const fetchCopy = () => elementActions.fetchElement('catalogs', catalog.id, 'copy') const fetchNested = () => elementActions.fetchElement('catalogs', catalog.id, 'nested') - const toggleAvailable = () => elementActions.storeElement('catalogs', {...catalog, available: !catalog.available }, null, false) - const toggleLocked = () => elementActions.storeElement('catalogs', {...catalog, locked: !catalog.locked }, null, false) + const toggleAvailable = () => elementActions.storeElement('catalogs', {...catalog, available: !catalog.available }) + const toggleLocked = () => elementActions.storeElement('catalogs', {...catalog, locked: !catalog.locked }) - const toggleCurrentSite = () => elementActions.storeElement('catalogs', catalog, 'toggle-site', false) + const toggleCurrentSite = () => elementActions.storeElement('catalogs', catalog, 'toggle-site') const createSection = () => elementActions.createElement('sections', { catalog }) diff --git a/rdmo/management/assets/js/components/element/Task.js b/rdmo/management/assets/js/components/element/Task.js index 339e3371a5..22c96ba22c 100644 --- a/rdmo/management/assets/js/components/element/Task.js +++ b/rdmo/management/assets/js/components/element/Task.js @@ -19,9 +19,9 @@ const Task = ({ config, task, elementActions, filter=false, filterSites=false, f const fetchEdit = () => elementActions.fetchElement('tasks', task.id) const fetchCopy = () => elementActions.fetchElement('tasks', task.id, 'copy') - const toggleAvailable = () => elementActions.storeElement('tasks', {...task, available: !task.available }, null, false) - const toggleLocked = () => elementActions.storeElement('tasks', {...task, locked: !task.locked }, null, false) - const toggleCurrentSite = () => elementActions.storeElement('tasks', task, 'toggle-site', false) + const toggleAvailable = () => elementActions.storeElement('tasks', {...task, available: !task.available }) + const toggleLocked = () => elementActions.storeElement('tasks', {...task, locked: !task.locked }) + const toggleCurrentSite = () => elementActions.storeElement('tasks', task, 'toggle-site') const fetchCondition = (index) => elementActions.fetchElement('conditions', task.conditions[index]) diff --git a/rdmo/management/assets/js/components/element/View.js b/rdmo/management/assets/js/components/element/View.js index 56976fa786..02ccda215f 100644 --- a/rdmo/management/assets/js/components/element/View.js +++ b/rdmo/management/assets/js/components/element/View.js @@ -18,9 +18,9 @@ const View = ({ config, view, elementActions, filter=false, filterSites=false, f const fetchEdit = () => elementActions.fetchElement('views', view.id) const fetchCopy = () => elementActions.fetchElement('views', view.id, 'copy') - const toggleAvailable = () => elementActions.storeElement('views', {...view, available: !view.available }, null, false) - const toggleLocked = () => elementActions.storeElement('views', {...view, locked: !view.locked }, null, false) - const toggleCurrentSite = () => elementActions.storeElement('views', view, 'toggle-site', false) + const toggleAvailable = () => elementActions.storeElement('views', {...view, available: !view.available }) + const toggleLocked = () => elementActions.storeElement('views', {...view, locked: !view.locked }) + const toggleCurrentSite = () => elementActions.storeElement('views', view, 'toggle-site') return showElement && (
  • From b6d3ebf2d9ebe3aa55686d5e669658d687f3bda3 Mon Sep 17 00:00:00 2001 From: David Wallace Date: Thu, 16 May 2024 10:48:31 +0200 Subject: [PATCH 056/504] chore: update signature for storeElement in EditQuestionSet Signed-off-by: David Wallace --- rdmo/management/assets/js/components/edit/EditQuestionSet.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rdmo/management/assets/js/components/edit/EditQuestionSet.js b/rdmo/management/assets/js/components/edit/EditQuestionSet.js index e78935196f..8736156615 100644 --- a/rdmo/management/assets/js/components/edit/EditQuestionSet.js +++ b/rdmo/management/assets/js/components/edit/EditQuestionSet.js @@ -45,7 +45,7 @@ const EditQuestionSet = ({ config, questionset, elements, elementActions }) => { elementActions.updateElement(questionset, { [key]: value }) } } - const storeQuestionSet = (back) => elementActions.storeElement('questionsets', questionset, back) + const storeQuestionSet = (back) => elementActions.storeElement('questionsets', questionset, elementAction, back) const deleteQuestionSet = () => elementActions.deleteElement('questionsets', questionset) const editElement = (value) => { From bed0ca906cd9b5ad56963d80a4fc69fd75ff4bed Mon Sep 17 00:00:00 2001 From: David Wallace Date: Tue, 21 May 2024 13:24:46 +0200 Subject: [PATCH 057/504] js: update ToggleCurrentSiteLink icon and move placement of icon in element Signed-off-by: David Wallace --- rdmo/management/assets/js/components/common/Links.js | 4 ++-- rdmo/management/assets/js/components/element/Catalog.js | 8 ++++---- rdmo/management/assets/js/components/element/Task.js | 8 ++++---- rdmo/management/assets/js/components/element/View.js | 8 ++++---- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/rdmo/management/assets/js/components/common/Links.js b/rdmo/management/assets/js/components/common/Links.js index 461d690fb5..82f6427995 100644 --- a/rdmo/management/assets/js/components/common/Links.js +++ b/rdmo/management/assets/js/components/common/Links.js @@ -106,8 +106,8 @@ LockedLink.propTypes = { const ToggleCurrentSiteLink = ({ hasCurrentSite, locked, onClick, show }) => { const className = classNames({ 'element-btn-link fa': true, - 'fa-plus-square-o': !hasCurrentSite, - 'fa-minus-square-o': hasCurrentSite, + 'fa-plus-square': !hasCurrentSite, + 'fa-minus-square': hasCurrentSite, }) const title = hasCurrentSite ? gettext('Remove your site'): gettext('Add your site') diff --git a/rdmo/management/assets/js/components/element/Catalog.js b/rdmo/management/assets/js/components/element/Catalog.js index 3f8fabc7ef..be408da1f0 100644 --- a/rdmo/management/assets/js/components/element/Catalog.js +++ b/rdmo/management/assets/js/components/element/Catalog.js @@ -34,10 +34,6 @@ const Catalog = ({ config, catalog, elementActions, display='list', const elementNode = (
    - @@ -47,6 +43,10 @@ const Catalog = ({ config, catalog, elementActions, display='list', : gettext('Make catalog available')} available={catalog.available} locked={catalog.locked} onClick={toggleAvailable} disabled={catalog.read_only} /> +
    - @@ -40,6 +36,10 @@ const Task = ({ config, task, elementActions, filter=false, filterSites=false, f : gettext('Make task available')} available={task.available} locked={task.locked} onClick={toggleAvailable} disabled={task.read_only} /> +
    - @@ -37,6 +33,10 @@ const View = ({ config, view, elementActions, filter=false, filterSites=false, f : gettext('Make view available')} available={view.available} locked={view.locked} onClick={toggleAvailable} disabled={view.read_only} /> + Date: Tue, 21 May 2024 14:33:12 +0200 Subject: [PATCH 058/504] js revert: remove elementAction arg from storeElementInit Signed-off-by: David Wallace --- rdmo/management/assets/js/actions/elementActions.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rdmo/management/assets/js/actions/elementActions.js b/rdmo/management/assets/js/actions/elementActions.js index 7cd1934c32..a91633d940 100644 --- a/rdmo/management/assets/js/actions/elementActions.js +++ b/rdmo/management/assets/js/actions/elementActions.js @@ -370,7 +370,7 @@ export function fetchElementError(error) { export function storeElement(elementType, element, elementAction = null, back = false) { return function(dispatch, getState) { - dispatch(storeElementInit(element, elementAction)) + dispatch(storeElementInit(element)) let action switch (elementType) { @@ -432,8 +432,8 @@ export function storeElement(elementType, element, elementAction = null, back = } } -export function storeElementInit(element, elementAction) { - return {type: 'elements/storeElementInit', element, elementAction} +export function storeElementInit(element) { + return {type: 'elements/storeElementInit', element} } export function storeElementSuccess(element) { From 7e6f373ef4c339c8035f918270cb0f70e6d3242f Mon Sep 17 00:00:00 2001 From: David Wallace Date: Tue, 21 May 2024 15:08:54 +0200 Subject: [PATCH 059/504] tests: refactor core multisite test helpers into constants and utils Signed-off-by: David Wallace --- .../tests/test_viewset_condition_multisite.py | 7 +- rdmo/core/tests/__init__.py | 175 ------------------ rdmo/core/tests/constants.py | 139 ++++++++++++++ rdmo/core/tests/utils.py | 32 ++++ .../tests/test_viewset_attribute_multisite.py | 7 +- .../tests/test_viewset_import_multisite.py | 4 +- .../tests/test_viewset_options_multisite.py | 7 +- .../test_viewset_optionsets_multisite.py | 7 +- .../tests/test_viewset_catalog_multisite.py | 7 +- .../tests/test_viewset_page_multisite.py | 7 +- .../tests/test_viewset_question_multisite.py | 7 +- .../test_viewset_questionset_multisite.py | 7 +- .../tests/test_viewset_section_multisite.py | 7 +- .../tests/test_viewset_task_multisite.py | 7 +- .../tests/test_viewset_view_multisite.py | 7 +- 15 files changed, 217 insertions(+), 210 deletions(-) create mode 100644 rdmo/core/tests/constants.py create mode 100644 rdmo/core/tests/utils.py diff --git a/rdmo/conditions/tests/test_viewset_condition_multisite.py b/rdmo/conditions/tests/test_viewset_condition_multisite.py index 0455e1c22a..6d1f0da587 100644 --- a/rdmo/conditions/tests/test_viewset_condition_multisite.py +++ b/rdmo/conditions/tests/test_viewset_condition_multisite.py @@ -4,9 +4,10 @@ from django.urls import reverse -from ...core.tests import get_obj_perms_status_code -from ...core.tests import multisite_status_map as status_map -from ...core.tests import multisite_users as users +from rdmo.core.tests.constants import multisite_status_map as status_map +from rdmo.core.tests.constants import multisite_users as users +from rdmo.core.tests.utils import get_obj_perms_status_code + from ..models import Condition from .test_viewset_condition import export_formats, urlnames diff --git a/rdmo/core/tests/__init__.py b/rdmo/core/tests/__init__.py index bbf4a01c02..e69de29bb2 100644 --- a/rdmo/core/tests/__init__.py +++ b/rdmo/core/tests/__init__.py @@ -1,175 +0,0 @@ - -from rdmo.core.models import Model - -multisite_users = ( - ('user', 'user'), - ('reviewer', 'reviewer'), - ('editor', 'editor'), - ('example-reviewer', 'example-reviewer'), - ('example-editor', 'example-editor'), - ('foo-user', 'foo-user'), - ('foo-reviewer', 'foo-reviewer'), - ('foo-editor', 'foo-editor'), - ('bar-user', 'bar-user'), - ('bar-reviewer', 'bar-reviewer'), - ('bar-editor', 'bar-editor'), - ('anonymous', None), -) - - -multisite_status_map = { - 'list': { - 'foo-user': 403, 'foo-reviewer': 200, 'foo-editor': 200, - 'bar-user': 403, 'bar-reviewer': 200, 'bar-editor': 200, - 'user': 403, 'example-reviewer': 200, 'example-editor': 200, - 'anonymous': 401, 'reviewer': 200, 'editor': 200, - }, - 'detail': { - 'foo-user': 404, 'foo-reviewer': 200, 'foo-editor': 200, - 'bar-user': 404, 'bar-reviewer': 200, 'bar-editor': 200, - 'user': 404, 'example-reviewer': 200, 'example-editor': 200, - 'anonymous': 401, 'reviewer': 200, 'editor': 200, - }, - 'nested': { - 'foo-user': 404, 'foo-reviewer': 200, 'foo-editor': 200, - 'bar-user': 404, 'bar-reviewer': 200, 'bar-editor': 200, - 'user': 404, 'example-reviewer': 200, 'example-editor': 200, - 'anonymous': 401, 'reviewer': 200, 'editor': 200, - }, - 'create': { - 'foo-user': 403, 'foo-reviewer': 403, 'foo-editor': 201, - 'bar-user': 403, 'bar-reviewer': 403, 'bar-editor': 201, - 'user': 403, 'example-reviewer': 403, 'example-editor': 201, - 'anonymous': 401, 'reviewer': 403, 'editor': 201, - }, - 'copy': { - 'foo-user': 404, 'foo-reviewer': 403, 'foo-editor': 201, - 'bar-user': 404, 'bar-reviewer': 403, 'bar-editor': 201, - 'user': 404, 'example-reviewer': 403, 'example-editor': 201, - 'anonymous': 401, 'reviewer': 403, 'editor': 201, - }, - 'update': { - 'foo-user': 404, 'foo-reviewer': 403, 'foo-editor': 200, - 'bar-user': 404, 'bar-reviewer': 403, 'bar-editor': 200, - 'user': 404, 'example-reviewer': 403, 'example-editor': 200, - 'anonymous': 401, 'reviewer': 403, 'editor': 200, - }, - 'delete': { - 'foo-user': 404, 'foo-reviewer': 403, 'foo-editor': 204, - 'bar-user': 404, 'bar-reviewer': 403, 'bar-editor': 204, - 'user': 404, 'example-reviewer': 403, 'example-editor': 204, - 'anonymous': 401, 'reviewer': 403, 'editor': 204, - }, - 'toggle-site': { - # foo-editor is not permitted to apply own site(foo.com) in test run(example.com) - 'foo-user': 403, 'foo-reviewer': 403, 'foo-editor': 403, - # bar-editor is not permitted to apply own site(bar.com) in test run(example.com) - 'bar-user': 403, 'bar-reviewer': 403, 'bar-editor': 403, - 'user': 403, 'example-reviewer': 403, 'example-editor': 200, - 'anonymous': 401, 'reviewer': 403, 'editor': 200, - }, -} - - -status_map_object_permissions = { - 'copy': { - 'all-element': { - 'foo-reviewer': 403, 'foo-editor': 201, - 'bar-reviewer': 403, 'bar-editor': 201, - 'example-reviewer': 403, 'example-editor': 201, - }, - 'foo-element': { - 'foo-reviewer': 403, 'foo-editor': 201, - 'bar-reviewer': 404, 'bar-editor': 404, - 'example-reviewer': 404, 'example-editor': 404, - }, - 'bar-element': { - 'foo-reviewer': 404, 'foo-editor': 404, - 'bar-reviewer': 403, 'bar-editor': 201, - 'example-reviewer': 404, 'example-editor': 404, - } - }, - 'update': { - 'all-element': { - 'foo-reviewer': 403, 'foo-editor': 200, - 'bar-reviewer': 403, 'bar-editor': 200, - 'example-reviewer': 403, 'example-editor': 200, - }, - 'foo-element': { - 'foo-reviewer': 403, 'foo-editor': 200, - 'bar-reviewer': 404, 'bar-editor': 404, - 'example-reviewer': 404, 'example-editor': 404, - }, - 'bar-element': { - 'foo-reviewer': 404, 'foo-editor': 404, - 'bar-reviewer': 403, 'bar-editor': 200, - 'example-reviewer': 404, 'example-editor': 404, - } - }, - 'delete': { - 'all-element': { - 'foo-reviewer': 403, 'foo-editor': 204, - 'bar-reviewer': 403, 'bar-editor': 204, - 'example-reviewer': 403, 'example-editor': 204, - }, - 'foo-element': { - 'foo-reviewer': 403, 'foo-editor': 204, - 'bar-reviewer': 404, 'bar-editor': 404, - 'example-reviewer': 404, 'example-editor': 404, - }, - 'bar-element': { - 'foo-reviewer': 404, 'foo-editor': 404, - 'bar-reviewer': 403, 'bar-editor': 204, - 'example-reviewer': 404, 'example-editor': 404, - } - }, - 'toggle-site': { - 'all-element': { - # foo-editor can not apply own site(foo.com) in test run(example.com) - 'foo-reviewer': 403, 'foo-editor': 403, - # bar-editor can not apply own site(bar.com) in test run(example.com) - 'bar-reviewer': 403, 'bar-editor': 403, - 'example-reviewer': 403, 'example-editor': 200, - }, - 'foo-element': { - 'foo-reviewer': 403, 'foo-editor': 403, - 'bar-reviewer': 403, 'bar-editor': 403, - 'example-reviewer': 403, 'example-editor': 200, - }, - 'bar-element': { - 'foo-reviewer': 403, 'foo-editor': 403, - 'bar-reviewer': 403, 'bar-editor': 403, - 'example-reviewer': 403, 'example-editor': 200, - } - } -} - - -def get_obj_perms_status_code(instance, username, method): - ''' looks for the object permissions of the instance and returns the status code ''' - - if isinstance(instance, Model): - try: - if not instance.editors.exists(): - return multisite_status_map[method][username] - except AttributeError as e: - raise AttributeError(f'instance {instance} should have an editors attribute') from e - elif isinstance(instance, str): - pass - - if 'foo-' in str(instance): - instance_obj_perms_key = 'foo-element' - elif 'bar-' in str(instance): - instance_obj_perms_key = 'bar-element' - else: - instance_obj_perms_key = 'all-element' - - try: - method_instance_obj_perms_map = status_map_object_permissions[method][instance_obj_perms_key] - except KeyError as e: - raise KeyError(f'instance ({instance_obj_perms_key}) should be defined in status_map_object_permissions') from e - try: - return method_instance_obj_perms_map[username] - except KeyError: - # not all users are defined in the method_instance_perms_map - return multisite_status_map[method][username] diff --git a/rdmo/core/tests/constants.py b/rdmo/core/tests/constants.py new file mode 100644 index 0000000000..f8e26a30e8 --- /dev/null +++ b/rdmo/core/tests/constants.py @@ -0,0 +1,139 @@ + +multisite_status_map = { + 'list': { + 'foo-user': 403, 'foo-reviewer': 200, 'foo-editor': 200, + 'bar-user': 403, 'bar-reviewer': 200, 'bar-editor': 200, + 'user': 403, 'example-reviewer': 200, 'example-editor': 200, + 'anonymous': 401, 'reviewer': 200, 'editor': 200, + }, + 'detail': { + 'foo-user': 404, 'foo-reviewer': 200, 'foo-editor': 200, + 'bar-user': 404, 'bar-reviewer': 200, 'bar-editor': 200, + 'user': 404, 'example-reviewer': 200, 'example-editor': 200, + 'anonymous': 401, 'reviewer': 200, 'editor': 200, + }, + 'nested': { + 'foo-user': 404, 'foo-reviewer': 200, 'foo-editor': 200, + 'bar-user': 404, 'bar-reviewer': 200, 'bar-editor': 200, + 'user': 404, 'example-reviewer': 200, 'example-editor': 200, + 'anonymous': 401, 'reviewer': 200, 'editor': 200, + }, + 'create': { + 'foo-user': 403, 'foo-reviewer': 403, 'foo-editor': 201, + 'bar-user': 403, 'bar-reviewer': 403, 'bar-editor': 201, + 'user': 403, 'example-reviewer': 403, 'example-editor': 201, + 'anonymous': 401, 'reviewer': 403, 'editor': 201, + }, + 'copy': { + 'foo-user': 404, 'foo-reviewer': 403, 'foo-editor': 201, + 'bar-user': 404, 'bar-reviewer': 403, 'bar-editor': 201, + 'user': 404, 'example-reviewer': 403, 'example-editor': 201, + 'anonymous': 401, 'reviewer': 403, 'editor': 201, + }, + 'update': { + 'foo-user': 404, 'foo-reviewer': 403, 'foo-editor': 200, + 'bar-user': 404, 'bar-reviewer': 403, 'bar-editor': 200, + 'user': 404, 'example-reviewer': 403, 'example-editor': 200, + 'anonymous': 401, 'reviewer': 403, 'editor': 200, + }, + 'delete': { + 'foo-user': 404, 'foo-reviewer': 403, 'foo-editor': 204, + 'bar-user': 404, 'bar-reviewer': 403, 'bar-editor': 204, + 'user': 404, 'example-reviewer': 403, 'example-editor': 204, + 'anonymous': 401, 'reviewer': 403, 'editor': 204, + }, + 'toggle-site': { + # foo-editor is not permitted to apply own site(foo.com) in test run(example.com) + 'foo-user': 403, 'foo-reviewer': 403, 'foo-editor': 403, + # bar-editor is not permitted to apply own site(bar.com) in test run(example.com) + 'bar-user': 403, 'bar-reviewer': 403, 'bar-editor': 403, + 'user': 403, 'example-reviewer': 403, 'example-editor': 200, + 'anonymous': 401, 'reviewer': 403, 'editor': 200, + }, +} +status_map_object_permissions = { + 'copy': { + 'all-element': { + 'foo-reviewer': 403, 'foo-editor': 201, + 'bar-reviewer': 403, 'bar-editor': 201, + 'example-reviewer': 403, 'example-editor': 201, + }, + 'foo-element': { + 'foo-reviewer': 403, 'foo-editor': 201, + 'bar-reviewer': 404, 'bar-editor': 404, + 'example-reviewer': 404, 'example-editor': 404, + }, + 'bar-element': { + 'foo-reviewer': 404, 'foo-editor': 404, + 'bar-reviewer': 403, 'bar-editor': 201, + 'example-reviewer': 404, 'example-editor': 404, + } + }, + 'update': { + 'all-element': { + 'foo-reviewer': 403, 'foo-editor': 200, + 'bar-reviewer': 403, 'bar-editor': 200, + 'example-reviewer': 403, 'example-editor': 200, + }, + 'foo-element': { + 'foo-reviewer': 403, 'foo-editor': 200, + 'bar-reviewer': 404, 'bar-editor': 404, + 'example-reviewer': 404, 'example-editor': 404, + }, + 'bar-element': { + 'foo-reviewer': 404, 'foo-editor': 404, + 'bar-reviewer': 403, 'bar-editor': 200, + 'example-reviewer': 404, 'example-editor': 404, + } + }, + 'delete': { + 'all-element': { + 'foo-reviewer': 403, 'foo-editor': 204, + 'bar-reviewer': 403, 'bar-editor': 204, + 'example-reviewer': 403, 'example-editor': 204, + }, + 'foo-element': { + 'foo-reviewer': 403, 'foo-editor': 204, + 'bar-reviewer': 404, 'bar-editor': 404, + 'example-reviewer': 404, 'example-editor': 404, + }, + 'bar-element': { + 'foo-reviewer': 404, 'foo-editor': 404, + 'bar-reviewer': 403, 'bar-editor': 204, + 'example-reviewer': 404, 'example-editor': 404, + } + }, + 'toggle-site': { + 'all-element': { + # foo-editor can not apply own site(foo.com) in test run(example.com) + 'foo-reviewer': 403, 'foo-editor': 403, + # bar-editor can not apply own site(bar.com) in test run(example.com) + 'bar-reviewer': 403, 'bar-editor': 403, + 'example-reviewer': 403, 'example-editor': 200, + }, + 'foo-element': { + 'foo-reviewer': 403, 'foo-editor': 403, + 'bar-reviewer': 403, 'bar-editor': 403, + 'example-reviewer': 403, 'example-editor': 200, + }, + 'bar-element': { + 'foo-reviewer': 403, 'foo-editor': 403, + 'bar-reviewer': 403, 'bar-editor': 403, + 'example-reviewer': 403, 'example-editor': 200, + } + } +} +multisite_users = ( + ('user', 'user'), + ('reviewer', 'reviewer'), + ('editor', 'editor'), + ('example-reviewer', 'example-reviewer'), + ('example-editor', 'example-editor'), + ('foo-user', 'foo-user'), + ('foo-reviewer', 'foo-reviewer'), + ('foo-editor', 'foo-editor'), + ('bar-user', 'bar-user'), + ('bar-reviewer', 'bar-reviewer'), + ('bar-editor', 'bar-editor'), + ('anonymous', None), +) diff --git a/rdmo/core/tests/utils.py b/rdmo/core/tests/utils.py new file mode 100644 index 0000000000..3bf4db8c4a --- /dev/null +++ b/rdmo/core/tests/utils.py @@ -0,0 +1,32 @@ +from rdmo.core.models import Model +from rdmo.core.tests.constants import multisite_status_map, status_map_object_permissions + + +def get_obj_perms_status_code(instance, username, method): + ''' looks for the object permissions of the instance and returns the status code ''' + + if isinstance(instance, Model): + try: + if not instance.editors.exists(): + return multisite_status_map[method][username] + except AttributeError as e: + raise AttributeError(f'instance {instance} should have an editors attribute') from e + elif isinstance(instance, str): + pass + + if 'foo-' in str(instance): + instance_obj_perms_key = 'foo-element' + elif 'bar-' in str(instance): + instance_obj_perms_key = 'bar-element' + else: + instance_obj_perms_key = 'all-element' + + try: + method_instance_obj_perms_map = status_map_object_permissions[method][instance_obj_perms_key] + except KeyError as e: + raise KeyError(f'instance ({instance_obj_perms_key}) should be defined in status_map_object_permissions') from e + try: + return method_instance_obj_perms_map[username] + except KeyError: + # not all users are defined in the method_instance_perms_map + return multisite_status_map[method][username] diff --git a/rdmo/domain/tests/test_viewset_attribute_multisite.py b/rdmo/domain/tests/test_viewset_attribute_multisite.py index 674469a694..39bd7a663e 100644 --- a/rdmo/domain/tests/test_viewset_attribute_multisite.py +++ b/rdmo/domain/tests/test_viewset_attribute_multisite.py @@ -4,9 +4,10 @@ from django.urls import reverse -from ...core.tests import get_obj_perms_status_code -from ...core.tests import multisite_status_map as status_map -from ...core.tests import multisite_users as users +from rdmo.core.tests.constants import multisite_status_map as status_map +from rdmo.core.tests.constants import multisite_users as users +from rdmo.core.tests.utils import get_obj_perms_status_code + from ..models import Attribute from .test_viewset_attribute import urlnames diff --git a/rdmo/management/tests/test_viewset_import_multisite.py b/rdmo/management/tests/test_viewset_import_multisite.py index 5a0e2f3d35..bfc8dc1d0d 100644 --- a/rdmo/management/tests/test_viewset_import_multisite.py +++ b/rdmo/management/tests/test_viewset_import_multisite.py @@ -2,8 +2,8 @@ from django.urls import reverse -from rdmo.core.tests import get_obj_perms_status_code -from rdmo.core.tests import multisite_users as users +from rdmo.core.tests.constants import multisite_users as users +from rdmo.core.tests.utils import get_obj_perms_status_code from rdmo.questions.models import Catalog, Page, Question, QuestionSet, Section status_map = { diff --git a/rdmo/options/tests/test_viewset_options_multisite.py b/rdmo/options/tests/test_viewset_options_multisite.py index 9062de7f74..6834c6597e 100644 --- a/rdmo/options/tests/test_viewset_options_multisite.py +++ b/rdmo/options/tests/test_viewset_options_multisite.py @@ -4,9 +4,10 @@ from django.urls import reverse -from ...core.tests import get_obj_perms_status_code -from ...core.tests import multisite_status_map as status_map -from ...core.tests import multisite_users as users +from rdmo.core.tests.constants import multisite_status_map as status_map +from rdmo.core.tests.constants import multisite_users as users +from rdmo.core.tests.utils import get_obj_perms_status_code + from ..models import Option from .test_viewset_options import urlnames diff --git a/rdmo/options/tests/test_viewset_optionsets_multisite.py b/rdmo/options/tests/test_viewset_optionsets_multisite.py index 2c74bd8e79..55bd2a30eb 100644 --- a/rdmo/options/tests/test_viewset_optionsets_multisite.py +++ b/rdmo/options/tests/test_viewset_optionsets_multisite.py @@ -4,9 +4,10 @@ from django.urls import reverse -from ...core.tests import get_obj_perms_status_code -from ...core.tests import multisite_status_map as status_map -from ...core.tests import multisite_users as users +from rdmo.core.tests.constants import multisite_status_map as status_map +from rdmo.core.tests.constants import multisite_users as users +from rdmo.core.tests.utils import get_obj_perms_status_code + from ..models import OptionSet from .test_viewset_optionsets import urlnames diff --git a/rdmo/questions/tests/test_viewset_catalog_multisite.py b/rdmo/questions/tests/test_viewset_catalog_multisite.py index 79ffb760cc..38c6845fb8 100644 --- a/rdmo/questions/tests/test_viewset_catalog_multisite.py +++ b/rdmo/questions/tests/test_viewset_catalog_multisite.py @@ -5,9 +5,10 @@ from django.contrib.sites.models import Site from django.urls import reverse -from ...core.tests import get_obj_perms_status_code -from ...core.tests import multisite_status_map as status_map -from ...core.tests import multisite_users as users +from rdmo.core.tests.constants import multisite_status_map as status_map +from rdmo.core.tests.constants import multisite_users as users +from rdmo.core.tests.utils import get_obj_perms_status_code + from ..models import Catalog from .test_viewset_catalog import export_formats, urlnames diff --git a/rdmo/questions/tests/test_viewset_page_multisite.py b/rdmo/questions/tests/test_viewset_page_multisite.py index 98c06785da..6bd56690a8 100644 --- a/rdmo/questions/tests/test_viewset_page_multisite.py +++ b/rdmo/questions/tests/test_viewset_page_multisite.py @@ -5,9 +5,10 @@ from django.db.models import Max from django.urls import reverse -from ...core.tests import get_obj_perms_status_code -from ...core.tests import multisite_status_map as status_map -from ...core.tests import multisite_users as users +from rdmo.core.tests.constants import multisite_status_map as status_map +from rdmo.core.tests.constants import multisite_users as users +from rdmo.core.tests.utils import get_obj_perms_status_code + from ..models import Page from .test_viewset_page import export_formats, urlnames diff --git a/rdmo/questions/tests/test_viewset_question_multisite.py b/rdmo/questions/tests/test_viewset_question_multisite.py index 796121c0d9..73264498ed 100644 --- a/rdmo/questions/tests/test_viewset_question_multisite.py +++ b/rdmo/questions/tests/test_viewset_question_multisite.py @@ -5,9 +5,10 @@ from django.db.models import Max from django.urls import reverse -from ...core.tests import get_obj_perms_status_code -from ...core.tests import multisite_status_map as status_map -from ...core.tests import multisite_users as users +from rdmo.core.tests.constants import multisite_status_map as status_map +from rdmo.core.tests.constants import multisite_users as users +from rdmo.core.tests.utils import get_obj_perms_status_code + from ..models import Question from .test_viewset_question import export_formats, urlnames diff --git a/rdmo/questions/tests/test_viewset_questionset_multisite.py b/rdmo/questions/tests/test_viewset_questionset_multisite.py index a45360a800..2a11a36c2c 100644 --- a/rdmo/questions/tests/test_viewset_questionset_multisite.py +++ b/rdmo/questions/tests/test_viewset_questionset_multisite.py @@ -5,9 +5,10 @@ from django.db.models import Max from django.urls import reverse -from ...core.tests import get_obj_perms_status_code -from ...core.tests import multisite_status_map as status_map -from ...core.tests import multisite_users as users +from rdmo.core.tests.constants import multisite_status_map as status_map +from rdmo.core.tests.constants import multisite_users as users +from rdmo.core.tests.utils import get_obj_perms_status_code + from ..models import QuestionSet from .test_viewset_questionset import export_formats, urlnames diff --git a/rdmo/questions/tests/test_viewset_section_multisite.py b/rdmo/questions/tests/test_viewset_section_multisite.py index fcb166fd49..203d783ef4 100644 --- a/rdmo/questions/tests/test_viewset_section_multisite.py +++ b/rdmo/questions/tests/test_viewset_section_multisite.py @@ -5,9 +5,10 @@ from django.db.models import Max from django.urls import reverse -from ...core.tests import get_obj_perms_status_code -from ...core.tests import multisite_status_map as status_map -from ...core.tests import multisite_users as users +from rdmo.core.tests.constants import multisite_status_map as status_map +from rdmo.core.tests.constants import multisite_users as users +from rdmo.core.tests.utils import get_obj_perms_status_code + from ..models import Section from .test_viewset_section import export_formats, urlnames diff --git a/rdmo/tasks/tests/test_viewset_task_multisite.py b/rdmo/tasks/tests/test_viewset_task_multisite.py index 5fdedaac1f..d9786943ec 100644 --- a/rdmo/tasks/tests/test_viewset_task_multisite.py +++ b/rdmo/tasks/tests/test_viewset_task_multisite.py @@ -5,9 +5,10 @@ from django.contrib.sites.models import Site from django.urls import reverse -from ...core.tests import get_obj_perms_status_code -from ...core.tests import multisite_status_map as status_map -from ...core.tests import multisite_users as users +from rdmo.core.tests.constants import multisite_status_map as status_map +from rdmo.core.tests.constants import multisite_users as users +from rdmo.core.tests.utils import get_obj_perms_status_code + from ..models import Task from .test_viewset_task import export_formats, urlnames diff --git a/rdmo/views/tests/test_viewset_view_multisite.py b/rdmo/views/tests/test_viewset_view_multisite.py index e66fdd0c3c..7944c25fa1 100644 --- a/rdmo/views/tests/test_viewset_view_multisite.py +++ b/rdmo/views/tests/test_viewset_view_multisite.py @@ -5,9 +5,10 @@ from django.contrib.sites.models import Site from django.urls import reverse -from ...core.tests import get_obj_perms_status_code -from ...core.tests import multisite_status_map as status_map -from ...core.tests import multisite_users as users +from rdmo.core.tests.constants import multisite_status_map as status_map +from rdmo.core.tests.constants import multisite_users as users +from rdmo.core.tests.utils import get_obj_perms_status_code + from ..models import View from .test_viewset_view import export_formats, urlnames From 9b706900fa9da2288021918501d921053ed88d32 Mon Sep 17 00:00:00 2001 From: David Wallace Date: Wed, 22 May 2024 09:28:12 +0200 Subject: [PATCH 060/504] tests: add locked parameter to update ultisite toggle tests Signed-off-by: David Wallace --- .../tests/test_viewset_catalog_multisite.py | 15 ++++++++++----- rdmo/tasks/tests/test_viewset_task_multisite.py | 7 ++++++- rdmo/views/tests/test_viewset_view_multisite.py | 7 ++++++- 3 files changed, 22 insertions(+), 7 deletions(-) diff --git a/rdmo/questions/tests/test_viewset_catalog_multisite.py b/rdmo/questions/tests/test_viewset_catalog_multisite.py index 38c6845fb8..82bd691728 100644 --- a/rdmo/questions/tests/test_viewset_catalog_multisite.py +++ b/rdmo/questions/tests/test_viewset_catalog_multisite.py @@ -214,7 +214,8 @@ def test_detail_export(db, client, username, password, export_format): @pytest.mark.parametrize('username,password', users) @pytest.mark.parametrize('add_or_remove, has_current_site_check', [('add', True), ('remove', False)]) -def test_update_catalog_toggle_site(db, client, username, password, add_or_remove, has_current_site_check): +@pytest.mark.parametrize('locked', [True, False]) +def test_update_catalog_toggle_site(db, client, username, password, add_or_remove, has_current_site_check, locked): client.login(username=username, password=password) instances = Catalog.objects.all() current_site = Site.objects.get_current() @@ -225,17 +226,21 @@ def test_update_catalog_toggle_site(db, client, username, password, add_or_remov elif add_or_remove == 'remove': instance.sites.add(current_site) - before_has_current_site = instance.sites.filter(id=current_site.id).exists() + # locked state should not affect this toggle + instance.locked = locked + instance.save() + + before_put_has_current_site = instance.sites.filter(id=current_site.id).exists() url = reverse(urlnames['catalog-toggle-site'], kwargs={'pk': instance.pk}) response = client.put(url, {}, content_type='application/json') assert response.status_code == get_obj_perms_status_code(instance, username, 'toggle-site'), response.json() instance.refresh_from_db() - after_has_current_site = instance.sites.filter(id=current_site.id).exists() + after_put_has_current_site = instance.sites.filter(id=current_site.id).exists() if response.status_code == 200: # check if instance now has the current site or not - assert after_has_current_site is has_current_site_check + assert after_put_has_current_site is has_current_site_check else: # check that the instance was not updated - assert after_has_current_site is before_has_current_site + assert after_put_has_current_site is before_put_has_current_site diff --git a/rdmo/tasks/tests/test_viewset_task_multisite.py b/rdmo/tasks/tests/test_viewset_task_multisite.py index d9786943ec..402adf9198 100644 --- a/rdmo/tasks/tests/test_viewset_task_multisite.py +++ b/rdmo/tasks/tests/test_viewset_task_multisite.py @@ -141,7 +141,8 @@ def test_detail_export(db, client, username, password, export_format): @pytest.mark.parametrize('username,password', users) @pytest.mark.parametrize('add_or_remove, has_current_site_check', [('add', True), ('remove', False)]) -def test_update_task_toggle_site(db, client, username, password, add_or_remove, has_current_site_check): +@pytest.mark.parametrize('locked', [True, False]) +def test_update_task_toggle_site(db, client, username, password, add_or_remove, has_current_site_check, locked): client.login(username=username, password=password) instances = Task.objects.all() current_site = Site.objects.get_current() @@ -152,6 +153,10 @@ def test_update_task_toggle_site(db, client, username, password, add_or_remove, elif add_or_remove == 'remove': instance.sites.add(current_site) + # locked state should not affect this toggle + instance.locked = locked + instance.save() + before_has_current_site = instance.sites.filter(id=current_site.id).exists() url = reverse(urlnames['task-toggle-site'], kwargs={'pk': instance.pk}) diff --git a/rdmo/views/tests/test_viewset_view_multisite.py b/rdmo/views/tests/test_viewset_view_multisite.py index 7944c25fa1..bfe2c348db 100644 --- a/rdmo/views/tests/test_viewset_view_multisite.py +++ b/rdmo/views/tests/test_viewset_view_multisite.py @@ -131,7 +131,8 @@ def test_detail_export(db, client, username, password, export_format): @pytest.mark.parametrize('username,password', users) @pytest.mark.parametrize('add_or_remove, has_current_site_check', [('add', True), ('remove', False)]) -def test_update_view_toggle_site(db, client, username, password, add_or_remove, has_current_site_check): +@pytest.mark.parametrize('locked', [True, False]) +def test_update_view_toggle_site(db, client, username, password, add_or_remove, has_current_site_check, locked): client.login(username=username, password=password) instances = View.objects.all() current_site = Site.objects.get_current() @@ -142,6 +143,10 @@ def test_update_view_toggle_site(db, client, username, password, add_or_remove, elif add_or_remove == 'remove': instance.sites.add(current_site) + # locked state should not affect this toggle + instance.locked = locked + instance.save() + before_has_current_site = instance.sites.filter(id=current_site.id).exists() url = reverse(urlnames['view-toggle-site'], kwargs={'pk': instance.pk}) From 7f4551e4e56466c92db5e0c5541fb4d2b9f0bc1c Mon Sep 17 00:00:00 2001 From: David Wallace Date: Wed, 22 May 2024 09:29:27 +0200 Subject: [PATCH 061/504] js: remove locked parameter from ToggleCurrentSiteLink component and element components Signed-off-by: David Wallace --- rdmo/management/assets/js/components/common/Links.js | 6 ++---- rdmo/management/assets/js/components/element/Catalog.js | 1 - rdmo/management/assets/js/components/element/Task.js | 1 - rdmo/management/assets/js/components/element/View.js | 1 - 4 files changed, 2 insertions(+), 7 deletions(-) diff --git a/rdmo/management/assets/js/components/common/Links.js b/rdmo/management/assets/js/components/common/Links.js index 82f6427995..fd9d0b594a 100644 --- a/rdmo/management/assets/js/components/common/Links.js +++ b/rdmo/management/assets/js/components/common/Links.js @@ -103,7 +103,7 @@ LockedLink.propTypes = { disabled: PropTypes.bool } -const ToggleCurrentSiteLink = ({ hasCurrentSite, locked, onClick, show }) => { +const ToggleCurrentSiteLink = ({ hasCurrentSite, onClick, show }) => { const className = classNames({ 'element-btn-link fa': true, 'fa-plus-square': !hasCurrentSite, @@ -111,13 +111,11 @@ const ToggleCurrentSiteLink = ({ hasCurrentSite, locked, onClick, show }) => { }) const title = hasCurrentSite ? gettext('Remove your site'): gettext('Add your site') - return show && + return show && } ToggleCurrentSiteLink.propTypes = { hasCurrentSite: PropTypes.bool.isRequired, - locked: PropTypes.bool.isRequired, onClick: PropTypes.func.isRequired, show: PropTypes.bool } diff --git a/rdmo/management/assets/js/components/element/Catalog.js b/rdmo/management/assets/js/components/element/Catalog.js index be408da1f0..11dbdd670c 100644 --- a/rdmo/management/assets/js/components/element/Catalog.js +++ b/rdmo/management/assets/js/components/element/Catalog.js @@ -44,7 +44,6 @@ const Catalog = ({ config, catalog, elementActions, display='list', available={catalog.available} locked={catalog.locked} onClick={toggleAvailable} disabled={catalog.read_only} /> Date: Mon, 27 May 2024 15:45:52 +0200 Subject: [PATCH 062/504] Fix fetchConditions in project_questions --- .../projects/js/project_questions/services.js | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/rdmo/projects/static/projects/js/project_questions/services.js b/rdmo/projects/static/projects/js/project_questions/services.js index 1d5fbc84d5..c16f411349 100644 --- a/rdmo/projects/static/projects/js/project_questions/services.js +++ b/rdmo/projects/static/projects/js/project_questions/services.js @@ -495,8 +495,8 @@ angular.module('project_questions') // loop over the page and all questionsets to check conditions angular.forEach([future.page].concat(future.questionsets), function(questionset) { - angular.forEach(future.valuesets[questionset.id], function(valuesets, set_prefix) { - angular.forEach(valuesets, function(valueset, set_index) { + angular.forEach(future.valuesets[questionset.id], function(valuesets) { + angular.forEach(valuesets, function(valueset) { angular.forEach(questionset.elements, function(element) { if (element.model == 'questions.questionset') { var qs = element; @@ -505,8 +505,8 @@ angular.module('project_questions') id: service.project.id, detail_action: 'resolve', questionset: qs.id, - set_prefix: set_prefix, - set_index: set_index + set_prefix: valueset.set_prefix, + set_index: valueset.set_index }, function(response) { valueset.hidden.questionsets[qs.id] = !response.result; }).$promise); @@ -518,8 +518,8 @@ angular.module('project_questions') id: service.project.id, detail_action: 'resolve', question: q.id, - set_prefix: set_prefix, - set_index: set_index + set_prefix: valueset.set_prefix, + set_index: valueset.set_index }, function(response) { valueset.hidden.questions[q.id] = !response.result; }).$promise); @@ -531,8 +531,8 @@ angular.module('project_questions') id: service.project.id, detail_action: 'resolve', optionset: optionset.id, - set_prefix: set_prefix, - set_index: set_index + set_prefix: valueset.set_prefix, + set_index: valueset.set_index }, function(response) { valueset.hidden.optionsets[optionset.id] = !response.result; }).$promise); @@ -1003,8 +1003,8 @@ angular.module('project_questions') } // re-evaluate conditions angular.forEach([service.page].concat(service.questionsets), function(questionset) { - angular.forEach(service.valuesets[questionset.id], function(valuesets, set_prefix) { - angular.forEach(valuesets, function(valueset, set_index) { + angular.forEach(service.valuesets[questionset.id], function(valuesets) { + angular.forEach(valuesets, function(valueset) { angular.forEach(questionset.elements, function(element) { if (element.model == 'questions.questionset') { var qs = element; @@ -1013,8 +1013,8 @@ angular.module('project_questions') id: service.project.id, detail_action: 'resolve', questionset: qs.id, - set_prefix: set_prefix, - set_index: set_index + set_prefix: valueset.set_prefix, + set_index: valueset.set_index }, function(response) { valueset.hidden.questionsets[qs.id] = !response.result; }).$promise); @@ -1026,8 +1026,8 @@ angular.module('project_questions') id: service.project.id, detail_action: 'resolve', question: q.id, - set_prefix: set_prefix, - set_index: set_index + set_prefix: valueset.set_prefix, + set_index: valueset.set_index }, function(response) { valueset.hidden.questions[q.id] = !response.result; }).$promise); @@ -1038,8 +1038,8 @@ angular.module('project_questions') id: service.project.id, detail_action: 'resolve', optionset: optionset.id, - set_prefix: set_prefix, - set_index: set_index + set_prefix: valueset.set_prefix, + set_index: valueset.set_index }, function(response) { valueset.hidden.optionsets[optionset.id] = !response.result; }).$promise); From c555f88f406dd79160799be1fc3eb8d168497dc6 Mon Sep 17 00:00:00 2001 From: David Wallace Date: Mon, 13 May 2024 17:41:54 +0200 Subject: [PATCH 063/504] feat: add merge attribute command Signed-off-by: David Wallace --- .../management/commands/merge_attributes.py | 37 +++ rdmo/management/merge_attributes.py | 213 ++++++++++++++++++ rdmo/management/tests/__init__.py | 0 .../management/tests/test_merge_attributes.py | 199 ++++++++++++++++ rdmo/management/utils.py | 21 ++ 5 files changed, 470 insertions(+) create mode 100644 rdmo/management/management/commands/merge_attributes.py create mode 100644 rdmo/management/merge_attributes.py create mode 100644 rdmo/management/tests/__init__.py create mode 100644 rdmo/management/tests/test_merge_attributes.py create mode 100644 rdmo/management/utils.py diff --git a/rdmo/management/management/commands/merge_attributes.py b/rdmo/management/management/commands/merge_attributes.py new file mode 100644 index 0000000000..7abf59a412 --- /dev/null +++ b/rdmo/management/management/commands/merge_attributes.py @@ -0,0 +1,37 @@ +import logging + +from django.core.management.base import BaseCommand, CommandError +from django.utils.translation import gettext_lazy as _ + +from rdmo.management.merge_attributes import ReplaceAttributeOnElements + +logger = logging.getLogger(__name__) + + +class Command(BaseCommand): + + def add_arguments(self, parser): + parser.add_argument( + '--source', + help='The URI of the source attribute that will be replaced by the target and will be deleted') + parser.add_argument( + '--target', + help='The URI of the target attribute that will be used to replaced the source') + parser.add_argument( + '--save', + action='store_true', + help='If specified, the changes will be saved and the source attribute will be deleted. If not specified, the command will do a dry run.' # noqa: E501 + ) + + def handle(self, *args, **options): + try: + ReplaceAttributeOnElements( + source=options['source'], + target=options['target'], + save=options['save'], + verbosity=options['verbosity'] + ) + except ValueError as e: + raise CommandError(e) from e + except Exception as e: + raise CommandError(_('There was an unknown error in calling the command. %s') % e) from e diff --git a/rdmo/management/merge_attributes.py b/rdmo/management/merge_attributes.py new file mode 100644 index 0000000000..5cb8995260 --- /dev/null +++ b/rdmo/management/merge_attributes.py @@ -0,0 +1,213 @@ +from dataclasses import dataclass, field +from textwrap import dedent +from typing import Callable, Dict, List, Optional, Tuple, Type, Union + +from django.db import models +from django.db.models import QuerySet + +from rdmo.conditions.models import Condition +from rdmo.domain.models import Attribute +from rdmo.management.utils import replace_uri_in_template_string +from rdmo.projects.models import Value +from rdmo.questions.models import Page, Question, QuestionSet +from rdmo.tasks.models import Task +from rdmo.views.models import View + + +@dataclass +class ModelsWithAttributeHelper: + model: Type[models.Model] + field_name: str = field(default='attribute') + field_introspection: bool = field(default=False) + replacement_function: Callable = field(default=None) + + def __post_init__(self): + _field_model = self.model._meta.get_field(self.field_name).related_model + if not isinstance(_field_model, type(Attribute)) and not self.field_introspection: + raise ValueError(f"field {self.field_name} on the model {self.model_name} is not an attribute") + elif self.field_introspection and self.replacement_function is None: + raise ValueError(f"field {self.field_name} on the model {self.model_name} requires a replacement function") + + def get_queryset(self, attribute: Optional[Attribute]=None) -> QuerySet: + if attribute is None: + raise ValueError("attribute is required") + if self.field_introspection: + return self.model.objects.filter(**{f"{self.field_name}__contains": attribute.path}) + return self.model.objects.filter(**{self.field_name: attribute}) + + @property + def model_name(self): + return self.model._meta.model_name.capitalize() + + def replace_attribute_on_instance(self, + instance: models.Model, + source: Attribute, + target: Attribute) -> models.Model: + instance_field = getattr(instance, self.field_name) + + if isinstance(instance_field, Attribute) and not instance_field == source: # just to double-check + raise ValueError("Instance attribute should be equal to the source attribute") + elif not isinstance(instance_field, Attribute) and not self.field_introspection: + raise ValueError("When instance field is not an attribute, it should use field introspection") + + replacement_field = target + if self.field_introspection: # for when the attribute is "hidden as string" within the field + replacement_field = self.replacement_function(instance_field, source, target) + + setattr(instance, self.field_name, replacement_field) + + return instance + +model_helpers_with_attributes = ( + ModelsWithAttributeHelper(Page), ModelsWithAttributeHelper(QuestionSet), ModelsWithAttributeHelper(Question), + ModelsWithAttributeHelper(Condition, field_name='source'), + ModelsWithAttributeHelper(Task, field_name='start_attribute'), + ModelsWithAttributeHelper(Task, field_name='end_attribute'), + ModelsWithAttributeHelper(Value), + ModelsWithAttributeHelper(View, field_name='template', + field_introspection=True, + replacement_function=replace_uri_in_template_string), +) + + +@dataclass +class AttributeReplacementModelResult: + model_helper: Optional[ModelsWithAttributeHelper] = field(default=None) + source: Optional[Attribute] = field(default=None) + target: Optional[Attribute] = field(default=None) + instance: Optional[models.Model] = field(default=None) + saved: bool = field(default=False) + + def __repr__(self): + _repr = (f"""\ + Model={self.model_helper.model_name} + instance={self.instance} + source={self.source.uri} + source_exists={self.source_exists} + target={self.target.uri} + saved={self.saved}""") + _repr = dedent(_repr) + if hasattr(self.instance, 'project'): + _repr += f"\nproject={self.instance.project}" + _repr += "\n" + return _repr + + @property + def source_exists(self) -> bool: + if self.source.id is None: + return False + return self.model_helper.get_queryset(self.source).exists() + +def replace_attribute_on_element_instances( + model_helper: ModelsWithAttributeHelper, + source_attribute: Attribute, + target_attribute: Attribute, + save: bool +) -> List[AttributeReplacementModelResult]: + qs = model_helper.get_queryset(attribute=source_attribute) + replaced_attributes = [] + for instance in qs: + instance = model_helper.replace_attribute_on_instance(instance, source_attribute, target_attribute) + if save: + instance.save() # need to use save to trigger save method on model instances + replaced_attributes.append( + AttributeReplacementModelResult( + model_helper=model_helper, + source=source_attribute, + target=target_attribute, + instance=instance, + saved=save + ) + ) + return replaced_attributes + + +AttributeReplacementResultDict = Dict[str, List[AttributeReplacementModelResult]] + + +def results_message(results: AttributeReplacementResultDict) -> str: + if not results: + return "" + # counts = {k: len(v) for k, v in results.items() if v} + # {k: set(i.source for i in v) for k, v in results.items() if v} + _msg = "" + for k, merger_results in results.items(): + if not merger_results: + continue + _msg += f"Merger results for model {k.capitalize()} ({len(merger_results)})" + for result in merger_results: + _msg += f"\t{result}" + + element_counts = ", ".join([f"{k.capitalize()}({len(v)})" for k, v in results.items() if v]) + _msg += f"\nAffected elements: {element_counts}" + if 'Value' in results.keys(): + _msg += "\nAffected Projects:" + for project in {i.instance.project for i in results['Value']}: + _msg += f"\n\tproject={project} (id={project.id})" + return _msg + + +@dataclass +class ReplaceAttributeOnElements: + + source: Optional[Attribute] = field(default=None) + target: Optional[Attribute] = field(default=None) + model_helpers_with_attributes: Tuple[ModelsWithAttributeHelper] = model_helpers_with_attributes + save: bool = field(default=False) + results: AttributeReplacementResultDict = field(default_factory=dict) + verbosity: int = field(default=0) + + def __post_init__(self): + + self.source = get_valid_attribute(self.source, message_name='Source') + self.target = get_valid_attribute(self.target, message_name='Target') + + if self.source == self.target: + raise ValueError("Source and Target attribute are the same.") + + self.results = self.run_attribute_replacement_over_models(save=self.save) + if self.save and all(a.saved for i in self.results.values() for a in i): + try: + self.source.delete() + except self.source.DoesNotExist: + pass + if self.verbosity >= 1: + print(results_message(self.results)) + if self.save: + print(self.save_message()) + + def save_message(self) -> str: + _msg = f"Source attribute {self.source.uri} was replaced with {self.target.uri}." + _msg += f"\nSource attribute {self.source.uri} was deleted." + return _msg + + + def run_attribute_replacement_over_models(self, save=False) -> AttributeReplacementResultDict: + """ replaces the source attribute with target attribute on all elements of model_helpers_with_attributes """ + results = {} + for model_helper in self.model_helpers_with_attributes: + replaced_attributes = replace_attribute_on_element_instances(model_helper, + self.source, + self.target, + save) + results[model_helper.model_name] = replaced_attributes + return results + + +def get_valid_attribute(attribute: Union[str, Attribute], message_name: str = '') -> Attribute: + """ get an valid attribute instance from string (uri) or instance""" + if isinstance(attribute, str): + attribute_uri = attribute + try: + attribute = Attribute.objects.get(uri=attribute_uri) + except Attribute.DoesNotExist as e: + raise ValueError(f"{message_name} attribute {attribute_uri} does not exist.") from e + except Attribute.MultipleObjectsReturned as e: + raise ValueError(f"{message_name} attribute {attribute_uri} returns multiple objects.") from e + elif not isinstance(attribute, Attribute): + raise ValueError(f"{message_name} argument should be of type Attribute.") + + if attribute.get_descendants(): + raise ValueError(f"{message_name} attributes '{attribute}' with descendants are not (yet) supported.") + + return attribute diff --git a/rdmo/management/tests/__init__.py b/rdmo/management/tests/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/rdmo/management/tests/test_merge_attributes.py b/rdmo/management/tests/test_merge_attributes.py new file mode 100644 index 0000000000..416735d5a7 --- /dev/null +++ b/rdmo/management/tests/test_merge_attributes.py @@ -0,0 +1,199 @@ +import io +from string import Template +from typing import List, Union + +import pytest + +from django.core.management import CommandError, call_command + +from rdmo.conditions.models import Condition +from rdmo.domain.models import Attribute +from rdmo.management.merge_attributes import ReplaceAttributeOnElements, model_helpers_with_attributes +from rdmo.options.models import Option +from rdmo.questions.models import Page, Question, QuestionSet, Section +from rdmo.views.models import View + +ElementType = Union[Section, Page, QuestionSet, Question, Option, Condition] + + +EXAMPLE_URI_PREFIX = 'http://example.com/terms' +foo_merge_uri_prefix = 'http://foo-merge.com/terms' +bar_merge_uri_prefix = 'http://bar-merge.com/terms' +EXAMPLE_VIEW_URI_PATH = "views/view_a" +merge_view_template_addition_uri_path = 'individual/single/textarea' +merge_view_template_addition = Template("{% render_value '$new_uri' %}") +EXAMPLE_VIEW_URI = Attribute.build_uri(EXAMPLE_URI_PREFIX, merge_view_template_addition_uri_path) + + +new_merge_uri_prefixes = [foo_merge_uri_prefix, bar_merge_uri_prefix] + +def _prepare_instance_for_copy(instance, uri_prefix=None, uri_path=None): + instance.pk = None + instance.id = None + instance._state.adding = True + if uri_prefix: + instance.uri_prefix = uri_prefix + if uri_path: + instance.uri_path = uri_path + return instance + +def _add_new_line_to_view_template(model_helper, instance: View, new_uri_prefix: str) -> View: + current_field_value = getattr(instance, model_helper.field_name) + new_field_value = current_field_value + "\n" + new_uri = Attribute.build_uri(new_uri_prefix, merge_view_template_addition_uri_path) + new_field_value += merge_view_template_addition.substitute(new_uri=new_uri) + setattr(instance, model_helper.field_name, new_field_value) + return instance + +def _create_copy_of_view_that_uses_new_attribute(model_helper, new_prefixes: List[str]): + # TODO search in View.template for the attribute uri + example_uri = f"{EXAMPLE_URI_PREFIX}/{EXAMPLE_VIEW_URI_PATH}" + instance = model_helper.model.objects.get(uri=example_uri) + for new_prefix in new_prefixes: + instance = _prepare_instance_for_copy(instance, uri_prefix=new_prefix) + instance.uri_path = EXAMPLE_VIEW_URI_PATH + _add_new_line_to_view_template(model_helper, instance, new_prefix) + instance.save() + +def _create_copies_of_elements_with_new_uri_prefix(new_prefixes): + for model_helper in model_helpers_with_attributes: + if model_helper.field_introspection and model_helper.model == View: + _create_copy_of_view_that_uses_new_attribute(model_helper, new_prefixes) + continue # skip this model_helper + elif model_helper.field_introspection: + continue # skip this model_helper + else: + # create new model instances from example.com objects with the new uri_prefix + filter_kwargs = {f"{model_helper.field_name}__uri_prefix": EXAMPLE_URI_PREFIX} + example_objects = model_helper.model.objects.filter(**filter_kwargs) + + for new_prefix in new_prefixes: + + if not example_objects: + continue + for instance in example_objects: + instance = _prepare_instance_for_copy(instance, uri_prefix=new_prefix) + current_attribute = getattr(instance, model_helper.field_name) + if not isinstance(current_attribute, Attribute): + continue + filter_kwargs = {'path': current_attribute.path, 'uri_prefix': new_prefix} + new_attribute = Attribute.objects.filter(**filter_kwargs).first() + setattr(instance, model_helper.field_name, new_attribute) + instance.save() + +def _create_copies_of_attributes_with_new_uri_prefix(example_attributes, new_prefixes): + for attribute in example_attributes: + for new_prefix in new_prefixes: + attribute = _prepare_instance_for_copy(attribute, uri_prefix=new_prefix) + attribute.save() + + +@pytest.fixture +def create_merge_attributes(db, settings): + """ Creates model instances for merge attributes tests """ + example_attributes = Attribute.objects.filter(uri_prefix=EXAMPLE_URI_PREFIX).all() + _create_copies_of_attributes_with_new_uri_prefix(example_attributes, new_merge_uri_prefixes) + _create_copies_of_elements_with_new_uri_prefix(new_merge_uri_prefixes) + + +@pytest.mark.parametrize('uri_prefix', new_merge_uri_prefixes) +def test_that_the_freshly_created_merge_attributes_are_present(create_merge_attributes, uri_prefix): + merge_attributes = Attribute.objects.filter(uri_prefix=uri_prefix).all() + assert len(merge_attributes) > 2 + unique_uri_prefixes = set(Attribute.objects.values_list("uri_prefix", flat=True)) + # test that the currently selected uri_prefix is in db + assert uri_prefix in unique_uri_prefixes + + for attribute in merge_attributes: + original_attribute = Attribute.objects.get(uri_prefix=EXAMPLE_URI_PREFIX, path=attribute.path) + original_models_qs = [i.get_queryset(attribute=original_attribute) for i in model_helpers_with_attributes] + if not any(len(i) > 0 for i in original_models_qs): + continue # skipt this attribute + models_qs = [i.get_queryset(attribute=attribute) for i in model_helpers_with_attributes] + assert any(len(i) > 0 for i in models_qs) + +@pytest.mark.parametrize('source_uri_prefix', new_merge_uri_prefixes) +@pytest.mark.parametrize('save', [False, True]) +def test_replacement_of_attributes_on_elements(create_merge_attributes, source_uri_prefix, save): + source_attributes = Attribute.objects.filter(uri_prefix=source_uri_prefix).all() + assert len(source_attributes) > 2 + unique_uri_prefixes = set(Attribute.objects.values_list("uri_prefix", flat=True)) + # test that the currently selected uri_prefix is in db + assert source_uri_prefix in unique_uri_prefixes + + for source_attribute in source_attributes: + target_attribute = Attribute.objects.get(uri_prefix=EXAMPLE_URI_PREFIX, path=source_attribute.path) + failed, results = False, [] + if source_attribute.get_descendants() or target_attribute.get_descendants(): + with pytest.raises(ValueError): + merger = ReplaceAttributeOnElements(source=source_attribute, + target=target_attribute, + model_helpers_with_attributes=model_helpers_with_attributes, + save=save) + failed = True + else: + merger = ReplaceAttributeOnElements(source=source_attribute, + target=target_attribute, + model_helpers_with_attributes=model_helpers_with_attributes, + save=save) + results = [i for i in merger.results.values() if i] + if not results: + continue + + if save and not failed: + # assert that the source attribut was deleted + with pytest.raises(Attribute.DoesNotExist): + Attribute.objects.get(id=source_attribute.id) + + if merge_view_template_addition_uri_path in source_attribute.path: + # assert that the attribute in the view template was replaced as well + view = View.objects.get(uri_prefix=source_uri_prefix, uri_path=EXAMPLE_VIEW_URI_PATH) + assert any(EXAMPLE_VIEW_URI in i for i in view.template.splitlines()) + assert not any(source_attribute.uri in i for i in view.template.splitlines()) + else: + assert Attribute.objects.get(id=source_attribute.id) + + +@pytest.mark.parametrize('source_uri_prefix', new_merge_uri_prefixes) +@pytest.mark.parametrize('save', [False, True]) +def test_command_merge_attributes(create_merge_attributes, source_uri_prefix, save): + source_attributes = Attribute.objects.filter(uri_prefix=source_uri_prefix).all() + assert len(source_attributes) > 2 + unique_uri_prefixes = set(Attribute.objects.values_list("uri_prefix", flat=True)) + # test that the currently selected uri_prefix is in db + assert source_uri_prefix in unique_uri_prefixes + + for source_attribute in source_attributes: + target_attribute = Attribute.objects.get(uri_prefix=EXAMPLE_URI_PREFIX, path=source_attribute.path) + stdout, stderr = io.StringIO(), io.StringIO() + failed = False + if source_attribute.get_descendants(): + with pytest.raises(CommandError): + call_command('merge_attributes', + source=source_attribute.uri, target=target_attribute.uri, save=save, + stdout=stdout, stderr=stderr) + failed = True + elif target_attribute.get_descendants(): + with pytest.raises(CommandError): + call_command('merge_attributes', + source=source_attribute.uri, target=target_attribute.uri, save=save, + stdout=stdout, stderr=stderr) + failed = True + else: + call_command('merge_attributes', + source=source_attribute.uri, target=target_attribute.uri, save=save, + stdout=stdout, stderr=stderr) + + + if save and not failed: + # assert that the source attribut was deleted + with pytest.raises(Attribute.DoesNotExist): + Attribute.objects.get(id=source_attribute.id) + + if source_attribute.path in merge_view_template_addition_uri_path: + # assert that the attribute in the view template was replaced as well + view = View.objects.get(uri_prefix=source_uri_prefix, uri_path=EXAMPLE_VIEW_URI_PATH) + assert any(EXAMPLE_VIEW_URI in i for i in view.template.splitlines()) + assert not any(source_attribute.uri in i for i in view.template.splitlines()) + else: + assert Attribute.objects.get(id=source_attribute.id) diff --git a/rdmo/management/utils.py b/rdmo/management/utils.py new file mode 100644 index 0000000000..e0a0f1e372 --- /dev/null +++ b/rdmo/management/utils.py @@ -0,0 +1,21 @@ +from rdmo.domain.models import Attribute + + +def replace_uri_in_template_string(template: str, source: Attribute, target: Attribute) -> str: + result = [] + path_changed = source.path != target.path + for n, line in enumerate(template.splitlines()): + new_line = line + if source.uri in line: + new_line = new_line.replace(source.uri, target.uri) + if path_changed: + if source.path in new_line: + new_line = new_line.replace(source.path, target.path) + line_result = { + 'line_no': n, + 'new_line': new_line, + 'original_line': line + } + result.append(line_result) + new_template = "\n".join(i['new_line'] for i in result) + return new_template From c16decc59a4450c9b722ec132e00cd571e3bb303 Mon Sep 17 00:00:00 2001 From: David Wallace Date: Fri, 17 May 2024 15:33:59 +0200 Subject: [PATCH 064/504] chore: refactor merge_attributes into procedural style Signed-off-by: David Wallace --- .../management/commands/merge_attributes.py | 211 ++++++++++++++++- rdmo/management/merge_attributes.py | 213 ------------------ .../management/tests/test_merge_attributes.py | 31 +-- 3 files changed, 213 insertions(+), 242 deletions(-) delete mode 100644 rdmo/management/merge_attributes.py diff --git a/rdmo/management/management/commands/merge_attributes.py b/rdmo/management/management/commands/merge_attributes.py index 7abf59a412..711d4ca63c 100644 --- a/rdmo/management/management/commands/merge_attributes.py +++ b/rdmo/management/management/commands/merge_attributes.py @@ -1,36 +1,227 @@ import logging +from collections import namedtuple +from textwrap import dedent from django.core.management.base import BaseCommand, CommandError from django.utils.translation import gettext_lazy as _ -from rdmo.management.merge_attributes import ReplaceAttributeOnElements +from rdmo.conditions.models import Condition +from rdmo.domain.models import Attribute +from rdmo.management.utils import replace_uri_in_template_string +from rdmo.projects.models import Value +from rdmo.questions.models import Page, Question, QuestionSet +from rdmo.tasks.models import Task +from rdmo.views.models import View logger = logging.getLogger(__name__) +ModelHelper = namedtuple('ModelHelper', ['model', 'lookup_field', 'field_introspection', 'replacement_function']) + +REPLACE_ATTRIBUTE_MODEL_HELPERS = [ + ModelHelper(Page, 'attribute', False, None), + ModelHelper(QuestionSet, 'attribute', False, None), + ModelHelper(Question, 'attribute', False, None), + ModelHelper(Condition, 'source', False, None), + ModelHelper(Task, 'start_attribute', False, None), + ModelHelper(Task, 'end_attribute', False, None), + ModelHelper(Value, 'attribute', False, None), + ModelHelper(View, 'template', True, replace_uri_in_template_string) +] + + +def get_queryset(model, lookup_field, field_introspection, *_, attribute=None): + if attribute is None: + raise ValueError("attribute is required") + if field_introspection: + return model.objects.filter(**{f"{lookup_field}__contains": attribute.path}) + return model.objects.filter(**{lookup_field: attribute}) + + +def replace_attribute_on_instance(instance, lookup_field, source, target, field_introspection, replacement_function): + instance_field = getattr(instance, lookup_field) + + if isinstance(instance_field, Attribute) and instance_field != source: + raise ValueError("Instance attribute should be equal to the source attribute") + if not isinstance(instance_field, Attribute) and not field_introspection: + raise ValueError("When instance field is not an attribute, it should use field introspection") + + if field_introspection: + replacement_field = replacement_function(instance_field, source, target) + else: + replacement_field = target + + setattr(instance, lookup_field, replacement_field) + return instance + + +def replace_attribute_on_element_instances(model, + lookup_field, + field_introspection, + replacement_function, + source=None, + target=None, + save=False + ): + qs = get_queryset(model, lookup_field, field_introspection, attribute=source) + replaced_attributes = [] + for instance in qs: + instance = replace_attribute_on_instance(instance, lookup_field, source, target, field_introspection, + replacement_function) + if save: + instance.save() + replaced_attributes.append({ + 'model_name': model._meta.verbose_name_raw, + 'instance': instance, + 'source': source, + 'target': target, + 'saved': save, + 'source_exists': get_queryset(model, lookup_field, field_introspection, attribute=source).exists() + }) + return replaced_attributes + + +def get_valid_attribute(attribute, message_name=''): + if isinstance(attribute, str): + attribute_uri = attribute + try: + attribute = Attribute.objects.get(uri=attribute_uri) + except Attribute.DoesNotExist as e: + raise ValueError(f"{message_name} attribute {attribute_uri} does not exist.") from e + except Attribute.MultipleObjectsReturned as e: + raise ValueError(f"{message_name} attribute {attribute_uri} returns multiple objects.") from e + elif not isinstance(attribute, Attribute): + raise ValueError(f"{message_name} argument should be of type Attribute.") + + return attribute + +def make_elements_message(results): + element_counts = ", ".join([f"{k.capitalize()}({len(v)})" for k, v in results.items() if v]) + if not element_counts or not any(results.values()): + return "No elements affected." + return f"Affected elements: {element_counts}" + + +def make_affected_projects_message(results): + value_results = results.get(Value._meta.verbose_name_raw, []) + if not value_results: + return "No projects affected." + msg = "Affected Projects:" + for project in {i['instance'].project for i in value_results}: + msg += f"\n\tproject={project} (id={project.id})" + return msg + + +def make_affected_instances_message(results): + if not results: + return "" + msg = "" + for k, merger_results in results.items(): + if not merger_results: + continue + msg += f"Merger results for model {k.capitalize()} ({len(merger_results)})" + msg += '\n' + for result in merger_results: + msg += dedent(f'''\ + Model={result['model_name']} + instance={result['instance']} + source={result['source'].uri} + source_exists={result['source_exists']} + target={result['target'].uri} + saved={result['saved']} + ''') + if hasattr(result['instance'], 'project'): + msg += f"\nproject={result['instance'].project}" + msg += '\n' + return msg + + +def replace_attribute_on_elements(source, target, model_helpers_with_attributes, save): + + if source.get_descendants(): + raise ValueError(f"Source attribute '{source}' with descendants is not supported.") + if target.get_descendants(): + raise ValueError(f"Target attribute '{target}' with descendants is not supported.") + if source == target: + raise ValueError("Source and Target attribute are the same.") + + results = {} + for model, lookup_field, field_introspection, replacement_function in model_helpers_with_attributes: + replaced_attributes = replace_attribute_on_element_instances( + model, + lookup_field, + field_introspection, + replacement_function, + source=source, + target=target, + save=save + ) + results[model._meta.verbose_name_raw] = replaced_attributes + + if save and all(a['saved'] for i in results.values() for a in i): + try: + source.delete() + except source.DoesNotExist: + pass + return results + + +def main(source, target, save=False): + return replace_attribute_on_elements(source, target, REPLACE_ATTRIBUTE_MODEL_HELPERS, save) + + class Command(BaseCommand): + help = 'Replace an attribute with another attribute across multiple models' def add_arguments(self, parser): parser.add_argument( '--source', - help='The URI of the source attribute that will be replaced by the target and will be deleted') + required=True, + help='The URI of the source attribute that will be replaced by the target and will be deleted' + ) parser.add_argument( '--target', - help='The URI of the target attribute that will be used to replaced the source') + required=True, + help='The URI of the target attribute that will be used to replace the source' + ) parser.add_argument( '--save', action='store_true', - help='If specified, the changes will be saved and the source attribute will be deleted. If not specified, the command will do a dry run.' # noqa: E501 + help='''If specified, the changes will be saved and the source attribute will be deleted.\ + If not specified, the command will do a dry run.''' ) def handle(self, *args, **options): + source = options['source'] + target = options['target'] + save = options['save'] + verbosity = options.get('verbosity', 1) + try: - ReplaceAttributeOnElements( - source=options['source'], - target=options['target'], - save=options['save'], - verbosity=options['verbosity'] - ) + source = get_valid_attribute(source, message_name='Source') + target = get_valid_attribute(target, message_name='Target') + results = main(source, target, save) + + if verbosity >= 1: + if verbosity >= 2: + affected_instances_msg = make_affected_instances_message(results) + if affected_instances_msg: + self.stdout.write(affected_instances_msg) + affect_elements_msg = make_elements_message(results) + affected_projects_msg = make_affected_projects_message(results) + if save: + self.stdout.write(self.style.SUCCESS( + f"Successfully replaced source attribute {source.uri} with {target.uri}.\n" + f"Source attribute {source.uri} was deleted.\n" + f"{affect_elements_msg}\n" + f"{affected_projects_msg}" + )) + else: + self.stdout.write(self.style.SUCCESS( + f"Source attribute {source.uri} can be replaced with {target.uri}.\n" + f"{affect_elements_msg}\n" + f"{affected_projects_msg}" + )) except ValueError as e: raise CommandError(e) from e except Exception as e: diff --git a/rdmo/management/merge_attributes.py b/rdmo/management/merge_attributes.py deleted file mode 100644 index 5cb8995260..0000000000 --- a/rdmo/management/merge_attributes.py +++ /dev/null @@ -1,213 +0,0 @@ -from dataclasses import dataclass, field -from textwrap import dedent -from typing import Callable, Dict, List, Optional, Tuple, Type, Union - -from django.db import models -from django.db.models import QuerySet - -from rdmo.conditions.models import Condition -from rdmo.domain.models import Attribute -from rdmo.management.utils import replace_uri_in_template_string -from rdmo.projects.models import Value -from rdmo.questions.models import Page, Question, QuestionSet -from rdmo.tasks.models import Task -from rdmo.views.models import View - - -@dataclass -class ModelsWithAttributeHelper: - model: Type[models.Model] - field_name: str = field(default='attribute') - field_introspection: bool = field(default=False) - replacement_function: Callable = field(default=None) - - def __post_init__(self): - _field_model = self.model._meta.get_field(self.field_name).related_model - if not isinstance(_field_model, type(Attribute)) and not self.field_introspection: - raise ValueError(f"field {self.field_name} on the model {self.model_name} is not an attribute") - elif self.field_introspection and self.replacement_function is None: - raise ValueError(f"field {self.field_name} on the model {self.model_name} requires a replacement function") - - def get_queryset(self, attribute: Optional[Attribute]=None) -> QuerySet: - if attribute is None: - raise ValueError("attribute is required") - if self.field_introspection: - return self.model.objects.filter(**{f"{self.field_name}__contains": attribute.path}) - return self.model.objects.filter(**{self.field_name: attribute}) - - @property - def model_name(self): - return self.model._meta.model_name.capitalize() - - def replace_attribute_on_instance(self, - instance: models.Model, - source: Attribute, - target: Attribute) -> models.Model: - instance_field = getattr(instance, self.field_name) - - if isinstance(instance_field, Attribute) and not instance_field == source: # just to double-check - raise ValueError("Instance attribute should be equal to the source attribute") - elif not isinstance(instance_field, Attribute) and not self.field_introspection: - raise ValueError("When instance field is not an attribute, it should use field introspection") - - replacement_field = target - if self.field_introspection: # for when the attribute is "hidden as string" within the field - replacement_field = self.replacement_function(instance_field, source, target) - - setattr(instance, self.field_name, replacement_field) - - return instance - -model_helpers_with_attributes = ( - ModelsWithAttributeHelper(Page), ModelsWithAttributeHelper(QuestionSet), ModelsWithAttributeHelper(Question), - ModelsWithAttributeHelper(Condition, field_name='source'), - ModelsWithAttributeHelper(Task, field_name='start_attribute'), - ModelsWithAttributeHelper(Task, field_name='end_attribute'), - ModelsWithAttributeHelper(Value), - ModelsWithAttributeHelper(View, field_name='template', - field_introspection=True, - replacement_function=replace_uri_in_template_string), -) - - -@dataclass -class AttributeReplacementModelResult: - model_helper: Optional[ModelsWithAttributeHelper] = field(default=None) - source: Optional[Attribute] = field(default=None) - target: Optional[Attribute] = field(default=None) - instance: Optional[models.Model] = field(default=None) - saved: bool = field(default=False) - - def __repr__(self): - _repr = (f"""\ - Model={self.model_helper.model_name} - instance={self.instance} - source={self.source.uri} - source_exists={self.source_exists} - target={self.target.uri} - saved={self.saved}""") - _repr = dedent(_repr) - if hasattr(self.instance, 'project'): - _repr += f"\nproject={self.instance.project}" - _repr += "\n" - return _repr - - @property - def source_exists(self) -> bool: - if self.source.id is None: - return False - return self.model_helper.get_queryset(self.source).exists() - -def replace_attribute_on_element_instances( - model_helper: ModelsWithAttributeHelper, - source_attribute: Attribute, - target_attribute: Attribute, - save: bool -) -> List[AttributeReplacementModelResult]: - qs = model_helper.get_queryset(attribute=source_attribute) - replaced_attributes = [] - for instance in qs: - instance = model_helper.replace_attribute_on_instance(instance, source_attribute, target_attribute) - if save: - instance.save() # need to use save to trigger save method on model instances - replaced_attributes.append( - AttributeReplacementModelResult( - model_helper=model_helper, - source=source_attribute, - target=target_attribute, - instance=instance, - saved=save - ) - ) - return replaced_attributes - - -AttributeReplacementResultDict = Dict[str, List[AttributeReplacementModelResult]] - - -def results_message(results: AttributeReplacementResultDict) -> str: - if not results: - return "" - # counts = {k: len(v) for k, v in results.items() if v} - # {k: set(i.source for i in v) for k, v in results.items() if v} - _msg = "" - for k, merger_results in results.items(): - if not merger_results: - continue - _msg += f"Merger results for model {k.capitalize()} ({len(merger_results)})" - for result in merger_results: - _msg += f"\t{result}" - - element_counts = ", ".join([f"{k.capitalize()}({len(v)})" for k, v in results.items() if v]) - _msg += f"\nAffected elements: {element_counts}" - if 'Value' in results.keys(): - _msg += "\nAffected Projects:" - for project in {i.instance.project for i in results['Value']}: - _msg += f"\n\tproject={project} (id={project.id})" - return _msg - - -@dataclass -class ReplaceAttributeOnElements: - - source: Optional[Attribute] = field(default=None) - target: Optional[Attribute] = field(default=None) - model_helpers_with_attributes: Tuple[ModelsWithAttributeHelper] = model_helpers_with_attributes - save: bool = field(default=False) - results: AttributeReplacementResultDict = field(default_factory=dict) - verbosity: int = field(default=0) - - def __post_init__(self): - - self.source = get_valid_attribute(self.source, message_name='Source') - self.target = get_valid_attribute(self.target, message_name='Target') - - if self.source == self.target: - raise ValueError("Source and Target attribute are the same.") - - self.results = self.run_attribute_replacement_over_models(save=self.save) - if self.save and all(a.saved for i in self.results.values() for a in i): - try: - self.source.delete() - except self.source.DoesNotExist: - pass - if self.verbosity >= 1: - print(results_message(self.results)) - if self.save: - print(self.save_message()) - - def save_message(self) -> str: - _msg = f"Source attribute {self.source.uri} was replaced with {self.target.uri}." - _msg += f"\nSource attribute {self.source.uri} was deleted." - return _msg - - - def run_attribute_replacement_over_models(self, save=False) -> AttributeReplacementResultDict: - """ replaces the source attribute with target attribute on all elements of model_helpers_with_attributes """ - results = {} - for model_helper in self.model_helpers_with_attributes: - replaced_attributes = replace_attribute_on_element_instances(model_helper, - self.source, - self.target, - save) - results[model_helper.model_name] = replaced_attributes - return results - - -def get_valid_attribute(attribute: Union[str, Attribute], message_name: str = '') -> Attribute: - """ get an valid attribute instance from string (uri) or instance""" - if isinstance(attribute, str): - attribute_uri = attribute - try: - attribute = Attribute.objects.get(uri=attribute_uri) - except Attribute.DoesNotExist as e: - raise ValueError(f"{message_name} attribute {attribute_uri} does not exist.") from e - except Attribute.MultipleObjectsReturned as e: - raise ValueError(f"{message_name} attribute {attribute_uri} returns multiple objects.") from e - elif not isinstance(attribute, Attribute): - raise ValueError(f"{message_name} argument should be of type Attribute.") - - if attribute.get_descendants(): - raise ValueError(f"{message_name} attributes '{attribute}' with descendants are not (yet) supported.") - - return attribute diff --git a/rdmo/management/tests/test_merge_attributes.py b/rdmo/management/tests/test_merge_attributes.py index 416735d5a7..b20f8bbf15 100644 --- a/rdmo/management/tests/test_merge_attributes.py +++ b/rdmo/management/tests/test_merge_attributes.py @@ -8,7 +8,7 @@ from rdmo.conditions.models import Condition from rdmo.domain.models import Attribute -from rdmo.management.merge_attributes import ReplaceAttributeOnElements, model_helpers_with_attributes +from rdmo.management.management.commands.merge_attributes import REPLACE_ATTRIBUTE_MODEL_HELPERS, get_queryset, main from rdmo.options.models import Option from rdmo.questions.models import Page, Question, QuestionSet, Section from rdmo.views.models import View @@ -38,11 +38,11 @@ def _prepare_instance_for_copy(instance, uri_prefix=None, uri_path=None): return instance def _add_new_line_to_view_template(model_helper, instance: View, new_uri_prefix: str) -> View: - current_field_value = getattr(instance, model_helper.field_name) + current_field_value = getattr(instance, model_helper.lookup_field) new_field_value = current_field_value + "\n" new_uri = Attribute.build_uri(new_uri_prefix, merge_view_template_addition_uri_path) new_field_value += merge_view_template_addition.substitute(new_uri=new_uri) - setattr(instance, model_helper.field_name, new_field_value) + setattr(instance, model_helper.lookup_field, new_field_value) return instance def _create_copy_of_view_that_uses_new_attribute(model_helper, new_prefixes: List[str]): @@ -56,7 +56,7 @@ def _create_copy_of_view_that_uses_new_attribute(model_helper, new_prefixes: Lis instance.save() def _create_copies_of_elements_with_new_uri_prefix(new_prefixes): - for model_helper in model_helpers_with_attributes: + for model_helper in REPLACE_ATTRIBUTE_MODEL_HELPERS: if model_helper.field_introspection and model_helper.model == View: _create_copy_of_view_that_uses_new_attribute(model_helper, new_prefixes) continue # skip this model_helper @@ -64,7 +64,7 @@ def _create_copies_of_elements_with_new_uri_prefix(new_prefixes): continue # skip this model_helper else: # create new model instances from example.com objects with the new uri_prefix - filter_kwargs = {f"{model_helper.field_name}__uri_prefix": EXAMPLE_URI_PREFIX} + filter_kwargs = {f"{model_helper.lookup_field}__uri_prefix": EXAMPLE_URI_PREFIX} example_objects = model_helper.model.objects.filter(**filter_kwargs) for new_prefix in new_prefixes: @@ -73,12 +73,12 @@ def _create_copies_of_elements_with_new_uri_prefix(new_prefixes): continue for instance in example_objects: instance = _prepare_instance_for_copy(instance, uri_prefix=new_prefix) - current_attribute = getattr(instance, model_helper.field_name) + current_attribute = getattr(instance, model_helper.lookup_field) if not isinstance(current_attribute, Attribute): continue filter_kwargs = {'path': current_attribute.path, 'uri_prefix': new_prefix} new_attribute = Attribute.objects.filter(**filter_kwargs).first() - setattr(instance, model_helper.field_name, new_attribute) + setattr(instance, model_helper.lookup_field, new_attribute) instance.save() def _create_copies_of_attributes_with_new_uri_prefix(example_attributes, new_prefixes): @@ -106,10 +106,10 @@ def test_that_the_freshly_created_merge_attributes_are_present(create_merge_attr for attribute in merge_attributes: original_attribute = Attribute.objects.get(uri_prefix=EXAMPLE_URI_PREFIX, path=attribute.path) - original_models_qs = [i.get_queryset(attribute=original_attribute) for i in model_helpers_with_attributes] + original_models_qs = [get_queryset(*i, attribute=original_attribute) for i in REPLACE_ATTRIBUTE_MODEL_HELPERS] if not any(len(i) > 0 for i in original_models_qs): - continue # skipt this attribute - models_qs = [i.get_queryset(attribute=attribute) for i in model_helpers_with_attributes] + continue # skip this attribute + models_qs = [get_queryset(*i, attribute=attribute) for i in REPLACE_ATTRIBUTE_MODEL_HELPERS] assert any(len(i) > 0 for i in models_qs) @pytest.mark.parametrize('source_uri_prefix', new_merge_uri_prefixes) @@ -126,17 +126,10 @@ def test_replacement_of_attributes_on_elements(create_merge_attributes, source_u failed, results = False, [] if source_attribute.get_descendants() or target_attribute.get_descendants(): with pytest.raises(ValueError): - merger = ReplaceAttributeOnElements(source=source_attribute, - target=target_attribute, - model_helpers_with_attributes=model_helpers_with_attributes, - save=save) + results = main(source_attribute, target_attribute, save=save) failed = True else: - merger = ReplaceAttributeOnElements(source=source_attribute, - target=target_attribute, - model_helpers_with_attributes=model_helpers_with_attributes, - save=save) - results = [i for i in merger.results.values() if i] + results = main(source_attribute, target_attribute, save=save) if not results: continue From 833279c1f9bb1be3fce5c9a809e513d42fa64bd9 Mon Sep 17 00:00:00 2001 From: David Wallace Date: Tue, 21 May 2024 12:12:20 +0200 Subject: [PATCH 065/504] chore: refactor merge attributes command for #990 Signed-off-by: David Wallace --- .../management/commands/merge_attributes.py | 270 ++++++++---------- .../management/tests/test_merge_attributes.py | 110 +++---- rdmo/management/utils.py | 13 +- 3 files changed, 163 insertions(+), 230 deletions(-) diff --git a/rdmo/management/management/commands/merge_attributes.py b/rdmo/management/management/commands/merge_attributes.py index 711d4ca63c..b8851c0554 100644 --- a/rdmo/management/management/commands/merge_attributes.py +++ b/rdmo/management/management/commands/merge_attributes.py @@ -1,99 +1,158 @@ import logging -from collections import namedtuple from textwrap import dedent from django.core.management.base import BaseCommand, CommandError -from django.utils.translation import gettext_lazy as _ -from rdmo.conditions.models import Condition from rdmo.domain.models import Attribute from rdmo.management.utils import replace_uri_in_template_string from rdmo.projects.models import Value -from rdmo.questions.models import Page, Question, QuestionSet -from rdmo.tasks.models import Task from rdmo.views.models import View logger = logging.getLogger(__name__) -ModelHelper = namedtuple('ModelHelper', ['model', 'lookup_field', 'field_introspection', 'replacement_function']) - -REPLACE_ATTRIBUTE_MODEL_HELPERS = [ - ModelHelper(Page, 'attribute', False, None), - ModelHelper(QuestionSet, 'attribute', False, None), - ModelHelper(Question, 'attribute', False, None), - ModelHelper(Condition, 'source', False, None), - ModelHelper(Task, 'start_attribute', False, None), - ModelHelper(Task, 'end_attribute', False, None), - ModelHelper(Value, 'attribute', False, None), - ModelHelper(View, 'template', True, replace_uri_in_template_string) -] - +class Command(BaseCommand): + help = 'Replace an attribute with another attribute across multiple models' -def get_queryset(model, lookup_field, field_introspection, *_, attribute=None): - if attribute is None: - raise ValueError("attribute is required") - if field_introspection: - return model.objects.filter(**{f"{lookup_field}__contains": attribute.path}) - return model.objects.filter(**{lookup_field: attribute}) + def add_arguments(self, parser): + parser.add_argument( + '--source', + required=True, + help='The URI of the source attribute that will be replaced by the target and will be deleted' + ) + parser.add_argument( + '--target', + required=True, + help='The URI of the target attribute that will be used to replace the source' + ) + parser.add_argument( + '--save', + action='store_true', + help='''If specified, the changes will be saved and the source attribute will be deleted.\ + If not specified, the command will do a dry run.''' + ) + def handle(self, *args, **options): + source = options['source'] + target = options['target'] + save = options['save'] + verbosity = options.get('verbosity', 1) -def replace_attribute_on_instance(instance, lookup_field, source, target, field_introspection, replacement_function): - instance_field = getattr(instance, lookup_field) + source = get_valid_attribute(source, message_name='Source') + target = get_valid_attribute(target, message_name='Target') + + if source == target: + raise CommandError("Source and Target attribute are the same, nothing to do.") + + results = {} + related_model_fields = [i for i in Attribute._meta.get_fields() \ + if i.is_relation and not i.many_to_many and i.related_model is not Attribute] + for related_field in related_model_fields: + replaced_model_result = replace_attribute_on_related_model_instances( + related_field, + source=source, + target=target, + save=save + ) + results[related_field.related_model._meta.verbose_name_raw] = replaced_model_result + + view_template_result = replace_attribute_in_view_template(source=source, target=target, save=save) + results[View._meta.verbose_name_raw] = view_template_result + + if save and all(a['saved'] for i in results.values() for a in i): + try: + source.delete() + except source.DoesNotExist: + pass + + if verbosity >= 1: + if verbosity >= 2: + affected_instances_msg = make_affected_instances_message(results) + if affected_instances_msg: + self.stdout.write(affected_instances_msg) + affect_elements_msg = make_elements_message(results) + affected_projects_msg = make_affected_projects_message(results) + if save: + self.stdout.write(self.style.SUCCESS( + f"Successfully replaced source attribute {source.uri} with {target.uri}.\n" + f"Source attribute {source.uri} was deleted.\n" + f"{affect_elements_msg}\n" + f"{affected_projects_msg}" + )) + else: + self.stdout.write(self.style.SUCCESS( + f"Source attribute {source.uri} can be replaced with {target.uri}.\n" + f"{affect_elements_msg}\n" + f"{affected_projects_msg}" + )) - if isinstance(instance_field, Attribute) and instance_field != source: - raise ValueError("Instance attribute should be equal to the source attribute") - if not isinstance(instance_field, Attribute) and not field_introspection: - raise ValueError("When instance field is not an attribute, it should use field introspection") - if field_introspection: - replacement_field = replacement_function(instance_field, source, target) - else: - replacement_field = target +def get_valid_attribute(attribute, message_name=''): + if isinstance(attribute, str): + attribute_uri = attribute + try: + attribute = Attribute.objects.get(uri=attribute_uri) + except Attribute.DoesNotExist as e: + raise CommandError(f"{message_name} attribute {attribute_uri} does not exist.") from e + except Attribute.MultipleObjectsReturned as e: + raise CommandError(f"{message_name} attribute {attribute_uri} returns multiple objects.") from e + elif not isinstance(attribute, Attribute): + raise CommandError(f"{message_name} argument should be of type Attribute.") - setattr(instance, lookup_field, replacement_field) - return instance + if attribute.get_descendants(): + raise CommandError(f"{message_name} attribute '{attribute}' with descendants is not supported.") + return attribute -def replace_attribute_on_element_instances(model, - lookup_field, - field_introspection, - replacement_function, +def replace_attribute_on_related_model_instances(related_field, source=None, target=None, save=False ): - qs = get_queryset(model, lookup_field, field_introspection, attribute=source) - replaced_attributes = [] + model = related_field.related_model + lookup_field = related_field.remote_field.name + qs = model.objects.filter(**{lookup_field: source}) + + replacement_results = [] for instance in qs: - instance = replace_attribute_on_instance(instance, lookup_field, source, target, field_introspection, - replacement_function) + instance_source = getattr(instance, lookup_field) + + if isinstance(instance_source, Attribute) and instance_source != source: + raise CommandError("Instance attribute should be equal to the source attribute") + + setattr(instance, lookup_field, target) + if save: instance.save() - replaced_attributes.append({ + replacement_results.append({ 'model_name': model._meta.verbose_name_raw, 'instance': instance, 'source': source, 'target': target, 'saved': save, - 'source_exists': get_queryset(model, lookup_field, field_introspection, attribute=source).exists() }) - return replaced_attributes + return replacement_results -def get_valid_attribute(attribute, message_name=''): - if isinstance(attribute, str): - attribute_uri = attribute - try: - attribute = Attribute.objects.get(uri=attribute_uri) - except Attribute.DoesNotExist as e: - raise ValueError(f"{message_name} attribute {attribute_uri} does not exist.") from e - except Attribute.MultipleObjectsReturned as e: - raise ValueError(f"{message_name} attribute {attribute_uri} returns multiple objects.") from e - elif not isinstance(attribute, Attribute): - raise ValueError(f"{message_name} argument should be of type Attribute.") +def replace_attribute_in_view_template(source=None, target=None, save=False ): + qs = View.objects.filter(**{"template__contains": source.path}) + replacement_results = [] + for instance in qs: + + template_target = replace_uri_in_template_string(instance.template, source, target) + instance.template = template_target + + if save: + instance.save() + replacement_results.append({ + 'model_name': View._meta.verbose_name_raw, + 'instance': instance, + 'source': source, + 'target': target, + 'saved': save, + }) + return replacement_results - return attribute def make_elements_message(results): element_counts = ", ".join([f"{k.capitalize()}({len(v)})" for k, v in results.items() if v]) @@ -126,7 +185,6 @@ def make_affected_instances_message(results): Model={result['model_name']} instance={result['instance']} source={result['source'].uri} - source_exists={result['source_exists']} target={result['target'].uri} saved={result['saved']} ''') @@ -134,95 +192,3 @@ def make_affected_instances_message(results): msg += f"\nproject={result['instance'].project}" msg += '\n' return msg - - -def replace_attribute_on_elements(source, target, model_helpers_with_attributes, save): - - if source.get_descendants(): - raise ValueError(f"Source attribute '{source}' with descendants is not supported.") - if target.get_descendants(): - raise ValueError(f"Target attribute '{target}' with descendants is not supported.") - if source == target: - raise ValueError("Source and Target attribute are the same.") - - results = {} - for model, lookup_field, field_introspection, replacement_function in model_helpers_with_attributes: - replaced_attributes = replace_attribute_on_element_instances( - model, - lookup_field, - field_introspection, - replacement_function, - source=source, - target=target, - save=save - ) - results[model._meta.verbose_name_raw] = replaced_attributes - - if save and all(a['saved'] for i in results.values() for a in i): - try: - source.delete() - except source.DoesNotExist: - pass - return results - - -def main(source, target, save=False): - return replace_attribute_on_elements(source, target, REPLACE_ATTRIBUTE_MODEL_HELPERS, save) - - -class Command(BaseCommand): - help = 'Replace an attribute with another attribute across multiple models' - - def add_arguments(self, parser): - parser.add_argument( - '--source', - required=True, - help='The URI of the source attribute that will be replaced by the target and will be deleted' - ) - parser.add_argument( - '--target', - required=True, - help='The URI of the target attribute that will be used to replace the source' - ) - parser.add_argument( - '--save', - action='store_true', - help='''If specified, the changes will be saved and the source attribute will be deleted.\ - If not specified, the command will do a dry run.''' - ) - - def handle(self, *args, **options): - source = options['source'] - target = options['target'] - save = options['save'] - verbosity = options.get('verbosity', 1) - - try: - source = get_valid_attribute(source, message_name='Source') - target = get_valid_attribute(target, message_name='Target') - results = main(source, target, save) - - if verbosity >= 1: - if verbosity >= 2: - affected_instances_msg = make_affected_instances_message(results) - if affected_instances_msg: - self.stdout.write(affected_instances_msg) - affect_elements_msg = make_elements_message(results) - affected_projects_msg = make_affected_projects_message(results) - if save: - self.stdout.write(self.style.SUCCESS( - f"Successfully replaced source attribute {source.uri} with {target.uri}.\n" - f"Source attribute {source.uri} was deleted.\n" - f"{affect_elements_msg}\n" - f"{affected_projects_msg}" - )) - else: - self.stdout.write(self.style.SUCCESS( - f"Source attribute {source.uri} can be replaced with {target.uri}.\n" - f"{affect_elements_msg}\n" - f"{affected_projects_msg}" - )) - except ValueError as e: - raise CommandError(e) from e - except Exception as e: - raise CommandError(_('There was an unknown error in calling the command. %s') % e) from e diff --git a/rdmo/management/tests/test_merge_attributes.py b/rdmo/management/tests/test_merge_attributes.py index b20f8bbf15..e0e59e56ee 100644 --- a/rdmo/management/tests/test_merge_attributes.py +++ b/rdmo/management/tests/test_merge_attributes.py @@ -8,13 +8,14 @@ from rdmo.conditions.models import Condition from rdmo.domain.models import Attribute -from rdmo.management.management.commands.merge_attributes import REPLACE_ATTRIBUTE_MODEL_HELPERS, get_queryset, main from rdmo.options.models import Option from rdmo.questions.models import Page, Question, QuestionSet, Section from rdmo.views.models import View ElementType = Union[Section, Page, QuestionSet, Question, Option, Condition] +ATTRIBUTE_RELATED_MODELS_FIELDS = [i for i in Attribute._meta.get_fields() \ + if i.is_relation and not i.many_to_many and i.related_model is not Attribute] EXAMPLE_URI_PREFIX = 'http://example.com/terms' foo_merge_uri_prefix = 'http://foo-merge.com/terms' @@ -23,8 +24,6 @@ merge_view_template_addition_uri_path = 'individual/single/textarea' merge_view_template_addition = Template("{% render_value '$new_uri' %}") EXAMPLE_VIEW_URI = Attribute.build_uri(EXAMPLE_URI_PREFIX, merge_view_template_addition_uri_path) - - new_merge_uri_prefixes = [foo_merge_uri_prefix, bar_merge_uri_prefix] def _prepare_instance_for_copy(instance, uri_prefix=None, uri_path=None): @@ -37,35 +36,39 @@ def _prepare_instance_for_copy(instance, uri_prefix=None, uri_path=None): instance.uri_path = uri_path return instance -def _add_new_line_to_view_template(model_helper, instance: View, new_uri_prefix: str) -> View: - current_field_value = getattr(instance, model_helper.lookup_field) +def _get_queryset(related_field, attribute=None): + model = related_field.related_model + if model is View: + return model.objects.filter(**{"template__contains": attribute.path}) + lookup_field = related_field.remote_field.name + return model.objects.filter(**{lookup_field: attribute}) + +def _add_new_line_to_view_template(instance: View, new_uri_prefix: str) -> View: + current_field_value = instance.template new_field_value = current_field_value + "\n" new_uri = Attribute.build_uri(new_uri_prefix, merge_view_template_addition_uri_path) new_field_value += merge_view_template_addition.substitute(new_uri=new_uri) - setattr(instance, model_helper.lookup_field, new_field_value) + instance.template = new_field_value return instance -def _create_copy_of_view_that_uses_new_attribute(model_helper, new_prefixes: List[str]): +def create_copy_of_view_that_uses_new_attribute(new_prefixes: List[str]): # TODO search in View.template for the attribute uri - example_uri = f"{EXAMPLE_URI_PREFIX}/{EXAMPLE_VIEW_URI_PATH}" - instance = model_helper.model.objects.get(uri=example_uri) + # example_uri = f"{EXAMPLE_URI_PREFIX}/{EXAMPLE_VIEW_URI_PATH}" + # source = Attribute.objects.get(uri=example_uri) + qs = View.objects.filter(**{"template__contains": EXAMPLE_VIEW_URI_PATH}) for new_prefix in new_prefixes: - instance = _prepare_instance_for_copy(instance, uri_prefix=new_prefix) - instance.uri_path = EXAMPLE_VIEW_URI_PATH - _add_new_line_to_view_template(model_helper, instance, new_prefix) - instance.save() - -def _create_copies_of_elements_with_new_uri_prefix(new_prefixes): - for model_helper in REPLACE_ATTRIBUTE_MODEL_HELPERS: - if model_helper.field_introspection and model_helper.model == View: - _create_copy_of_view_that_uses_new_attribute(model_helper, new_prefixes) - continue # skip this model_helper - elif model_helper.field_introspection: - continue # skip this model_helper - else: - # create new model instances from example.com objects with the new uri_prefix - filter_kwargs = {f"{model_helper.lookup_field}__uri_prefix": EXAMPLE_URI_PREFIX} - example_objects = model_helper.model.objects.filter(**filter_kwargs) + for instance in qs: + instance = _prepare_instance_for_copy(instance) + instance = _add_new_line_to_view_template(instance, new_prefix) + instance.save() + +def create_copies_of_related_models_with_new_uri_prefix(new_prefixes): + for related_model_field in ATTRIBUTE_RELATED_MODELS_FIELDS: + model = related_model_field.related_model + lookup_field = related_model_field.remote_field.name + # create new model instances from example.com objects with the new uri_prefix + filter_kwargs = {f"{lookup_field}__uri_prefix": EXAMPLE_URI_PREFIX} + example_objects = model.objects.filter(**filter_kwargs) for new_prefix in new_prefixes: @@ -73,15 +76,16 @@ def _create_copies_of_elements_with_new_uri_prefix(new_prefixes): continue for instance in example_objects: instance = _prepare_instance_for_copy(instance, uri_prefix=new_prefix) - current_attribute = getattr(instance, model_helper.lookup_field) + current_attribute = getattr(instance, lookup_field) if not isinstance(current_attribute, Attribute): continue filter_kwargs = {'path': current_attribute.path, 'uri_prefix': new_prefix} new_attribute = Attribute.objects.filter(**filter_kwargs).first() - setattr(instance, model_helper.lookup_field, new_attribute) + setattr(instance, lookup_field, new_attribute) instance.save() -def _create_copies_of_attributes_with_new_uri_prefix(example_attributes, new_prefixes): + +def create_copies_of_attributes_with_new_uri_prefix(example_attributes, new_prefixes): for attribute in example_attributes: for new_prefix in new_prefixes: attribute = _prepare_instance_for_copy(attribute, uri_prefix=new_prefix) @@ -92,8 +96,9 @@ def _create_copies_of_attributes_with_new_uri_prefix(example_attributes, new_pre def create_merge_attributes(db, settings): """ Creates model instances for merge attributes tests """ example_attributes = Attribute.objects.filter(uri_prefix=EXAMPLE_URI_PREFIX).all() - _create_copies_of_attributes_with_new_uri_prefix(example_attributes, new_merge_uri_prefixes) - _create_copies_of_elements_with_new_uri_prefix(new_merge_uri_prefixes) + create_copies_of_attributes_with_new_uri_prefix(example_attributes, new_merge_uri_prefixes) + create_copies_of_related_models_with_new_uri_prefix(new_merge_uri_prefixes) + create_copy_of_view_that_uses_new_attribute(new_merge_uri_prefixes) @pytest.mark.parametrize('uri_prefix', new_merge_uri_prefixes) @@ -106,46 +111,12 @@ def test_that_the_freshly_created_merge_attributes_are_present(create_merge_attr for attribute in merge_attributes: original_attribute = Attribute.objects.get(uri_prefix=EXAMPLE_URI_PREFIX, path=attribute.path) - original_models_qs = [get_queryset(*i, attribute=original_attribute) for i in REPLACE_ATTRIBUTE_MODEL_HELPERS] + original_models_qs = [_get_queryset(i, attribute=original_attribute) for i in ATTRIBUTE_RELATED_MODELS_FIELDS] if not any(len(i) > 0 for i in original_models_qs): continue # skip this attribute - models_qs = [get_queryset(*i, attribute=attribute) for i in REPLACE_ATTRIBUTE_MODEL_HELPERS] + models_qs = [_get_queryset(i, attribute=attribute) for i in ATTRIBUTE_RELATED_MODELS_FIELDS] assert any(len(i) > 0 for i in models_qs) -@pytest.mark.parametrize('source_uri_prefix', new_merge_uri_prefixes) -@pytest.mark.parametrize('save', [False, True]) -def test_replacement_of_attributes_on_elements(create_merge_attributes, source_uri_prefix, save): - source_attributes = Attribute.objects.filter(uri_prefix=source_uri_prefix).all() - assert len(source_attributes) > 2 - unique_uri_prefixes = set(Attribute.objects.values_list("uri_prefix", flat=True)) - # test that the currently selected uri_prefix is in db - assert source_uri_prefix in unique_uri_prefixes - - for source_attribute in source_attributes: - target_attribute = Attribute.objects.get(uri_prefix=EXAMPLE_URI_PREFIX, path=source_attribute.path) - failed, results = False, [] - if source_attribute.get_descendants() or target_attribute.get_descendants(): - with pytest.raises(ValueError): - results = main(source_attribute, target_attribute, save=save) - failed = True - else: - results = main(source_attribute, target_attribute, save=save) - if not results: - continue - - if save and not failed: - # assert that the source attribut was deleted - with pytest.raises(Attribute.DoesNotExist): - Attribute.objects.get(id=source_attribute.id) - - if merge_view_template_addition_uri_path in source_attribute.path: - # assert that the attribute in the view template was replaced as well - view = View.objects.get(uri_prefix=source_uri_prefix, uri_path=EXAMPLE_VIEW_URI_PATH) - assert any(EXAMPLE_VIEW_URI in i for i in view.template.splitlines()) - assert not any(source_attribute.uri in i for i in view.template.splitlines()) - else: - assert Attribute.objects.get(id=source_attribute.id) - @pytest.mark.parametrize('source_uri_prefix', new_merge_uri_prefixes) @pytest.mark.parametrize('save', [False, True]) @@ -185,8 +156,9 @@ def test_command_merge_attributes(create_merge_attributes, source_uri_prefix, sa if source_attribute.path in merge_view_template_addition_uri_path: # assert that the attribute in the view template was replaced as well - view = View.objects.get(uri_prefix=source_uri_prefix, uri_path=EXAMPLE_VIEW_URI_PATH) - assert any(EXAMPLE_VIEW_URI in i for i in view.template.splitlines()) - assert not any(source_attribute.uri in i for i in view.template.splitlines()) + # uri_prefix = source_uri_prefix, uri_path = EXAMPLE_VIEW_URI_PATH + for instance in View.objects.filter(**{"template__contains": EXAMPLE_VIEW_URI_PATH}): + assert any(EXAMPLE_VIEW_URI in i for i in instance.template.splitlines()) + assert not any(source_attribute.uri in i for i in instance.template.splitlines()) else: assert Attribute.objects.get(id=source_attribute.id) diff --git a/rdmo/management/utils.py b/rdmo/management/utils.py index e0a0f1e372..223678cf1b 100644 --- a/rdmo/management/utils.py +++ b/rdmo/management/utils.py @@ -2,20 +2,15 @@ def replace_uri_in_template_string(template: str, source: Attribute, target: Attribute) -> str: - result = [] + new_lines = [] path_changed = source.path != target.path - for n, line in enumerate(template.splitlines()): + for line in template.splitlines(): new_line = line if source.uri in line: new_line = new_line.replace(source.uri, target.uri) if path_changed: if source.path in new_line: new_line = new_line.replace(source.path, target.path) - line_result = { - 'line_no': n, - 'new_line': new_line, - 'original_line': line - } - result.append(line_result) - new_template = "\n".join(i['new_line'] for i in result) + new_lines.append(new_line) + new_template = "\n".join(new_lines) return new_template From 13066a294a562822e4231aca0f5d5fc40bf45b90 Mon Sep 17 00:00:00 2001 From: David Wallace Date: Thu, 6 Jun 2024 15:34:44 +0200 Subject: [PATCH 066/504] feat(management command): change merge_attributes args to --delete and --view and update output messages Signed-off-by: David Wallace --- .../management/commands/merge_attributes.py | 101 +++++++++++------- 1 file changed, 65 insertions(+), 36 deletions(-) diff --git a/rdmo/management/management/commands/merge_attributes.py b/rdmo/management/management/commands/merge_attributes.py index b8851c0554..6e74aa9b78 100644 --- a/rdmo/management/management/commands/merge_attributes.py +++ b/rdmo/management/management/commands/merge_attributes.py @@ -26,16 +26,24 @@ def add_arguments(self, parser): help='The URI of the target attribute that will be used to replace the source' ) parser.add_argument( - '--save', + '--delete', action='store_true', + default=False, help='''If specified, the changes will be saved and the source attribute will be deleted.\ - If not specified, the command will do a dry run.''' + If not specified, the command will not make any changes in the database.''' + ) + parser.add_argument( + '--view', + action='store_true', + default=False, + help='If specified, the changes will be applied to the affected Views as well.' ) def handle(self, *args, **options): source = options['source'] target = options['target'] - save = options['save'] + delete_source = options['delete'] + update_views = options['view'] verbosity = options.get('verbosity', 1) source = get_valid_attribute(source, message_name='Source') @@ -47,44 +55,50 @@ def handle(self, *args, **options): results = {} related_model_fields = [i for i in Attribute._meta.get_fields() \ if i.is_relation and not i.many_to_many and i.related_model is not Attribute] + for related_field in related_model_fields: - replaced_model_result = replace_attribute_on_related_model_instances( - related_field, - source=source, - target=target, - save=save - ) + replaced_model_result = replace_attribute_on_related_model_instances(related_field, source=source, + target=target, + delete_source=delete_source) results[related_field.related_model._meta.verbose_name_raw] = replaced_model_result - view_template_result = replace_attribute_in_view_template(source=source, target=target, save=save) + view_template_result = replace_attribute_in_view_template(source=source, target=target, + delete_source=delete_source, + update_views=update_views) results[View._meta.verbose_name_raw] = view_template_result - if save and all(a['saved'] for i in results.values() for a in i): + if delete_source and all(a['saved'] for i in results.values() for a in i): try: source.delete() + logger.info(f"Source attribute {source.uri} was deleted.") except source.DoesNotExist: pass if verbosity >= 1: - if verbosity >= 2: - affected_instances_msg = make_affected_instances_message(results) - if affected_instances_msg: - self.stdout.write(affected_instances_msg) + affect_elements_msg = make_elements_message(results) affected_projects_msg = make_affected_projects_message(results) - if save: + affected_views_msg = make_affected_views_message(results) + if delete_source: self.stdout.write(self.style.SUCCESS( f"Successfully replaced source attribute {source.uri} with {target.uri}.\n" f"Source attribute {source.uri} was deleted.\n" f"{affect_elements_msg}\n" - f"{affected_projects_msg}" + f"{affected_projects_msg}\n" + f"{affected_views_msg}" )) else: self.stdout.write(self.style.SUCCESS( f"Source attribute {source.uri} can be replaced with {target.uri}.\n" f"{affect_elements_msg}\n" - f"{affected_projects_msg}" + f"{affected_projects_msg}\n" + f"{affected_views_msg}" )) + if verbosity >= 2: + affected_instances_msg = make_affected_instances_message(results) + if affected_instances_msg: + self.stdout.write() + self.stdout.write(affected_instances_msg) def get_valid_attribute(attribute, message_name=''): @@ -104,11 +118,7 @@ def get_valid_attribute(attribute, message_name=''): return attribute -def replace_attribute_on_related_model_instances(related_field, - source=None, - target=None, - save=False - ): +def replace_attribute_on_related_model_instances(related_field, source=None, target=None, delete_source=False): model = related_field.related_model lookup_field = related_field.remote_field.name qs = model.objects.filter(**{lookup_field: source}) @@ -122,19 +132,20 @@ def replace_attribute_on_related_model_instances(related_field, setattr(instance, lookup_field, target) - if save: + if delete_source: instance.save() + logger.info(f"Attribute {source.uri} on {model._meta.verbose_name_raw}(id={instance.id}) was replaced with {target.uri}.") # noqa: E501 replacement_results.append({ 'model_name': model._meta.verbose_name_raw, 'instance': instance, 'source': source, 'target': target, - 'saved': save, + 'saved': delete_source, }) return replacement_results -def replace_attribute_in_view_template(source=None, target=None, save=False ): +def replace_attribute_in_view_template(source=None, target=None, delete_source=False, update_views=False): qs = View.objects.filter(**{"template__contains": source.path}) replacement_results = [] for instance in qs: @@ -142,32 +153,48 @@ def replace_attribute_in_view_template(source=None, target=None, save=False ): template_target = replace_uri_in_template_string(instance.template, source, target) instance.template = template_target - if save: + if delete_source and update_views: instance.save() + logger.info(f"Attribute {source.uri} in {View._meta.verbose_name_raw}(id={instance.id}) template was replaced with {target.uri}.") # noqa: E501 replacement_results.append({ 'model_name': View._meta.verbose_name_raw, 'instance': instance, 'source': source, 'target': target, - 'saved': save, + 'saved': delete_source, }) return replacement_results +def get_affected_projects_from_results(results): + value_results = results.get(Value._meta.verbose_name_raw, []) + return list({i['instance'].project for i in value_results}) def make_elements_message(results): element_counts = ", ".join([f"{k.capitalize()}({len(v)})" for k, v in results.items() if v]) if not element_counts or not any(results.values()): return "No elements affected." + affected_projects = get_affected_projects_from_results(results) + if affected_projects: + element_counts += f", Project({len(affected_projects)})" return f"Affected elements: {element_counts}" def make_affected_projects_message(results): - value_results = results.get(Value._meta.verbose_name_raw, []) - if not value_results: - return "No projects affected." + affected_projects = get_affected_projects_from_results(results) + if not affected_projects: + return "No Projects are affected." msg = "Affected Projects:" - for project in {i['instance'].project for i in value_results}: - msg += f"\n\tproject={project} (id={project.id})" + for project in affected_projects: + msg += f"\n\t{project.id}\t{project}" + return msg + +def make_affected_views_message(results): + view_results = results.get(View._meta.verbose_name_raw, []) + if not view_results: + return "No Views affected." + msg = "Affected Views:" + for view in {i['instance'] for i in view_results}: + msg += f"\n\t{view.id}\t{view}" return msg @@ -178,17 +205,19 @@ def make_affected_instances_message(results): for k, merger_results in results.items(): if not merger_results: continue - msg += f"Merger results for model {k.capitalize()} ({len(merger_results)})" + msg += f"Merge attribute results for model {k.capitalize()} ({len(merger_results)})" msg += '\n' for result in merger_results: msg += dedent(f'''\ - Model={result['model_name']} + + {result['model_name']}(id={result['instance'].id}) instance={result['instance']} source={result['source'].uri} target={result['target'].uri} saved={result['saved']} ''') if hasattr(result['instance'], 'project'): - msg += f"\nproject={result['instance'].project}" + msg += f"Project(id={result['instance'].project.id}) {result['instance'].project}" + msg += '\n' msg += '\n' return msg From d62cfb046899b69d34c727765d662259427e7d14 Mon Sep 17 00:00:00 2001 From: David Wallace Date: Thu, 6 Jun 2024 15:38:54 +0200 Subject: [PATCH 067/504] tests(management): update args for merge_attribute command tests Signed-off-by: David Wallace --- rdmo/management/tests/test_merge_attributes.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/rdmo/management/tests/test_merge_attributes.py b/rdmo/management/tests/test_merge_attributes.py index e0e59e56ee..cadb543614 100644 --- a/rdmo/management/tests/test_merge_attributes.py +++ b/rdmo/management/tests/test_merge_attributes.py @@ -119,8 +119,8 @@ def test_that_the_freshly_created_merge_attributes_are_present(create_merge_attr @pytest.mark.parametrize('source_uri_prefix', new_merge_uri_prefixes) -@pytest.mark.parametrize('save', [False, True]) -def test_command_merge_attributes(create_merge_attributes, source_uri_prefix, save): +@pytest.mark.parametrize('delete', [False, True]) +def test_command_merge_attributes(create_merge_attributes, source_uri_prefix, delete): source_attributes = Attribute.objects.filter(uri_prefix=source_uri_prefix).all() assert len(source_attributes) > 2 unique_uri_prefixes = set(Attribute.objects.values_list("uri_prefix", flat=True)) @@ -134,22 +134,22 @@ def test_command_merge_attributes(create_merge_attributes, source_uri_prefix, sa if source_attribute.get_descendants(): with pytest.raises(CommandError): call_command('merge_attributes', - source=source_attribute.uri, target=target_attribute.uri, save=save, + source=source_attribute.uri, target=target_attribute.uri, delete=delete, stdout=stdout, stderr=stderr) failed = True elif target_attribute.get_descendants(): with pytest.raises(CommandError): call_command('merge_attributes', - source=source_attribute.uri, target=target_attribute.uri, save=save, + source=source_attribute.uri, target=target_attribute.uri, delete=delete, stdout=stdout, stderr=stderr) failed = True else: call_command('merge_attributes', - source=source_attribute.uri, target=target_attribute.uri, save=save, + source=source_attribute.uri, target=target_attribute.uri, delete=delete, stdout=stdout, stderr=stderr) - if save and not failed: + if delete and not failed: # assert that the source attribut was deleted with pytest.raises(Attribute.DoesNotExist): Attribute.objects.get(id=source_attribute.id) From 6c11f702def975958b9fc466ce7d215cfbf58f9c Mon Sep 17 00:00:00 2001 From: David Wallace Date: Fri, 7 Jun 2024 14:27:58 +0200 Subject: [PATCH 068/504] feat(management command): change merge_attributes args to --save, --delete and --view and update tests and output messages Signed-off-by: David Wallace --- .../management/commands/merge_attributes.py | 81 ++++++++++++------- .../management/tests/test_merge_attributes.py | 59 +++++++++++--- 2 files changed, 98 insertions(+), 42 deletions(-) diff --git a/rdmo/management/management/commands/merge_attributes.py b/rdmo/management/management/commands/merge_attributes.py index 6e74aa9b78..b61e814950 100644 --- a/rdmo/management/management/commands/merge_attributes.py +++ b/rdmo/management/management/commands/merge_attributes.py @@ -26,12 +26,19 @@ def add_arguments(self, parser): help='The URI of the target attribute that will be used to replace the source' ) parser.add_argument( - '--delete', + '--save', action='store_true', default=False, - help='''If specified, the changes will be saved and the source attribute will be deleted.\ + help='''If specified, the changes will be saved.\ If not specified, the command will not make any changes in the database.''' ) + parser.add_argument( + '--delete', + action='store_true', + default=False, + help='''If specified, the source attribute will be deleted.\ + If not specified, the command will not delete the source attribute.''' + ) parser.add_argument( '--view', action='store_true', @@ -42,6 +49,7 @@ def add_arguments(self, parser): def handle(self, *args, **options): source = options['source'] target = options['target'] + save_changes = options['save'] delete_source = options['delete'] update_views = options['view'] verbosity = options.get('verbosity', 1) @@ -59,46 +67,55 @@ def handle(self, *args, **options): for related_field in related_model_fields: replaced_model_result = replace_attribute_on_related_model_instances(related_field, source=source, target=target, - delete_source=delete_source) + save_changes=save_changes) results[related_field.related_model._meta.verbose_name_raw] = replaced_model_result view_template_result = replace_attribute_in_view_template(source=source, target=target, - delete_source=delete_source, - update_views=update_views) + save_changes=save_changes, update_views=update_views) results[View._meta.verbose_name_raw] = view_template_result - if delete_source and all(a['saved'] for i in results.values() for a in i): + if delete_source: try: source.delete() logger.info(f"Source attribute {source.uri} was deleted.") except source.DoesNotExist: - pass + logger.info(f"Source attribute {source.uri} did not exist.") if verbosity >= 1: - - affect_elements_msg = make_elements_message(results) + all_instances_were_updated = all(a['saved'] for i in results.values() for a in i) + affect_elements_msg = make_affected_elements_counts_message(results) affected_projects_msg = make_affected_projects_message(results) affected_views_msg = make_affected_views_message(results) + if save_changes: + info_msg = f"Successfully replaced source attribute {source.uri} with {target.uri} on affected elements." # noqa: E501 + if update_views: + info_msg += f"\nSuccessfully replaced source attribute {source.uri} in affected View templates." + self.stdout.write(self.style.SUCCESS(info_msg)) + if delete_source: self.stdout.write(self.style.SUCCESS( - f"Successfully replaced source attribute {source.uri} with {target.uri}.\n" f"Source attribute {source.uri} was deleted.\n" - f"{affect_elements_msg}\n" - f"{affected_projects_msg}\n" - f"{affected_views_msg}" )) - else: + if not all_instances_were_updated: + self.stdout.write( + self.style.NOTICE(f"Source attribute {source.uri} was deleted without moving affected elements to the target attribute.") # noqa: E501 + ) + if not save_changes and not delete_source: self.stdout.write(self.style.SUCCESS( - f"Source attribute {source.uri} can be replaced with {target.uri}.\n" - f"{affect_elements_msg}\n" - f"{affected_projects_msg}\n" - f"{affected_views_msg}" + f"Nothing was changed. Displaying affected elements for replacement of source attribute {source.uri} with target {target.uri}." # noqa: E501 )) + + + self.stdout.write(self.style.SUCCESS( + f"{affect_elements_msg}\n" + f"{affected_projects_msg}\n" + f"{affected_views_msg}" + )) + if verbosity >= 2: - affected_instances_msg = make_affected_instances_message(results) - if affected_instances_msg: - self.stdout.write() - self.stdout.write(affected_instances_msg) + affected_instances_msg = make_affected_instances_detail_message(results) + self.stdout.write() + self.stdout.write(affected_instances_msg) def get_valid_attribute(attribute, message_name=''): @@ -118,7 +135,7 @@ def get_valid_attribute(attribute, message_name=''): return attribute -def replace_attribute_on_related_model_instances(related_field, source=None, target=None, delete_source=False): +def replace_attribute_on_related_model_instances(related_field, source=None, target=None, save_changes=False): model = related_field.related_model lookup_field = related_field.remote_field.name qs = model.objects.filter(**{lookup_field: source}) @@ -132,20 +149,21 @@ def replace_attribute_on_related_model_instances(related_field, source=None, tar setattr(instance, lookup_field, target) - if delete_source: + if save_changes: instance.save() logger.info(f"Attribute {source.uri} on {model._meta.verbose_name_raw}(id={instance.id}) was replaced with {target.uri}.") # noqa: E501 + replacement_results.append({ 'model_name': model._meta.verbose_name_raw, 'instance': instance, 'source': source, 'target': target, - 'saved': delete_source, + 'saved': save_changes, }) return replacement_results -def replace_attribute_in_view_template(source=None, target=None, delete_source=False, update_views=False): +def replace_attribute_in_view_template(source=None, target=None, save_changes=False, update_views=False): qs = View.objects.filter(**{"template__contains": source.path}) replacement_results = [] for instance in qs: @@ -153,15 +171,16 @@ def replace_attribute_in_view_template(source=None, target=None, delete_source=F template_target = replace_uri_in_template_string(instance.template, source, target) instance.template = template_target - if delete_source and update_views: + if save_changes and update_views: instance.save() - logger.info(f"Attribute {source.uri} in {View._meta.verbose_name_raw}(id={instance.id}) template was replaced with {target.uri}.") # noqa: E501 + logger.info(f"Attribute {source.uri} in {View._meta.verbose_name_raw}(id={instance.id}) template was replaced with target {target.uri}.") # noqa: E501 + replacement_results.append({ 'model_name': View._meta.verbose_name_raw, 'instance': instance, 'source': source, 'target': target, - 'saved': delete_source, + 'saved': save_changes, }) return replacement_results @@ -169,7 +188,7 @@ def get_affected_projects_from_results(results): value_results = results.get(Value._meta.verbose_name_raw, []) return list({i['instance'].project for i in value_results}) -def make_elements_message(results): +def make_affected_elements_counts_message(results): element_counts = ", ".join([f"{k.capitalize()}({len(v)})" for k, v in results.items() if v]) if not element_counts or not any(results.values()): return "No elements affected." @@ -198,7 +217,7 @@ def make_affected_views_message(results): return msg -def make_affected_instances_message(results): +def make_affected_instances_detail_message(results): if not results: return "" msg = "" diff --git a/rdmo/management/tests/test_merge_attributes.py b/rdmo/management/tests/test_merge_attributes.py index cadb543614..76a5e2dd51 100644 --- a/rdmo/management/tests/test_merge_attributes.py +++ b/rdmo/management/tests/test_merge_attributes.py @@ -91,6 +91,16 @@ def create_copies_of_attributes_with_new_uri_prefix(example_attributes, new_pref attribute = _prepare_instance_for_copy(attribute, uri_prefix=new_prefix) attribute.save() +def get_related_affected_instances(attribute) -> list: + + related_qs = [] + for related_field in ATTRIBUTE_RELATED_MODELS_FIELDS: + model = related_field.related_model + lookup_field = related_field.remote_field.name + qs = model.objects.filter(**{lookup_field: attribute}) + related_qs.append(qs) + return related_qs + @pytest.fixture def create_merge_attributes(db, settings): @@ -119,8 +129,10 @@ def test_that_the_freshly_created_merge_attributes_are_present(create_merge_attr @pytest.mark.parametrize('source_uri_prefix', new_merge_uri_prefixes) +@pytest.mark.parametrize('save', [False, True]) @pytest.mark.parametrize('delete', [False, True]) -def test_command_merge_attributes(create_merge_attributes, source_uri_prefix, delete): +@pytest.mark.parametrize('view', [False, True]) +def test_command_merge_attributes(create_merge_attributes, source_uri_prefix, save, delete, view): source_attributes = Attribute.objects.filter(uri_prefix=source_uri_prefix).all() assert len(source_attributes) > 2 unique_uri_prefixes = set(Attribute.objects.values_list("uri_prefix", flat=True)) @@ -130,35 +142,60 @@ def test_command_merge_attributes(create_merge_attributes, source_uri_prefix, de for source_attribute in source_attributes: target_attribute = Attribute.objects.get(uri_prefix=EXAMPLE_URI_PREFIX, path=source_attribute.path) stdout, stderr = io.StringIO(), io.StringIO() + before_source_related_qs = get_related_affected_instances(source_attribute) + before_source_related_view_qs = View.objects.filter(**{"template__contains": source_attribute.path}) + # before_target_related_qs = get_related_affected_instances(target_attribute) + + command_kwargs = {'source': source_attribute.uri, + 'target': target_attribute.uri, + 'save': save, 'delete': delete, 'view': view} failed = False if source_attribute.get_descendants(): with pytest.raises(CommandError): call_command('merge_attributes', - source=source_attribute.uri, target=target_attribute.uri, delete=delete, - stdout=stdout, stderr=stderr) + stdout=stdout, stderr=stderr, **command_kwargs) failed = True elif target_attribute.get_descendants(): with pytest.raises(CommandError): call_command('merge_attributes', - source=source_attribute.uri, target=target_attribute.uri, delete=delete, - stdout=stdout, stderr=stderr) + stdout=stdout, stderr=stderr, **command_kwargs) failed = True else: call_command('merge_attributes', - source=source_attribute.uri, target=target_attribute.uri, delete=delete, - stdout=stdout, stderr=stderr) + stdout=stdout, stderr=stderr, **command_kwargs) if delete and not failed: # assert that the source attribut was deleted with pytest.raises(Attribute.DoesNotExist): Attribute.objects.get(id=source_attribute.id) + else: + assert Attribute.objects.get(id=source_attribute.id) + + after_source_related_qs = get_related_affected_instances(source_attribute) + after_source_related_view_qs = View.objects.filter(**{"template__contains": source_attribute.path}) + after_target_related_qs = get_related_affected_instances(target_attribute) + # after_target_related_view_qs = View.objects.filter(**{"template__contains": target_attribute.path}) + + if save and not failed: + + if any(i.exists() for i in before_source_related_qs): + assert not any(i.exists() for i in after_source_related_qs) + assert any(i.exists() for i in after_target_related_qs) if source_attribute.path in merge_view_template_addition_uri_path: # assert that the attribute in the view template was replaced as well + # the EXAMPLE_VIEW_URI is from the target attribute # uri_prefix = source_uri_prefix, uri_path = EXAMPLE_VIEW_URI_PATH - for instance in View.objects.filter(**{"template__contains": EXAMPLE_VIEW_URI_PATH}): - assert any(EXAMPLE_VIEW_URI in i for i in instance.template.splitlines()) - assert not any(source_attribute.uri in i for i in instance.template.splitlines()) + if before_source_related_view_qs.exists(): + if view and source_attribute.path != target_attribute.path: + assert not after_source_related_view_qs.exists() + for instance in after_source_related_view_qs: + assert any(target_attribute.path in i for i in instance.template.splitlines()) + assert not any(source_attribute.path in i for i in instance.template.splitlines()) + else: + assert after_source_related_view_qs.exists() + else: - assert Attribute.objects.get(id=source_attribute.id) + if any(i.exists() for i in before_source_related_qs): + assert any(i.exists() for i in after_source_related_qs) From ff55c7a64ec718f011722b318c9e979790fa31c4 Mon Sep 17 00:00:00 2001 From: David Wallace Date: Mon, 17 Jun 2024 16:49:00 +0200 Subject: [PATCH 069/504] feat(merge attributes): update replace_uri_in_template_string util func Signed-off-by: David Wallace --- .../management/commands/merge_attributes.py | 2 +- rdmo/management/utils.py | 19 ++++++------------- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/rdmo/management/management/commands/merge_attributes.py b/rdmo/management/management/commands/merge_attributes.py index b61e814950..c889582366 100644 --- a/rdmo/management/management/commands/merge_attributes.py +++ b/rdmo/management/management/commands/merge_attributes.py @@ -168,7 +168,7 @@ def replace_attribute_in_view_template(source=None, target=None, save_changes=Fa replacement_results = [] for instance in qs: - template_target = replace_uri_in_template_string(instance.template, source, target) + template_target = replace_uri_in_template_string(instance.template, source.uri, target.uri) instance.template = template_target if save_changes and update_views: diff --git a/rdmo/management/utils.py b/rdmo/management/utils.py index 223678cf1b..1b30dc5283 100644 --- a/rdmo/management/utils.py +++ b/rdmo/management/utils.py @@ -1,16 +1,9 @@ -from rdmo.domain.models import Attribute +def replace_uri_in_template_string(template: str, source_uri: str, target_uri: str) -> str: + patterns = [f"'{source_uri}'", f'"{source_uri}"'] + replacements = [f"'{target_uri}'", f'"{target_uri}"'] -def replace_uri_in_template_string(template: str, source: Attribute, target: Attribute) -> str: - new_lines = [] - path_changed = source.path != target.path - for line in template.splitlines(): - new_line = line - if source.uri in line: - new_line = new_line.replace(source.uri, target.uri) - if path_changed: - if source.path in new_line: - new_line = new_line.replace(source.path, target.path) - new_lines.append(new_line) - new_template = "\n".join(new_lines) + new_template = template + for pattern, replacement in zip(patterns, replacements): + new_template = new_template.replace(pattern, replacement) return new_template From 1c66288493cf48ee2cf9fa325a20b7ae0fc97517 Mon Sep 17 00:00:00 2001 From: David Wallace Date: Mon, 17 Jun 2024 16:50:42 +0200 Subject: [PATCH 070/504] tests(merge attributes): update tests for replacement of view template Signed-off-by: David Wallace --- .../management/tests/test_merge_attributes.py | 158 +++++++++++++----- 1 file changed, 114 insertions(+), 44 deletions(-) diff --git a/rdmo/management/tests/test_merge_attributes.py b/rdmo/management/tests/test_merge_attributes.py index 76a5e2dd51..3f3ae483e0 100644 --- a/rdmo/management/tests/test_merge_attributes.py +++ b/rdmo/management/tests/test_merge_attributes.py @@ -18,13 +18,14 @@ if i.is_relation and not i.many_to_many and i.related_model is not Attribute] EXAMPLE_URI_PREFIX = 'http://example.com/terms' -foo_merge_uri_prefix = 'http://foo-merge.com/terms' -bar_merge_uri_prefix = 'http://bar-merge.com/terms' +FOO_MERGE_URI_PREFIX = 'http://foo-merge.com/terms' +BAR_MERGE_URI_PREFIX = 'http://bar-merge.com/terms' EXAMPLE_VIEW_URI_PATH = "views/view_a" -merge_view_template_addition_uri_path = 'individual/single/textarea' -merge_view_template_addition = Template("{% render_value '$new_uri' %}") -EXAMPLE_VIEW_URI = Attribute.build_uri(EXAMPLE_URI_PREFIX, merge_view_template_addition_uri_path) -new_merge_uri_prefixes = [foo_merge_uri_prefix, bar_merge_uri_prefix] +VIEW_TEMPLATE_URI_PATH = 'individual/single/textarea' +VIEW_TEMPLATE_URI_PATH_ADDITIONS = ['', '/test1', '/test2', '/testfoo'] +VIEW_TEMPLATE_RENDER_VALUE = Template("{% render_value '$new_uri' %}") +EXAMPLE_VIEW_URI = Attribute.build_uri(EXAMPLE_URI_PREFIX, VIEW_TEMPLATE_URI_PATH) +NEW_MERGE_URI_PREFIXES = [FOO_MERGE_URI_PREFIX, BAR_MERGE_URI_PREFIX] def _prepare_instance_for_copy(instance, uri_prefix=None, uri_path=None): instance.pk = None @@ -43,23 +44,32 @@ def _get_queryset(related_field, attribute=None): lookup_field = related_field.remote_field.name return model.objects.filter(**{lookup_field: attribute}) -def _add_new_line_to_view_template(instance: View, new_uri_prefix: str) -> View: - current_field_value = instance.template - new_field_value = current_field_value + "\n" - new_uri = Attribute.build_uri(new_uri_prefix, merge_view_template_addition_uri_path) - new_field_value += merge_view_template_addition.substitute(new_uri=new_uri) - instance.template = new_field_value - return instance +def create_new_uris_with_uri_prefix_for_template(new_uri_prefix: str) -> List[str]: + new_uris = [] + for extra_path in VIEW_TEMPLATE_URI_PATH_ADDITIONS: + new_uri_path = VIEW_TEMPLATE_URI_PATH + extra_path + new_uri = Attribute.build_uri(new_uri_prefix, new_uri_path) + new_uris.append(new_uri) + return new_uris -def create_copy_of_view_that_uses_new_attribute(new_prefixes: List[str]): +def create_copy_of_view_that_uses_new_attribute(db, new_prefixes: List[str]): # TODO search in View.template for the attribute uri # example_uri = f"{EXAMPLE_URI_PREFIX}/{EXAMPLE_VIEW_URI_PATH}" # source = Attribute.objects.get(uri=example_uri) - qs = View.objects.filter(**{"template__contains": EXAMPLE_VIEW_URI_PATH}) - for new_prefix in new_prefixes: - for instance in qs: - instance = _prepare_instance_for_copy(instance) - instance = _add_new_line_to_view_template(instance, new_prefix) + qs = View.objects.filter(**{"uri__contains": EXAMPLE_VIEW_URI_PATH}).all() + if not qs.exists(): + raise ValueError("Views for tests should exist here.") + for instance in qs: + original_template = instance.template + for new_prefix in new_prefixes: + instance = _prepare_instance_for_copy(instance, uri_prefix=new_prefix, uri_path=EXAMPLE_VIEW_URI_PATH) + new_template_uris = create_new_uris_with_uri_prefix_for_template(new_prefix) + new_template = '' + new_template += original_template + for uri in new_template_uris: + new_template += '\n' + new_template += VIEW_TEMPLATE_RENDER_VALUE.substitute(new_uri=uri) + instance.template = new_template instance.save() def create_copies_of_related_models_with_new_uri_prefix(new_prefixes): @@ -103,16 +113,16 @@ def get_related_affected_instances(attribute) -> list: @pytest.fixture -def create_merge_attributes(db, settings): +def create_new_merge_attributes_and_views(db, settings): """ Creates model instances for merge attributes tests """ example_attributes = Attribute.objects.filter(uri_prefix=EXAMPLE_URI_PREFIX).all() - create_copies_of_attributes_with_new_uri_prefix(example_attributes, new_merge_uri_prefixes) - create_copies_of_related_models_with_new_uri_prefix(new_merge_uri_prefixes) - create_copy_of_view_that_uses_new_attribute(new_merge_uri_prefixes) + create_copies_of_attributes_with_new_uri_prefix(example_attributes, NEW_MERGE_URI_PREFIXES) + create_copies_of_related_models_with_new_uri_prefix(NEW_MERGE_URI_PREFIXES) + create_copy_of_view_that_uses_new_attribute(db, NEW_MERGE_URI_PREFIXES) -@pytest.mark.parametrize('uri_prefix', new_merge_uri_prefixes) -def test_that_the_freshly_created_merge_attributes_are_present(create_merge_attributes, uri_prefix): +@pytest.mark.parametrize('uri_prefix', NEW_MERGE_URI_PREFIXES) +def test_that_the_freshly_created_merge_attributes_are_present(db, create_new_merge_attributes_and_views, uri_prefix): merge_attributes = Attribute.objects.filter(uri_prefix=uri_prefix).all() assert len(merge_attributes) > 2 unique_uri_prefixes = set(Attribute.objects.values_list("uri_prefix", flat=True)) @@ -127,12 +137,25 @@ def test_that_the_freshly_created_merge_attributes_are_present(create_merge_attr models_qs = [_get_queryset(i, attribute=attribute) for i in ATTRIBUTE_RELATED_MODELS_FIELDS] assert any(len(i) > 0 for i in models_qs) + # assert new views created by create_copy_of_view_that_uses_new_attribute + # foo-merge + foo_merge_view_qs = View.objects.filter(template__contains=FOO_MERGE_URI_PREFIX).exclude( + template__contains=BAR_MERGE_URI_PREFIX) + assert foo_merge_view_qs.count() == 1 + assert foo_merge_view_qs.first().uri_prefix == FOO_MERGE_URI_PREFIX + # bar-merge + bar_merge_view_qs = View.objects.filter(template__contains=BAR_MERGE_URI_PREFIX).exclude( + template__contains=FOO_MERGE_URI_PREFIX) + assert bar_merge_view_qs.count() == 1 + assert bar_merge_view_qs.first().uri_prefix == BAR_MERGE_URI_PREFIX -@pytest.mark.parametrize('source_uri_prefix', new_merge_uri_prefixes) + +@pytest.mark.parametrize('source_uri_prefix', NEW_MERGE_URI_PREFIXES) @pytest.mark.parametrize('save', [False, True]) @pytest.mark.parametrize('delete', [False, True]) @pytest.mark.parametrize('view', [False, True]) -def test_command_merge_attributes(create_merge_attributes, source_uri_prefix, save, delete, view): +def test_command_merge_attributes(db, settings, create_new_merge_attributes_and_views, + source_uri_prefix, save, delete, view): source_attributes = Attribute.objects.filter(uri_prefix=source_uri_prefix).all() assert len(source_attributes) > 2 unique_uri_prefixes = set(Attribute.objects.values_list("uri_prefix", flat=True)) @@ -143,7 +166,6 @@ def test_command_merge_attributes(create_merge_attributes, source_uri_prefix, sa target_attribute = Attribute.objects.get(uri_prefix=EXAMPLE_URI_PREFIX, path=source_attribute.path) stdout, stderr = io.StringIO(), io.StringIO() before_source_related_qs = get_related_affected_instances(source_attribute) - before_source_related_view_qs = View.objects.filter(**{"template__contains": source_attribute.path}) # before_target_related_qs = get_related_affected_instances(target_attribute) command_kwargs = {'source': source_attribute.uri, @@ -172,30 +194,78 @@ def test_command_merge_attributes(create_merge_attributes, source_uri_prefix, sa else: assert Attribute.objects.get(id=source_attribute.id) + after_source_related_qs = get_related_affected_instances(source_attribute) - after_source_related_view_qs = View.objects.filter(**{"template__contains": source_attribute.path}) after_target_related_qs = get_related_affected_instances(target_attribute) - # after_target_related_view_qs = View.objects.filter(**{"template__contains": target_attribute.path}) if save and not failed: if any(i.exists() for i in before_source_related_qs): assert not any(i.exists() for i in after_source_related_qs) assert any(i.exists() for i in after_target_related_qs) - - if source_attribute.path in merge_view_template_addition_uri_path: - # assert that the attribute in the view template was replaced as well - # the EXAMPLE_VIEW_URI is from the target attribute - # uri_prefix = source_uri_prefix, uri_path = EXAMPLE_VIEW_URI_PATH - if before_source_related_view_qs.exists(): - if view and source_attribute.path != target_attribute.path: - assert not after_source_related_view_qs.exists() - for instance in after_source_related_view_qs: - assert any(target_attribute.path in i for i in instance.template.splitlines()) - assert not any(source_attribute.path in i for i in instance.template.splitlines()) - else: - assert after_source_related_view_qs.exists() - else: if any(i.exists() for i in before_source_related_qs): assert any(i.exists() for i in after_source_related_qs) + + +@pytest.mark.parametrize('source_uri_prefix', NEW_MERGE_URI_PREFIXES) +@pytest.mark.parametrize('save', [False, True]) +@pytest.mark.parametrize('delete', [False, True]) +@pytest.mark.parametrize('view', [False, True]) +def test_command_merge_attributes_for_views(db, settings, create_new_merge_attributes_and_views, + source_uri_prefix, save, delete, view): + source_attributes = Attribute.objects.filter(uri_prefix=source_uri_prefix).all() + assert len(source_attributes) > 2 + unique_uri_prefixes = set(Attribute.objects.values_list("uri_prefix", flat=True)) + # test that the currently selected uri_prefix is in db + assert source_uri_prefix in unique_uri_prefixes + source_attribute_uri = Attribute.build_uri(uri_prefix=source_uri_prefix, path=VIEW_TEMPLATE_URI_PATH) + target_attribute_uri = Attribute.build_uri(uri_prefix=EXAMPLE_URI_PREFIX, path=VIEW_TEMPLATE_URI_PATH) + + stdout, stderr = io.StringIO(), io.StringIO() + before_source_related_view_uri_qs = View.objects.filter(**{"template__contains": f"'{source_attribute_uri}'"}).all() + + before_source_related_view_uri_templates = {i.uri: i.template for i in before_source_related_view_uri_qs} + + command_kwargs = {'source': source_attribute_uri, + 'target': target_attribute_uri, + 'save': save, 'delete': delete, 'view': view} + failed = False + call_command('merge_attributes', + stdout=stdout, stderr=stderr, **command_kwargs) + + if delete and not failed: + # assert that the source attribut was deleted + with pytest.raises(Attribute.DoesNotExist): + Attribute.objects.get(uri=source_attribute_uri) + else: + assert Attribute.objects.get(uri=source_attribute_uri) + + after_source_related_view_uri_qs = View.objects.filter(**{"template__contains": f"'{source_attribute_uri}'"}) + after_target_related_view_uri_qs = View.objects.filter(**{"template__contains": f"'{target_attribute_uri}'"}) + + if not save or not view: + assert not after_target_related_view_uri_qs.exists() + return + + if save and not failed: + pass + + + if (save and not failed and view + and VIEW_TEMPLATE_URI_PATH in source_attribute_uri): + # assert that the attribute in the view template was replaced as well + # the EXAMPLE_VIEW_URI is from the target attribute + # uri_prefix = source_uri_prefix, uri_path = EXAMPLE_VIEW_URI_PATH + assert not after_source_related_view_uri_qs.exists() + assert after_target_related_view_uri_qs.exists() + + if (before_source_related_view_uri_templates and + source_attribute_uri != target_attribute_uri): + + after_occurrences = list(filter(lambda x:target_attribute_uri in x, + after_target_related_view_uri_qs.first().template.splitlines())) + assert len(after_occurrences) == 1 + before_occurrences = list(filter(lambda x: target_attribute_uri in x, + before_source_related_view_uri_qs.first().template.splitlines())) + assert len(before_occurrences) == 0 From 1bf0d46d9f8f499ae65a17bdd0c16024f590c864 Mon Sep 17 00:00:00 2001 From: David Wallace Date: Mon, 17 Jun 2024 17:33:53 +0200 Subject: [PATCH 071/504] refactor(merge attribute): make replace_uri_in_template_string more readable Signed-off-by: David Wallace --- rdmo/management/utils.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/rdmo/management/utils.py b/rdmo/management/utils.py index 1b30dc5283..cff679811b 100644 --- a/rdmo/management/utils.py +++ b/rdmo/management/utils.py @@ -1,9 +1,9 @@ def replace_uri_in_template_string(template: str, source_uri: str, target_uri: str) -> str: - patterns = [f"'{source_uri}'", f'"{source_uri}"'] - replacements = [f"'{target_uri}'", f'"{target_uri}"'] - - new_template = template - for pattern, replacement in zip(patterns, replacements): - new_template = new_template.replace(pattern, replacement) - return new_template + replacements = [ + (f"'{source_uri}'", f"'{target_uri}'"), + (f'"{source_uri}"', f'"{target_uri}"'), + ] + for pattern, replacement in replacements: + template = template.replace(pattern, replacement) + return template From 485a2d9802083f5f4debcbf4f07d5b672783b2e1 Mon Sep 17 00:00:00 2001 From: Jochen Klar Date: Thu, 6 Jun 2024 19:27:18 +0200 Subject: [PATCH 072/504] Use only available catalogs for import (#455) --- rdmo/projects/imports.py | 15 +++++++++++++-- rdmo/projects/mixins.py | 1 + 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/rdmo/projects/imports.py b/rdmo/projects/imports.py index b49c7492cd..605f7a3726 100644 --- a/rdmo/projects/imports.py +++ b/rdmo/projects/imports.py @@ -4,6 +4,7 @@ import mimetypes from django import forms +from django.core.exceptions import ValidationError from django.core.files import File from django.shortcuts import redirect, render from django.utils.translation import gettext_lazy as _ @@ -100,11 +101,21 @@ def check(self): def process(self): if self.current_project is None: catalog_uri = get_uri(self.root.find('catalog'), self.ns_map) + + available_catalogs = Catalog.objects.filter_current_site() \ + .filter_group(self.request.user) \ + .filter_availability(self.request.user) \ + .order_by('order') + try: - self.catalog = Catalog.objects.all().get(uri=catalog_uri) + self.catalog = available_catalogs.get(uri=catalog_uri) except Catalog.DoesNotExist: log.info('Catalog not in db. Created with uri %s', catalog_uri) - self.catalog = Catalog.objects.all().first() + self.catalog = available_catalogs.first() + + if self.catalog is None: + log.info('No catalog is available.') + raise ValidationError('No catalog is available.') self.project = Project() self.project.title = self.root.find('title').text or '' diff --git a/rdmo/projects/mixins.py b/rdmo/projects/mixins.py index 3b8eb3d7af..516386061c 100644 --- a/rdmo/projects/mixins.py +++ b/rdmo/projects/mixins.py @@ -101,6 +101,7 @@ def import_form(self): import_plugin.current_project = current_project import_plugin.file_name = import_file_name import_plugin.source_title = import_source_title + import_plugin.request = self.request if import_plugin.check(): try: From 2d9c3af9163186c51360e719ad1a104ebda0a131 Mon Sep 17 00:00:00 2001 From: David Wallace Date: Wed, 19 Jun 2024 11:08:54 +0200 Subject: [PATCH 073/504] update log message for project import Signed-off-by: David Wallace --- rdmo/projects/imports.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rdmo/projects/imports.py b/rdmo/projects/imports.py index 605f7a3726..f3665111fc 100644 --- a/rdmo/projects/imports.py +++ b/rdmo/projects/imports.py @@ -110,7 +110,7 @@ def process(self): try: self.catalog = available_catalogs.get(uri=catalog_uri) except Catalog.DoesNotExist: - log.info('Catalog not in db. Created with uri %s', catalog_uri) + log.info('Catalog with uri %s does not exists. Used first available catalog.', catalog_uri) self.catalog = available_catalogs.first() if self.catalog is None: From 959317d72da1df9fcaf804da07e768d1448d0b2f Mon Sep 17 00:00:00 2001 From: Jochen Klar Date: Mon, 3 Jun 2024 18:54:52 +0200 Subject: [PATCH 074/504] Fix progress action if progress did not change --- .../tests/test_viewset_project_progress.py | 42 +++++++++++++++++++ rdmo/projects/viewsets.py | 9 ++-- 2 files changed, 47 insertions(+), 4 deletions(-) diff --git a/rdmo/projects/tests/test_viewset_project_progress.py b/rdmo/projects/tests/test_viewset_project_progress.py index 6c39a52798..8b6af4bd9c 100644 --- a/rdmo/projects/tests/test_viewset_project_progress.py +++ b/rdmo/projects/tests/test_viewset_project_progress.py @@ -91,3 +91,45 @@ def test_progress_post(db, client, username, password, project_id): assert response.status_code == 404 else: assert response.status_code == 401 + + +def test_progress_post_changed(db, client): + client.login(username='owner', password='owner') + + project = Project.objects.get(id=1) + project.progress_count = progress_count = 0 + project.progress_total = progress_total = 0 + project.save() + project.refresh_from_db() + project_updated = project.updated + + url = reverse(urlnames['progress'], args=[1]) + response = client.post(url) + + project.refresh_from_db() + + assert response.status_code == 200 + assert project.updated > project_updated + assert project.progress_count > progress_count + assert project.progress_total > progress_total + + +def test_progress_post_unchanged(db, client): + client.login(username='owner', password='owner') + + project = Project.objects.get(id=1) + project.progress_count = progress_count = 58 # the progres in the fixture is not up-to-date + project.progress_total = progress_total = 81 + project.save() + project.refresh_from_db() + project_updated = project.updated + + url = reverse(urlnames['progress'], args=[1]) + response = client.post(url) + + project.refresh_from_db() + + assert response.status_code == 200 + assert project.progress_count == progress_count + assert project.progress_total == progress_total + assert project.updated == project_updated diff --git a/rdmo/projects/viewsets.py b/rdmo/projects/viewsets.py index 35558fc562..9a974895a5 100644 --- a/rdmo/projects/viewsets.py +++ b/rdmo/projects/viewsets.py @@ -213,11 +213,12 @@ def progress(self, request, pk=None): project = self.get_object() if request.method == 'POST' or project.progress_count is None or project.progress_total is None: - # compute the progress and store + # compute the progress, but store it only, if it has changed project.catalog.prefetch_elements() - project.progress_count, project.progress_total = compute_progress(project) - project.save() - + progress_count, progress_total = compute_progress(project) + if progress_count != project.progress_count or progress_total != project.progress_total: + project.progress_count, project.progress_total = progress_count, progress_total + project.save() try: ratio = project.progress_count / project.progress_total except ZeroDivisionError: From 9f2ce5dac3772672d6c7235e59f0799b1ce9145d Mon Sep 17 00:00:00 2001 From: Jochen Klar Date: Fri, 17 May 2024 19:43:15 +0200 Subject: [PATCH 075/504] Add parent attributes to full export --- rdmo/domain/renderers/mixins.py | 10 +++++++--- rdmo/domain/serializers/export.py | 8 +++++++- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/rdmo/domain/renderers/mixins.py b/rdmo/domain/renderers/mixins.py index cc0589cf52..45899ba86e 100644 --- a/rdmo/domain/renderers/mixins.py +++ b/rdmo/domain/renderers/mixins.py @@ -1,6 +1,6 @@ class AttributeRendererMixin: - def render_attribute(self, xml, attribute): + def render_attribute(self, xml, attribute, include_children=True): if attribute['uri'] not in self.uris: self.uris.add(attribute['uri']) @@ -12,6 +12,10 @@ def render_attribute(self, xml, attribute): self.render_text_element(xml, 'parent', {'dc:uri': attribute['parent']}, None) xml.endElement('attribute') - if 'children' in attribute and attribute['children']: - for child in attribute['children']: + if include_children: + for child in attribute.get('children', []): self.render_attribute(xml, child) + + parent_data = attribute.get('parent_data') + if parent_data: + self.render_attribute(xml, parent_data, include_children=False) diff --git a/rdmo/domain/serializers/export.py b/rdmo/domain/serializers/export.py index 27a5bdf16e..7071482140 100644 --- a/rdmo/domain/serializers/export.py +++ b/rdmo/domain/serializers/export.py @@ -6,6 +6,7 @@ class AttributeExportSerializer(serializers.ModelSerializer): parent = serializers.CharField(source='parent.uri', default=None, read_only=True) + parent_data = serializers.SerializerMethodField() class Meta: model = Attribute @@ -15,5 +16,10 @@ class Meta: 'key', 'path', 'comment', - 'parent' + 'parent', + 'parent_data' ) + + def get_parent_data(self, obj): + if obj.parent is not None: + return AttributeExportSerializer(obj.parent).data From 08df6a412c78b558884b24c7d9a410f2cc19ec2c Mon Sep 17 00:00:00 2001 From: Jochen Klar Date: Mon, 3 Jun 2024 17:39:19 +0200 Subject: [PATCH 076/504] Add test_detail_export_full test --- rdmo/questions/tests/test_viewset_catalog.py | 17 +++++++++++++++++ rdmo/questions/tests/test_viewset_page.py | 17 +++++++++++++++++ rdmo/questions/tests/test_viewset_question.py | 15 +++++++++++++++ .../questions/tests/test_viewset_questionset.py | 16 ++++++++++++++++ rdmo/questions/tests/test_viewset_section.py | 17 +++++++++++++++++ 5 files changed, 82 insertions(+) diff --git a/rdmo/questions/tests/test_viewset_catalog.py b/rdmo/questions/tests/test_viewset_catalog.py index f6e0d1fc74..e1a4e2cbb7 100644 --- a/rdmo/questions/tests/test_viewset_catalog.py +++ b/rdmo/questions/tests/test_viewset_catalog.py @@ -251,3 +251,20 @@ def test_detail_export(db, client, username, password, export_format): assert root.tag == 'rdmo' for child in root: assert child.tag in ['catalog', 'section', 'page', 'questionset', 'question'] + + +def test_detail_export_full(db, client): + client.login(username='editor', password='editor') + + url = reverse(urlnames['detail_export'], args=[1]) + 'xml/?full=true' + response = client.get(url) + assert response.status_code == status_map['detail']['editor'], response.content + + root = et.fromstring(response.content) + assert root.tag == 'rdmo' + + uris = [child.attrib[r'{http://purl.org/dc/elements/1.1/}uri'] for child in root] + assert 'http://example.com/terms/conditions/options_empty' in uris + assert 'http://example.com/terms/domain/conditions' in uris + assert 'http://example.com/terms/options/one_two_three' in uris + assert 'http://example.com/terms/options/one_two_three/one' in uris diff --git a/rdmo/questions/tests/test_viewset_page.py b/rdmo/questions/tests/test_viewset_page.py index afac8f91ef..e0147bb0b5 100644 --- a/rdmo/questions/tests/test_viewset_page.py +++ b/rdmo/questions/tests/test_viewset_page.py @@ -330,3 +330,20 @@ def test_detail_export(db, client, username, password, export_format): assert root.tag == 'rdmo' for child in root: assert child.tag in ['page', 'questionset', 'question'] + + +def test_detail_export_full(db, client): + client.login(username='editor', password='editor') + + url = reverse(urlnames['detail_export'], args=[71]) + 'xml/?full=true' + response = client.get(url) + assert response.status_code == status_map['detail']['editor'], response.content + + root = et.fromstring(response.content) + assert root.tag == 'rdmo' + + uris = [child.attrib[r'{http://purl.org/dc/elements/1.1/}uri'] for child in root] + assert 'http://example.com/terms/conditions/options_empty' in uris + assert 'http://example.com/terms/domain/conditions' in uris + assert 'http://example.com/terms/options/one_two_three' in uris + assert 'http://example.com/terms/options/one_two_three/one' in uris diff --git a/rdmo/questions/tests/test_viewset_question.py b/rdmo/questions/tests/test_viewset_question.py index 8456621494..baee8839b5 100644 --- a/rdmo/questions/tests/test_viewset_question.py +++ b/rdmo/questions/tests/test_viewset_question.py @@ -365,3 +365,18 @@ def test_detail_export(db, client, username, password, export_format): assert root.tag == 'rdmo' for child in root: assert child.tag in ['question'] + + +def test_detail_export_full(db, client): + client.login(username='editor', password='editor') + + url = reverse(urlnames['detail_export'], args=[104]) + 'xml/?full=true' + response = client.get(url) + assert response.status_code == status_map['detail']['editor'], response.content + + root = et.fromstring(response.content) + assert root.tag == 'rdmo' + + uris = [child.attrib[r'{http://purl.org/dc/elements/1.1/}uri'] for child in root] + assert 'http://example.com/terms/conditions/set_bool_is_true' in uris + assert 'http://example.com/terms/domain/conditions' in uris diff --git a/rdmo/questions/tests/test_viewset_questionset.py b/rdmo/questions/tests/test_viewset_questionset.py index e3781b7e6d..314e874255 100644 --- a/rdmo/questions/tests/test_viewset_questionset.py +++ b/rdmo/questions/tests/test_viewset_questionset.py @@ -370,3 +370,19 @@ def test_detail_export(db, client, username, password, export_format): assert root.tag == 'rdmo' for child in root: assert child.tag in ['questionset', 'question'] + + +def test_detail_export_full(db, client): + client.login(username='editor', password='editor') + + url = reverse(urlnames['detail_export'], args=[90]) + 'xml/?full=true' + response = client.get(url) + assert response.status_code == status_map['detail']['editor'], response.content + + root = et.fromstring(response.content) + assert root.tag == 'rdmo' + + uris = [child.attrib[r'{http://purl.org/dc/elements/1.1/}uri'] for child in root] + assert 'http://example.com/terms/domain/blocks' in uris + assert 'http://example.com/terms/options/one_two_three' in uris + assert 'http://example.com/terms/options/one_two_three/one' in uris diff --git a/rdmo/questions/tests/test_viewset_section.py b/rdmo/questions/tests/test_viewset_section.py index 3176ef391b..efd64e07da 100644 --- a/rdmo/questions/tests/test_viewset_section.py +++ b/rdmo/questions/tests/test_viewset_section.py @@ -275,3 +275,20 @@ def test_detail_export(db, client, username, password, export_format): assert root.tag == 'rdmo' for child in root: assert child.tag in ['section', 'page', 'questionset', 'question'] + + +def test_detail_export_full(db, client): + client.login(username='editor', password='editor') + + url = reverse(urlnames['detail_export'], args=[5]) + 'xml/?full=true' + response = client.get(url) + assert response.status_code == status_map['detail']['editor'], response.content + + root = et.fromstring(response.content) + assert root.tag == 'rdmo' + + uris = [child.attrib[r'{http://purl.org/dc/elements/1.1/}uri'] for child in root] + assert 'http://example.com/terms/conditions/options_empty' in uris + assert 'http://example.com/terms/domain/conditions' in uris + assert 'http://example.com/terms/options/one_two_three' in uris + assert 'http://example.com/terms/options/one_two_three/one' in uris From 3ab0e519029d29aefac3c73eaed4015efe2ee81d Mon Sep 17 00:00:00 2001 From: Jochen Klar Date: Thu, 20 Jun 2024 09:56:17 +0200 Subject: [PATCH 077/504] Merge pull request #1000 from rdmorganiser/fix_full_export Add parent attributes to full export From 13e342b1da5a78525e272dd019dbfb0a266818c3 Mon Sep 17 00:00:00 2001 From: Jochen Klar Date: Thu, 20 Jun 2024 09:58:27 +0200 Subject: [PATCH 078/504] Merge pull request #1015 from rdmorganiser/fix_progress_action Fix progress action if progress did not change From ff6e0a322fb2f5b4501ddefcfe1013450dbd99aa Mon Sep 17 00:00:00 2001 From: Jochen Klar Date: Thu, 6 Jun 2024 18:05:52 +0200 Subject: [PATCH 079/504] Add short_title for navigation to section and page (#346, #363) --- .../assets/js/components/edit/EditPage.js | 2 + .../assets/js/components/edit/EditSection.js | 2 + rdmo/projects/progress.py | 4 +- .../migrations/0094_section_short_title.py | 38 +++++++++++++++++++ .../migrations/0095_page_short_title.py | 38 +++++++++++++++++++ rdmo/questions/models/page.py | 30 +++++++++++++++ rdmo/questions/models/section.py | 30 +++++++++++++++ rdmo/questions/serializers/v1/page.py | 2 + rdmo/questions/serializers/v1/section.py | 2 + 9 files changed, 146 insertions(+), 2 deletions(-) create mode 100644 rdmo/questions/migrations/0094_section_short_title.py create mode 100644 rdmo/questions/migrations/0095_page_short_title.py diff --git a/rdmo/management/assets/js/components/edit/EditPage.js b/rdmo/management/assets/js/components/edit/EditPage.js index 7cb8d8cbb8..6c25ab0d7f 100644 --- a/rdmo/management/assets/js/components/edit/EditPage.js +++ b/rdmo/management/assets/js/components/edit/EditPage.js @@ -136,6 +136,8 @@ const EditPage = ({ config, page, elements, elementActions }) => { +