2017-01-19 15:50:26 -02:00
|
|
|
import fuzzy from 'fuzzy';
|
WIP - Global UI (#785)
* update top bar and collections sidebar UI
* update collection entries UI
* improve global layout
* merge search page into collection page
* enable new entry button
* search fixup
* wip -initial editor update
* update editor scrolling and markdown toolbar position
* wip
* editor toolbar progress
* editor toolbar wip
* finished basic editor toolbar
* add standalone toggle component
* improve markdown toolbar spacing
* add user avatar placeholder
* finish markdown toggle styling
* refactor icon setup, add new icons
* add new icons to markdown editor toolbar
* remove extra app container
* add markdown active mark style
* relation and text widget styling
* widget design updates, basic list/object design update
* widget style updates, image widget improvements
* refactor widget directory, fix file removal
* widget focus styles
* finish editor widget focus styles
* migrate media library modal to react-modal
* wip - migrate editor component form to modal
* wip - move editor component form to modal
* wip - embed plugin forms in the editor
* inline shortcode forms working
* disable react hot loading, its breaking things
* improve shortcode form styles
* make shortcode form collapsible, improve styling
* add close functionality to shortcode blocks
* improve base media library styling
* fix shortcode label
* migrate unstyled workflow to new UI
* wip - reorganizing everything
* more work moving everything
* finish more moving and eliminating stuff
* restructure, remove react-toolbox
* wip - removing old stuff, more restructure
* finish restructure
* wip - css arch
* switch back to test repo
* update react-datetime to ^2.11.0
* remove leftover react-toolbox button
* more restructuring clean-up
* fix UI component directory case
* wip -css editor control style
* wip - consolidate widget styles
* wip - use a single control renderer
* fixed object values breaking
* wip - editor control active styles
* pass control wrapper to widgets
* ensure branch name is trimmed
* wip - improve widget authoring support
* import Map to Widget component
* refactor toolbar buttons
* wip - more widget active styles
* break out editor toggle component
* add local scroll sync back
* update editor toggle icons
* limit editor control pane content width
* fix editor control spacing
* migrate markdown toolbar stickiness to css
* fix markdown toolbar border radius
* temporarily use test backend
* stop markdown toolbar from going to bottom
* restore disabled markdown toolbar buttons for raw
* test markdown widget without focus styles
* more widget updates
* remove card visuals from editor
* disable dragging editor split off screen
* use editorControl component for shortcode fields
* make header site link configurable
* add configurable collection descriptions
* temporarily add example assets
* add basic list view
* remove outdated css mixins
* add and implement search icon
* activate quick add menu
* visualize usable space in editor view
* fix entry close, other improvements
* wip - editorial workflow updates
* some dropshadow and other CSS tweaks
* workflow ui updates
* add worfklow card buttons
* fix workflow card button handlers
* some dropshadow and other CSS tweaks
* make workflow board wider
* center workflow and collection views
* add basic responsiveness
* a bunch of fun UI fixes! a BUNCH! (#875)
* give `.nc-entryEditor-toolbar-mainSection` left and right child divs
* a bunch of fun UI fixes! a BUNCH!
* remove obscure --buttonShadow
* revert to test repo
* fix not found page styling
* allow workflow publishing from any column
* disallow publishing from all columns, with feedback
* fix new entry button
* fix markdown state persisting across entries
* enable simple workflow save and new from editor
* update slug in address bar when saving new entry
* wip - workflow updates, deletion working
* add status change functionality to editor
* wip - improving status change from editor
* editor toolbar back button improvements, loading improvements, cleanup
* progress on the media library UI cleanup
* remove font smothing css
* a quick fix for these buttons
* tweaks
* progress on media library modal— broken FYI
* fix media library functionality, finish migrating footer
* remove media library footer files
* remove leftover css import
* fix media library
* editor publishing functionality complete (unstyled)
* remove leftover loader var from media library
* wip - editor publishing styles
* add status dropdown styling
* editor toolbar style updates
* editor toolbar state improvements
* progress on the media library UI cleanup, style improvements
* finish editorial workflow editor styling
* finish media library styling
* fix config
* add what-input to optimize focus styling
* fix button
* fix navigation blocking for simple workflow
* improve simple workflow publishing
* add avatar dropdown to editor top bar
* style github and test-repo auth pages
* add git gateway auth page styles
* improve editor error styling
2017-12-07 12:37:10 -05:00
|
|
|
import { currentBackend } from 'Backends/backend';
|
|
|
|
import { getIntegrationProvider } from 'Integrations';
|
|
|
|
import { selectIntegration, selectEntries } from 'Reducers';
|
|
|
|
import { selectInferedField } from 'Reducers/collections';
|
|
|
|
import { WAIT_UNTIL_ACTION } from 'Redux/middleware/waitUntilAction';
|
2017-01-19 15:50:26 -02:00
|
|
|
import { loadEntries, ENTRIES_SUCCESS } from './entries';
|
2016-12-07 15:44:07 -02:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Contant Declarations
|
|
|
|
*/
|
|
|
|
export const SEARCH_ENTRIES_REQUEST = 'SEARCH_ENTRIES_REQUEST';
|
|
|
|
export const SEARCH_ENTRIES_SUCCESS = 'SEARCH_ENTRIES_SUCCESS';
|
|
|
|
export const SEARCH_ENTRIES_FAILURE = 'SEARCH_ENTRIES_FAILURE';
|
|
|
|
|
2016-12-29 17:18:24 -02:00
|
|
|
export const QUERY_REQUEST = 'INIT_QUERY';
|
|
|
|
export const QUERY_SUCCESS = 'QUERY_OK';
|
|
|
|
export const QUERY_FAILURE = 'QUERY_ERROR';
|
2016-12-07 15:44:07 -02:00
|
|
|
|
|
|
|
export const SEARCH_CLEAR = 'SEARCH_CLEAR';
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Simple Action Creators (Internal)
|
|
|
|
* We still need to export them for tests
|
|
|
|
*/
|
|
|
|
export function searchingEntries(searchTerm) {
|
|
|
|
return {
|
|
|
|
type: SEARCH_ENTRIES_REQUEST,
|
|
|
|
payload: { searchTerm },
|
|
|
|
};
|
|
|
|
}
|
|
|
|
|
|
|
|
export function searchSuccess(searchTerm, entries, page) {
|
|
|
|
return {
|
|
|
|
type: SEARCH_ENTRIES_SUCCESS,
|
|
|
|
payload: {
|
|
|
|
searchTerm,
|
|
|
|
entries,
|
|
|
|
page,
|
|
|
|
},
|
|
|
|
};
|
|
|
|
}
|
|
|
|
|
|
|
|
export function searchFailure(searchTerm, error) {
|
|
|
|
return {
|
|
|
|
type: SEARCH_ENTRIES_FAILURE,
|
|
|
|
payload: {
|
|
|
|
searchTerm,
|
|
|
|
error,
|
|
|
|
},
|
|
|
|
};
|
|
|
|
}
|
|
|
|
|
2016-12-29 17:18:24 -02:00
|
|
|
export function querying(namespace, collection, searchFields, searchTerm) {
|
2016-12-07 15:44:07 -02:00
|
|
|
return {
|
|
|
|
type: QUERY_REQUEST,
|
|
|
|
payload: {
|
2016-12-29 17:18:24 -02:00
|
|
|
namespace,
|
2016-12-07 15:44:07 -02:00
|
|
|
collection,
|
|
|
|
searchFields,
|
|
|
|
searchTerm,
|
|
|
|
},
|
|
|
|
};
|
|
|
|
}
|
|
|
|
|
2016-12-29 17:18:24 -02:00
|
|
|
export function querySuccess(namespace, collection, searchFields, searchTerm, response) {
|
2016-12-07 15:44:07 -02:00
|
|
|
return {
|
|
|
|
type: QUERY_SUCCESS,
|
|
|
|
payload: {
|
2016-12-29 17:18:24 -02:00
|
|
|
namespace,
|
2016-12-07 15:44:07 -02:00
|
|
|
collection,
|
|
|
|
searchFields,
|
|
|
|
searchTerm,
|
|
|
|
response,
|
|
|
|
},
|
|
|
|
};
|
|
|
|
}
|
|
|
|
|
2016-12-29 17:18:24 -02:00
|
|
|
export function queryFailure(namespace, collection, searchFields, searchTerm, error) {
|
2016-12-07 15:44:07 -02:00
|
|
|
return {
|
|
|
|
type: QUERY_SUCCESS,
|
|
|
|
payload: {
|
2016-12-29 17:18:24 -02:00
|
|
|
namespace,
|
2016-12-07 15:44:07 -02:00
|
|
|
collection,
|
|
|
|
searchFields,
|
|
|
|
searchTerm,
|
|
|
|
error,
|
|
|
|
},
|
|
|
|
};
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Exported simple Action Creators
|
|
|
|
*/
|
|
|
|
|
|
|
|
export function clearSearch() {
|
|
|
|
return { type: SEARCH_CLEAR };
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Exported Thunk Action Creators
|
|
|
|
*/
|
|
|
|
|
|
|
|
// SearchEntries will search for complete entries in all collections.
|
|
|
|
export function searchEntries(searchTerm, page = 0) {
|
|
|
|
return (dispatch, getState) => {
|
|
|
|
const state = getState();
|
2017-01-19 15:50:26 -02:00
|
|
|
const allCollections = state.collections.keySeq().toArray();
|
|
|
|
const collections = allCollections.filter(collection => selectIntegration(state, collection, 'search'));
|
2016-12-07 15:44:07 -02:00
|
|
|
const integration = selectIntegration(state, collections[0], 'search');
|
|
|
|
if (!integration) {
|
2017-01-19 15:50:26 -02:00
|
|
|
localSearch(searchTerm, getState, dispatch);
|
|
|
|
} else {
|
|
|
|
const provider = getIntegrationProvider(state.integrations, currentBackend(state.config).getToken, integration);
|
|
|
|
dispatch(searchingEntries(searchTerm));
|
|
|
|
provider.search(collections, searchTerm, page).then(
|
|
|
|
response => dispatch(searchSuccess(searchTerm, response.entries, response.pagination)),
|
|
|
|
error => dispatch(searchFailure(searchTerm, error))
|
|
|
|
);
|
2016-12-07 15:44:07 -02:00
|
|
|
}
|
|
|
|
};
|
|
|
|
}
|
|
|
|
|
|
|
|
// Instead of searching for complete entries, query will search for specific fields
|
|
|
|
// in specific collections and return raw data (no entries).
|
2016-12-29 17:18:24 -02:00
|
|
|
export function query(namespace, collection, searchFields, searchTerm) {
|
2016-12-07 15:44:07 -02:00
|
|
|
return (dispatch, getState) => {
|
|
|
|
const state = getState();
|
|
|
|
const integration = selectIntegration(state, collection, 'search');
|
2017-01-19 15:50:26 -02:00
|
|
|
dispatch(querying(namespace, collection, searchFields, searchTerm));
|
2016-12-07 15:44:07 -02:00
|
|
|
if (!integration) {
|
2017-01-19 15:50:26 -02:00
|
|
|
localQuery(namespace, collection, searchFields, searchTerm, state, dispatch);
|
|
|
|
} else {
|
|
|
|
const provider = getIntegrationProvider(state.integrations, currentBackend(state.config).getToken, integration);
|
|
|
|
provider.searchBy(searchFields.map(f => `data.${ f }`), collection, searchTerm).then(
|
|
|
|
response => dispatch(querySuccess(namespace, collection, searchFields, searchTerm, response)),
|
|
|
|
error => dispatch(queryFailure(namespace, collection, searchFields, searchTerm, error))
|
|
|
|
);
|
2016-12-07 15:44:07 -02:00
|
|
|
}
|
|
|
|
};
|
|
|
|
}
|
2017-01-19 15:50:26 -02:00
|
|
|
|
|
|
|
// Local Query & Search functions
|
|
|
|
|
|
|
|
function localSearch(searchTerm, getState, dispatch) {
|
|
|
|
return (function acc(localResults = { entries: [] }) {
|
|
|
|
function processCollection(collection, collectionKey) {
|
|
|
|
const state = getState();
|
|
|
|
if (state.entries.hasIn(['pages', collectionKey, 'ids'])) {
|
|
|
|
const searchFields = [
|
|
|
|
selectInferedField(collection, 'title'),
|
|
|
|
selectInferedField(collection, 'shortTitle'),
|
|
|
|
selectInferedField(collection, 'author'),
|
|
|
|
];
|
|
|
|
const collectionEntries = selectEntries(state, collectionKey).toJS();
|
|
|
|
const filteredEntries = fuzzy.filter(searchTerm, collectionEntries, {
|
|
|
|
extract: entry => searchFields.reduce((acc, field) => {
|
|
|
|
const f = entry.data[field];
|
|
|
|
return f ? `${ acc } ${ f }` : acc;
|
|
|
|
}, ""),
|
|
|
|
}).filter(entry => entry.score > 5);
|
|
|
|
localResults[collectionKey] = true;
|
|
|
|
localResults.entries = localResults.entries.concat(filteredEntries);
|
|
|
|
|
|
|
|
const returnedKeys = Object.keys(localResults);
|
|
|
|
const allCollections = state.collections.keySeq().toArray();
|
|
|
|
if (allCollections.every(v => returnedKeys.indexOf(v) !== -1)) {
|
|
|
|
const sortedResults = localResults.entries.sort((a, b) => {
|
|
|
|
if (a.score > b.score) return -1;
|
|
|
|
if (a.score < b.score) return 1;
|
|
|
|
return 0;
|
|
|
|
}).map(f => f.original);
|
|
|
|
if (allCollections.size > 3 || localResults.entries.length > 30) {
|
|
|
|
console.warn('The Netlify CMS is currently using a Built-in search.' +
|
|
|
|
'\nWhile this works great for small sites, bigger projects might benefit from a separate search integration.' +
|
|
|
|
'\nPlease refer to the documentation for more information');
|
|
|
|
}
|
|
|
|
dispatch(searchSuccess(searchTerm, sortedResults, 0));
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
// Collection entries aren't loaded yet.
|
|
|
|
// Dispatch loadEntries and wait before redispatching this action again.
|
|
|
|
dispatch({
|
|
|
|
type: WAIT_UNTIL_ACTION,
|
|
|
|
predicate: action => (action.type === ENTRIES_SUCCESS && action.payload.collection === collectionKey),
|
|
|
|
run: () => processCollection(collection, collectionKey),
|
|
|
|
});
|
|
|
|
dispatch(loadEntries(collection));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
getState().collections.forEach(processCollection);
|
|
|
|
}());
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
function localQuery(namespace, collection, searchFields, searchTerm, state, dispatch) {
|
|
|
|
// Check if entries in this collection were already loaded
|
|
|
|
if (state.entries.hasIn(['pages', collection, 'ids'])) {
|
|
|
|
const entries = selectEntries(state, collection).toJS();
|
|
|
|
const filteredEntries = fuzzy.filter(searchTerm, entries, {
|
|
|
|
extract: entry => searchFields.reduce((acc, field) => {
|
|
|
|
const f = entry.data[field];
|
|
|
|
return f ? `${ acc } ${ f }` : acc;
|
|
|
|
}, ""),
|
|
|
|
}).filter(entry => entry.score > 5);
|
|
|
|
|
|
|
|
const resultObj = {
|
|
|
|
query: searchTerm,
|
|
|
|
hits: [],
|
|
|
|
};
|
|
|
|
|
|
|
|
resultObj.hits = filteredEntries.map(f => f.original);
|
|
|
|
dispatch(querySuccess(namespace, collection, searchFields, searchTerm, resultObj));
|
|
|
|
} else {
|
|
|
|
// Collection entries aren't loaded yet.
|
|
|
|
// Dispatch loadEntries and wait before redispatching this action again.
|
|
|
|
dispatch({
|
|
|
|
type: WAIT_UNTIL_ACTION,
|
|
|
|
predicate: action => (action.type === ENTRIES_SUCCESS && action.payload.collection === collection),
|
|
|
|
run: dispatch => dispatch(query(namespace, collection, searchFields, searchTerm)),
|
|
|
|
});
|
|
|
|
dispatch(loadEntries(state.collections.get(collection)));
|
|
|
|
}
|
|
|
|
}
|