@concretecms/bedrock 1.1.0 → 1.1.1

package/.idea/bedrock.iml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

package/.idea/codeStyles/Project.xml

@@ -0,0 +1,48 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <PHPCodeStyleSettings>
+      <option name="BLANK_LINES_BETWEEN_IMPORTS" value="1" />
+      <option name="LOWER_CASE_BOOLEAN_CONST" value="true" />
+      <option name="LOWER_CASE_NULL_CONST" value="true" />
+      <option name="ELSE_IF_STYLE" value="COMBINE" />
+      <option name="KEEP_RPAREN_AND_LBRACE_ON_ONE_LINE" value="true" />
+      <option name="BLANK_LINES_AFTER_OPENING_TAG" value="1" />
+      <option name="KEEP_BLANK_LINES_AFTER_LBRACE" value="0" />
+      <option name="NEW_LINE_AFTER_PHP_OPENING_TAG" value="true" />
+    </PHPCodeStyleSettings>
+    <codeStyleSettings language="JavaScript">
+      <option name="INDENT_CASE_FROM_SWITCH" value="false" />
+      <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
+      <option name="ALIGN_MULTILINE_FOR" value="false" />
+    </codeStyleSettings>
+    <codeStyleSettings language="PHP">
+      <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="0" />
+      <option name="BLANK_LINES_AFTER_PACKAGE" value="1" />
+      <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
+      <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
+      <option name="ALIGN_MULTILINE_EXTENDS_LIST" value="true" />
+      <option name="CALL_PARAMETERS_WRAP" value="5" />
+      <option name="CALL_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
+      <option name="CALL_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />
+      <option name="METHOD_PARAMETERS_WRAP" value="5" />
+      <option name="METHOD_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
+      <option name="METHOD_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />
+      <option name="EXTENDS_LIST_WRAP" value="5" />
+      <option name="FOR_STATEMENT_LPAREN_ON_NEXT_LINE" value="true" />
+      <option name="FOR_STATEMENT_RPAREN_ON_NEXT_LINE" value="true" />
+      <option name="ARRAY_INITIALIZER_WRAP" value="5" />
+      <option name="ARRAY_INITIALIZER_LBRACE_ON_NEXT_LINE" value="true" />
+      <option name="ARRAY_INITIALIZER_RBRACE_ON_NEXT_LINE" value="true" />
+      <option name="IF_BRACE_FORCE" value="3" />
+      <option name="DOWHILE_BRACE_FORCE" value="3" />
+      <option name="WHILE_BRACE_FORCE" value="3" />
+      <option name="FOR_BRACE_FORCE" value="3" />
+    </codeStyleSettings>
+    <codeStyleSettings language="Vue">
+      <indentOptions>
+        <option name="INDENT_SIZE" value="4" />
+        <option name="TAB_SIZE" value="4" />
+      </indentOptions>
+    </codeStyleSettings>
+  </code_scheme>
+</component>

package/.idea/codeStyles/codeStyleConfig.xml

@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </state>
+</component>

package/.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,7 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="Stylelint" enabled="true" level="ERROR" enabled_by_default="true" />
+  </profile>
+</component>

package/.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/bedrock.iml" filepath="$PROJECT_DIR$/.idea/bedrock.iml" />
+    </modules>
+  </component>
+</project>

package/.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>

package/assets/cms/components/file-manager/Chooser/FileManager.vue

@@ -1,92 +1,95 @@
 <template>
-  <div>
-    <chooser-header :resultsFormFactor.sync="formFactor"
-                    :breadcrumb-items="breadcrumbItems"
-                    @breadcrumbItemClick="activeFolder = $event.folderId"
-                    :title="title"/>
+    <div>
+        <chooser-header :resultsFormFactor.sync="formFactor"
+                        :breadcrumb-items="breadcrumbItems"
+                        @breadcrumbItemClick="activeFolder = $event.folderId"
+                        :title="title"/>
 
-    <files :selectedFiles.sync="selectedFiles"
-           :resultsFormFactor="formFactor"
-           :routePath="routePath + activeFolder"
-           :enable-pagination="true"
-           :enable-sort="true"
-           :multipleSelection="multipleSelection"
-           @folderClick="activeFolder = $event"/>
-  </div>
+        <files :selectedFiles.sync="selectedFiles"
+               :resultsFormFactor="formFactor"
+               :routePath="routePath + activeFolder"
+               :enable-pagination="true"
+               :enable-sort="true"
+               :filters="filters"
+               :multipleSelection="multipleSelection"
+               @folderClick="activeFolder = $event"/>
+    </div>
 </template>
 
 <script>
 /* global CCM_DISPATCHER_FILENAME, ConcreteAjaxRequest */
