@comet/cms-admin 9.0.0-beta.1 → 9.0.0-beta.3

package/lib/dam/DataGrid/FolderDataGrid.js

@@ -1,18 +1,18 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-var _excluded = ["id", "filterApi", "breadcrumbs", "hideContextMenu", "hideArchiveFilter", "hideMultiselect", "renderDamLabel"];
-function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
-function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(r); }
+var _excluded = ["id", "filterApi", "breadcrumbs", "hideContextMenu", "hideArchiveFilter", "toolbarOptions", "hideMultiselect", "renderDamLabel"];
+function _regenerator() { /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */ var e, t, r = "function" == typeof Symbol ? Symbol : {}, n = r.iterator || "@@iterator", o = r.toStringTag || "@@toStringTag"; function i(r, n, o, i) { var c = n && n.prototype instanceof Generator ? n : Generator, u = Object.create(c.prototype); return _regeneratorDefine2(u, "_invoke", function (r, n, o) { var i, c, u, f = 0, p = o || [], y = !1, G = { p: 0, n: 0, v: e, a: d, f: d.bind(e, 4), d: function d(t, r) { return i = t, c = 0, u = e, G.n = r, a; } }; function d(r, n) { for (c = r, u = n, t = 0; !y && f && !o && t < p.length; t++) { var o, i = p[t], d = G.p, l = i[2]; r > 3 ? (o = l === n) && (u = i[(c = i[4]) ? 5 : (c = 3, 3)], i[4] = i[5] = e) : i[0] <= d && ((o = r < 2 && d < i[1]) ? (c = 0, G.v = n, G.n = i[1]) : d < l && (o = r < 3 || i[0] > n || n > l) && (i[4] = r, i[5] = n, G.n = l, c = 0)); } if (o || r > 1) return a; throw y = !0, n; } return function (o, p, l) { if (f > 1) throw TypeError("Generator is already running"); for (y && 1 === p && d(p, l), c = p, u = l; (t = c < 2 ? e : u) || !y;) { i || (c ? c < 3 ? (c > 1 && (G.n = -1), d(c, u)) : G.n = u : G.v = u); try { if (f = 2, i) { if (c || (o = "next"), t = i[o]) { if (!(t = t.call(i, u))) throw TypeError("iterator result is not an object"); if (!t.done) return t; u = t.value, c < 2 && (c = 0); } else 1 === c && (t = i["return"]) && t.call(i), c < 2 && (u = TypeError("The iterator does not provide a '" + o + "' method"), c = 1); i = e; } else if ((t = (y = G.n < 0) ? u : r.call(n, G)) !== a) break; } catch (t) { i = e, c = 1, u = t; } finally { f = 1; } } return { value: t, done: y }; }; }(r, o, i), !0), u; } var a = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} t = Object.getPrototypeOf; var c = [][n] ? t(t([][n]())) : (_regeneratorDefine2(t = {}, n, function () { return this; }), t), u = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(c); function f(e) { return Object.setPrototypeOf ? Object.setPrototypeOf(e, GeneratorFunctionPrototype) : (e.__proto__ = GeneratorFunctionPrototype, _regeneratorDefine2(e, o, "GeneratorFunction")), e.prototype = Object.create(u), e; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, _regeneratorDefine2(u, "constructor", GeneratorFunctionPrototype), _regeneratorDefine2(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = "GeneratorFunction", _regeneratorDefine2(GeneratorFunctionPrototype, o, "GeneratorFunction"), _regeneratorDefine2(u), _regeneratorDefine2(u, o, "Generator"), _regeneratorDefine2(u, n, function () { return this; }), _regeneratorDefine2(u, "toString", function () { return "[object Generator]"; }), (_regenerator = function _regenerator() { return { w: i, m: f }; })(); }
+function _regeneratorDefine2(e, r, n, t) { var i = Object.defineProperty; try { i({}, "", {}); } catch (e) { i = 0; } _regeneratorDefine2 = function _regeneratorDefine(e, r, n, t) { function o(r, n) { _regeneratorDefine2(e, r, function (e) { return this._invoke(r, n, e); }); } r ? i ? i(e, r, { value: n, enumerable: !t, configurable: !t, writable: !t }) : e[r] = n : (o("next", 0), o("throw", 1), o("return", 2)); }, _regeneratorDefine2(e, r, n, t); }
+function asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.value; } catch (n) { return void e(n); } i.done ? t(u) : Promise.resolve(u).then(r, o); }
+function _asyncToGenerator(n) { return function () { var t = this, e = arguments; return new Promise(function (r, o) { var a = n.apply(t, e); function _next(n) { asyncGeneratorStep(a, r, o, _next, _throw, "next", n); } function _throw(n) { asyncGeneratorStep(a, r, o, _next, _throw, "throw", n); } _next(void 0); }); }; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-function _regenerator() { /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */ var e, t, r = "function" == typeof Symbol ? Symbol : {}, n = r.iterator || "@@iterator", o = r.toStringTag || "@@toStringTag"; function i(r, n, o, i) { var c = n && n.prototype instanceof Generator ? n : Generator, u = Object.create(c.prototype); return _regeneratorDefine2(u, "_invoke", function (r, n, o) { var i, c, u, f = 0, p = o || [], y = !1, G = { p: 0, n: 0, v: e, a: d, f: d.bind(e, 4), d: function d(t, r) { return i = t, c = 0, u = e, G.n = r, a; } }; function d(r, n) { for (c = r, u = n, t = 0; !y && f && !o && t < p.length; t++) { var o, i = p[t], d = G.p, l = i[2]; r > 3 ? (o = l === n) && (u = i[(c = i[4]) ? 5 : (c = 3, 3)], i[4] = i[5] = e) : i[0] <= d && ((o = r < 2 && d < i[1]) ? (c = 0, G.v = n, G.n = i[1]) : d < l && (o = r < 3 || i[0] > n || n > l) && (i[4] = r, i[5] = n, G.n = l, c = 0)); } if (o || r > 1) return a; throw y = !0, n; } return function (o, p, l) { if (f > 1) throw TypeError("Generator is already running"); for (y && 1 === p && d(p, l), c = p, u = l; (t = c < 2 ? e : u) || !y;) { i || (c ? c < 3 ? (c > 1 && (G.n = -1), d(c, u)) : G.n = u : G.v = u); try { if (f = 2, i) { if (c || (o = "next"), t = i[o]) { if (!(t = t.call(i, u))) throw TypeError("iterator result is not an object"); if (!t.done) return t; u = t.value, c < 2 && (c = 0); } else 1 === c && (t = i["return"]) && t.call(i), c < 2 && (u = TypeError("The iterator does not provide a '" + o + "' method"), c = 1); i = e; } else if ((t = (y = G.n < 0) ? u : r.call(n, G)) !== a) break; } catch (t) { i = e, c = 1, u = t; } finally { f = 1; } } return { value: t, done: y }; }; }(r, o, i), !0), u; } var a = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} t = Object.getPrototypeOf; var c = [][n] ? t(t([][n]())) : (_regeneratorDefine2(t = {}, n, function () { return this; }), t), u = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(c); function f(e) { return Object.setPrototypeOf ? Object.setPrototypeOf(e, GeneratorFunctionPrototype) : (e.__proto__ = GeneratorFunctionPrototype, _regeneratorDefine2(e, o, "GeneratorFunction")), e.prototype = Object.create(u), e; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, _regeneratorDefine2(u, "constructor", GeneratorFunctionPrototype), _regeneratorDefine2(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = "GeneratorFunction", _regeneratorDefine2(GeneratorFunctionPrototype, o, "GeneratorFunction"), _regeneratorDefine2(u), _regeneratorDefine2(u, o, "Generator"), _regeneratorDefine2(u, n, function () { return this; }), _regeneratorDefine2(u, "toString", function () { return "[object Generator]"; }), (_regenerator = function _regenerator() { return { w: i, m: f }; })(); }
-function _regeneratorDefine2(e, r, n, t) { var i = Object.defineProperty; try { i({}, "", {}); } catch (e) { i = 0; } _regeneratorDefine2 = function _regeneratorDefine(e, r, n, t) { function o(r, n) { _regeneratorDefine2(e, r, function (e) { return this._invoke(r, n, e); }); } r ? i ? i(e, r, { value: n, enumerable: !t, configurable: !t, writable: !t }) : e[r] = n : (o("next", 0), o("throw", 1), o("return", 2)); }, _regeneratorDefine2(e, r, n, t); }
-function asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.value; } catch (n) { return void e(n); } i.done ? t(u) : Promise.resolve(u).then(r, o); }
-function _asyncToGenerator(n) { return function () { var t = this, e = arguments; return new Promise(function (r, o) { var a = n.apply(t, e); function _next(n) { asyncGeneratorStep(a, r, o, _next, _throw, "next", n); } function _throw(n) { asyncGeneratorStep(a, r, o, _next, _throw, "throw", n); } _next(void 0); }); }; }
+function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
+function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(r); }
 function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
