@micromag/media-gallery 0.3.514 → 0.3.516

package/es/index.js

@@ -11,6 +11,7 @@ import { FormattedMessage } from 'react-intl';
 import { MediasPickerContainer, MediasBrowserContainer } from '@panneau/medias';
 import { PropTypes as PropTypes$1 } from '@micromag/core';
 import { UploadModal } from '@micromag/core/components';
+import { useStory } from '@micromag/core/contexts';
 import { useApi, useMediaCreate } from '@micromag/data';
 import { useUrlGenerator } from '@folklore/routes';
 
@@ -175,17 +176,20 @@ var defaultFields = [{
     }]
   }),
   type: 'array',
-  component: 'select'
-  // requestUrl: route('medias.tags') || '/api/medias/tags',
-  //     itemLabelPath: 'name',
+  component: 'select',
+  requestUrl: '/api/medias/tags',
+  optionLabelPath: 'name',
+  optionValuePath: 'id',
+  multiple: true,
+  paginated: false
 }, {
-  id: 'custom_field',
-  component: 'custom_field',
+  id: 'jobs',
+  component: 'jobs',
   label: /*#__PURE__*/React.createElement(FormattedMessage, {
-    id: "BjSp56",
+    id: "SrFsAq",
     defaultMessage: [{
       "type": 0,
-      "value": "Test custom field"
+      "value": "Jobs"
     }]
   })
 }, {
@@ -358,39 +362,27 @@ function filters() {
     name: 'source',
     options: [{
       label: /*#__PURE__*/React.createElement(FormattedMessage, {
-        id: "DYxnlo",
+        id: "o+7d2z",
         defaultMessage: [{
           "type": 0,
-          "value": "All"
+          "value": "All medias"
         }]
       }),
       value: 'all'
-    }, {
-      label: /*#__PURE__*/React.createElement(FormattedMessage, {
-        id: "AgH3AR",
-        defaultMessage: [{
-          "type": 0,
-          "value": "This micromag"
-        }]
-      }),
-      value: 'document-'
     }]
-  }, {
-    id: 'authors',
-    component: 'select',
-    name: 'authors',
-    placeholder: /*#__PURE__*/React.createElement(FormattedMessage, {
-      id: "7oXkoj",
-      defaultMessage: [{
-        "type": 0,
-        "value": "Authors"
-      }]
-    }),
-    requestUrl: route('medias.authors') || '/api/medias/authors',
-    itemLabelPath: 'name',
-    itemValuePath: 'id',
-    multiple: true
-  }, {
+  },
+  // TODO: fix this on micromag.ca
+  // {
+  //     id: 'authors',
+  //     component: 'select',
+  //     name: 'authors',
+  //     placeholder: <FormattedMessage defaultMessage="Authors" description="Filter label" />,
+  //     requestUrl: route('medias.authors') || '/api/medias/authors',
+  //     itemLabelPath: 'name',
+  //     itemValuePath: 'id',
+  //     multiple: true,
+  // },
+  {
     id: 'tags',
     component: 'select',
     name: 'tags',
@@ -457,11 +449,16 @@ function MediaGallery(_ref) {
     columns = _ref.columns,
     isPicker = _ref.isPicker,
     multiple = _ref.multiple,
-    initialMedias = _ref.medias;
-    _ref.buttons;
-    var className = _ref.className,
+    initialMedias = _ref.medias,
+    buttons = _ref.buttons,
+    className = _ref.className,
     onChange = _ref.onChange;
   var api = useApi();
+  var story = useStory();
+  var _ref2 = story || {},
+    _ref2$id = _ref2.id,
+    storyId = _ref2$id === void 0 ? null : _ref2$id;
+  console.log('storyId', storyId);
   var mediasApi = useMemo(function () {
     return {
       get: function get() {
@@ -528,18 +525,35 @@ function MediaGallery(_ref) {
   var partialFilters = filters$1 || filters() || [];
   var finalFilters = useMemo(function () {
     return partialFilters.map(function (filter) {
-      var _ref2 = filter || {},
-        _ref2$id = _ref2.id,
-        id = _ref2$id === void 0 ? null : _ref2$id;
-      if (id === 'sources') {
-        return filter;
+      var _ref3 = filter || {},
+        _ref3$id = _ref3.id,
+        id = _ref3$id === void 0 ? null : _ref3$id;
+      if (id === 'source' && storyId !== null) {
+        var _ref4 = filter || {},
+          _ref4$options = _ref4.options,
+          options = _ref4$options === void 0 ? null : _ref4$options;
+        var finalOptions = (options || []).length > 0 ? [].concat(_toConsumableArray(options), [{
+          label: /*#__PURE__*/React.createElement(FormattedMessage, {
+            id: "eiaIIB",
+            defaultMessage: [{
+              "type": 0,
+              "value": "This Micromag"
+            }]
+          }),
+          value: "document-".concat(storyId)
+        }]) : null;
+        if (finalOptions === null) {
+          return null;
+        }
+        return _objectSpread(_objectSpread({}, filter), {}, {
+          options: finalOptions
+        });
       }
-      // if (id === 'tags' && tags !== null) {
-      //     return { ...filter, options: tags };
-      // }
       return filter;
-    }).concat();
-  }, [partialFilters]);
+    }).filter(function (f) {
+      return f !== null;
+    });
+  }, [partialFilters, storyId]);
   var _useState7 = useState(source !== null ? {
       source: source
     } : null),
@@ -557,10 +571,10 @@ function MediaGallery(_ref) {
     }
     console.log('addedMedias', addedMedias);
     if (!multiple) {
-      var _ref3 = addedMedias || [],
-        _ref4 = _slicedToArray(_ref3, 1),
-        _ref4$ = _ref4[0],
-        firstMedia = _ref4$ === void 0 ? null : _ref4$;
+      var _ref5 = addedMedias || [],
+        _ref6 = _slicedToArray(_ref5, 1),
+        _ref6$ = _ref6[0],
+        firstMedia = _ref6$ === void 0 ? null : _ref6$;
       return firstMedia || null;
     }
     var allMedias = [].concat(_toConsumableArray(addedMedias), _toConsumableArray(isArray(value) ? value || [] : [value]));
@@ -601,7 +615,7 @@ function MediaGallery(_ref) {
     fields: fields,
     columns: columns,
     onChange: onChange,
-    buttons: finalButtons,
+    buttons: buttons || finalButtons,
     buttonsClassName: "ms-xl-auto",
     withStickySelection: true
   }) : /*#__PURE__*/React.createElement(MediasBrowserContainer, {
@@ -616,7 +630,7 @@ function MediaGallery(_ref) {
     filters: finalFilters,
     fields: fields,
     columns: columns,
-    buttons: finalButtons,
+    buttons: buttons || finalButtons,
     buttonsClassName: "ms-xl-auto",
     withStickySelection: true
   }), /*#__PURE__*/createPortal( /*#__PURE__*/React.createElement(UploadModal, {

package/lib/index.js

@@ -13,6 +13,7 @@ var reactIntl = require('react-intl');
 var medias = require('@panneau/medias');
 var core = require('@micromag/core');
 var components = require('@micromag/core/components');
+var contexts = require('@micromag/core/contexts');
 var data = require('@micromag/data');
 var pathToRegexp = require('path-to-regexp');
 
@@ -177,17 +178,20 @@ var defaultFields = [{
     }]
   }),
   type: 'array',
-  component: 'select'
-  // requestUrl: route('medias.tags') || '/api/medias/tags',
-  //     itemLabelPath: 'name',
+  component: 'select',
+  requestUrl: '/api/medias/tags',
+  optionLabelPath: 'name',
+  optionValuePath: 'id',
+  multiple: true,
+  paginated: false
 }, {
-  id: 'custom_field',
-  component: 'custom_field',
+  id: 'jobs',
+  component: 'jobs',
   label: /*#__PURE__*/React.createElement(reactIntl.FormattedMessage, {
-    id: "BjSp56",
+    id: "SrFsAq",
     defaultMessage: [{
       "type": 0,
-      "value": "Test custom field"
+      "value": "Jobs"
     }]
   })
 }, {
@@ -398,39 +402,27 @@ function filters() {
     name: 'source',
     options: [{
       label: /*#__PURE__*/React.createElement(reactIntl.FormattedMessage, {
-        id: "DYxnlo",
+        id: "o+7d2z",
         defaultMessage: [{
           "type": 0,
-          "value": "All"
+          "value": "All medias"
         }]
       }),
       value: 'all'
-    }, {
-      label: /*#__PURE__*/React.createElement(reactIntl.FormattedMessage, {
-        id: "AgH3AR",
-        defaultMessage: [{
-          "type": 0,
-          "value": "This micromag"
-        }]
-      }),
-      value: 'document-'
     }]
-  }, {
-    id: 'authors',
-    component: 'select',
-    name: 'authors',
-    placeholder: /*#__PURE__*/React.createElement(reactIntl.FormattedMessage, {
-      id: "7oXkoj",
-      defaultMessage: [{
-        "type": 0,
-        "value": "Authors"
-      }]
-    }),
-    requestUrl: route('medias.authors') || '/api/medias/authors',
-    itemLabelPath: 'name',
-    itemValuePath: 'id',
-    multiple: true
-  }, {
+  },
+  // TODO: fix this on micromag.ca
+  // {
+  //     id: 'authors',
+  //     component: 'select',
+  //     name: 'authors',
+  //     placeholder: <FormattedMessage defaultMessage="Authors" description="Filter label" />,
+  //     requestUrl: route('medias.authors') || '/api/medias/authors',
+  //     itemLabelPath: 'name',
+  //     itemValuePath: 'id',
+  //     multiple: true,
+  // },
+  {
     id: 'tags',
     component: 'select',
     name: 'tags',
@@ -497,11 +489,16 @@ function MediaGallery(_ref) {
     columns = _ref.columns,
     isPicker = _ref.isPicker,
     multiple = _ref.multiple,
-    initialMedias = _ref.medias;
-    _ref.buttons;
-    var className = _ref.className,
+    initialMedias = _ref.medias,
+    buttons = _ref.buttons,
+    className = _ref.className,
     onChange = _ref.onChange;
   var api = data.useApi();
+  var story = contexts.useStory();
+  var _ref2 = story || {},
+    _ref2$id = _ref2.id,
+    storyId = _ref2$id === void 0 ? null : _ref2$id;
+  console.log('storyId', storyId);
   var mediasApi = React.useMemo(function () {
     return {
       get: function get() {
@@ -568,18 +565,35 @@ function MediaGallery(_ref) {
   var partialFilters = filters$1 || filters() || [];
   var finalFilters = React.useMemo(function () {
     return partialFilters.map(function (filter) {
-      var _ref2 = filter || {},
-        _ref2$id = _ref2.id,
-        id = _ref2$id === void 0 ? null : _ref2$id;
-      if (id === 'sources') {
-        return filter;
+      var _ref3 = filter || {},
+        _ref3$id = _ref3.id,
+        id = _ref3$id === void 0 ? null : _ref3$id;
+      if (id === 'source' && storyId !== null) {
+        var _ref4 = filter || {},
+          _ref4$options = _ref4.options,
+          options = _ref4$options === void 0 ? null : _ref4$options;
+        var finalOptions = (options || []).length > 0 ? [].concat(_toConsumableArray(options), [{
+          label: /*#__PURE__*/React.createElement(reactIntl.FormattedMessage, {
+            id: "eiaIIB",
+            defaultMessage: [{
+              "type": 0,
+              "value": "This Micromag"
+            }]
+          }),
+          value: "document-".concat(storyId)
+        }]) : null;
+        if (finalOptions === null) {
+          return null;
+        }
+        return _objectSpread(_objectSpread({}, filter), {}, {
+          options: finalOptions
+        });
       }
-      // if (id === 'tags' && tags !== null) {
-      //     return { ...filter, options: tags };
-      // }
       return filter;
-    }).concat();
-  }, [partialFilters]);
+    }).filter(function (f) {
+      return f !== null;
+    });
+  }, [partialFilters, storyId]);
   var _useState7 = React.useState(source !== null ? {
       source: source
     } : null),
@@ -597,10 +611,10 @@ function MediaGallery(_ref) {
     }
     console.log('addedMedias', addedMedias);
     if (!multiple) {
-      var _ref3 = addedMedias || [],
-        _ref4 = _slicedToArray(_ref3, 1),
-        _ref4$ = _ref4[0],
-        firstMedia = _ref4$ === void 0 ? null : _ref4$;
+      var _ref5 = addedMedias || [],
+        _ref6 = _slicedToArray(_ref5, 1),
+        _ref6$ = _ref6[0],
+        firstMedia = _ref6$ === void 0 ? null : _ref6$;
       return firstMedia || null;
     }
     var allMedias = [].concat(_toConsumableArray(addedMedias), _toConsumableArray(isArray(value) ? value || [] : [value]));
@@ -641,7 +655,7 @@ function MediaGallery(_ref) {
     fields: fields,
     columns: columns,
     onChange: onChange,
-    buttons: finalButtons,
+    buttons: buttons || finalButtons,
     buttonsClassName: "ms-xl-auto",
     withStickySelection: true
   }) : /*#__PURE__*/React.createElement(medias.MediasBrowserContainer, {
@@ -656,7 +670,7 @@ function MediaGallery(_ref) {
     filters: finalFilters,
     fields: fields,
     columns: columns,
-    buttons: finalButtons,
+    buttons: buttons || finalButtons,
     buttonsClassName: "ms-xl-auto",
     withStickySelection: true
   }), /*#__PURE__*/reactDom.createPortal( /*#__PURE__*/React.createElement(components.UploadModal, {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@micromag/media-gallery",
-    "version": "0.3.514",
+    "version": "0.3.516",
     "private": false,
     "description": "",
     "keywords": [
@@ -72,8 +72,8 @@
         "@fortawesome/fontawesome-svg-core": "^6.5.2",
         "@fortawesome/free-solid-svg-icons": "^6.5.2",
         "@fortawesome/react-fontawesome": "^0.2.0",
-        "@micromag/core": "^0.3.514",
-        "@micromag/data": "^0.3.514",
+        "@micromag/core": "^0.3.516",
+        "@micromag/data": "^0.3.516",
         "@panneau/medias": "^3.0.163",
         "bootstrap": "^5.3.1",
         "classnames": "^2.2.6",
@@ -87,5 +87,5 @@
         "access": "public",
         "registry": "https://registry.npmjs.org/"
     },
-    "gitHead": "40bbf8d97c0d912ce8be3c8caa2c70e117286fc2"
+    "gitHead": "27d49f1cd9ba3bac90dcd7f20ff053078be20333"
 }