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

Jump to bottom

Ti 135 doc highlighting #25

Merged
merged 20 commits into from Apr 26, 2016
Merged

Ti 135 doc highlighting #25

merged 20 commits into from Apr 26, 2016

Conversation

arielisaacs
Copy link
Contributor

  • Fix highlighting function in document list
  • Add highlighting to slack and jira, as well as regular documents
  • Change default fields for Jira
  • Add styling for highlighting, currently background color highlight-color will be applied to results to be highlighted
  • NB highlighting for twitter does not currently work. Please refer to TI-142.

@arielisaacs arielisaacs added this to the 1.0.1 milestone Apr 26, 2016
JoshEllinger
JoshEllinger reviewed Apr 26, 2016
View reviewed changes
client/assets/components/document/document_file/document_file.html
hkey="owner_s"></field>
</div>
<div class="last-modified" ng-if="::vm.doc.lastModified_dt">
<span class="doc-label">last modified:</span> <field value="::vm.doc.lastModified_dtFormatted"></field> UTC
</div>

<div class="last-modified">
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It appears this is a duplicate for the above field. Should only be one last modified.

@JoshEllinger
Copy link
Member

JoshEllinger commented Apr 26, 2016 •
edited

@arielisaacs Left a few comments,
we should try and be consistent with one time bindings where we can ( i didn't comment on each one), and there were a few missing doc ids.

@JoshEllinger
Copy link
Member

JoshEllinger commented Apr 26, 2016 •
edited by arielisaacs

Doctypes:

  • web datasource**
  • jira datasource issue
  • jira datasource project
  • slack datasource
  • twitter datasource
  • local file datasource**
  • generic datasource (not working) -- could just need steps to reproduce not sure what im looking for.

key
** = default display will not show anything in some cases due to how solr works

Note: to test jira projects you have to index projects, a setting on the datasource. Also it is recommended to use a facet on jira_content_type_s so you can focus on just projects.

i was unable to get web datasource to work with highlighting in view
fusion

@arielisaacs
Copy link
Contributor Author

  • Web is working, I'm not sure how to replicate what you are seeing. A lot of times it seems as though the custom fields that the highlight is showing up on is not one of the fields in view. Since fields are customizable, I don't feel comfortable adding every possible field that could have highlighting. Especially in looking at CSV and other datasources without standardized fields, this becomes an issue. Furthermore, since we are not using the prefs API, there isn't a way to change what fields are showing up. Body link anchor would not show up by design in the response in view. Hence your issue.

JoshEllinger
JoshEllinger reviewed Apr 26, 2016
View reviewed changes
client/assets/components/documentList/documentList.js
vals[key] = $sce.trustAsHtml(high);
});
});
highlighting[key] = vals;
$log.debug('value', vals);
vm.highlighting[key] = vals;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why are we using vm.highlighting here as opposed to a non attached variable? we are already going to assign the value in the activate function. I think this will have a slight performance cost which will grow with a large number of highlights.

Won't this trigger a watch event for each iteration of the loop.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think this is worth fixing at the current moment.

@arielisaacs
Copy link
Contributor Author

All datasources save for twitter are tested and working. Closing this PR

@arielisaacs arielisaacs merged commit 66181e1 into develop Apr 26, 2016
JoshEllinger added a commit that referenced this pull request Aug 5, 2016
@JoshEllinger
Add doc fix
4e29251 
commit 4471a3e
Author: Joshua Ellinger <joshua.ellinger@lucidworks.com>
Date:   Fri Aug 5 14:49:46 2016 -0700

    Another tiny wording fix

commit e34085b
Merge: 7187e19 8097f11
Author: Joshua Ellinger <joshua.ellinger@lucidworks.com>
Date:   Fri Aug 5 14:46:08 2016 -0700

    Merge branch 'master' into develop

    # Conflicts:
    #	CHANGELOG.md

commit 7187e19
Author: Joshua Ellinger <joshua.ellinger@lucidworks.com>
Date:   Fri Aug 5 14:45:04 2016 -0700

    Add bug fix

