Skip to content

Commit

Permalink
Merge pull request #9 from eea/seperate-collections-block
Browse files Browse the repository at this point in the history
separate out collections block
  • Loading branch information
nileshgulia1 authored Mar 23, 2021
2 parents fb36257 + dc2f374 commit 265a5df
Show file tree
Hide file tree
Showing 12 changed files with 154 additions and 859 deletions.
2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
"@eeacms/volto-columns-block",
"@eeacms/volto-corsproxy",
"@eeacms/volto-block-style",
"@eeacms/volto-collection-block",
"@eeacms/volto-sentry-rancher-config"
],
"jest": {
Expand Down Expand Up @@ -102,6 +103,7 @@
},
"dependencies": {
"@eeacms/volto-corsproxy": "2.1.0",
"@eeacms/volto-collection-block": "github:eea/volto-collection-block",
"@eeacms/volto-block-style": "2.2.0",
"@eeacms/volto-columns-block": "^3.0.0",
"@eeacms/volto-sentry-rancher-config": "^2.0.0",
Expand Down
21 changes: 6 additions & 15 deletions src/actions/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
*/

import {
GET_INDEX_VALUES,
SET_FOLDER_HEADER,
SET_FOLDER_TABS,
GET_PARENT_FOLDER_DATA,
Expand Down Expand Up @@ -82,13 +81,13 @@ export function quickSearchContent(url, options, subrequest = null) {
console.log('in action - quicksearch');

let queryArray = [];
const arrayOptions = pickBy(options, item => isArray(item));
const arrayOptions = pickBy(options, (item) => isArray(item));

queryArray = concat(
queryArray,
options
? join(
map(toPairs(pickBy(options, item => !isArray(item))), item => {
map(toPairs(pickBy(options, (item) => !isArray(item))), (item) => {
if (item[0] === 'SearchableText') {
// Adds the wildcard to the SearchableText param
item[1] = `${item[1]}*`;
Expand All @@ -105,7 +104,10 @@ export function quickSearchContent(url, options, subrequest = null) {
arrayOptions
? join(
map(pickBy(arrayOptions), (item, key) =>
join(item.map(value => `${key}:list=${value}`), '&'),
join(
item.map((value) => `${key}:list=${value}`),
'&',
),
),
'&',
)
Expand All @@ -130,14 +132,3 @@ export function quickResetSearchContent(subrequest = null) {
subrequest,
};
}

export function getIndexValues(name) {
return {
type: GET_INDEX_VALUES,
request: {
op: 'post',
path: '/@index-values',
data: { name },
},
};
}
158 changes: 0 additions & 158 deletions src/components/theme/Collection/BlockEdit.jsx

This file was deleted.

Loading

0 comments on commit 265a5df

Please sign in to comment.