Merge pull request #157 from citizennet/davezuch/FBCM-4107/optional-filtering-sorting-typeahead

FBCM-4107 Configurable filtering for Typeahead search results

Author: davezuch

.circleci/config.yml

@@ -25,6 +25,10 @@ jobs:
             - v1-spago-cache-{{ .Branch }}
             - v1-spago-cache
 
+      - run:
+          name: Verify the tests pass
+          command: make test
+
       - run:
           name: Verify the project and all components build successfully
           command: make build

Makefile

@@ -6,6 +6,7 @@ OUTPUT_DIR ?= $(ROOT_DIR)/output
 PARCEL_DIR ?= $(BUILD_DIR)/parcel
 RTS_ARGS ?=
 SRC_DIR ?= $(ROOT_DIR)/src
+TEST_DIR ?= $(ROOT_DIR)/test
 UI_GUIDE_DIR ?= $(ROOT_DIR)/ui-guide
 
 # Variables that we control
@@ -16,6 +17,7 @@ FIND_SRC_FILES_ARGS := \( -name '*.purs' -o -name '*.js' \) -type f
 NODE_MODULES := $(ROOT_DIR)/node_modules/.stamp
 PACKAGE_JSON := $(ROOT_DIR)/package.json
 SRC_FILES := $(shell find $(SRC_DIR) $(FIND_SRC_FILES_ARGS))
+TEST_FILES := $(shell find $(TEST_DIR) $(FIND_SRC_FILES_ARGS))
 UI_GUIDE_FILES := $(shell find $(UI_GUIDE_DIR) $(FIND_SRC_FILES_ARGS))
 YARN_LOCK := $(ROOT_DIR)/yarn.lock
 
@@ -28,16 +30,29 @@ YARN := cd $(ROOT_DIR) && yarn
 $(BUILD_DIR) $(DIST_DIR) $(PARCEL_DIR):
 	mkdir -p $@
 
+$(BUILD_DIR)/test.js: $(OUTPUT_DIR)/Test.Main/index.js | $(BUILD_DIR)
+	$(YARN) run purs bundle \
+		$(RTS_ARGS) \
+		$(OUTPUT_DIR)/*/*.js \
+		--main Test.Main \
+		--module Test.Main \
+		--output $@
+
+$(BUILD_DIR)/test.out: $(BUILD_DIR)/test.js
+	node $< | tee $@.tmp # Store output in a temp file in case of a failure.
+	mv $@.tmp $@ # Move the output where it belongs.
+
 $(DEPS): packages.dhall spago.dhall $(NODE_MODULES) | $(BUILD_DIR)
 	$(YARN) run spago install $(RTS_ARGS)
 	touch $@
 
 $(DIST_DIR)/bundled.js: $(OUTPUT_DIR)/Main/index.js
-	$(YARN) run purs bundle $(OUTPUT_DIR)/*/*.js \
+	$(YARN) run purs bundle \
+		$(RTS_ARGS) \
+		$(OUTPUT_DIR)/*/*.js \
 		--main Main \
 		--module Main \
-		--output $@ \
-		$(RTS_ARGS)
+		--output $@
 
 $(DIST_DIR)/index.js: $(OUTPUT_DIR)/Main/index.js
 	$(YARN) run browserify dist/main.js --outfile $@
@@ -49,6 +64,9 @@ $(NODE_MODULES): $(PACKAGE_JSON) $(YARN_LOCK)
 $(OUTPUT_DIR)/Main/index.js: $(SRC_FILES) $(UI_GUIDE_FILES) $(DEPS)
 	$(YARN) run spago build -p "$(UI_GUIDE_DIR)/**/*.purs" -u "$(RTS_ARGS)"
 
+$(OUTPUT_DIR)/Test.Main/index.js: $(SRC_FILES) $(TEST_FILES) $(DEPS)
+	$(YARN) run spago build -p "$(TEST_DIR)/Main.purs $(TEST_DIR)/Test/**/*.purs" -u "$(RTS_ARGS)"
+
 .PHONY: build
 build: $(BUILD_DEPS)
 
@@ -65,6 +83,9 @@ clean: $(CLEAN_DEPS)
 		$(ROOT_DIR)/.spago \
 		$(ROOT_DIR)/node_modules
 
+.PHONY: test
+test: $(BUILD_DIR)/test.out
+
 .PHONY: ui-guide
 ui-guide: build-css $(OUTPUT_DIR)/Main/index.js $(NODE_MODULES) | $(PARCEL_DIR)
 	npx parcel $(DIST_DIR)/parcel.html --out-dir $(PARCEL_DIR) --no-cache

src/Interfaces/Typeahead/Interface.purs

@@ -27,7 +27,7 @@ import Halogen.VDom.Driver (runUI)
 import Html.Renderer.Halogen as Parser
 import Network.RemoteData (RemoteData(..))
 import Ocelot.Block.ItemContainer (boldMatches)
-import Ocelot.Typeahead (Component, Input, Insertable(..), Output(..), Query(..), defRenderContainer, multi, renderMulti, renderSingle, single, component, renderHeaderSearchDropdown, renderSearchDropdown, renderToolbarSearchDropdown)
+import Ocelot.Typeahead (Component, Input, Insertable(..), Output(..), Query(..), defFilterFuzzy, defRenderContainer, multi, renderMulti, renderSingle, single, component, renderHeaderSearchDropdown, renderSearchDropdown, renderToolbarSearchDropdown)
 import Ocelot.HTML.Properties (css)
 import Ocelot.Interface.Utilities (Interface, mkSubscription)
 import Partial.Unsafe (unsafePartial)
@@ -247,7 +247,8 @@ single' :: ∀ action item. Eq item => Component action Maybe item Aff
 single' = component
   { runSelect: const <<< Just
   , runRemove: const (const Nothing)
-  , runFilter: const
+  , runFilterFuzzy: defFilterFuzzy
+  , runFilterItems: const
   }
 
 -- DEPRECATED