Merge remote-tracking branch 'upstream/staging' into unvendor-awkde

Author: grahamalama

.github/dependabot.yml

@@ -18,6 +18,11 @@ updates:
     directory: '/'
     schedule:
       interval: 'weekly'
+    ignore:
+      -depedency-name: 'next'
+      -dependency-name: 'react'
+      -dependency-name: 'react-dom'
+      -dependency-name: 'tailwindcss'
     target-branch: 'staging'
     commit-message:
       prefix: 'deps'

data/pyproject.toml

@@ -1,10 +1,3 @@
-[tool.pylint]
-output-format = "colorized,parseable"
-
-[tool.pylint.'MESSAGES CONTROL']
-disable = ["all"]
-enable = ["duplicate-code"]
-
 [tool.vulture]
 make_whitelist = true
 # min_confidence = 80

data/src/Pipfile

@@ -5,38 +5,37 @@ name = "pypi"
 
 [packages]
 awkde = { git = 'https://github.com/mennthor/awkde.git', ref = '5b601fe4d92229d5deb8737fd121dce193bac552' }
-jupyter = "*"
-requests = "*"
-pandas = "==2.2.2"
+esridump = "~=1.13.0"
+fiona = "~=1.10.1"
+future = "~=1.0.0"
+geoalchemy2 = "~=0.16.0"
 geopandas = "==1.0.1"
-shapely = "*"
-matplotlib = "*"
-rasterio = "*"
-scikit-learn = "*"
-mapclassify = "*"
-fiona = "*"
-esridump = "*"
-sqlalchemy = "*"
-psycopg2-binary = "*"
-mapbox = "*"
-google-cloud-storage = "*"
+google-cloud-storage = "~=2.19.0"
+jenkspy = "~=0.4.1"
+jupyter = "~=1.1.1"
+libpysal = "~=4.12.1"
+mapbox = "~=0.18.1"
+mapclassify = "~=2.8.1"
+matplotlib = "~=3.9.3"
+networkx = "~=3.4.2"
+pandas = "==2.2.2"
+psycopg2-binary = "~=2.9.10"
+pyarrow = "~=18.1.0"
 pydantic = "==2.8.2"
-future = "*"
-slack-sdk = "*"
-networkx = "*"
-libpysal = "*"
-jenkspy = "*"
-pyarrow = "*"
-tqdm = "*"
-geoalchemy2 ="*"
+rasterio = "~=1.4.3"
+requests = "~=2.32.3"
+scikit-learn = "~=1.6.0"
+shapely = "~=2.0.6"
+slack-sdk = "~=3.33.5"
+sqlalchemy = "~=2.0.36"
+tqdm = "~=4.67.1"
+
 
 [dev-packages]
-black = "*"
-pytest = "*"
-vulture = "*"
-pylint = "*"
-radon = "*"
-ruff = "*"
+pytest = "~=8.3.4"
+vulture = "~=2.14"
+radon = "~=6.0.1"
+ruff = "~=0.8.2"
 
 [requires]
 python_version = "3.11"

data/src/Pipfile.lock

@@ -5,54 +5,10 @@ import { PiX } from 'react-icons/pi';
 import { ThemeButton } from './ThemeButton';
 import { BarClickOptions } from '@/app/find-properties/[[...opa_id]]/page';
 import { rcos, neighborhoods, zoning } from './Filters/filterOptions';
-import DimensionFilter from './Filters/DimensionFilter';
-
-const filters = [
-  {
-    property: 'priority_level',
-    display: 'Suggested Priority',
-    options: ['Low', 'Medium', 'High'],
-    type: 'buttonGroup',
-  },
-  {
-    property: 'get_access',
-    display: 'Get Access',
-    options: [
-      'TACTICAL_URBANISM',
-      'PRIVATE_LAND_USE',
-      'BUY_FROM_OWNER',
-      'SIDE_YARD',
-      'LAND_BANK',
-      'CONSERVATORSHIP',
-    ],
-    type: 'panels',
-  },
-  {
-    property: 'neighborhood',
-    display: 'Neighborhoods',
-    options: neighborhoods,
-    type: 'multiSelect',
-  },
-  {
-    property: 'rco_names',
-    display: 'Community Organizations',
-    options: rcos,
-    type: 'multiSelect',
-    useIndexOfFilter: true,
-  },
-  {
-    property: 'zoning_base_district',
-    display: 'Zoning',
-    options: zoning,
-    type: 'multiSelect',
-  },
-  {
-    property: 'parcel_type',
-    display: 'Property Type',
-    options: ['Land', 'Building'],
-    type: 'buttonGroup',
-  },
-];
+import FilterDescription from './Filters/FilterDescription';
+import ButtonGroup from './Filters/ButtonGroup';
+import MultiSelect from './Filters/MultiSelect';
+import Panels from './Filters/Panels';
 
 interface FilterViewProps {
   updateCurrentView: (view: BarClickOptions) => void;
@@ -72,9 +28,62 @@ const FilterView: FC<FilterViewProps> = ({ updateCurrentView }) => {
           updateCurrentView('filter');
         }}
       />
