feat: search bar component (#95)

Initial work on the search-bar component

we have a search box and a button. It can be tested locally on http://search.localhost:8000/static/off.html.

At the moment it just send the request, it does not display the results (next results components).

.gitignore

@@ -118,4 +118,4 @@ dmypy.json
 /frontend/node_modules/
 /frontend/lib/
 /frontend/test/
-/frontend/public/
+/frontend/public/dist/

Makefile

@@ -91,9 +91,15 @@ check:
 # note: this is called by pre-commit
 check_front:  _ensure_network
 	${DOCKER_COMPOSE} run --rm -T search_nodejs npm run check
-lint:
-	@echo "🔎 Running linters..."
+
+lint: lint_back lint_front
+
+lint_back:
+	@echo "🔎 Running linters for backend code..."
 	pre-commit run black --all-files
+
+lint_front:
+	@echo "🔎 Running linters for frontend code..."
 	${DOCKER_COMPOSE} run --rm search_nodejs npm run format
 
 #-------#
@@ -125,7 +131,7 @@ guard-%: # guard clause for targets that require an environment variable (usuall
 
 import-dataset: guard-filepath
 	@echo "🔎 Importing data …"
-	${DOCKER_COMPOSE} run --rm api python3 -m app import /opt/search/data/${filepath} --num-processes=2
+	${DOCKER_COMPOSE} run --rm api python3 -m app import /opt/search/data/${filepath} ${args} --num-processes=2
 
 
 #-------#

README.md

@@ -79,6 +79,10 @@ If you get errors, try adding more RAM (12GB works well if you have that spare),
 
 Typical import time is 45-60 minutes.
 
+If you want to skip updates (eg. because you don't have a Redis installed), 
+use `make import-dataset filepath='products.jsonl.gz' args="--skip-updates"`
+
+
 ## Fundings
 
 This project has received financial support from the NGI Search (New Generation Internet) program, funded by the European Commission.

app/_import.py

@@ -405,6 +405,7 @@ def run_full_import(
     num_processes: int,
     config: IndexConfig,
     num_items: int | None = None,
+    skip_updates: bool = False,
 ):
     """Run a full data import from a JSONL.
 
@@ -447,7 +448,8 @@ def run_full_import(
     with Pool(num_processes) as pool:
         pool.starmap(import_parallel, args)
     # update with last index updates (hopefully since the jsonl)
-    get_redis_updates(es_client, next_index, config)
+    if not skip_updates:
+        get_redis_updates(es_client, next_index, config)
     # make alias point to new index
     update_alias(es_client, next_index, config.index.name)
 

app/cli/main.py

@@ -15,6 +15,10 @@ def import_data(
         dir_okay=False,
         help="Path of the JSONL data file",
     ),
+    skip_updates: bool = typer.Option(
+        default=False,
+        help="Skip fetching fresh records from redis",
+    ),
     num_processes: int = typer.Option(
         default=2, help="How many import processes to run in parallel"
     ),
@@ -63,6 +67,7 @@ def import_data(
         num_processes,
         index_config,
         num_items=num_items,
+        skip_updates=skip_updates,
     )
     end_time = time.perf_counter()
     logger.info("Import time: %s seconds", end_time - start_time)

confs/nginx.conf

@@ -27,6 +27,10 @@ server {
 	# this is the internal Docker DNS, cache only for 30s
     resolver 127.0.0.11 valid=30s;
 
+	# web server dev has specific urls, we want to redirect them to static
+	rewrite ^/(__wds-|__web-dev-server)(.*)$ /static/$1$2 last;
+
+
 	# Static files - in DEV = node server
 	location /static${DEV_UI_SUFFIX} {
 		proxy_set_header Host $host;
@@ -35,7 +39,7 @@ server {
 		set $search_nodejs search_nodejs;
 		# rewrite to get rid of /static
 		# double $ to avoid being interpreted by interpolation
-		rewrite ^/static${DEV_UI_SUFFIX}/(.*)$ /$1 break;
+		# rewrite ^/static${DEV_UI_SUFFIX}/(.*)$ /$1 break;
 		# important do not add a / at the end for node is picky on not having '//' in url
 		proxy_pass http://$search_nodejs:8000;
 	}

docker/dev.yml

@@ -42,6 +42,9 @@ services:
       # by setting PROD_UI_SUFFIX to "" and DEV_UI_SUFFIX to "-dev"
       PROD_UI_SUFFIX: "${PROD_UI_SUFFIX--static}"
       DEV_UI_SUFFIX: "${DEV_UI_SUFFIX-}"
+    volumes:
+      # dynamic mount
+      - ./frontend/public:/opt/search-a-licious/public
 
 
   # Node that create the webcomponents

frontend/Dockerfile

@@ -46,7 +46,7 @@ COPY --chown=node:node tsconfig.json /opt/search-a-licious/tsconfig.json
 COPY --chown=node:node rollup.config.js /opt/search-a-licious/rollup.config.js
 # build for production
 # no need of a public url, we are at the root
-RUN npm run build && npm run bundle
+RUN rm -rf public/dist/* && npm run build && npm run bundle
 CMD ["npm", "run", "serve"]
 
 # nginx