Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add search by code naf #323

Merged
merged 1 commit into from
Feb 13, 2024
Merged

feat: add search by code naf #323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 6 additions & 9 deletions src/client/src/components/Search/Search.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,14 @@ import trancheEffectif from "../../containers/Search/tranche-effectif.json";
import UsersFeedback from "../../containers/UsersFeedback";
import Config from "../../services/Config";
import SearchResults from "../SearchResults";
import { useCodeNaf } from "./codeNaf.gql.js";
import AdministartionFilter from "./Filters/AdministartionFilter.jsx";
import AutoCompleteFilter from "./Filters/AutoCompleteFilter";
import CheckboxFilter from "./Filters/CheckboxFilter";
import DirigeantFromFilter from "./Filters/DirigeantFromFilter";
import LocationFilter from "./Filters/LocationFilter";
import SearchBar from "./SearchBar";

const formatDivisionsNaf = (divisionsNaf) =>
divisionsNaf.map(({ code, libelle }) => ({
label: `${code} - ${libelle}`,
value: code,
}));

const formatTrancheEffectifs = (trancheEffectifs) =>
trancheEffectifs.map(({ code, libelle }) => ({
label: libelle,
Expand Down Expand Up @@ -49,10 +44,11 @@ const Search = ({
sortField,
sortDirection,
options,
divisionsNaf,
generateXlsx,
downloadLoading,
}) => {
const { data: codesNaf } = useCodeNaf();

const onFormSubmit = (e) => {
e.preventDefault();
sendRequest(searchTerm, options);
Expand Down Expand Up @@ -176,12 +172,13 @@ const Search = ({
placeholder="Choisir une tranche d’effectif"
/>
<div className="horizontal-separator" />

<AutoCompleteFilter
filters={filters}
addFilter={addFilter}
removeFilter={removeFilter}
options={formatDivisionsNaf(divisionsNaf)}
id="activites"
options={codesNaf}
id="naf"
label="Activité (NAF ou libellé)"
placeholder="Choisir un code NAF/APE"
/>
Expand Down
4 changes: 4 additions & 0 deletions src/server/src/utils/elastic.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ const filtersFieldMap = {
departement: "departement",
codesPostaux: "codesPostalEtablissement",
tranchesEffectifs: "trancheEffectifsEtablissement",
naf:"codeActivitePrincipale"
};

const getCodeNafLibelle = (code) =>
Expand Down Expand Up @@ -212,6 +213,7 @@ const formatElasticResult = (hit) => {
export const getElasticQueryParams = (req) => {
const query = (req.query["q"] || "").trim();
const activites = req.query["activites"] || [];
const naf=req.query["naf"] || [];
const codesCommunes = req.query["codesCommunes"] || [];
const codesPostaux = req.query["codesPostaux"] || [];
const departement = req.query["departements"] || [];
Expand All @@ -237,10 +239,12 @@ export const getElasticQueryParams = (req) => {
codesPostaux,
tranchesEffectifs,
dirigeant,
naf
};
};

export const requestElastic = async (params, { from, size }) => {
console.log(params);
const body = makeQuery(params);
const {
body: {
Expand Down
Loading