@@ -22,7 +22,7 @@ function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var n = Object.getOwnPropertySymbols(e); for (r = 0; r < n.length; r++) o = n[r], -1 === t.indexOf(o) && {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
 function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (-1 !== e.indexOf(n)) continue; t[n] = r[n]; } return t; }
 import { useApolloClient, useQuery } from "@apollo/client";
-import { DataGridToolbar, EditDialog, FillSpace, GridCellContent, PrettyBytes, ToolbarActions, ToolbarItem, Tooltip, useDataGridRemote, useSnackbarApi, useStackSwitchApi, useStoredState } from "@comet/admin";
+import { DataGridToolbar, EditDialog, FillSpace, GridCellContent, muiGridSortToGql, PrettyBytes, ToolbarActions, ToolbarItem, Tooltip, useDataGridRemote, useSnackbarApi, useStackSwitchApi, useStoredState } from "@comet/admin";
 import { Info as InfoIcon } from "@comet/admin-icons";
 import { DialogContent, Slide, Snackbar } from "@mui/material";
 import { DataGrid, GridColumnHeaderTitle, useGridApiRef } from "@mui/x-data-grid";
@@ -58,6 +58,7 @@ function FolderDataGridToolbar(_ref) {
   var currentFolderId = _ref.id,
     filterApi = _ref.filterApi,
     hideArchiveFilter = _ref.hideArchiveFilter,
+    hideSelectiveActions = _ref.hideSelectiveActions,
     additionalToolbarItems = _ref.additionalToolbarItems,
     uploadFilters = _ref.uploadFilters;
   var _useQuery = useQuery(damFolderQuery, {
@@ -85,7 +86,8 @@ function FolderDataGridToolbar(_ref) {
           horizontal: "left"
         },
         folderId: data === null || data === void 0 ? void 0 : data.damFolder.id,
-        filter: uploadFilters
+        filter: uploadFilters,
+        hideSelectiveActions: hideSelectiveActions
       }), /*#__PURE__*/_jsx(UploadFilesButton, {
         folderId: data === null || data === void 0 ? void 0 : data.damFolder.id,
         filter: uploadFilters
@@ -94,13 +96,14 @@ function FolderDataGridToolbar(_ref) {
   });
 }
 var FolderDataGrid = function FolderDataGrid(_ref2) {
-  var _filterApi$current$so, _filterApi$current$so2, _dataGridData$damItem, _filterApi$current$se, _props$allowedMimetyp, _dataGridData$damItem2, _dataGridData$damItem3;
+  var _gqlSort$, _gqlSort$2, _dataGridData$damItem, _filterApi$current$se, _props$allowedMimetyp, _dataGridData$damItem2, _dataGridData$damItem3;
   var currentFolderId = _ref2.id,
     filterApi = _ref2.filterApi,
     breadcrumbs = _ref2.breadcrumbs,
     _ref2$hideContextMenu = _ref2.hideContextMenu,
     hideContextMenu = _ref2$hideContextMenu === void 0 ? false : _ref2$hideContextMenu,
     hideArchiveFilter = _ref2.hideArchiveFilter,
+    toolbarOptions = _ref2.toolbarOptions,
     hideMultiselect = _ref2.hideMultiselect,
     renderDamLabel = _ref2.renderDamLabel,
     props = _objectWithoutProperties(_ref2, _excluded);
@@ -129,7 +132,11 @@ var FolderDataGrid = function FolderDataGrid(_ref2) {
     setUploadTargetFolderName(undefined);
   };
   var dataGridProps = useDataGridRemote({
-    pageSize: 20
+    pageSize: 20,
+    initialSort: [{
+      field: "name",
+      sort: "asc"
+    }]
   });
   var _useQuery2 = useQuery(damFolderQuery, {
       variables: {
@@ -140,6 +147,233 @@ var FolderDataGrid = function FolderDataGrid(_ref2) {
     }),
     currentFolderData = _useQuery2.data;
   var apiRef = useGridApiRef();
+  var dataGridColumns = [{
+    field: "name",
+    headerName: intl.formatMessage({
+      id: "comet.dam.file.name",
+      defaultMessage: "Name"
+    }),
+    flex: 1,
+    minWidth: 300,
+    renderCell: function renderCell(_ref4) {
+      var _fileUploadApi$newlyU;
+      var row = _ref4.row;
+      return /*#__PURE__*/_jsx(DamItemLabelColumn, {
+        item: row,
+        renderDamLabel: renderDamLabel,
+        matches: matches,
+        filterApi: filterApi,
+        isSearching: isSearching,
+        fileUploadApi: fileUploadApi,
+        footerApi: {
+          show: showUploadFooter,
+          hide: hideUploadFooter
+        },
+        hoverApi: {
+          showHoverStyles: showHoverStyles,
+          hideHoverStyles: hideHoverStyles,
+          isHovered: hoveredId === row.id
+        },
+        scrollIntoView: ((_fileUploadApi$newlyU = fileUploadApi.newlyUploadedItems[0]) === null || _fileUploadApi$newlyU === void 0 ? void 0 : _fileUploadApi$newlyU.id) === row.id
+      });
+    },
+    disableColumnMenu: true
+  }, {
+    field: "importSourceType",
+    headerName: intl.formatMessage({
+      id: "comet.dam.file.importSourceType",
+      defaultMessage: "Source"
+    }),
+    renderCell: function renderCell(_ref5) {
+      var row = _ref5.row;
+      if (isFile(row) && row.importSourceType && importSources !== null && importSources !== void 0 && importSources[row.importSourceType]) {
+        return importSources[row.importSourceType].label;
+      }
+    },
+    // TODO enable sorting/filtering in API
+    sortable: false,
+    hideSortIcons: true,
+    disableColumnMenu: true
+  }, {
+    field: "type",
+    sortBy: "mimetype",
+    headerName: intl.formatMessage({
+      id: "comet.dam.file.fileType",
+      defaultMessage: "Type/Format"
+    }),
+    headerAlign: "left",
+    align: "left",
+    minWidth: 140,
+    renderCell: function renderCell(_ref6) {
+      var row = _ref6.row;
+      if (isFile(row) && row.mimetype) {
+        return row.mimetype;
+      } else if (isFolder(row)) {
+        return intl.formatMessage({
+          id: "comet.dam.file.fileType.folder",
+          defaultMessage: "Folder"
+        });
+      }
+    },
+    disableColumnMenu: true
+  }, {
+    field: "info",
+    sortBy: "size",
+    headerName: intl.formatMessage({
+      id: "comet.dam.file.info",
+      defaultMessage: "Info"
+    }),
+    align: "right",
+    minWidth: 100,
+    renderCell: function renderCell(_ref7) {
+      var row = _ref7.row;
+      if (isFile(row)) {
+        return /*#__PURE__*/_jsx(PrettyBytes, {
+          value: row.size
+        });
+      } else {
+        return /*#__PURE__*/_jsx(FormattedMessage, {
+          id: "comet.dam.folderSize",
+          defaultMessage: "{number} {number, plural, one {item} other {items}}",
+          values: {
+            number: row.numberOfFiles + row.numberOfChildFolders
+          }
+        });
+      }
+    },
+    disableColumnMenu: true
+  }].concat(_toConsumableArray(enableLicenseFeature ? [{
+    field: "license",
+    headerName: intl.formatMessage({
+      id: "comet.dam.file.license",
+      defaultMessage: "License"
+    }),
+    headerAlign: "left",
+    align: "left",
+    minWidth: 200,
+    renderCell: function renderCell(_ref8) {
+      var row = _ref8.row;
+      if (isFile(row) && row.license && row.license.type) {
+        return /*#__PURE__*/_jsx(GridCellContent, {
+          primaryText: licenseTypeLabels[row.license.type],
+          secondaryText: row.license.expiresWithinThirtyDays || row.license.hasExpired ? /*#__PURE__*/_jsx(LicenseValidityTags, _objectSpread(_objectSpread({}, row.license), {}, {
+            expirationDate: row.license.expirationDate ? new Date(row.license.expirationDate) : undefined
+          })) : /*#__PURE__*/_jsxs(_Fragment, {
+            children: [/*#__PURE__*/_jsx(FormattedMessage, {
+              id: "comet.dam.file.license.validUntil",
+              defaultMessage: "Valid until:"
+            }), " ", row.license.durationTo ? /*#__PURE__*/_jsx(FormattedDate, {
+              value: row.license.durationTo,
+              dateStyle: "medium"
+            }) : /*#__PURE__*/_jsx(FormattedMessage, {
+              id: "comet.dam.file.license.unlimited",
+              defaultMessage: "Unlimited"
+            })]
+          })
+        });
+      }
+    },
+    sortable: false,
+    hideSortIcons: true,
+    disableColumnMenu: true
+  }] : []), [{
+    field: "usages",
+    headerName: intl.formatMessage({
+      id: "comet.dam.file.usages",
+      defaultMessage: "Usages"
+    }),
+    headerAlign: "right",
+    align: "right",
+    minWidth: 100,
+    renderHeader: function renderHeader(props) {
+      return /*#__PURE__*/_jsxs(_Fragment, {
+        children: [/*#__PURE__*/_jsx(GridColumnHeaderTitle, {
+          label: intl.formatMessage({
+            id: "comet.dam.file.usages",
+            defaultMessage: "Usages"
+          }),
+          columnWidth: 150
+        }), /*#__PURE__*/_jsx(Tooltip, {
+          title: /*#__PURE__*/_jsx(FormattedMessage, {
+            id: "comet.dam.file.usages.tooltip",
+            defaultMessage: "Cached for performance, can be slightly outdated"
+          }),
+          children: /*#__PURE__*/_jsx(InfoIcon, {
+            sx: {
+              marginLeft: 1
+            }
+          })
+        })]
+      });
+    },
+    renderCell: function renderCell(_ref9) {
+      var row = _ref9.row;
+      if (isFile(row)) {
+        return row.dependents.totalCount;
+      }
+    },
+    sortable: false,
+    hideSortIcons: true,
+    disableColumnMenu: true
+  }, {
+    field: "createdAt",
+    headerName: intl.formatMessage({
+      id: "comet.dam.file.creationDate",
+      defaultMessage: "Creation"
+    }),
+    headerAlign: "left",
+    align: "left",
+    minWidth: 180,
+    valueFormatter: function valueFormatter(value) {
+      return value ? intl.formatDate(value, {
+        dateStyle: "medium",
+        timeStyle: "short"
+      }) : "";
+    },
+    disableColumnMenu: true
+  }, {
+    field: "updatedAt",
+    headerName: intl.formatMessage({
+      id: "comet.dam.file.changeDate",
+      defaultMessage: "Latest change"
+    }),
+    headerAlign: "left",
+    align: "left",
+    minWidth: 180,
+    valueFormatter: function valueFormatter(value) {
+      return value ? intl.formatDate(value, {
+        dateStyle: "medium",
+        timeStyle: "short"
+      }) : "";
+    },
+    disableColumnMenu: true
+  }, {
+    field: "actions",
+    headerName: "",
+    type: "actions",
+    align: "right",
+    pinned: "right",
+    width: 52,
+    renderCell: function renderCell(_ref0) {
+      var row = _ref0.row;
+      return isFile(row) ? /*#__PURE__*/_jsx(DamContextMenu, {
+        file: row,
+        openMoveDialog: openMoveDialog
+      }) : /*#__PURE__*/_jsx(DamContextMenu, {
+        folder: row,
+        openMoveDialog: openMoveDialog
+      });
+    },
+    renderHeader: function renderHeader() {
+      return null;
+    },
+    sortable: false,
+    hideSortIcons: true,
+    disableColumnMenu: true
+  }]);
+  var gqlSort = muiGridSortToGql(dataGridProps.sortModel, dataGridColumns);
+  var sortColumnName = gqlSort === null || gqlSort === void 0 || (_gqlSort$ = gqlSort[0]) === null || _gqlSort$ === void 0 ? void 0 : _gqlSort$.field;
+  var sortDirection = gqlSort === null || gqlSort === void 0 || (_gqlSort$2 = gqlSort[0]) === null || _gqlSort$2 === void 0 ? void 0 : _gqlSort$2.direction;
   var _useQuery3 = useQuery(damItemsListQuery, {
       variables: {
         folderId: currentFolderId,
@@ -148,8 +382,8 @@ var FolderDataGrid = function FolderDataGrid(_ref2) {
           mimetypes: props.allowedMimetypes,
           searchText: filterApi.current.searchText
         },
-        sortColumnName: (_filterApi$current$so = filterApi.current.sort) === null || _filterApi$current$so === void 0 ? void 0 : _filterApi$current$so.columnName,
-        sortDirection: (_filterApi$current$so2 = filterApi.current.sort) === null || _filterApi$current$so2 === void 0 ? void 0 : _filterApi$current$so2.direction,
+        sortColumnName: sortColumnName,
+        sortDirection: sortDirection,
         limit: dataGridProps.paginationModel.pageSize,
         offset: dataGridProps.paginationModel.page * dataGridProps.paginationModel.pageSize,
         scope: scope
@@ -174,7 +408,6 @@ var FolderDataGrid = function FolderDataGrid(_ref2) {
     }
     function _navigateToNewlyUploadedItems() {
       _navigateToNewlyUploadedItems = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee() {
-        var _filterApi$current$so3, _filterApi$current$so4;
         var type, id, parentId, redirectToSubfolder, folders, firstFolder, files, firstFile, result, position, targetPage, _apiRef$current;
         return _regenerator().w(function (_context) {
           while (1) switch (_context.n) {
@@ -236,8 +469,8 @@ var FolderDataGrid = function FolderDataGrid(_ref2) {
                     mimetypes: props.allowedMimetypes,
                     searchText: filterApi.current.searchText
                   },
-                  sortColumnName: (_filterApi$current$so3 = filterApi.current.sort) === null || _filterApi$current$so3 === void 0 ? void 0 : _filterApi$current$so3.columnName,
-                  sortDirection: (_filterApi$current$so4 = filterApi.current.sort) === null || _filterApi$current$so4 === void 0 ? void 0 : _filterApi$current$so4.direction,
+                  sortColumnName: sortColumnName,
+                  sortDirection: sortDirection,
                   scope: scope
                 }
               });
@@ -363,7 +596,7 @@ var FolderDataGrid = function FolderDataGrid(_ref2) {
   };
   var handleSelectionModelChange = function handleSelectionModelChange(newSelectionModel) {
     var newMap = new Map();
-    newSelectionModel.forEach(function (selectedId) {
+    newSelectionModel.ids.forEach(function (selectedId) {
       var typedId = selectedId;
       if (damSelectionActionsApi.selectionMap.has(typedId)) {
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
@@ -386,8 +619,8 @@ var FolderDataGrid = function FolderDataGrid(_ref2) {
     });
     damSelectionActionsApi.setSelectionMap(newMap);
   };
-  var getRowClassName = function getRowClassName(_ref4) {
-    var row = _ref4.row;
+  var getRowClassName = function getRowClassName(_ref1) {
+    var row = _ref1.row;
     if (fileUploadApi.newlyUploadedItems.find(function (newItem) {
       return newItem.id === row.id;
     })) {
@@ -398,239 +631,6 @@ var FolderDataGrid = function FolderDataGrid(_ref2) {
     }
     return "";
   };
-  var dataGridColumns = [{
-    field: "name",
-    headerName: intl.formatMessage({
-      id: "comet.dam.file.name",
-      defaultMessage: "Name"
-    }),
-    flex: 1,
-    minWidth: 300,
-    renderCell: function renderCell(_ref5) {
-      var _fileUploadApi$newlyU;
-      var row = _ref5.row;
-      return /*#__PURE__*/_jsx(DamItemLabelColumn, {
-        item: row,
-        renderDamLabel: renderDamLabel,
-        matches: matches,
-        filterApi: filterApi,
-        isSearching: isSearching,
-        fileUploadApi: fileUploadApi,
-        footerApi: {
-          show: showUploadFooter,
-          hide: hideUploadFooter
-        },
-        hoverApi: {
-          showHoverStyles: showHoverStyles,
-          hideHoverStyles: hideHoverStyles,
-          isHovered: hoveredId === row.id
-        },
-        scrollIntoView: ((_fileUploadApi$newlyU = fileUploadApi.newlyUploadedItems[0]) === null || _fileUploadApi$newlyU === void 0 ? void 0 : _fileUploadApi$newlyU.id) === row.id
-      });
-    },
-    sortable: false,
-    hideSortIcons: true,
-    disableColumnMenu: true
-  }, {
-    field: "importSourceType",
-    headerName: intl.formatMessage({
-      id: "comet.dam.file.importSourceType",
-      defaultMessage: "Source"
-    }),
-    renderCell: function renderCell(_ref6) {
-      var row = _ref6.row;
-      if (isFile(row) && row.importSourceType && importSources !== null && importSources !== void 0 && importSources[row.importSourceType]) {
-        return importSources[row.importSourceType].label;
-      }
-    },
-    // TODO enable sorting/filtering in API
-    sortable: false,
-    hideSortIcons: true,
-    disableColumnMenu: true
-  }, {
-    field: "type",
-    headerName: intl.formatMessage({
-      id: "comet.dam.file.fileType",
-      defaultMessage: "Type/Format"
-    }),
-    headerAlign: "left",
-    align: "left",
-    minWidth: 140,
-    renderCell: function renderCell(_ref7) {
-      var row = _ref7.row;
-      if (isFile(row) && row.mimetype) {
-        return row.mimetype;
-      } else if (isFolder(row)) {
-        return intl.formatMessage({
-          id: "comet.dam.file.fileType.folder",
-          defaultMessage: "Folder"
-        });
-      }
-    },
-    sortable: false,
-    hideSortIcons: true,
-    disableColumnMenu: true
-  }, {
-    field: "info",
-    headerName: intl.formatMessage({
-      id: "comet.dam.file.info",
-      defaultMessage: "Info"
-    }),
-    headerAlign: "right",
-    align: "right",
-    minWidth: 100,
-    renderCell: function renderCell(_ref8) {
-      var row = _ref8.row;
-      if (isFile(row)) {
-        return /*#__PURE__*/_jsx(PrettyBytes, {
-          value: row.size
-        });
-      } else {
-        return /*#__PURE__*/_jsx(FormattedMessage, {
-          id: "comet.dam.folderSize",
-          defaultMessage: "{number} {number, plural, one {item} other {items}}",
-          values: {
-            number: row.numberOfFiles + row.numberOfChildFolders
-          }
-        });
-      }
-    },
-    sortable: false,
-    hideSortIcons: true,
-    disableColumnMenu: true
-  }].concat(_toConsumableArray(enableLicenseFeature ? [{
-    field: "license",
-    headerName: intl.formatMessage({
-      id: "comet.dam.file.license",
-      defaultMessage: "License"
-    }),
-    headerAlign: "left",
-    align: "left",
-    minWidth: 200,
-    renderCell: function renderCell(_ref9) {
-      var row = _ref9.row;
-      if (isFile(row) && row.license && row.license.type) {
-        return /*#__PURE__*/_jsx(GridCellContent, {
-          primaryText: licenseTypeLabels[row.license.type],
-          secondaryText: row.license.expiresWithinThirtyDays || row.license.hasExpired ? /*#__PURE__*/_jsx(LicenseValidityTags, _objectSpread(_objectSpread({}, row.license), {}, {
-            expirationDate: row.license.expirationDate ? new Date(row.license.expirationDate) : undefined
-          })) : /*#__PURE__*/_jsxs(_Fragment, {
-            children: [/*#__PURE__*/_jsx(FormattedMessage, {
-              id: "comet.dam.file.license.validUntil",
-              defaultMessage: "Valid until:"
-            }), " ", row.license.durationTo ? /*#__PURE__*/_jsx(FormattedDate, {
-              value: row.license.durationTo,
-              dateStyle: "medium"
-            }) : /*#__PURE__*/_jsx(FormattedMessage, {
-              id: "comet.dam.file.license.unlimited",
-              defaultMessage: "Unlimited"
-            })]
-          })
-        });
-      }
-    },
-    sortable: false,
-    hideSortIcons: true,
-    disableColumnMenu: true
-  }] : []), [{
-    field: "usages",
-    headerName: intl.formatMessage({
-      id: "comet.dam.file.usages",
-      defaultMessage: "Usages"
-    }),
-    headerAlign: "right",
-    align: "right",
-    minWidth: 100,
-    renderHeader: function renderHeader(props) {
-      return /*#__PURE__*/_jsxs(_Fragment, {
-        children: [/*#__PURE__*/_jsx(GridColumnHeaderTitle, {
-          label: intl.formatMessage({
-            id: "comet.dam.file.usages",
-            defaultMessage: "Usages"
-          }),
-          columnWidth: 150
-        }), /*#__PURE__*/_jsx(Tooltip, {
-          title: /*#__PURE__*/_jsx(FormattedMessage, {
-            id: "comet.dam.file.usages.tooltip",
-            defaultMessage: "Cached for performance, can be slightly outdated"
-          }),
-          children: /*#__PURE__*/_jsx(InfoIcon, {
-            sx: {
-              marginLeft: 1
-            }
-          })
-        })]
-      });
-    },
-    renderCell: function renderCell(_ref0) {
-      var row = _ref0.row;
-      if (isFile(row)) {
-        return row.dependents.totalCount;
-      }
-    },
-    sortable: false,
-    hideSortIcons: true,
-    disableColumnMenu: true
-  }, {
-    field: "createdAt",
-    headerName: intl.formatMessage({
-      id: "comet.dam.file.creationDate",
-      defaultMessage: "Creation"
-    }),
-    headerAlign: "left",
-    align: "left",
-    minWidth: 180,
-    valueFormatter: function valueFormatter(value) {
-      return value ? intl.formatDate(value, {
-        dateStyle: "medium",
-        timeStyle: "short"
-      }) : "";
-    },
-    sortable: false,
-    hideSortIcons: true,
-    disableColumnMenu: true
-  }, {
-    field: "updatedAt",
-    headerName: intl.formatMessage({
-      id: "comet.dam.file.changeDate",
-      defaultMessage: "Latest change"
-    }),
-    headerAlign: "left",
-    align: "left",
-    minWidth: 180,
-    valueFormatter: function valueFormatter(value) {
-      return value ? intl.formatDate(value, {
-        dateStyle: "medium",
-        timeStyle: "short"
-      }) : "";
-    },
-    sortable: false,
-    hideSortIcons: true,
-    disableColumnMenu: true
-  }, {
-    field: "actions",
-    headerName: "",
-    type: "actions",
-    align: "right",
-    pinned: "right",
-    width: 52,
-    renderCell: function renderCell(_ref1) {
-      var row = _ref1.row;
-      return isFile(row) ? /*#__PURE__*/_jsx(DamContextMenu, {
-        file: row,
-        openMoveDialog: openMoveDialog
-      }) : /*#__PURE__*/_jsx(DamContextMenu, {
-        folder: row,
-        openMoveDialog: openMoveDialog
-      });
-    },
-    renderHeader: function renderHeader() {
-      return null;
-    },
-    sortable: false,
-    hideSortIcons: true,
-    disableColumnMenu: true
-  }]);
   var uploadFilters = {
     allowedMimetypes: props.allowedMimetypes
   };
@@ -649,8 +649,12 @@ var FolderDataGrid = function FolderDataGrid(_ref2) {
         getRowClassName: getRowClassName,
         columns: dataGridColumns,
         checkboxSelection: !hideMultiselect,
-        rowSelectionModel: Array.from(damSelectionActionsApi.selectionMap.keys()),
+        rowSelectionModel: {
+          type: "include",
+          ids: new Set(damSelectionActionsApi.selectionMap.keys())
+        },
         onRowSelectionModelChange: handleSelectionModelChange,
+        disableRowSelectionExcludeModel: true,
         initialState: {
           columns: {
             columnVisibilityModel: {
@@ -659,20 +663,21 @@ var FolderDataGrid = function FolderDataGrid(_ref2) {
           }
         },
         columnVisibilityModel: {
-          contextMenu: !hideContextMenu
+          actions: !hideContextMenu
         },
         slots: {
           toolbar: FolderDataGridToolbar
         },
         slotProps: {
-          toolbar: {
+          toolbar: _objectSpread({
             id: currentFolderId,
             breadcrumbs: breadcrumbs,
             filterApi: filterApi,
             uploadFilters: uploadFilters,
             additionalToolbarItems: props.additionalToolbarItems
-          }
-        }
+          }, toolbarOptions)
+        },
+        showToolbar: true
       }))
     })), /*#__PURE__*/_jsx(DamUploadFooter, {
       open: Boolean(uploadTargetFolderName),

package/lib/dam/DataGrid/duplicatedFilenames/ManualDuplicatedFilenamesHandler.d.ts

@@ -1,5 +1,5 @@
 import { type PropsWithChildren } from "react";
-import { type GQLFilenameResponse } from "../../../graphql.generated";
+import type { GQLFilenameResponse } from "../../../graphql.generated";
 interface ManualDuplicatedFilenamesHandlerApi {
     checkForDuplicates: (fileData: FilenameData[]) => Promise<GQLFilenameResponse[]>;
     letUserHandleDuplicates: (fileData: FilenameData[]) => Promise<{

package/lib/dam/DataGrid/duplicatedFilenames/ManualDuplicatedFilenamesHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ManualDuplicatedFilenamesHandler.d.ts","sourceRoot":"","sources":["../../../../src/dam/DataGrid/duplicatedFilenames/ManualDuplicatedFilenamesHandler.tsx"],"names":[],"mappings":"AACA,OAAO,EAAiB,KAAK,iBAAiB,EAAqC,MAAM,OAAO,CAAC;AAEjG,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAStE,UAAU,mCAAmC;IACzC,kBAAkB,EAAE,CAAC,QAAQ,EAAE,YAAY,EAAE,KAAK,OAAO,CAAC,mBAAmB,EAAE,CAAC,CAAC;IACjF,uBAAuB,EAAE,CAAC,QAAQ,EAAE,YAAY,EAAE,KAAK,OAAO,CAAC;QAAE,SAAS,EAAE,YAAY,EAAE,CAAC;QAAC,eAAe,EAAE,eAAe,CAAA;KAAE,CAAC,CAAC;CACnI;AAED,MAAM,WAAW,YAAY;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;CACrB;AAID,eAAO,MAAM,mCAAmC,QAAO,mCAAmC,GAAG,SAE5F,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG,SAAS,GAAG,MAAM,GAAG,MAAM,CAAC;AAE1D,eAAO,MAAM,+CAA+C,GAAI,cAAc,iBAAiB,4CA+F9F,CAAC"}
+{"version":3,"file":"ManualDuplicatedFilenamesHandler.d.ts","sourceRoot":"","sources":["../../../../src/dam/DataGrid/duplicatedFilenames/ManualDuplicatedFilenamesHandler.tsx"],"names":[],"mappings":"AACA,OAAO,EAAiB,KAAK,iBAAiB,EAAqC,MAAM,OAAO,CAAC;AAEjG,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAMtE,UAAU,mCAAmC;IACzC,kBAAkB,EAAE,CAAC,QAAQ,EAAE,YAAY,EAAE,KAAK,OAAO,CAAC,mBAAmB,EAAE,CAAC,CAAC;IACjF,uBAAuB,EAAE,CAAC,QAAQ,EAAE,YAAY,EAAE,KAAK,OAAO,CAAC;QAAE,SAAS,EAAE,YAAY,EAAE,CAAC;QAAC,eAAe,EAAE,eAAe,CAAA;KAAE,CAAC,CAAC;CACnI;AAED,MAAM,WAAW,YAAY;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;CACrB;AAID,eAAO,MAAM,mCAAmC,QAAO,mCAAmC,GAAG,SAE5F,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG,SAAS,GAAG,MAAM,GAAG,MAAM,CAAC;AAE1D,eAAO,MAAM,+CAA+C,GAAI,cAAc,iBAAiB,4CA+F9F,CAAC"}