-      {filters.map((attr) => (
-        <DimensionFilter key={attr.property} {...attr} />
-      ))}
+      <div className="pt-3 pb-6">
+        <FilterDescription
+          title="Suggested Priority"
+          description="Find properties based on how much they can reduce gun violence considering the gun violence, cleanliness, and tree canopy nearby. "
+          link="/methodology/#priority-method"
+        />
+        <ButtonGroup
+          property="priority_level"
+          options={['Low', 'Medium', 'High']}
+          aria_describedby_label="Suggested Priority"
+        />
+      </div>
+      <div className="pt-3 pb-6">
+        <FilterDescription
+          title="Get Access"
+          description="Find properties based on what we think the easiest method to get legal access to them is, based on the data available to us."
+          link="/methodology/#access-method"
+        />
+        <Panels />
+      </div>
+      <div className="pt-3 pb-6">
+        <FilterDescription title="Neighborhoods" />
+        <MultiSelect
+          property="neighborhood"
+          options={neighborhoods}
+          aria_describedby_label="Neighborhoods"
+          useIndexOfFilter={false}
+        />
+      </div>
+      <div className="pt-3 pb-6">
+        <FilterDescription title="Community Organizations" />
+        <MultiSelect
+          property="rco_names"
+          options={rcos}
+          aria_describedby_label="Community_Organizations"
+          useIndexOfFilter={true}
+        />
+      </div>
+
+      <div className="pt-3 pb-6">
+        <FilterDescription title="Zoning" />
+        <MultiSelect
+          property="zoning_base_district"
+          options={zoning}
+          aria_describedby_label="Zoning"
+          useIndexOfFilter={false}
+        />
+      </div>
+      <div className="pt-3 pb-6">
+        <FilterDescription title="Property Type" />
+        <ButtonGroup
+          property="parcel_type"
+          options={['Land', 'Building']}
+          aria_describedby_label="Property_Type"
+        />
+      </div>
     </div>
   );
 };

eslint.config.js eslint.config.mjseslint.config.js renamed to eslint.config.mjs

@@ -1,24 +1,36 @@
 'use client';
 
-import React, { FC } from 'react';
+import React, { FC, useState } from 'react';
 import { Button } from '@nextui-org/react';
 import { Check } from '@phosphor-icons/react';
+import { useFilter } from '@/context/FilterContext';
 
 type ButtonGroupProps = {
+  property: string;
   options: string[];
-  selectedKeys: string[];
   aria_describedby_label?: string;
-  toggleDimension: (dimension: string) => void;
-  displayOptions?: { [key: string]: string };
 };
 
-const ButtonGroup: FC<ButtonGroupProps> = ({
+const ButtonGroup = ({
+  property,
   options,
-  selectedKeys,
-  toggleDimension,
   aria_describedby_label,
-  displayOptions = {},
-}) => {
+}: ButtonGroupProps): JSX.Element => {
+  const { dispatch, appFilter } = useFilter();
+  const currentFilterKeys = appFilter[property]?.values || [];
+
+  const toggleDimension = (dimension: string) => {
+    const updatedKeys = currentFilterKeys.includes(dimension)
+      ? currentFilterKeys.filter((item) => item !== dimension)
+      : [...currentFilterKeys, dimension];
+
+    dispatch({
+      type: 'SET_DIMENSIONS',
+      property,
+      dimensions: updatedKeys,
+    });
+  };
+
   return (
     <div className="flex flex-wrap gap-x-2 min-h-[33.5px]">
       {options.map((option, index) => (
@@ -28,23 +40,25 @@ const ButtonGroup: FC<ButtonGroupProps> = ({
           role="checkbox"
           onPress={() => toggleDimension(option)}
           size="sm"
-          color={selectedKeys.includes(option) ? 'success' : 'default'}
+          color={currentFilterKeys.includes(option) ? 'success' : 'default'}
           className={
-            (selectedKeys.includes(option) ? 'tagSelected' : 'tagDefault') +
+            (currentFilterKeys.includes(option)
+              ? 'tagSelected'
+              : 'tagDefault') +
             (option === 'Private Land Use Agreement'
               ? ' max-[475px]:mt-2 sm:max-[1103px]:mt-2'
               : '')
           }
           radius="full"
-          aria-checked={selectedKeys.includes(option)}
+          aria-checked={currentFilterKeys.includes(option)}
           aria-describedby={aria_describedby_label}
           startContent={
-            selectedKeys.includes(option) ? (
-              <Check className="w-3 w-3.5 max-h-6" />
+            currentFilterKeys.includes(option) ? (
+              <Check className="w-3 max-h-6" />
             ) : undefined
           }
         >
-          {displayOptions[option] || option}
+          {option}
         </Button>
       ))}
     </div>