-/* eslint indent: [2, 2, {"SwitchCase": 1}] */
 /* eslint-disable no-new */
 import ChooserHeader from './Header'
 import Files from './Files'
 
 export default {
-  components: {
-    ChooserHeader,
-    Files
-  },
-  data: () => ({
-    activeFolder: '',
-    selectedFiles: [],
-    breadcrumbItems: [],
-    routePath: '/ccm/system/file/chooser/get_folder_files/',
-    formFactor: 'grid'
-  }),
-  props: {
-    resultsFormFactor: {
-      type: String,
-      required: false,
-      default: 'grid', // grid | list
-      validator: value => ['grid', 'list'].indexOf(value) !== -1
+    components: {
+        ChooserHeader,
+        Files
     },
-    startFolder: {
-      type: String,
-      required: true
+    data: () => ({
+        activeFolder: '',
+        selectedFiles: [],
+        breadcrumbItems: [],
+        routePath: '/ccm/system/file/chooser/get_folder_files/',
+        formFactor: 'grid'
+    }),
+    props: {
+        resultsFormFactor: {
+            type: String,
+            required: false,
+            default: 'grid', // grid | list
+            validator: value => ['grid', 'list'].indexOf(value) !== -1
+        },
+        startFolder: {
+            type: String,
+            required: true
+        },
+        title: {
+            type: String,
+            required: true
+        },
+        multipleSelection: {
+            type: Boolean,
+            default: true
+        },
+        filters: {
+            type: Array
+        }
     },
-    title: {
-      type: String,
-      required: true
+    created() {
+        this.activeFolder = this.$props.startFolder
+        this.fetchBreadcrumb(this.activeFolder)
     },
-    multipleSelection: {
-      type: Boolean,
-      default: true
-    }
-  },
-  created() {
-    this.activeFolder = this.$props.startFolder
-    this.fetchBreadcrumb(this.activeFolder)
-  },
-  methods: {
-    fetchBreadcrumb(folderId = '') {
-      new ConcreteAjaxRequest({
-        url: `${CCM_DISPATCHER_FILENAME}/ccm/system/file/chooser/get_breadcrumb/${folderId}`,
-        success: r => {
-          this.breadcrumbItems = r.data
+    methods: {
+        fetchBreadcrumb(folderId = '') {
+            new ConcreteAjaxRequest({
+                url: `${CCM_DISPATCHER_FILENAME}/ccm/system/file/chooser/get_breadcrumb/${folderId}`,
+                success: r => {
+                    this.breadcrumbItems = r.data
+                }
+            })
         }
-      })
-    }
-  },
-  watch: {
-    activeFolder(value) {
-      this.fetchBreadcrumb(value)
     },
-    selectedFiles(value) {
-      this.$emit('update:selectedFiles', value)
-    },
-    formFactor(value) {
-      this.$emit('update:resultsFormFactor', value)
+    watch: {
+        activeFolder(value) {
+            this.fetchBreadcrumb(value)
+        },
+        selectedFiles(value) {
+            this.$emit('update:selectedFiles', value)
+        },
+        formFactor(value) {
+            this.$emit('update:resultsFormFactor', value)
+        },
+        startFolder(value) {
+            this.activeFolder = value
+            this.fetchBreadcrumb(value)
+        }
     },
-    startFolder(value) {
-      this.activeFolder = value
-      this.fetchBreadcrumb(value)
+    mounted() {
+        this.formFactor = this.resultsFormFactor
+        this.activeFolder = this.$props.startFolder
+        this.fetchBreadcrumb(this.activeFolder)
     }
-  },
-  mounted() {
-    this.formFactor = this.resultsFormFactor
-    this.activeFolder = this.$props.startFolder
-    this.fetchBreadcrumb(this.activeFolder)
-  }
 }
 </script>

package/assets/cms/components/file-manager/Chooser/FileSets.vue

@@ -10,19 +10,20 @@
                 <select id="fileSetSelector" class="form-select file-set-menu" v-model="activeSet">
                     <option value="" selected>{{ i18n.selectFileSet }}</option>
                     <option v-for="set in sets" :key="set.id" :value="set.id">
-                        {{set.name}}
+                        {{ set.name }}
                     </option>
                 </select>
             </div>
         </div>
         <div class="mt-3" v-show="activeSet">
             <files v-if="activeSet"
-                :selectedFiles.sync="selectedFiles"
-                :resultsFormFactor="formFactor"
-                :routePath="routePath + activeSet"
-                :enable-pagination="true"
-                :enable-sort="true"
-                :multipleSelection="multipleSelection"/>
+                   :selectedFiles.sync="selectedFiles"
+                   :resultsFormFactor="formFactor"
+                   :routePath="routePath + activeSet"
+                   :enable-pagination="true"
+                   :enable-sort="true"
+                   :filters="filters"
+                   :multipleSelection="multipleSelection"/>
         </div>
     </div>
 </template>
@@ -69,6 +70,9 @@ export default {
         multipleSelection: {
             type: Boolean,
             default: true
+        },
+        filters: {
+            type: Array
         }
     },
     methods: {

package/assets/cms/components/file-manager/Chooser/FileUpload.vue

@@ -2,7 +2,9 @@
     <div>
         <chooser-header :show-form-factor-selector="false" :title="title"/>
 
-        <uploader/>
+        <uploader
+            @upload-complete="$emit('upload-complete')"
+        />
     </div>
 </template>
 

package/assets/cms/components/file-manager/Chooser/Files.vue

@@ -9,8 +9,8 @@
                             <label class="form-label" :for="'file-' + (file.fID || file.treeNodeID)"><span v-html="file.resultsThumbnailImg"></span></label>
                             <div class="ccm-image-cell-title pt-1">
                                 <div class="form-check form-check-inline">
-                                    <input class="form-check-input" type="checkbox" v-if="multipleSelection && !file.isFolder" v-model="selectedFiles" :id="'file-' + file.fID" :value="file.fID">
-                                    <input class="form-check-input" type="radio" v-if="!multipleSelection && !file.isFolder" v-model="selectedFiles" :id="'file-' + file.fID" :value="file.fID">
+                                    <input :disabled="!canChooseFile(file)" class="form-check-input" type="checkbox" v-if="multipleSelection && !file.isFolder" v-model="selectedFiles" :id="'file-' + file.fID" :value="file.fID">
+                                    <input :disabled="!canChooseFile(file)" class="form-check-input" type="radio" v-if="!multipleSelection && !file.isFolder" v-model="selectedFiles" :id="'file-' + file.fID" :value="file.fID">
                                     <label class="form-check-label" :for="'file-' + (file.fID || file.treeNodeID)">{{file.title}}</label>
                                 </div>
                             </div>
@@ -38,8 +38,8 @@
                     <tbody>
                         <tr v-for="file in fileList" :key="(file.fID || file.treeNodeID) + 'list'" @click="onItemClick(file)">
                             <td>
-                                <input type="checkbox" v-if="multipleSelection && !file.isFolder" v-model="selectedFiles" :id="'file-' + file.fID" :value="file.fID">
-                                <input type="radio" v-if="!multipleSelection && !file.isFolder" v-model="selectedFiles" :id="'file-' + file.fID" :value="file.fID">
+                                <input type="checkbox" :disabled="!canChooseFile(file)" v-if="multipleSelection && !file.isFolder" v-model="selectedFiles" :id="'file-' + file.fID" :value="file.fID">
+                                <input type="radio" :disabled="!canChooseFile(file)" v-if="!multipleSelection && !file.isFolder" v-model="selectedFiles" :id="'file-' + file.fID" :value="file.fID">
                             </td>
                             <td class="ccm-image-chooser-icon"><span v-html="file.resultsThumbnailImg" width="32" height="32"></span></td>
                             <td>{{file.fID}}</td>
@@ -100,6 +100,9 @@ export default {
         viewIsLoading: false
     }),
     props: {
+        filters: {
+            type: Array
+        },
         enableSort: {
             type: Boolean,
             required: false,
@@ -171,6 +174,37 @@ export default {
         }
     },
     methods: {
+        canChooseFile(file) {
+            var canChooseFile = -1
+            if (this.filters) {
+                var fileExtension = file.extension
+                var fileType = file.genericType
+                this.filters.forEach(function(filter) {
+                    if (filter.filter === 'extension') {
+                        if (filter.extensions.includes(fileExtension)) {
+                            canChooseFile = true
+                        } else {
+                            canChooseFile = false
+                        }
+                    }
+                    if (canChooseFile !== false) {
+                        if (filter.filter === 'type') {
+                            if (filter.type === fileType) {
+                                canChooseFile = true
+                            } else {
+                                canChooseFile = false
+                            }
+                        }
+                    }
+                })
+            }
+
+            if (canChooseFile === -1) {
+                return true
+            } else {
+                return canChooseFile
+            }
+        },
         getFiles() {
             const my = this
             my.rows = false

package/assets/cms/components/file-manager/Chooser/FolderBookmark.vue

@@ -10,6 +10,7 @@
                :routePath="routePath + activeFolder"
                :enable-pagination="true"
                :enable-sort="true"
+               :filters="filters"
                :multipleSelection="multipleSelection"
                @folderClick="activeFolder = $event"/>
     </div>
@@ -51,6 +52,9 @@ export default {
         multipleSelection: {
             type: Boolean,
             default: true
+        },
+        filters: {
+            type: Array
         }
     },
     created() {

package/assets/cms/components/file-manager/Chooser/RecentUploads.vue

@@ -4,6 +4,7 @@
 
         <files :selectedFiles.sync="selectedFiles"
                :resultsFormFactor="formFactor"
+               :filters="filters"
                routePath="/ccm/system/file/chooser/recent"
                :multipleSelection="multipleSelection"/>
     </div>
@@ -37,6 +38,9 @@ export default {
         multipleSelection: {
             type: Boolean,
             default: true
+        },
+        filters: {
+            type: Array
         }
     },
     watch: {

package/assets/cms/components/file-manager/Chooser/SavedSearch.vue

@@ -13,19 +13,20 @@
                 <select id="searchPresets" class="form-select search-presets-menu" v-model="activeSearchPreset">
                     <option value="" selected>{{ i18n.selectPreset }}</option>
                     <option v-for="searchPreset in searchPresets" :key="searchPreset.id" :value="searchPreset.id">
-                        {{searchPreset.presetName}}
+                        {{ searchPreset.presetName }}
                     </option>
                 </select>
             </div>
         </div>
         <div class="mt-3" v-show="activeSearchPreset">
             <files v-if="activeSearchPreset"
-                :selectedFiles.sync="selectedFiles"
-                :resultsFormFactor="formFactor"
-                :routePath="routePath + activeSearchPreset"
-                :enable-pagination="true"
-                :multipleSelection="multipleSelection"
-                @folderClick="activeFolder = $event"/>
+                   :selectedFiles.sync="selectedFiles"
+                   :resultsFormFactor="formFactor"
+                   :filters="filters"
+                   :routePath="routePath + activeSearchPreset"
+                   :enable-pagination="true"
+                   :multipleSelection="multipleSelection"
+                   @folderClick="activeFolder = $event"/>
         </div>
     </div>
 </template>
@@ -74,6 +75,9 @@ export default {
         multipleSelection: {
             type: Boolean,
             default: true
+        },
+        filters: {
+            type: Array
         }
     },
     methods: {

package/assets/cms/components/file-manager/Chooser/Search.vue

@@ -6,7 +6,8 @@
             <div class="col-md-4 ms-auto">
                 <form @submit.prevent="search">
                     <div class="ccm-header-search-form-input input-group">
-                        <input type="text" class="form-control border-end-0" :placeholder="i18n.search" autocomplete="false" v-model="searchText">
+                        <input type="text" class="form-control border-end-0" :placeholder="i18n.search"
+                               autocomplete="false" v-model="searchText">
                         <button type="submit" class="input-group-icon">
                             <svg width="16" height="16">
                                 <use xlink:href="#icon-search"/>
@@ -24,12 +25,13 @@
         </div>
         <div>
             <files v-if="keywords"
-                :selectedFiles.sync="selectedFiles"
-                :resultsFormFactor="formFactor"
-                :routePath="routePath + keywords"
-                :enable-pagination="true"
-                :enable-sort="true"
-                :multipleSelection="multipleSelection"/>
+                   :selectedFiles.sync="selectedFiles"
+                   :resultsFormFactor="formFactor"
+                   :routePath="routePath + keywords"
+                   :enable-pagination="true"
+                   :enable-sort="true"
+                   :filters="filters"
+                   :multipleSelection="multipleSelection"/>
         </div>
     </div>
 </template>
@@ -71,10 +73,13 @@ export default {
         multipleSelection: {
             type: Boolean,
             default: true
+        },
+        filters: {
+            type: Array
         }
     },
     methods: {
-        search () {
+        search() {
             this.keywords = this.searchText
         }
     },

package/assets/cms/components/file-manager/Chooser.vue

@@ -34,6 +34,8 @@
                                    :selectedFiles.sync="selectedFiles"
                                    :resultsFormFactor.sync="resultsFormFactor"
                                    :filesReadyToUpload.sync="filesReadyToUpload"
+                                   :filters="filters"
+                                   @upload-complete="activateTabByKey('recent-uploads')"
                                    ref="c"
                         />
                     </transition>
@@ -125,6 +127,9 @@ export default {
         multipleSelection: {
             type: Boolean,
             default: true
+        },
+        filters: {
+            type: Array
         }
     },
     created() {
@@ -192,6 +197,19 @@ export default {
         isChooseFilesMode() {
             return this.activeNavItem.componentKey !== 'file-upload' && this.activeNavItem.componentKey !== 'external-file-provider'
         },
+        activateTabByKey(key) {
+            var my = this
+            this.choosers.forEach(function(chooser) {
+                if (chooser.id === key) {
+                    my.activateTab(chooser)
+                }
+            })
+            this.uploaders.forEach(function(uploader) {
+                if (uploader.id === key) {
+                    my.activateTab(uploader)
+                }
+            })
+        },
         activateTab(item) {
             this.activeNavItem = item
 

package/assets/cms/components/file-manager/Uploader/UploadFromComputer.vue

@@ -131,7 +131,8 @@ export default {
                             me.uploadedFiles.forEach(function(file) {
                                 fileIds.push(file.fID)
                             })
-                            ConcreteEvent.publish('FileManagerSelectFile', { fID: fileIds })
+                            // Instead of firing this event let's use uploadComplete() below to re-select the Recent Uploads tab.
+                            // ConcreteEvent.publish('FileManagerSelectFile', { fID: fileIds })
                             me.uploadedFiles = []
                         }
                         me.uploadComplete()
@@ -222,7 +223,7 @@ export default {
             this.dropzone.removeAllFiles(true)
         },
         uploadComplete() {
-            this.$emit('update:uploadCompleted')
+            this.$emit('upload-complete')
 
             ConcreteAlert.notify({
                 title: 'Complete',

package/assets/cms/components/file-manager/Uploader.vue

@@ -2,6 +2,7 @@
     <div>
         <upload-from-computer
             :upload-directory-id="uploadDirectoryId"
+            @upload-complete="$emit('upload-complete')"
             @uploadProgressStateChange="isUploadInProgress = $event"/>
 
         <concrete-file-directory-input

package/assets/cms/components/form/ConcreteFileInput.vue

@@ -52,6 +52,9 @@ export default {
         },
         chooseText: {
             type: String
+        },
+        filters: {
+            type: Array
         }
     },
     watch: {
@@ -84,9 +87,13 @@ export default {
         },
         openChooser: function() {
             var my = this
+            var options = {}
+            if (my.filters) {
+                options.filters = my.filters
+            }
             ConcreteFileManager.launchDialog(function(r) {
                 my.loadFile(r.fID)
-            })
+            }, options)
         },
         loadFile(fileId) {
             var my = this

package/assets/cms/js/file-manager/file-manager.js

@@ -17,14 +17,7 @@ class ConcreteFileManager {
         }
 
         if (options.filters.length > 0) {
-            data['field[]'] = []
-
-            for (i = 0; i < options.filters.length; i++) {
-                var filter = $.extend(true, {}, options.filters[i]) // clone
-                data['field[]'].push(filter.field)
-                delete (filter.field)
-                $.extend(data, filter) // add all remaining fields to the data
-            }
+            data.filters = options.filters
         }
 
         $.fn.dialog.open({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@concretecms/bedrock",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "The asset framework and dependencies for Concrete CMS.",
   "scripts": {
     "lint": "standardx \"**/*.{js,vue}\" && stylelint assets/**/*.{scss,vue}",