-
Notifications
You must be signed in to change notification settings - Fork 16
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.
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
Draft #67
Draft
phillygogo
wants to merge
6
commits into
wilr:main
Choose a base branch
from
education-nz:main
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Draft #67
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
6f2a820
adding support for snippeted results
phillygogo 255c2c6
Merge pull request #1 from education-nz/bug/add-support-for-snippet-r…
phillygogo ad38dcd
Adding a custom sorting function, and adding Content to be indexed
phillygogo 93e1cef
Merge pull request #2 from education-nz/bug/add-support-for-snippet-r…
phillygogo 068060e
removing code and have reworked it into the intranet repo
2b53a45
removing bug which is overwriting my content
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -68,6 +68,20 @@ function array_key_first(array $arr) | |
$record = $className::get()->byId($id); | ||
|
||
if ($record && $record->canView()) { | ||
// Snippet results are cofigured in Algolia to be returned. | ||
// Since the following result is actually fetched from the DB | ||
// I need to concatenate the aogolias snippeted result to the $hit to be returned | ||
if(isset($hit["_snippetResult"]) && isset($hit["_snippetResult"]['Content'])) { | ||
$record->snippetResult = $hit["_snippetResult"]['Content']["value"]; | ||
} | ||
if(isset($hit["_snippetResult"]) && isset($hit["_snippetResult"]['objectContent'])) { | ||
$record->snippetResult = $hit["_snippetResult"]['objectContent']["value"]; | ||
} | ||
|
||
if(isset($hit["objectLink"])) { | ||
$record->AlgoliaLink = $hit["objectLink"]; | ||
} | ||
|
||
$records->push($record); | ||
} | ||
} catch (Throwable $e) { | ||
|
@@ -76,6 +90,16 @@ function array_key_first(array $arr) | |
} | ||
} | ||
|
||
//Custom sorting results so Guide pages are always first. | ||
//This will unset all results that aren't guide pages | ||
//Then instantly re add to array which places them at the bottom. | ||
foreach($records as $key => $wanted) { | ||
if($wanted->ClassName != 'IntranetGuidePage') { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @phillygogo Definitely should not be done in here :) Sorting can be set in Algolia directly. |
||
unset($records[$key]); | ||
} | ||
$records[$key] = $wanted; | ||
} | ||
|
||
$this->lastResult = $results; | ||
|
||
$output = PaginatedList::create($records); | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
spelling mistake "algolia"