From 40b1c368d98ce2b27218ab61fe3b8a680246c35a Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Fri, 27 Apr 2018 11:32:55 +0100 Subject: [PATCH 1/2] update search filter configuration --- src/app.config.json | 138 ++++++++++++++++++++++---------------------- 1 file changed, 68 insertions(+), 70 deletions(-) diff --git a/src/app.config.json b/src/app.config.json index 6db201ac8..111986f78 100644 --- a/src/app.config.json +++ b/src/app.config.json @@ -8,19 +8,10 @@ "languagePicker": false, "pagination": { "size": 25, - "supportedPageSizes": [ - 25, - 50, - 100 - ] + "supportedPageSizes": [25, 50, 100] }, "files": { - "excluded": [ - ".DS_Store", - "desktop.ini", - "thumbs.db", - ".git" - ] + "excluded": [".DS_Store", "desktop.ini", "thumbs.db", ".git"] }, "adf-version-manager": { "allowComments": true, @@ -162,10 +153,8 @@ } }, "search": { - "limits": { - "permissionEvaluationTime": null, - "permissionEvaluationCount": null - }, + "include": ["path", "allowableOperations"], + "fields": [], "filterQueries": [ { "query": "TYPE:'cm:folder' OR TYPE:'cm:content'" }, { "query": "NOT cm:creator:System" } @@ -176,39 +165,45 @@ { "field": "content.size", "mincount": 1, "label": "Size" }, { "field": "creator", "mincount": 1, "label": "Creator" }, { "field": "modifier", "mincount": 1, "label": "Modifier" } - ] + ] }, "facetQueries": [ { "query": "created:2018", "label": "Created This Year" }, { "query": "content.mimetype", "label": "Type" }, - { "query": "content.size:[0 TO 10240]", "label": "Size: xtra small"}, - { "query": "content.size:[10240 TO 102400]", "label": "Size: small"}, - { "query": "content.size:[102400 TO 1048576]", "label": "Size: medium" }, - { "query": "content.size:[1048576 TO 16777216]", "label": "Size: large" }, - { "query": "content.size:[16777216 TO 134217728]", "label": "Size: xtra large" }, - { "query": "content.size:[134217728 TO MAX]", "label": "Size: XX large" } + { + "query": "content.size:[0 TO 10240]", + "label": "Size: xtra small" + }, + { + "query": "content.size:[10240 TO 102400]", + "label": "Size: small" + }, + { + "query": "content.size:[102400 TO 1048576]", + "label": "Size: medium" + }, + { + "query": "content.size:[1048576 TO 16777216]", + "label": "Size: large" + }, + { + "query": "content.size:[16777216 TO 134217728]", + "label": "Size: xtra large" + }, + { + "query": "content.size:[134217728 TO MAX]", + "label": "Size: XX large" + } ], "query": { "categories": [ - { - "id": "broken", - "name": "Broken Facet", - "enabled": false, - "expanded": false, - "component": { - "selector": "adf-search-text", - "settings": { - "field": "fieldname" - } - } - }, { "id": "queryName", "name": "Name", "enabled": true, "expanded": true, "component": { - "selector": "adf-search-text", + "selector": "text", "settings": { "pattern": "cm:name:'(.*?)'", "field": "cm:name", @@ -217,20 +212,28 @@ } }, { - "id": "queryFields", - "name": "Fields", + "id": "contentSize", + "name": "Content Size", "enabled": true, - "expanded": false, "component": { - "selector": "adf-search-fields", + "selector": "slider", "settings": { - "field": null, - "options": [ - { "name": "Name", "value": "name", "fields": ["name"], "default": true }, - { "name": "File Size", "value": "content.sizeInBytes", "fields": ["content"], "default": true }, - { "name": "Modified On", "value": "modifiedAt", "fields": ["modifiedAt"], "default": true }, - { "name": "Modified By", "value": "modifiedByUser.displayName", "fields": ["modifiedByUser"], "default": true } - ] + "field": "cm:content.size", + "min": 0, + "max": 18, + "step": 1, + "thumbLabel": true + } + } + }, + { + "id": "contentSizeRange", + "name": "Content Size (range)", + "enabled": true, + "component": { + "selector": "number-range", + "settings": { + "field": "cm:content.size" } } }, @@ -238,34 +241,29 @@ "id": "queryType", "name": "Type", "enabled": true, - "expanded": false, "component": { - "selector": "adf-search-radio", - "settings": { - "field": null, - "options": [ - { "name": "None", "value": "", "default": true }, - { "name": "All", "value": "TYPE:'cm:folder' OR TYPE:'cm:content'" }, - { "name": "Folder", "value": "TYPE:'cm:folder'" }, - { "name": "Document", "value": "TYPE:'cm:content'" } - ] - } - } - }, - { - "id": "queryLocations", - "name": "Locations", - "enabled": true, - "expanded": false, - "component": { - "selector": "adf-search-scope-locations", + "selector": "radio", "settings": { "field": null, "options": [ - { "name": "Default", "value": "nodes", "default": true }, - { "name": "Nodes", "value": "nodes" }, - { "name": "Deleted Nodes", "value": "deleted-nodes" }, - { "name": "Versions", "value": "versions" } + { + "name": "None", + "value": "", + "default": true + }, + { + "name": "All", + "value": + "TYPE:'cm:folder' OR TYPE:'cm:content'" + }, + { + "name": "Folder", + "value": "TYPE:'cm:folder'" + }, + { + "name": "Document", + "value": "TYPE:'cm:content'" + } ] } } From bd19889e647a524f9d95a7dfced1c36b0403ed6a Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Fri, 27 Apr 2018 11:49:23 +0100 Subject: [PATCH 2/2] update to latest ADF alpha --- package-lock.json | 36 ++++++++++++++++++------------------ package.json | 6 +++--- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/package-lock.json b/package-lock.json index ec86141a3..b5c4353bb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,11 +5,11 @@ "requires": true, "dependencies": { "@alfresco/adf-content-services": { - "version": "2.4.0-3bc419e12852527bf82047010d4bf7280712140c", - "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-2.4.0-3bc419e12852527bf82047010d4bf7280712140c.tgz", - "integrity": "sha512-HoHYXtLiWLcSsdSR09FzE0bE6Mx5u9IMPu3foUt6MYR5h0pHk/+DpCx/ODi8ABny9d3saxDk91cpmOI1/4jBgw==", + "version": "2.4.0-b18b041ade818cb8afe681649c1ac1293f6e860d", + "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-2.4.0-b18b041ade818cb8afe681649c1ac1293f6e860d.tgz", + "integrity": "sha512-EHYvODiv3w12jbPCZacFSQ2fhwx5FVdmidsU+3ngWWXELjXuWIFhUWv02nEw3BBDO0xA/UkC2D4ASN0GVNNlyA==", "requires": { - "@alfresco/adf-core": "2.4.0-3bc419e12852527bf82047010d4bf7280712140c", + "@alfresco/adf-core": "2.4.0-b18b041ade818cb8afe681649c1ac1293f6e860d", "@angular/animations": "5.1.1", "@angular/cdk": "5.0.1", "@angular/common": "5.1.1", @@ -24,7 +24,7 @@ "@angular/platform-browser-dynamic": "5.1.1", "@angular/router": "5.1.1", "@ngx-translate/core": "9.1.1", - "alfresco-js-api": "2.3.0-20521af7bbf48e0259bc810f01cdb5b085bc8f19", + "alfresco-js-api": "2.4.0-6aeb75354b9b0ddb74444bfb449549ec21c123de", "chart.js": "2.5.0", "core-js": "2.4.1", "hammerjs": "2.0.8", @@ -41,9 +41,9 @@ }, "dependencies": { "alfresco-js-api": { - "version": "2.3.0-20521af7bbf48e0259bc810f01cdb5b085bc8f19", - "resolved": "https://registry.npmjs.org/alfresco-js-api/-/alfresco-js-api-2.3.0-20521af7bbf48e0259bc810f01cdb5b085bc8f19.tgz", - "integrity": "sha512-BSysLJxGEIcdAOMd/F1kk92KXuDnFwIM10g26EfykhTa0s+PVy0xxEkgQJ3QWeGt4OgNet/ViRkTnj6BkyRFAg==", + "version": "2.4.0-6aeb75354b9b0ddb74444bfb449549ec21c123de", + "resolved": "https://registry.npmjs.org/alfresco-js-api/-/alfresco-js-api-2.4.0-6aeb75354b9b0ddb74444bfb449549ec21c123de.tgz", + "integrity": "sha512-8d9H4fY7rxPoSpDa42EqI9D0lg1AOQOnkP+0Qz1jkS7w/otsOcCT29jlo5Y1avwscS+QNrwo+RMTaVdGnxwqAA==", "requires": { "event-emitter": "0.3.4", "superagent": "3.8.2" @@ -70,9 +70,9 @@ } }, "@alfresco/adf-core": { - "version": "2.4.0-3bc419e12852527bf82047010d4bf7280712140c", - "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-2.4.0-3bc419e12852527bf82047010d4bf7280712140c.tgz", - "integrity": "sha512-EGPtv7KlTAsXkHIxRzm0qT+RgUosYoEDLxzimgw1Nj9bdBPh9hDmoUG8iKg9k8hC7uugTvsgdKUgU+eLQN43pQ==", + "version": "2.4.0-b18b041ade818cb8afe681649c1ac1293f6e860d", + "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-2.4.0-b18b041ade818cb8afe681649c1ac1293f6e860d.tgz", + "integrity": "sha512-cvu/PPHcXW0v9dPJ3EMGmEqIJLH+RkwkkvVWpz3v0Zck0y9KRuXkqxOIOoUJwm1AAwPdbyKxDcKFNxpXZ+EdoQ==", "requires": { "@angular/animations": "5.1.1", "@angular/cdk": "5.0.1", @@ -88,7 +88,7 @@ "@angular/platform-browser-dynamic": "5.1.1", "@angular/router": "5.1.1", "@ngx-translate/core": "9.1.1", - "alfresco-js-api": "2.3.0-20521af7bbf48e0259bc810f01cdb5b085bc8f19", + "alfresco-js-api": "2.4.0-6aeb75354b9b0ddb74444bfb449549ec21c123de", "chart.js": "2.5.0", "core-js": "2.4.1", "hammerjs": "2.0.8", @@ -105,9 +105,9 @@ }, "dependencies": { "alfresco-js-api": { - "version": "2.3.0-20521af7bbf48e0259bc810f01cdb5b085bc8f19", - "resolved": "https://registry.npmjs.org/alfresco-js-api/-/alfresco-js-api-2.3.0-20521af7bbf48e0259bc810f01cdb5b085bc8f19.tgz", - "integrity": "sha512-BSysLJxGEIcdAOMd/F1kk92KXuDnFwIM10g26EfykhTa0s+PVy0xxEkgQJ3QWeGt4OgNet/ViRkTnj6BkyRFAg==", + "version": "2.4.0-6aeb75354b9b0ddb74444bfb449549ec21c123de", + "resolved": "https://registry.npmjs.org/alfresco-js-api/-/alfresco-js-api-2.4.0-6aeb75354b9b0ddb74444bfb449549ec21c123de.tgz", + "integrity": "sha512-8d9H4fY7rxPoSpDa42EqI9D0lg1AOQOnkP+0Qz1jkS7w/otsOcCT29jlo5Y1avwscS+QNrwo+RMTaVdGnxwqAA==", "requires": { "event-emitter": "0.3.4", "superagent": "3.8.2" @@ -655,9 +655,9 @@ "integrity": "sha1-rCsnk5xUPpXSwG5/f1wnvkqlQ74=" }, "alfresco-js-api": { - "version": "2.3.0-20521af7bbf48e0259bc810f01cdb5b085bc8f19", - "resolved": "https://registry.npmjs.org/alfresco-js-api/-/alfresco-js-api-2.3.0-20521af7bbf48e0259bc810f01cdb5b085bc8f19.tgz", - "integrity": "sha512-BSysLJxGEIcdAOMd/F1kk92KXuDnFwIM10g26EfykhTa0s+PVy0xxEkgQJ3QWeGt4OgNet/ViRkTnj6BkyRFAg==", + "version": "2.4.0-6aeb75354b9b0ddb74444bfb449549ec21c123de", + "resolved": "https://registry.npmjs.org/alfresco-js-api/-/alfresco-js-api-2.4.0-6aeb75354b9b0ddb74444bfb449549ec21c123de.tgz", + "integrity": "sha512-8d9H4fY7rxPoSpDa42EqI9D0lg1AOQOnkP+0Qz1jkS7w/otsOcCT29jlo5Y1avwscS+QNrwo+RMTaVdGnxwqAA==", "requires": { "event-emitter": "0.3.4", "superagent": "3.8.2" diff --git a/package.json b/package.json index f42ee6cc8..5b57b0b4a 100644 --- a/package.json +++ b/package.json @@ -23,8 +23,8 @@ }, "private": true, "dependencies": { - "@alfresco/adf-content-services": "2.4.0-3bc419e12852527bf82047010d4bf7280712140c", - "@alfresco/adf-core": "2.4.0-3bc419e12852527bf82047010d4bf7280712140c", + "@alfresco/adf-content-services": "2.4.0-b18b041ade818cb8afe681649c1ac1293f6e860d", + "@alfresco/adf-core": "2.4.0-b18b041ade818cb8afe681649c1ac1293f6e860d", "@angular/animations": "5.1.1", "@angular/cdk": "5.0.1", "@angular/common": "5.1.1", @@ -41,7 +41,7 @@ "@mat-datetimepicker/core": "1.0.1", "@mat-datetimepicker/moment": "1.0.1", "@ngx-translate/core": "9.1.1", - "alfresco-js-api": "2.3.0-20521af7bbf48e0259bc810f01cdb5b085bc8f19", + "alfresco-js-api": "2.4.0-6aeb75354b9b0ddb74444bfb449549ec21c123de", "core-js": "2.5.3", "hammerjs": "2.0.8", "moment-es6": "1.0.0",