Improved full text search matching

gui/app/components/search/search-results.js

@@ -12,21 +12,18 @@
 import Component from '@ember/component';
 
 export default Component.extend({
-	resultPhrase: "",
-
-	init() {
-		this._super(...arguments);
-		this.results = [];
-	},
+	resultPhrase: '',
 
 	didReceiveAttrs() {
+		this._super(...arguments);
+
 		let docs = this.get('results');
 		let duped = [];
 		let phrase = 'Nothing found';
 
 		if (docs.length > 0) {
 			duped = _.uniq(docs, function (item) {
-				return item.documentId;
+				return item.get('documentId');
 			});
 
 			let references = docs.length === 1 ? "reference" : "references";

gui/app/models/doc-search-result.js

@@ -24,5 +24,7 @@ export default Model.extend({
 	space: attr(),
 	spaceId: attr(),
 	spaceSlug: attr(),
+	template: attr(),
+	versionId: attr(),
 	selected: attr()
 });

gui/app/services/search.js

@@ -39,4 +39,4 @@ export default Service.extend({
 			return error;
 		});
 	},
-});
+});

gui/app/styles/view/search.scss

@@ -17,7 +17,6 @@
 			position: relative;
 			margin: 0 0 30px 0;
 			width: 100%;
-			// height: 150px;
 
 			&:hover {
 				> .checkbox {
@@ -33,26 +32,33 @@
 
 				> .title {
 					color: $color-black;
-					font-size: 1.3rem;
+					font-weight: bold;
+					font-size: 1.4rem;
+					margin-bottom: 5px;
+
+					> .version {
+						font-size: 1.1rem;
+						font-weight: bold;
+						color: $color-gray;
+					}
+				}
+
+				> .space {
+					color: $color-off-black;
+					font-size: 1.2rem;
 					margin-bottom: 5px;
 				}
 
 				> .snippet {
 					color: $color-gray;
-					font-size: 1rem;
-					line-height: 24px;
+					font-size: 1.1rem;
+					margin-bottom: 10px;
 				}
 
 				&:hover {
-					color: $color-gray;
-
 					> .title {
 						color: $color-link;
 					}
-
-					> .snippet {
-						color: $color-link;
-					}
 				}
 			}
 
@@ -61,7 +67,7 @@
 					display: inline-block;
 					margin: 5px 10px 0 5px;
 					color: $color-gray;
-					font-size: 0.875rem;
+					font-size: 1rem;
 					font-style: italic;
 
 					&:hover {

gui/app/templates/components/search/search-results.hbs

@@ -1,15 +1,23 @@
 <div class="view-search my-5">
-    <div class="heading">{{resultPhrase}}</div>
-    <ul class="documents">
-        {{#each documents key="id" as |result index|}}
+	<div class="heading">{{resultPhrase}}</div>
+	<ul class="documents">
+		{{#each documents key="id" as |result index|}}
 			<li class="document">
-                <a class="link" href="s/{{result.spaceId}}/{{result.spaceSlug}}/d/{{ result.documentId }}/{{result.documentSlug}}?page={{ result.itemId }}">
-					<div class="title">{{result.document}}</div>
+				<a class="link" href="s/{{result.spaceId}}/{{result.spaceSlug}}/d/{{ result.documentId }}/{{result.documentSlug}}?page={{ result.itemId }}">
+					<div class="title">
+						{{result.document}}
+						{{#if (gt result.versionId.length 0)}}
+							<span class="version">&nbsp;&nbsp;{{result.versionId}}</span>
+						{{/if}}
+					</div>
+					<div class="space">{{result.space}}</div>
 					<div class="snippet">{{result.excerpt}}</div>
-					<div class="snippet">({{result.space}})</div>
 					{{folder/document-tags documentTags=result.tags}}
-                </a>
-            </li>
-        {{/each}}
-    </ul>
-</div>
+					{{#if result.template}}
+						<button type="button" class="mt-3 btn btn-warning text-uppercase font-weight-bold">TEMPLATE</button>
+					{{/if}}
+				</a>
+			</li>
+		{{/each}}
+	</ul>
+</div>