Merge pull request #340 from KnowWhereGraph/develop

RC2

.github/workflows/prettier-pr.yaml

@@ -22,4 +22,4 @@ jobs:
         with:
           # This part is also where you can pass other options, for example:
           prettier_options: --check **/*.{js,md,ts}
-          only_changed: True
+          only_changed: True

.prettierrc.json

@@ -3,5 +3,5 @@
   "tabWidth": 2,
   "semi": false,
   "singleQuote": true,
-  "prettier.printWidth": 120
+  "printWidth": 80
 }

README.md

@@ -25,7 +25,7 @@ or
 
 When building choose between the configurations specified in with the `--configuration` flag. The `production` flag should be used for production builds and `stage` for staging.
 
-`ng build --configuration <production/stage>`
+`ng build --configuration=<production/stage>`
 
 This command builds outputs the build in the `dist/` folder.
 
@@ -39,31 +39,15 @@ There are three types of deployments:
 
 #### Locally (Development Mode)
 
-When working on the faceted-search, use the traditional `ng serve`. Visit the site locally at http://localhost:4200.
-
-#### Docker + NGINX
-
-To run the full NGINX and Angular stack, run the docker container created from the included Dockerfile.
-
-```bash
-docker build -t faceted-search .
-docker run -d -p 8080:80 faceted-search
-```
-
-Visit http://localhost:8080 for the deployment.
-
-#### Staging & Production Servers
-
-When deploying on the staging or production servers, first fetch the cache, then build the project, and finally copy the files to a location that is being served by NGINX.
-
-For example,
+When working on the faceted-search, run the following
 
 ```bash
 npm run cache-prod
-npm run build --configuration=stage
-cp -r dist/faceted-search/* /var/www/html
+ng serve
 ```
 
+Visit the site at http://localhost:4200
+
 ## Troubleshooting
 
 ### The GNIS/Hazard/Location Tree Facets Aren't Working
@@ -134,6 +118,4 @@ The Faceted Search follows versioning conventions from [Semantic Versioning](htt
 
 Contributions as issues and pull requests are welcome. New features should be made as pull requests into the `develop` branch and attached to an issue. The pull request should detail what was done, how it can be tested, and any relevant documentation updates. The project uses [prettier](https://prettier.io/) for code formatting, with line widths set to 120 characters.
 
-Before creating pull requests, lint the project with
-
-`ng lint`
+Before creating pull requests, prettify your code changes with [prettier](https://prettier.io/).

package.json

@@ -63,7 +63,7 @@
     "karma-coverage": "~2.1.0",
     "karma-jasmine": "~4.0.0",
     "karma-jasmine-html-reporter": "~1.7.0",
-    "prettier": "^2.8.7",
+    "prettier": "2.8.8",
     "typescript": "~4.8.4"
   }
 }

src/app/facets/facets.component.scss

@@ -32,6 +32,7 @@
   border-radius: 0 5px 5px 0;
   color: #fff;
   cursor: pointer;
+  width: 30%
 }
 
 .facet {

src/app/places-table/places-table.component.ts

@@ -66,6 +66,7 @@ export class PlacesTableComponent implements OnInit {
     this.placesDataSource = new MatTableDataSource(this.places)
     this.populateTable()
     this.totalSize = 0
+    // Emit an event signaling that counting has stopped, and include the results count
     this.resultsCountEvent.emit(this.totalSize)
   }
 
@@ -105,11 +106,10 @@ export class PlacesTableComponent implements OnInit {
       .then((results: any) => {
         this.places = []
         // Check to see if the query failed
-        if (results === false) {
+        if (results.records === undefined) {
           this.totalSize = 0
           this.resultsCountEvent.emit(this.totalSize)
           this.searchQueryFinishedEvent.emit(true)
-          this.errorModal.emit()
           return
         }
         results.records.forEach((result) => {

src/app/services/query.service.ts

@@ -430,7 +430,7 @@ export class QueryService {
 
     if (placesFacets['keyword'] && placesFacets['keyword'] != '') {
       placeQuery += `
-      ?search a elastic-index:kwg_fs_index;
+      ?search a elastic-index:kwg_manhattan_fs_index;
       elastic:query "${placesFacets['keyword']}";
       elastic:entities ?entity.
       ?entity elastic:score ?score.
@@ -659,7 +659,7 @@ export class QueryService {
     //Keyword search
     if (hazardFacets['keyword'] && hazardFacets['keyword'] != '') {
       hazardQuery += `
-        ?search a elastic-index:kwg_fs_index;
+        ?search a elastic-index:kwg_manhattan_fs_index;
         elastic:query "${hazardFacets['keyword']}";
         elastic:entities ?entity.
         ?entity elastic:score ?score.
@@ -871,7 +871,7 @@ export class QueryService {
     }
     let keyword_query = ``
     if (keyword != '') {
-      keyword_query = `?search a elastic-index:kwg_fs_index;
+      keyword_query = `?search a elastic-index:kwg_manhattan_fs_index;
       elastic:query "${keyword}";
       elastic:entities ?entity.
       ?entity elastic:score ?score.`