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

feat: migrate search to snjs #526

Closed
wants to merge 10 commits into from
Closed

feat: migrate search to snjs #526

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
3e616d3
WIP:
SNCubes Mar 1, 2021
ad50b29
feat(search) : move search to SNJS
SNCubes Mar 1, 2021
be15aec
Merge branch 'help/cubes' of https://github.com/SNCubes/web into help…
SNCubes Mar 1, 2021
9ad09aa
chore : fix commit message style
SNCubes Mar 1, 2021
b369e34
chore : fix commit message style
SNCubes Mar 1, 2021
926e922
chore: fix commit message style
SNCubes Mar 1, 2021
7d326cd
chore: fix comment message style
SNCubes Mar 1, 2021
b9bbdc8
chore: remove TODOs
SNCubes Mar 1, 2021
5686165
fix(notes_view): remove overhead class
SNCubes Mar 3, 2021
09c71b3
chore: update yarn
SNCubes Mar 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 0 additions & 59 deletions app/assets/javascripts/views/notes/note_utils.ts
View file
Open in desktop

This file was deleted.

24 changes: 8 additions & 16 deletions app/assets/javascripts/views/notes/notes_view.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,12 @@ import {
PrefKey,
findInArray,
CollectionSort,
Search
} from '@standardnotes/snjs';
import { PureViewCtrl } from '@Views/abstract/pure_view_ctrl';
import { AppStateEvent } from '@/ui_models/app_state';
import { KeyboardModifier, KeyboardKey } from '@/services/keyboardManager';
import {
PANEL_NAME_NOTES
} from '@/views/constants';
import {
notePassesFilter
} from './note_utils';
import { PANEL_NAME_NOTES } from '@/views/constants';
import { UuidString } from '@standardnotes/snjs';

type NotesState = {
Expand Down Expand Up @@ -331,19 +327,15 @@ class NotesViewCtrl extends PureViewCtrl<unknown, NotesState> {
*/
private reloadNotesDisplayOptions() {
const tag = this.appState.selectedTag!;
this.application!.setNotesDisplayOptions(
const searchParameters = Search.create(
tag,
this.state.sortBy! as CollectionSort,
this.state.sortReverse! ? 'asc' : 'dsc',
(note: SNNote) => {
return notePassesFilter(
note,
this.getState().showArchived! || tag?.isArchiveTag || tag?.isTrashTag,
this.getState().hidePinned!,
this.getState().noteFilter.text.toLowerCase()
);
}
);
this.getState().showArchived! || tag?.isArchiveTag || tag?.isTrashTag,
this.getState().hidePinned!,
this.getState().noteFilter.text.toLowerCase()
);
this.application!.setNotesDisplayOptions(searchParameters);
}

private get selectedTag() {
Expand Down
1 change: 1 addition & 0 deletions webpack.dev.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ module.exports = (env, argv) => {
const port = argv.port || 3001;
return merge(config(env, argv), {
mode: 'development',
devtool: 'inline-source-map',
Copy link
Contributor

Choose a reason for hiding this comment

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

Wait we didn't have a lighter special sourcemap option set up before? 😳

/** Only create an html file for the dev-server */
plugins: argv.liveReload ? [
new HtmlWebpackPlugin({
Expand Down
Loading