From d19fe0da668d06f378c0f9f9eac27a7b24a30130 Mon Sep 17 00:00:00 2001 From: Majk Shkurti Date: Wed, 6 Sep 2023 17:46:34 +0200 Subject: [PATCH] merge: filters --- .gitignore | 4 +- LICENSE | 674 ------------------ .../app/api/auth/[...nextauth]/options.ts | 2 + .../organizations/[organizationId]/route.ts | 1 + apps/goat/app/api/auth/organizations/route.ts | 2 + .../get-feature-keys/[layer_id]/route.ts | 2 +- apps/goat/components/map/Layers.tsx | 45 +- .../map/panels/filter/Exppression.tsx | 48 +- .../components/map/panels/filter/Filter.tsx | 107 +-- .../map/panels/filter/FilterOptionField.tsx | 209 +++--- apps/goat/hooks/map/FilteringHooks.ts | 2 +- apps/goat/lib/api/apiConstants.ts | 2 +- apps/goat/lib/store/mapFilters/slice.ts | 54 +- .../public/assets/data/comparers_filter.ts | 76 +- apps/goat/types/map/filtering.d.ts | 19 +- apps/goat/types/store.d.ts | 3 +- .../ui/components/Navigation/ToggleTabs.tsx | 2 +- 17 files changed, 350 insertions(+), 902 deletions(-) delete mode 100644 LICENSE diff --git a/.gitignore b/.gitignore index f19ff9ad..2748e4ff 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,5 @@ # See https://help.github.com/articles/ignoring-files/ for more about ignoring files. -.env - # dependencies node_modules .pnp @@ -41,4 +39,4 @@ yarn-error.log* # others build_keycloak storybook-static -*.jar +*.jar \ No newline at end of file diff --git a/LICENSE b/LICENSE deleted file mode 100644 index f288702d..00000000 --- a/LICENSE +++ /dev/null @@ -1,674 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. diff --git a/apps/goat/app/api/auth/[...nextauth]/options.ts b/apps/goat/app/api/auth/[...nextauth]/options.ts index 5cd76d8e..bc31cc8a 100644 --- a/apps/goat/app/api/auth/[...nextauth]/options.ts +++ b/apps/goat/app/api/auth/[...nextauth]/options.ts @@ -27,6 +27,7 @@ async function doFinalSignoutHandshake(token: JWT) { async function getOrganization(token: JWT) { try { + // eslint-disable-next-line turbo/no-undeclared-env-vars const url = new URL(`api/v1/users/organization`, process.env.API_URL); const res = await fetch(url.href, { headers: { @@ -44,6 +45,7 @@ async function getOrganization(token: JWT) { async function getSubscriptions(token: JWT) { try { + // eslint-disable-next-line turbo/no-undeclared-env-vars const url = new URL(`api/v1/users/subscriptions`, process.env.API_URL); const res = await fetch(url.href, { headers: { diff --git a/apps/goat/app/api/auth/organizations/[organizationId]/route.ts b/apps/goat/app/api/auth/organizations/[organizationId]/route.ts index ae3d8968..149f231e 100644 --- a/apps/goat/app/api/auth/organizations/[organizationId]/route.ts +++ b/apps/goat/app/api/auth/organizations/[organizationId]/route.ts @@ -19,6 +19,7 @@ export async function GET(_req: NextRequest, context: z.infer { const { layers, addLayer } = props; - const getQuery = useCallback(() => { - if (Object.keys(filters).length) { - if (Object.keys(filters).length === 1) { - return filters["1"]; - } else { - if (logicalOperator === "match_all_expressions") { - return and_operator(Object.keys(filters).map((key) => filters[key])); - } else { - return or_operator(Object.keys(filters).map((key) => filters[key])); - } - } - } - }, [filters, logicalOperator]); - useEffect(() => { const filterJson = getQuery(); if (filterJson) { @@ -63,12 +50,26 @@ const Layers = (props: LayersProps) => { { id: "layer1", sourceUrl: - "http://127.0.0.1:8081/collections/user_data.8c4ad0c86a2d4e60b42ad6fb8760a76e/tiles/{z}/{x}/{y}", + "http://127.0.0.1:8080/collections/user_data.8c4ad0c86a2d4e60b42ad6fb8760a76e/tiles/{z}/{x}/{y}", color: "#FF0000", }, ]); } - }, [addLayer, filters, getQuery]); + }, [filters]); + + function getQuery() { + if (Object.keys(filters).length) { + if (Object.keys(filters).length === 1) { + return filters[Object.keys(filters)[0]]; + } else { + if (logicalOperator === "match_all_expressions") { + return and_operator(Object.keys(filters).map((key) => filters[key])); + } else { + return or_operator(Object.keys(filters).map((key) => filters[key])); + } + } + } + } const clusterLayer: LayerProps = { id: "clusters", @@ -85,13 +86,9 @@ const Layers = (props: LayersProps) => { <> {layers.length ? layers.map((layer: XYZ_Layer) => ( - - - + + + )) : null} diff --git a/apps/goat/components/map/panels/filter/Exppression.tsx b/apps/goat/components/map/panels/filter/Exppression.tsx index caf18ea2..e25d00e7 100644 --- a/apps/goat/components/map/panels/filter/Exppression.tsx +++ b/apps/goat/components/map/panels/filter/Exppression.tsx @@ -1,7 +1,6 @@ import React, { useState } from "react"; -import { useGetKeys } from "@/hooks/map/FilteringHooks"; import { comparerModes } from "@/public/assets/data/comparers_filter"; -import type { ComparerMode, LayerPropsMode } from "@/types/map/filtering"; +import type { ComparerMode } from "@/types/map/filtering"; import { SelectField } from "@p4b/ui/components/Inputs"; @@ -14,20 +13,21 @@ import { v4 } from "uuid"; import { Chip } from "@/components/common/Chip"; import { makeStyles } from "@/lib/theme"; import { Button, Menu, MenuItem } from "@mui/material"; +import type { Expression } from "@/types/map/filtering"; +import { useDispatch } from "react-redux"; +import { addExpression, removeFilter } from "@/lib/store/mapFilters/slice"; +import type { LayerPropsMode } from "@/types/map/filtering"; interface ExpressionProps { isLast: boolean; - expression: { - attribute: LayerPropsMode | null; - expression: ComparerMode | null; - value: (string | number | number[]) | null; - }; + expression: Expression; logicalOperator: string; id: string; + keys: LayerPropsMode[]; } const Exppression = (props: ExpressionProps) => { - const { isLast, expression, logicalOperator, id } = props; + const { isLast, expression, logicalOperator, id, keys } = props; const [attributeSelected, setAttributeSelected] = useState( expression.attribute ? expression.attribute.name : "", ); @@ -37,11 +37,10 @@ const Exppression = (props: ExpressionProps) => { const [anchorEl, setAnchorEl] = React.useState(null); const open = Boolean(anchorEl); - const sampleLayerID = "user_data.8c4ad0c86a2d4e60b42ad6fb8760a76e"; - const { keys } = useGetKeys({ layer_id: sampleLayerID }); - const { classes } = useStyles(); + const dispatch = useDispatch(); + function getFeatureAttribute(type: string | string[]) { const valueToFilter = keys.filter((key) => key.name === type); if (valueToFilter[0].type === "string") { @@ -50,6 +49,26 @@ const Exppression = (props: ExpressionProps) => { return valueToFilter[0].type; } + function handleAttributeSelect(value: string) { + const newExpression = { ...expression }; + newExpression.attribute = { + type: getFeatureAttribute(value), + name: value, + }; + setAttributeSelected(value); + dispatch(addExpression(newExpression)); + } + + function handleComparerSelect(value: string) { + const newExpression = { ...expression }; + newExpression.expression = getComparer(value)[0]; + newExpression.firstInput = ""; + newExpression.secondInput = ""; + setComparerSelected(value); + dispatch(addExpression(newExpression)); + dispatch(removeFilter(newExpression.id)); + } + function getComparer(type: string | string[]) { return comparerModes[getFeatureAttribute(attributeSelected)].filter( (compAttribute) => type === compAttribute.value, @@ -94,7 +113,7 @@ const Exppression = (props: ExpressionProps) => { label="Select attribute" size="small" defaultValue={attributeSelected ? attributeSelected : ""} - updateChange={setAttributeSelected} + updateChange={handleAttributeSelect} /> { defaultValue={comparerSelected ? comparerSelected : ""} size="small" disabled={attributeSelected.length ? false : true} - updateChange={setComparerSelected} + updateChange={handleComparerSelect} /> {attributeSelected.length ? ( <> @@ -131,7 +150,8 @@ const Exppression = (props: ExpressionProps) => { prop={ typeof attributeSelected === "string" ? attributeSelected : "" } - expression={id} + expressionId={id} + expression={expression} /> ) : null} diff --git a/apps/goat/components/map/panels/filter/Filter.tsx b/apps/goat/components/map/panels/filter/Filter.tsx index 31ca05ed..39580a4a 100644 --- a/apps/goat/components/map/panels/filter/Filter.tsx +++ b/apps/goat/components/map/panels/filter/Filter.tsx @@ -1,9 +1,10 @@ "use client"; + import Container from "@/components/map/panels/Container"; -import type { ComparerMode, LayerPropsMode } from "@/types/map/filtering"; import { useState } from "react"; import { makeStyles } from "@p4b/ui/lib/ThemeProvider"; +import { useGetKeys } from "@/hooks/map/FilteringHooks"; import { Card, CardMedia } from "@p4b/ui/components/Surfaces"; import { ICON_NAME } from "@p4b/ui/components/Icon"; @@ -14,21 +15,25 @@ import { Box } from "@mui/material"; import { Button } from "@p4b/ui/components/theme"; import Exppression from "./Exppression"; import { SelectField } from "@p4b/ui/components/Inputs"; -import { useDispatch } from "react-redux"; -import { setLogicalOperator, setFilters } from "@/lib/store/mapFilters/slice"; +import { useDispatch, useSelector } from "react-redux"; +import { + setLogicalOperator, + setFilters, + addExpression, + clearExpression +} from "@/lib/store/mapFilters/slice"; +import { v4 } from "uuid"; +import type { IStore } from "@/types/store"; const FilterPanel = () => { const dispatch = useDispatch(); - const [logicalOperator, setLogicalOperatorVal] = useState("match_all_expressions"); - const [expressions, setExpressions] = useState< - | { - attribute: LayerPropsMode | null; - expression: ComparerMode | null; - value: (string | number | number[]) | null; - }[] - | null - >(null); + const { expressions } = useSelector((state: IStore) => state.mapFilters); + const [logicalOperator, setLogicalOperatorVal] = useState( + "match_all_expressions", + ); + const sampleLayerID = "user_data.8c4ad0c86a2d4e60b42ad6fb8760a76e"; + const { keys } = useGetKeys({ layer_id: sampleLayerID }); const theme = useTheme(); const { classes } = useStyles(); @@ -44,25 +49,17 @@ const FilterPanel = () => { ]; function createExpression() { - if (expressions) { - dispatch(setLogicalOperator("match_all_expressions")) - setExpressions([ - ...expressions, - { - attribute: null, - expression: null, - value: null, - }, - ]); - } else { - setExpressions([ - { - attribute: null, - expression: null, - value: null, - }, - ]); - } + dispatch(setLogicalOperator("match_all_expressions")); + dispatch( + addExpression({ + id: v4(), + attribute: null, + expression: null, + value: null, + firstInput: "", + secondInput: "", + }), + ); } function handleOperatorChange(value: string) { @@ -71,7 +68,7 @@ const FilterPanel = () => { } function cleanExpressions() { - setExpressions(null); + dispatch(clearExpression()); dispatch(setFilters({})); } @@ -83,7 +80,10 @@ const FilterPanel = () => {
- + @content_label @@ -97,7 +97,10 @@ const FilterPanel = () => { ({ name: key.label, value: key.value }))} + options={logicalOperatorOptions.map((key) => ({ + name: key.label, + value: key.value, + }))} label="Select attribute" size="small" defaultValue={logicalOperator ? logicalOperator : ""} @@ -108,14 +111,15 @@ const FilterPanel = () => { {expressions ? ( expressions.map((expression, indx) => ( - <> - - + // <> + )) ) : ( @@ -126,23 +130,32 @@ const FilterPanel = () => { className={classes.cardMediaImage} src="https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcSQy9x3wyV5OWYWA8XxBJKMlH2QvuSSOIdOItRK1jgXSQ&s" /> - }> + } + >
Filter your data - Perform targeted data analysis. Filter layers, apply an expression and narrow down data - displayed. Sort data and hide data that does not match your criteria. Learn more + Perform targeted data analysis. Filter layers, apply an + expression and narrow down data displayed. Sort data and + hide data that does not match your criteria. Learn more
)} -
{expressions && expressions.length ? ( - ) : null} diff --git a/apps/goat/components/map/panels/filter/FilterOptionField.tsx b/apps/goat/components/map/panels/filter/FilterOptionField.tsx index bc760983..8e75ec53 100644 --- a/apps/goat/components/map/panels/filter/FilterOptionField.tsx +++ b/apps/goat/components/map/panels/filter/FilterOptionField.tsx @@ -1,7 +1,7 @@ import type { ComparerMode } from "@/types/map/filtering"; -import React, { useState, useEffect, useCallback } from "react"; +import React, { useState, useEffect } from "react"; import { useDispatch } from "react-redux"; -import { addFilter } from "@/lib/store/mapFilters/slice"; +import { addExpression, addFilter } from "@/lib/store/mapFilters/slice"; import { is, is_not, // includes, @@ -22,135 +22,77 @@ import { } from "@/lib/utils/filtering_cql"; import { NumberOption, TextOption } from "./FilterOption"; import { debounce } from "@mui/material/utils"; +import type { Expression } from "@/types/map/filtering"; interface FilterResultProps { comparer: ComparerMode | null; prop: string; - expression: string; + expressionId: string; + expression: Expression; } const FilterOptionField = (props: FilterResultProps) => { const { comparer, prop, expression } = props; - const [firstInput, setFirstInput] = useState(""); - const [secondInput, setSecondInput] = useState(""); + const newExpressionToModify = { ...expression }; + const [firstInput, setFirstInput] = useState( + newExpressionToModify.firstInput, + ); + const [secondInput, setSecondInput] = useState( + newExpressionToModify.secondInput, + ); const dispatch = useDispatch(); - const handleFilter = useCallback( - (value: string, value2?: string) => { - if (!comparer) return; - let query; - if (value) { - switch (comparer.value) { - case "is": - query = is( - prop, - comparer.type === "number" ? parseInt(value) : value, - ); - break; - case "is_not": - query = is_not(prop, value); - break; - case "includes": - case "excludes": - query = excludes(prop, ["playground", "bus_stop"]); - break; - case "starts_with": - if (typeof value === "string") { - query = starts_with(prop, value); - } - break; - case "ends_with": - if (typeof value === "string") { - query = ends_with(prop, value); - } - break; - case "contains_the_text": - if (typeof value === "string") { - query = contains_the_text(prop, value); - } - break; - case "does_not_contains_the_text": - if (typeof value === "string") { - query = does_not_contains_the_text(prop, value); - } - break; - case "is_blank": - query = is_blank(prop); - break; - case "is_not_blank": - query = is_not_blank(prop); - break; - case "is_empty_string": - query = is_empty_string(prop); - break; - case "is_not_empty_string": - query = is_not_empty_string(prop); - break; - case "is_at_least": - query = is_at_least(prop, parseInt(value)); - break; - case "is_at_most": - query = is_at_most(prop, parseInt(value)); - break; - case "is_less_than": - query = is_less_than(prop, parseInt(value)); - break; - case "is_greater_than": - query = is_greater_than(prop, parseInt(value)); - break; - case "is_between": - query = is_between( - prop, - parseInt(value), - parseInt(value2 ? value2 : "0"), - ); - break; - default: - return; - } - } else { - query = ""; - } - - dispatch(addFilter({ query, expression })); - }, - [comparer, dispatch, expression, prop], - ); - const sendQuery = React.useMemo( () => debounce((request: { input: string; input2?: string }) => { if ( request.input || (comparer && - [ + ![ "is_blank", "is_not_blank", "is_empty_string", "is_not_empty_string", ].includes(comparer.value)) ) { + newExpressionToModify.firstInput = request.input; + dispatch(addExpression(newExpressionToModify)); setFirstInput(request.input); if (request.input2) { + newExpressionToModify.secondInput = request.input2; + dispatch(addExpression(newExpressionToModify)); setSecondInput(request.input2); } handleFilter(request.input, request.input2); } else { - handleFilter(""); + handleFilter("excludes"); } }, 1000), - [comparer, handleFilter], + [comparer], ); useEffect(() => { - if (secondInput) { - sendQuery({ input: firstInput, input2: secondInput }); - } else { + if (secondInput !== newExpressionToModify.secondInput) { + sendQuery({ + input: firstInput, + input2: secondInput, + }); + } else if (firstInput !== newExpressionToModify.firstInput) { + sendQuery({ input: firstInput }); + } else if ( + comparer && + [ + "is_blank", + "is_not_blank", + "is_empty_string", + "is_not_empty_string", + ].includes(comparer.value) + ) { sendQuery({ input: firstInput }); } - }, [firstInput, secondInput, sendQuery, comparer]); + }); function handleInputChange(newValue: string) { setFirstInput(newValue); @@ -160,6 +102,85 @@ const FilterOptionField = (props: FilterResultProps) => { setSecondInput(newValue); } + const handleFilter = (value: string, value2?: string) => { + if (!comparer) return; + let query; + if (value) { + switch (comparer.value) { + case "is": + query = is( + prop, + comparer.type === "number" ? parseInt(value) : value, + ); + break; + case "is_not": + query = is_not(prop, value); + break; + case "includes": + case "excludes": + query = excludes(prop, ["playground", "bus_stop"]); + break; + case "starts_with": + if (typeof value === "string") { + query = starts_with(prop, value); + } + break; + case "ends_with": + if (typeof value === "string") { + query = ends_with(prop, value); + } + break; + case "contains_the_text": + if (typeof value === "string") { + query = contains_the_text(prop, value); + } + break; + case "does_not_contains_the_text": + if (typeof value === "string") { + query = does_not_contains_the_text(prop, value); + } + break; + case "is_blank": + query = is_blank(prop); + break; + case "is_not_blank": + query = is_not_blank(prop); + break; + case "is_empty_string": + query = is_empty_string(prop); + break; + case "is_not_empty_string": + query = is_not_empty_string(prop); + break; + case "is_at_least": + query = is_at_least(prop, parseInt(value)); + break; + case "is_at_most": + query = is_at_most(prop, parseInt(value)); + break; + case "is_less_than": + query = is_less_than(prop, parseInt(value)); + break; + case "is_greater_than": + query = is_greater_than(prop, parseInt(value)); + break; + case "is_between": + query = is_between( + prop, + parseInt(value), + parseInt(value2 ? value2 : "0"), + ); + break; + default: + return; + } + } else { + query = ""; + } + + dispatch(addFilter({ query, expression: expression.id })); + }; + if (!comparer) return null; let inputComponent: React.ReactNode | null = null; diff --git a/apps/goat/hooks/map/FilteringHooks.ts b/apps/goat/hooks/map/FilteringHooks.ts index 3c54586f..683956f3 100644 --- a/apps/goat/hooks/map/FilteringHooks.ts +++ b/apps/goat/hooks/map/FilteringHooks.ts @@ -6,7 +6,7 @@ import { useState, useEffect } from "react"; export const useGetKeys = ({ layer_id }: { layer_id: string }) => { const [keys, setkeys] = useState([]); - + useEffect(() => { axios.get(`http://localhost:3000/api/map/filtering/layer/get-feature-keys/${layer_id}`).then((data) => { const keys = data.data.properties; diff --git a/apps/goat/lib/api/apiConstants.ts b/apps/goat/lib/api/apiConstants.ts index e4346235..c0204933 100644 --- a/apps/goat/lib/api/apiConstants.ts +++ b/apps/goat/lib/api/apiConstants.ts @@ -8,4 +8,4 @@ export const API = { project: "api/v2/content/project", }; // export const FILTERING = "http://localhost:3000/api/map/filtering/layer/"; -export const FILTERING = (layer_id: string) => `http://127.0.0.1:8081/collections/${layer_id}/tiles/{z}/{x}/{y}`; \ No newline at end of file +export const FILTERING = (layer_id: string) => `http://127.0.0.1:8080/collections/${layer_id}/tiles/{z}/{x}/{y}`; \ No newline at end of file diff --git a/apps/goat/lib/store/mapFilters/slice.ts b/apps/goat/lib/store/mapFilters/slice.ts index 8205fdf8..95e3b016 100644 --- a/apps/goat/lib/store/mapFilters/slice.ts +++ b/apps/goat/lib/store/mapFilters/slice.ts @@ -1,14 +1,17 @@ import { createSlice } from "@reduxjs/toolkit"; import type { EmptyObject, PayloadAction } from "@reduxjs/toolkit"; +import type { Expression } from "@/types/map/filtering"; interface FilterState { - filters: {[key: string]: string} | EmptyObject; + filters: { [key: string]: string } | EmptyObject; logicalOperator: string; + expressions: Expression[]; } const initialState = { filters: {}, logicalOperator: "", + expressions: [], } as FilterState; const filterSlice = createSlice({ @@ -18,15 +21,58 @@ const filterSlice = createSlice({ setLogicalOperator(state, action: PayloadAction) { state.logicalOperator = action.payload; }, - setFilters(state, action: PayloadAction<{[key: string]: string} | object>) { + setFilters( + state, + action: PayloadAction<{ [key: string]: string } | object>, + ) { state.filters = action.payload; }, - addFilter(state, action: PayloadAction<{query: string, expression: string}>) { + addFilter( + state, + action: PayloadAction<{ query: string; expression: string }>, + ) { state.filters[action.payload.expression] = action.payload.query; }, + removeFilter(state, action: PayloadAction) { + const filters = state.filters; + console.log(filters, action.payload); + delete filters[action.payload]; + console.log(filters); + // state.filters = state.filters[action.payload] + }, + addExpression(state, action: PayloadAction) { + const existingExpression = state.expressions.find( + (expr) => expr.id === action.payload.id, + ); + + if (existingExpression) { + state.expressions = state.expressions.map((expression) => + expression.id === action.payload.id ? action.payload : expression, + ); + } else { + state.expressions = [...state.expressions, action.payload]; + } + }, + clearExpression(state) { + state.expressions = []; + }, + setExpression(state, action: PayloadAction) { + state.expressions = action.payload; + }, + getExpressionById(state, action: PayloadAction) { + state.expressions.find((expr) => expr.id === action.payload); + }, }, }); -export const { setLogicalOperator, setFilters, addFilter } = filterSlice.actions; +export const { + setLogicalOperator, + setFilters, + addFilter, + addExpression, + clearExpression, + setExpression, + removeFilter, +} = filterSlice.actions; export const filtersReducer = filterSlice.reducer; diff --git a/apps/goat/public/assets/data/comparers_filter.ts b/apps/goat/public/assets/data/comparers_filter.ts index ad190707..d447fad0 100644 --- a/apps/goat/public/assets/data/comparers_filter.ts +++ b/apps/goat/public/assets/data/comparers_filter.ts @@ -57,18 +57,19 @@ export const comparerModes: { number: ComparerMode[]; date: ComparerMode[]; text type: "dual_number", select: true, }, - { - label: "is blank", - value: "is_blank", - type: "none", - select: false, - }, - { - label: "is not blank", - value: "is_not_blank", - type: "none", - select: false, - }, + // we can enable them when the problem is solved + // { + // label: "is blank", + // value: "is_blank", + // type: "none", + // select: false, + // }, + // { + // label: "is not blank", + // value: "is_not_blank", + // type: "none", + // select: false, + // }, ], date: [ // Date Comparers @@ -120,18 +121,19 @@ export const comparerModes: { number: ComparerMode[]; date: ComparerMode[]; text type: "dualDate", select: false, }, - { - label: "is blank", - value: "is_blank", - type: "none", - select: false, - }, - { - label: "is not blank", - value: "is_not_blank", - type: "none", - select: false, - }, + // we can enable them when the problem is solved + // { + // label: "is blank", + // value: "is_blank", + // type: "none", + // select: false, + // }, + // { + // label: "is not blank", + // value: "is_not_blank", + // type: "none", + // select: false, + // }, ], text: [ // Text Comparers @@ -183,18 +185,20 @@ export const comparerModes: { number: ComparerMode[]; date: ComparerMode[]; text type: "text", select: false, }, - { - label: "is blank", - value: "is_blank", - type: "none", - select: false, - }, - { - label: "is not blank", - value: "is_not_blank", - type: "none", - select: false, - }, + // we can enable them when the problem is solved + + // { + // label: "is blank", + // value: "is_blank", + // type: "none", + // select: false, + // }, + // { + // label: "is not blank", + // value: "is_not_blank", + // type: "none", + // select: false, + // }, { label: "is empty string", value: "is_empty_string", diff --git a/apps/goat/types/map/filtering.d.ts b/apps/goat/types/map/filtering.d.ts index 22fc5e18..1afc10ae 100644 --- a/apps/goat/types/map/filtering.d.ts +++ b/apps/goat/types/map/filtering.d.ts @@ -11,6 +11,15 @@ interface Extent { }; } +export interface Expression { + id: string, + attribute: LayerPropsMode | null; + expression: ComparerMode | null; + value: (string | number | number[]) | null; + firstInput: string; + secondInput: string; +} + export interface LayerData { id: string; title: string; @@ -58,6 +67,14 @@ export interface LayerPropsMode { interface ComparerMode { label: string; value: string; - type: "number" | "date" | "text" | "select" | "dual_number" | "none" | "year_filter" | "dualDate"; + type: + | "number" + | "date" + | "text" + | "select" + | "dual_number" + | "none" + | "year_filter" + | "dualDate"; select: boolean; } diff --git a/apps/goat/types/store.d.ts b/apps/goat/types/store.d.ts index eee382ef..f7e10091 100644 --- a/apps/goat/types/store.d.ts +++ b/apps/goat/types/store.d.ts @@ -1,5 +1,5 @@ import type {IStylingState} from "@/lib/store/styling/slice"; - +import type { Expression } from "./map/filtering"; export interface IStore { map: object; content: { @@ -11,5 +11,6 @@ export interface IStore { mapFilters: { filters: { [key: string]: string }; logicalOperator: string; + expressions: Expression[]; }; } diff --git a/packages/ui/components/Navigation/ToggleTabs.tsx b/packages/ui/components/Navigation/ToggleTabs.tsx index 51ffdd11..989d8caf 100644 --- a/packages/ui/components/Navigation/ToggleTabs.tsx +++ b/packages/ui/components/Navigation/ToggleTabs.tsx @@ -22,7 +22,7 @@ export type ToggleTabsProps = { }; export const ToggleTabs = memo( - forwardRef((props, ref) => { + forwardRef((props) => { const { className, tabs,