commit 6ecc399
Author: Josh Ellinger <josh.ellinger@gmail.com>
Date:   Fri Aug 5 14:26:34 2016 -0700

    1.3.0 Release notes (#62)

    * Update version

    * Update changelog

    * Update text

    * Fix View port line

commit 886584a
Author: Josh Ellinger <josh.ellinger@gmail.com>
Date:   Fri Aug 5 13:51:00 2016 -0700

    Change performant build to be default (#61)

    * Change default build to be more performant

    * Update readme

    * And do it for windows too :)

commit 0312af1
Author: Nicholas DiPiazza <nicholas.dipiazza@lucidworks.com>
Date:   Fri Aug 5 15:01:47 2016 -0500

    View on windows (#54)

    Implements packaging to make view work on windows

commit 2bcad3b
Merge: 2993e94 4414063
Author: Joshua Ellinger <joshua.ellinger@lucidworks.com>
Date:   Thu Aug 4 12:53:10 2016 -0700

    Merge branch 'develop' of https://github.com/LucidWorks/lucidworks-view into develop

    # Conflicts:
    #	README.md

commit 2993e94
Author: Joshua Ellinger <joshua.ellinger@lucidworks.com>
Date:   Thu Aug 4 12:52:15 2016 -0700

    Move packaging info from regular readme

commit 4414063
Author: Josh Ellinger <josh.ellinger@gmail.com>
Date:   Thu Aug 4 12:35:53 2016 -0700

    link to the Q&A site where users can ask questions (#60)

commit 0085216
Merge: 27e62c6 d5b5ca5
Author: Joshua Ellinger <joshua.ellinger@lucidworks.com>
Date:   Thu Aug 4 12:34:00 2016 -0700

    Merge branch 'master' into develop

commit 27e62c6
Author: Yuwen Fang <wenbof1020@users.noreply.github.com>
Date:   Mon Aug 1 14:17:17 2016 -0700

    Performance improvements for production build (#55)

    * Now npm `run start-production`  will serve with minified production app. JS load size is reduced from 2.4mb to 500k. (2.2mb => 400k for foundation.js, and 100k => 59k for app.js )

    * Fixed an issue to make sure ngAnnotate routine is invoked before the JS get uglified which building production.

    * Removed anmiation while page loading, which will cause considerable performance impact especially on slow browser.

    * Turned off browserSync ui.

    * Added server_port param to fusion config.

commit 88829f1
Merge: 318ad84 405fb85
Author: Nathaniel Maynard <nate.maynard@lucidworks.com>
Date:   Tue Jul 12 14:03:43 2016 -0700

    Merge pull request #52 from lucidworks/TI-203-last-index

    Use lastIndexOf when mucking w/ the local param strings

commit 405fb85
Author: Nathaniel Maynard <nate.maynard@lucidworks.com>
Date:   Mon Jul 11 16:34:07 2016 -0700

    fixed typo

commit 9db5fbf
Author: gsingers <gsingers@apache.org>
Date:   Sat Jul 2 06:51:42 2016 -0400

    use last index of on the parentheses

commit 318ad84
Merge: 08f873e bf49d7a
Author: Joshua Ellinger <joshua.ellinger@lucidworks.com>
Date:   Thu Jun 30 12:36:39 2016 -0700

    Merge branch 'master' into develop

commit 08f873e
Author: Josh Ellinger <josh.ellinger@gmail.com>
Date:   Thu Jun 30 12:28:07 2016 -0700

    Update CHANGELOG.md

commit 4157cb5
Author: Josh Ellinger <josh.ellinger@gmail.com>
Date:   Thu Jun 30 12:27:07 2016 -0700

    Cersei's Iron Tiara

commit 92b1d1d
Merge: f17e01d f19f4a3
Author: Joshua Ellinger <joshua.ellinger@lucidworks.com>
Date:   Thu Jun 30 12:24:19 2016 -0700

    Merge branch 'master' into develop

    # Conflicts:
    #	CHANGELOG.md
    #	bower.json
    #	client/assets/components/document/document_default/document_default.html
    #	client/assets/components/document/document_default/document_default.js
    #	client/assets/components/document/document_file/document_file.js
    #	client/assets/components/document/document_jira/contentTypes/jiraIssue.html
    #	client/assets/components/document/document_jira/contentTypes/jiraIssue.js
    #	client/assets/components/document/document_jira/contentTypes/jiraProject.html
    #	client/assets/components/document/document_jira/contentTypes/jiraProject.js
    #	client/assets/components/document/document_jira/document_jira.js
    #	client/assets/components/document/document_slack/document_slack.js
    #	client/assets/components/document/document_twitter/document_twitter.js
    #	client/assets/components/document/document_web/document_web.html
    #	client/assets/components/document/document_web/document_web.js
    #	client/assets/components/documentList/documentList.html
    #	client/assets/components/documentList/documentList.js
    #	client/assets/js/controllers/HomeController.js
    #	client/assets/js/services/SignalService.js
    #	gulp/serve.js
    #	package.json
    #	view.sh

commit f17e01d
Merge: ccb6156 a311ba4
Author: Nathaniel Maynard <nate.maynard@lucidworks.com>
Date:   Thu Jun 30 09:47:29 2016 -0700

    Merge pull request #50 from lucidworks/TI-202-release-notes-v2

    1.2 release notes

commit a311ba4
Merge: 4917744 ccb6156
Author: Nathaniel Maynard <Nmaynard91@gmail.com>
Date:   Thu Jun 30 09:46:43 2016 -0700

    resolved conflicts

commit ccb6156
Author: Nathaniel Maynard <Nmaynard91@gmail.com>
Date:   Thu Jun 30 09:31:52 2016 -0700

    fixed spelling error

commit 4917744
Author: Ariel Isaacs <ariel.isaacs@lucidworks.com>
Date:   Wed Jun 29 19:30:59 2016 -0700

    1.2 release notes

commit 8c62aa1
Author: Nathaniel Maynard <nate.maynard@lucidworks.com>
Date:   Wed Jun 29 17:09:03 2016 -0700

    Release Notes for 1.2.0  (#49)

    * Release notes

    * missed one

    * Copy changes to release notes

    * updated version

commit 248890e
Author: Jane Mendonca <janezomgzomg@users.noreply.github.com>
Date:   Sat Jun 18 00:25:56 2016 +0400

    Added support for clearing filters on a facet (#47)

    * * clear filters applied on a field facet

    * * changed <a> to <span>
    * styling for the facet block header

    * * replicated the clearAppliedFilter changes to range facets
    * renamed CheckQueryFacetExists to CheckFacetExists to avoid confusion with facet.query (future)

commit 492492d
Author: Jane Mendonca <janezomgzomg@users.noreply.github.com>
Date:   Thu Jun 16 18:56:15 2016 +0400

    SignalsService.postClickSignal should pass in position information (#39)

    * * set __signals_doc_id__ with doc.id * may be an issue

    * * Added ClientStatsService which returns a set of functions that retrieve specific information related to the client setup
      * getBrowserLanguage returns the language and locale of the browser
      * getBrowserPlatform returns the platform of the browser
      * getBrowserUserAgent returns the userAgent
      * getIP returns the IP address
      * getBrowser returns the browsername
      * getUsername returns the username of the user
    * A scope variable 'position' is passed down into the document. It returns the value of getDocPosition which returns the index of the document in the current document result list.
    * Params passed into the postSignal function are lw_url, position, page. These get appended to the data in SignalsService.postClickSignal.
    * The value of the current page number is normalized wrt 1.
    * Params that have been added to SignalsService.postClickSignal are:
      * lw_head_field
      * lw_language
      * lw_platform
      * lw_userAgent

    * * removed lw_ prefix from the custom fields
    * username is retrieved from ConfigService

    * * replicated changes in default, jira (issue, project), slack, web
    * added getNormalizedCurrentPage to PaginateService

    * * passed in position to the grouped docs templates
    * added position to the scope of document_file directive

    * * moved signals, position, page statements into processDocument functions wherever applicable

    * * minor cleanup

    * * some cleanup wrt postSignal in the controller of every doc type
    * doc and lw_url will be passed in via the function call in the template
    * position and page will be added to the options obj in the controller
    * SignalService.postClickSignal will be called in the postSignal function in the controller with the required parameters
    * this will ensure that the postSignal call in the template is readable

    * remove double position

    * * escape and sanitize field
    * escapes the html and removes unwanted html entities

    * Implement more/less functionality using Angular limitTo functionality (#42)

    * Implement more/less functionality using Angular limitTo functionality

    * * template tweaks
    * replaced the <p> with <span> as it changed the formatting of the primary and secondary fields
    * tweaked the Read More/Less toggle template

    * Initial pass at field directive callback for formatting (#44)

    * Initial pass at field directive callback for formatting

    * Initial implementation of callback function and default implementation #43

    * * vm.doc isn't passed into postSignal anymore.
    * vm.doc is accessed in postSignal

    * * piggyback fix - changed Read More/Less to Read more/less

commit 13cca2a
Author: Jane Mendonca <janezomgzomg@users.noreply.github.com>
Date:   Thu Jun 16 18:30:08 2016 +0400

    Fixed flakiness wrt using multiple multiselect facets (#46)

    * added a function checkQueryFacetExists to run a proper check for both fq:field and localparam transformers and facet key names

commit 0c25263
Author: Jane Mendonca <janezomgzomg@users.noreply.github.com>
Date:   Thu Jun 16 00:09:24 2016 +0400

    Implement multi select faceting for field facets (#45)

    * * added LocalParamsService to create the structure for the facet from the responseHeader.params of the search result
    * this structure will contain the local params that were configured for the facet in the pipeline

    * * moved facetLocalParam construction call from HomeController into FacetList

    * * add tag to every individual facet list
    * tag may contain a value or may be null

    * * facetTag is passed down into the facetField directive
    * it is added to the query facet object in the addQueryFacet function

    * * renamed `localParen` functions to `localParam`

    * * wip
    * added localParams as a transformer function if the query facet object has a tag
    * getTransformerFunction can now handle an array of transformer keys. It returns the first key that matches.
    * localParamWrapperTransformer is now triggered.
    * TODO: handle post localParamWrapperTransformer. pass in an array of values in a query facet object, instead of an array of query facet object with a single value.
    * QueryBuilder might have to be modified to create a url in the syntax {!tag=abc}fieldName:("a" OR "b")

    * * checks if the multiselectfq exists in the query.fq object and if it has the tag
    * if it exists, the title value of the fq to be added is pushed into the values array
    * TODO: fix the localparamwrapper syntax
    * TODO: support removal of filter

    * * filters can be added to a multiselect facet
    * TODO: remove hardcoded tagname

    * * minor tweaking of localParam functions

    * * works for >=1 multiselect filter

    * * multiselect filters can now be removed
    * display of facet has been fixed
    * cleanup in fieldFacet.js

    * * cleanup and tweaks

    * * changed comment

    * * minor changes
    * fixed typo
    * removed facet.date from TODO comment related to future typeKeys to be supported
    * Moved the snippet of determining the transformer from an array of transformers into a gist for later use.

    * * moved LocalParam transformer functions from facetField.js into a config block in LocalParamService.js

    * * added some comments

    * * added comments for LocalParamService.js

commit 89977a2
Author: Grant Ingersoll <gsingers@apache.org>
Date:   Tue Jun 14 16:04:16 2016 -0400

    Initial pass at field directive callback for formatting (#44)

    * Initial pass at field directive callback for formatting

commit 1f9e71d
Author: Jane Mendonca <jane.zomg@gmail.com>
Date:   Tue Jun 14 23:47:08 2016 +0400

    Initial implementation of callback function and default implementation #43

commit ae5bcf2
Author: Grant Ingersoll <gsingers@apache.org>
Date:   Tue Jun 14 07:29:52 2016 -0400

    Implement more/less functionality using Angular limitTo functionality (#42)

    * Implement more/less functionality using Angular limitTo functionality

    * * template tweaks
    * replaced the <p> with <span> as it changed the formatting of the primary and secondary fields
    * tweaked the Read More/Less toggle template

commit 3c0091a
Merge: d8ee884 6dbf91e
Author: Jane Mendonca <janezomgzomg@users.noreply.github.com>
Date:   Fri Jun 10 16:21:43 2016 +0400

    Merge pull request #41 from lucidworks/field-directive-max-length

    Fixed field-directive maxlength for field value which contains an HTML entity.

commit 6dbf91e
Author: Jane Mendonca <jane.zomg@gmail.com>
Date:   Fri Jun 10 15:24:34 2016 +0400

    * escape and sanitize field
    * escapes the html and removes unwanted html entities

commit d8ee884
Author: Arijit Dasgupta <arijit.rivalslayer@gmail.com>
Date:   Fri May 20 22:37:37 2016 +0530

    Fixed query-profile/query-pipeline switch for typeahead (#36)

commit 5eaf90d
Author: Arijit Dasgupta <arijit.rivalslayer@gmail.com>
Date:   Wed May 18 13:32:48 2016 -0700

    Added basic support for range facet directive

commit da0b18c
Author: Joshua Ellinger <joshua.ellinger@lucidworks.com>
Date:   Tue May 17 15:49:59 2016 -0700

    fix ghostMode bug

commit 6e1e36d
Author: Ariel Isaacs <ariel.isaacs@lucidworks.com>
Date:   Wed May 4 15:24:23 2016 -0700

    update changelog with release notes for 1.1.0

commit 8171d09
Author: Ariel <ariel.isaacs@lucidworks.com>
Date:   Wed May 4 15:07:17 2016 -0700

    Release preparation (#30)

    * release prep 1

    * fix broken tests

commit 65f0aef
Author: Ariel <ariel.isaacs@lucidworks.com>
Date:   Tue May 3 17:06:52 2016 -0700

    More signals (#26)

    * Add more signals options and clean up doc binding.
    * Add another signal option for more flexible data submission, fix a bug in the document click signals not pulling in the pipeline or signal type
    * Fixed the problem with binds in Angular template which prevented the document signal Id to be passed onto the directives document object
     - Added $log for better debugging in the future
    * WIP

    * cleanup after merge

    * WIP

    * Simplify postClickSignal method

    * Remove $log from signla service

    * fix data so params are passed through.

    * update signaltype param

    * Even better refactor

    * Forgot docId

    * order by alpha

    * Update example document in documentList

    * cleanup

    * update readme for docs with view

    * WIP

    * update readme and remove unused fcn

    * cleanup home controller to break up large function

    * cleanup

commit 1bfdf1c
Author: Ariel <ariel.isaacs@lucidworks.com>
Date:   Mon May 2 09:50:28 2016 -0700

    Ti 121 grouped results (#29)

    * home controller accounts for grouped results
    * grouped results for different datatypes
    * add facets back in for grouped results, add toggle show hide for grouped results
    * cleanup

commit e2fdde5
Author: Josh Ellinger <josh.ellinger@gmail.com>
Date:   Thu Apr 28 14:25:48 2016 -0700

    Ti 141 add fallback instructions (#28)

    * Add fallback instructions for view.sh

commit 0ff8223
Author: Josh Ellinger <josh.ellinger@gmail.com>
Date:   Thu Apr 28 12:59:41 2016 -0700

    TI-137 and TI-29 allow https for view and get view to properly handle self signed certificates in the proxy (#27)

    *  https proxy fix

    * make https even more configurable

    * default https to false

    * set ghostmode to false

    *  Allow https proxy to be a self signed cert

    * Modify config to comment out https by default

commit e59bc5a
Author: Ariel Isaacs <ariel.isaacs@lucidworks.com>
Date:   Wed Apr 27 11:07:54 2016 -0700

    fix highlighting in doc view

commit 66181e1
Author: Ariel <ariel.isaacs@lucidworks.com>
Date:   Tue Apr 26 15:55:08 2016 -0700

    Ti 135 doc highlighting (#25)

    * add highlighting to doc types and default doc

commit 5d8c1f3
Author: Josh Ellinger <josh.ellinger@gmail.com>
Date:   Fri Apr 22 09:38:14 2016 -0700

    Fix bug (#23)

commit 289924f
Author: Ariel <ariel.isaacs@lucidworks.com>
Date:   Wed Apr 20 12:37:51 2016 -0700

    fix watch, lots of debugging and tests (#20)

    * fix watch, make sure component files are being watch and use sequences

commit fc6dabf
Author: Josh Lipps <josh.lipps@gmail.com>
Date:   Tue Apr 19 14:44:00 2016 -0700

    TI-129: Fixed watching of templates on npm start  (#19)

    * TI-129: fixed reloadBrowsers task to call cb so template:sequence can continue
    * Add Ariel and josh l as contributors

commit 637dfe3
Author: Ariel <ariel.isaacs@lucidworks.com>
Date:   Mon Apr 18 11:19:31 2016 -0700

    add lodash unique filter for landing pages (#18)

commit 2d43846
Author: Ariel <ariel.isaacs@lucidworks.com>
Date:   Thu Apr 14 16:35:08 2016 -0700

    Ti 128 facet (#17)

    *Add conditional for when there is no facet stage present in set pipeline

commit c3cb96a
Author: Erik Hatcher <erikhatcher@users.noreply.github.com>
Date:   Thu Apr 14 15:38:21 2016 -0400

    * Fix typos in sample.js file

commit e38955a
Author: Joshua Ellinger <joshua.ellinger@lucidworks.com>
Date:   Wed Apr 13 14:35:15 2016 -0700

    Fix leftover from search hub

commit dc4e819
Merge: ed5034c bd13f54
Author: Joshua Ellinger <joshua.ellinger@lucidworks.com>
Date:   Tue Apr 12 16:34:12 2016 -0700

    Merge branch 'master' into develop

commit ed5034c
Merge: 4f4367e 42fe23a
Author: Joshua Ellinger <joshua.ellinger@lucidworks.com>
Date:   Tue Apr 12 16:19:38 2016 -0700

    Merge branch 'master' into develop

commit 4f4367e
Merge: da002aa b0ddee1
Author: Joshua Ellinger <joshua.ellinger@lucidworks.com>
Date:   Tue Apr 12 12:25:56 2016 -0700

    Merge branch 'master' into develop

commit da002aa
Author: Arijit Dasgupta <arijit.rivalslayer@gmail.com>
Date:   Tue Apr 12 21:42:12 2016 +0530

    Removed stray

commit 1a13b62
Author: Arijit Dasgupta <arijit.rivalslayer@gmail.com>
Date:   Tue Apr 12 21:41:38 2016 +0530

    Removed stray

commit 16a6eae
Merge: 905d5df b1bd086
Author: Arijit Dasgupta <arijit.rivalslayer@gmail.com>
Date:   Tue Apr 12 21:40:34 2016 +0530

    Fixed conflicts in gitignore

commit 905d5df
Author: Arijit Dasgupta <arijit.rivalslayer@gmail.com>
Date:   Tue Apr 12 21:38:22 2016 +0530

    Fixed typeahead query object in service
@JoshEllinger JoshEllinger deleted the TI-135-doc-highlighting branch February 15, 2017 19:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@arielisaacs arielisaacs

Labels
enhancement
Projects
None yet
Milestone
1.1
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@arielisaacs @JoshEllinger @JoshLipps