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

package/lib/dependencies/{DependencyList.js → DependentsList.js}

@@ -15,25 +15,25 @@ function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length)
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 import { useApolloClient, useQuery } from "@apollo/client";
-import { Alert, DataGridToolbar, FillSpace, messages, Tooltip, useBufferedRowCount, useDataGridRemote, usePersistentColumnState } from "@comet/admin";
+import { Alert, DataGridToolbar, FillSpace, GridCellContent, GridFilterButton, messages, muiGridFilterToGql, muiGridSortToGql, Tooltip, useBufferedRowCount, useDataGridRemote, usePersistentColumnState } from "@comet/admin";
 import { ArrowRight, OpenNewTab, Reload, ThreeDotSaving } from "@comet/admin-icons";
-import { IconButton } from "@mui/material";
+import { Box, Chip, IconButton } from "@mui/material";
 import { DataGrid } from "@mui/x-data-grid";
-import { useState } from "react";
+import { useMemo, useState } from "react";
 import { FormattedMessage, useIntl } from "react-intl";
 import { useHistory } from "react-router";
 import { useContentScope } from "../contentScope/Provider";
 import { useDependenciesConfig } from "./dependenciesConfig";
-import * as sc from "./DependencyList.sc";
+import { getDisplayNameString } from "./getDisplayNameString";
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-function DependencyListGridToolbar(_ref) {
+function DependentsListGridToolbar(_ref) {
   var refetch = _ref.refetch;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     isRefetching = _useState2[0],
     setIsRefetching = _useState2[1];
   return /*#__PURE__*/_jsxs(DataGridToolbar, {
-    children: [/*#__PURE__*/_jsx(FillSpace, {}), /*#__PURE__*/_jsx(Tooltip, {
+    children: [/*#__PURE__*/_jsx(GridFilterButton, {}), /*#__PURE__*/_jsx(FillSpace, {}), /*#__PURE__*/_jsx(Tooltip, {
       title: /*#__PURE__*/_jsx(FormattedMessage, {
         id: "comet.dependencies.dataGrid.reloadTooltip",
         defaultMessage: "Reload"
@@ -65,8 +65,8 @@ function DependencyListGridToolbar(_ref) {
   });
 }
 var pageSize = 10;
-export var DependencyList = function DependencyList(_ref3) {
-  var _data$item$type, _data$item$type$nodes, _data$item$type2;
+export var DependentsList = function DependentsList(_ref3) {
+  var _data$item$dependents, _data$item$dependents2, _data$item$dependents3;
   var query = _ref3.query,
     variables = _ref3.variables;
   var intl = useIntl();
@@ -76,130 +76,165 @@ export var DependencyList = function DependencyList(_ref3) {
   var apolloClient = useApolloClient();
   var history = useHistory();
   var dataGridProps = _objectSpread(_objectSpread({}, useDataGridRemote({
-    queryParamsPrefix: "dependencies",
-    pageSize: pageSize
-  })), usePersistentColumnState("DependencyList"));
-  var columns = [{
-    field: "nameInfo",
-    headerName: intl.formatMessage({
-      id: "comet.dependencies.dataGrid.nameAndInfo",
-      defaultMessage: "Name/Info"
-    }),
-    sortable: false,
-    flex: 1,
-    renderCell: function renderCell(_ref4) {
-      var _row$name;
-      var row = _ref4.row;
-      return /*#__PURE__*/_jsxs(sc.NameInfoWrapper, {
-        children: [/*#__PURE__*/_jsx(sc.NameInfoTypography, {
-          color: "text.primary",
-          children: (_row$name = row.name) !== null && _row$name !== void 0 ? _row$name : /*#__PURE__*/_jsx(FormattedMessage, _objectSpread({}, messages.unknown))
-        }), /*#__PURE__*/_jsx(sc.NameInfoTypography, {
-          color: "text.secondary",
-          children: row.secondaryInformation
-        })]
-      });
-    }
-  }, {
-    field: "type",
-    headerName: intl.formatMessage({
-      id: "comet.dependencies.dataGrid.type",
-      defaultMessage: "Type"
-    }),
-    sortable: false,
-    renderCell: function renderCell(_ref5) {
-      var _entityDependencyMap$, _entityDependencyMap$2;
-      var row = _ref5.row;
-      return /*#__PURE__*/_jsx(sc.StyledChip, {
-        label: (_entityDependencyMap$ = (_entityDependencyMap$2 = entityDependencyMap[row.graphqlObjectType]) === null || _entityDependencyMap$2 === void 0 ? void 0 : _entityDependencyMap$2.displayName) !== null && _entityDependencyMap$ !== void 0 ? _entityDependencyMap$ : row.graphqlObjectType
-      });
+    queryParamsPrefix: "dependents",
+    pageSize: pageSize,
+    initialFilter: {
+      items: [{
+        field: "visible",
+        operator: "is",
+        value: "true"
+      }]
     }
-  }, {
-    field: "actions",
-    type: "actions",
-    headerName: "",
-    sortable: false,
-    renderCell: function renderCell(_ref6) {
-      var row = _ref6.row;
-      var dependencyObject = entityDependencyMap[row.graphqlObjectType];
-      if (dependencyObject === undefined) {
-        if (process.env.NODE_ENV === "development") {
-          console.warn("Cannot load URL because no implementation of DependencyInterface for ".concat(row.graphqlObjectType, " was provided via the DependenciesConfig"));
-        }
-        return /*#__PURE__*/_jsx(FormattedMessage, {
-          id: "comet.dependencies.dataGrid.cannotLoadUrl",
-          defaultMessage: "Cannot determine URL"
+  })), usePersistentColumnState("DependentsList"));
+  var columns = useMemo(function () {
+    return [{
+      field: "name",
+      headerName: intl.formatMessage({
+        id: "comet.dependencies.dataGrid.nameAndInfo",
+        defaultMessage: "Name/Info"
+      }),
+      flex: 1,
+      sortBy: "name",
+      renderCell: function renderCell(_ref4) {
+        var _row$name;
+        var row = _ref4.row;
+        return /*#__PURE__*/_jsx(GridCellContent, {
+          primaryText: (_row$name = row.name) !== null && _row$name !== void 0 ? _row$name : /*#__PURE__*/_jsx(FormattedMessage, _objectSpread({}, messages.unknown)),
+          secondaryText: row.secondaryInformation
         });
       }
-      var loadUrl = /*#__PURE__*/function () {
-        var _ref7 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2() {
-          var path;
-          return _regenerator().w(function (_context2) {
-            while (1) switch (_context2.n) {
-              case 0:
-                _context2.n = 1;
-                return dependencyObject.resolvePath({
-                  rootColumnName: row.rootColumnName,
-                  jsonPath: row.jsonPath,
-                  apolloClient: apolloClient,
-                  id: row.id
-                });
-              case 1:
-                path = _context2.v;
-                return _context2.a(2, contentScope.match.url + path);
-            }
-          }, _callee2);
-        }));
-        return function loadUrl() {
-          return _ref7.apply(this, arguments);
+    }, {
+      field: "secondaryInformation",
+      headerName: intl.formatMessage({
+        id: "comet.dependencies.dataGrid.secondaryInformation",
+        defaultMessage: "Secondary information"
+      }),
+      sortBy: "secondaryInformation",
+      visible: false
+    }, {
+      field: "rootGraphqlObjectType",
+      headerName: intl.formatMessage({
+        id: "comet.dependencies.dataGrid.type",
+        defaultMessage: "Type"
+      }),
+      type: "singleSelect",
+      sortBy: "graphqlObjectType",
+      valueOptions: Object.entries(entityDependencyMap).map(function (_ref5) {
+        var _ref6 = _slicedToArray(_ref5, 2),
+          value = _ref6[0],
+          dep = _ref6[1];
+        return {
+          value: value,
+          label: getDisplayNameString(dep.displayName, intl, value)
         };
-      }();
-      return /*#__PURE__*/_jsxs("div", {
-        style: {
-          display: "flex"
-        },
-        children: [/*#__PURE__*/_jsx(IconButton, {
-          onClick: /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3() {
-            var url;
-            return _regenerator().w(function (_context3) {
-              while (1) switch (_context3.n) {
-                case 0:
-                  _context3.n = 1;
-                  return loadUrl();
-                case 1:
-                  url = _context3.v;
-                  window.open(url, "_blank");
-                case 2:
-                  return _context3.a(2);
-              }
-            }, _callee3);
-          })),
-          children: /*#__PURE__*/_jsx(OpenNewTab, {})
-        }), /*#__PURE__*/_jsx(IconButton, {
-          onClick: /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee4() {
-            var url;
-            return _regenerator().w(function (_context4) {
-              while (1) switch (_context4.n) {
+      }),
+      renderCell: function renderCell(_ref7) {
+        var _entityDependencyMap$, _entityDependencyMap$2;
+        var row = _ref7.row;
+        return /*#__PURE__*/_jsx(Chip, {
+          label: (_entityDependencyMap$ = (_entityDependencyMap$2 = entityDependencyMap[row.rootGraphqlObjectType]) === null || _entityDependencyMap$2 === void 0 ? void 0 : _entityDependencyMap$2.displayName) !== null && _entityDependencyMap$ !== void 0 ? _entityDependencyMap$ : row.rootGraphqlObjectType
+        });
+      }
+    }, {
+      field: "visible",
+      headerName: intl.formatMessage({
+        id: "comet.dependencies.dataGrid.visible",
+        defaultMessage: "Visible"
+      }),
+      type: "boolean",
+      visible: false,
+      sortBy: "visible"
+    }, {
+      field: "actions",
+      type: "actions",
+      headerName: "",
+      filterable: false,
+      sortable: false,
+      renderCell: function renderCell(_ref8) {
+        var row = _ref8.row;
+        var dependencyObject = entityDependencyMap[row.rootGraphqlObjectType];
+        if (dependencyObject === undefined) {
+          if (process.env.NODE_ENV === "development") {
+            console.warn("Cannot load URL because no implementation of DependencyInterface for ".concat(row.rootGraphqlObjectType, " was provided via the DependenciesConfig"));
+          }
+          return /*#__PURE__*/_jsx(FormattedMessage, {
+            id: "comet.dependencies.dataGrid.cannotLoadUrl",
+            defaultMessage: "Cannot determine URL"
+          });
+        }
+        var loadUrl = /*#__PURE__*/function () {
+          var _ref9 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2() {
+            var path;
+            return _regenerator().w(function (_context2) {
+              while (1) switch (_context2.n) {
                 case 0:
-                  _context4.n = 1;
-                  return loadUrl();
+                  _context2.n = 1;
+                  return dependencyObject.resolvePath({
+                    rootColumnName: row.rootColumnName,
+                    jsonPath: row.jsonPath,
+                    apolloClient: apolloClient,
+                    id: row.id
+                  });
                 case 1:
-                  url = _context4.v;
-                  history.push(url);
-                case 2:
-                  return _context4.a(2);
+                  path = _context2.v;
+                  return _context2.a(2, contentScope.match.url + path);
               }
-            }, _callee4);
-          })),
-          children: /*#__PURE__*/_jsx(ArrowRight, {})
-        })]
-      });
-    }
-  }];
+            }, _callee2);
+          }));
+          return function loadUrl() {
+            return _ref9.apply(this, arguments);
+          };
+        }();
+        return /*#__PURE__*/_jsxs(Box, {
+          display: "flex",
+          children: [/*#__PURE__*/_jsx(IconButton, {
+            onClick: /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3() {
+              var url;
+              return _regenerator().w(function (_context3) {
+                while (1) switch (_context3.n) {
+                  case 0:
+                    _context3.n = 1;
+                    return loadUrl();
+                  case 1:
+                    url = _context3.v;
+                    window.open(url, "_blank");
+                  case 2:
+                    return _context3.a(2);
+                }
+              }, _callee3);
+            })),
+            children: /*#__PURE__*/_jsx(OpenNewTab, {})
+          }), /*#__PURE__*/_jsx(IconButton, {
+            onClick: /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee4() {
+              var url;
+              return _regenerator().w(function (_context4) {
+                while (1) switch (_context4.n) {
+                  case 0:
+                    _context4.n = 1;
+                    return loadUrl();
+                  case 1:
+                    url = _context4.v;
+                    history.push(url);
+                  case 2:
+                    return _context4.a(2);
+                }
+              }, _callee4);
+            })),
+            children: /*#__PURE__*/_jsx(ArrowRight, {})
+          })]
+        });
+      }
+    }];
+  }, [intl, entityDependencyMap, apolloClient, contentScope, history]);
+  var _muiGridFilterToGql = muiGridFilterToGql(columns, dataGridProps.filterModel),
+    gqlFilter = _muiGridFilterToGql.filter;
+  var sort = muiGridSortToGql(dataGridProps.sortModel, columns);
   var _useQuery = useQuery(query, {
       variables: _objectSpread({
         offset: dataGridProps.paginationModel.page * dataGridProps.paginationModel.pageSize,
-        limit: dataGridProps.paginationModel.pageSize
+        limit: dataGridProps.paginationModel.pageSize,
+        filter: gqlFilter,
+        sort: sort
       }, variables)
     }),
     data = _useQuery.data,
@@ -207,17 +242,12 @@ export var DependencyList = function DependencyList(_ref3) {
     error = _useQuery.error,
     refetch = _useQuery.refetch;
   if (error) throw error;
-  if (!loading && (data !== null && data !== void 0 && data.item.dependencies && data !== null && data !== void 0 && data.item.dependents || !(data !== null && data !== void 0 && data.item.dependents) && !(data !== null && data !== void 0 && data.item.dependencies))) {
-    throw new Error("Either dependencies or dependents must be defined, but not both.");
-  }
-  var type = data !== null && data !== void 0 && data.item.dependencies ? "dependencies" : "dependents";
-  var rowCount = useBufferedRowCount(data === null || data === void 0 || (_data$item$type = data.item[type]) === null || _data$item$type === void 0 ? void 0 : _data$item$type.totalCount);
-  var rows = (_data$item$type$nodes = data === null || data === void 0 || (_data$item$type2 = data.item[type]) === null || _data$item$type2 === void 0 ? void 0 : _data$item$type2.nodes.map(function (node) {
+  var rowCount = useBufferedRowCount(data === null || data === void 0 || (_data$item$dependents = data.item.dependents) === null || _data$item$dependents === void 0 ? void 0 : _data$item$dependents.totalCount);
+  var rows = (_data$item$dependents2 = data === null || data === void 0 || (_data$item$dependents3 = data.item.dependents) === null || _data$item$dependents3 === void 0 ? void 0 : _data$item$dependents3.nodes.map(function (node) {
     return _objectSpread(_objectSpread({}, node), {}, {
-      graphqlObjectType: type === "dependencies" ? node.targetGraphqlObjectType : node.rootGraphqlObjectType,
-      id: type === "dependencies" ? node.targetId : node.rootId
+      id: node.rootId
     });
-  })) !== null && _data$item$type$nodes !== void 0 ? _data$item$type$nodes : [];
+  })) !== null && _data$item$dependents2 !== void 0 ? _data$item$dependents2 : [];
   return /*#__PURE__*/_jsxs(_Fragment, {
     children: [/*#__PURE__*/_jsx(DataGrid, _objectSpread(_objectSpread({}, dataGridProps), {}, {
       rows: rows,
@@ -228,7 +258,7 @@ export var DependencyList = function DependencyList(_ref3) {
         return "".concat(row.id, "_").concat(row.rootColumnName, "_").concat(row.jsonPath);
       },
       slots: {
-        toolbar: DependencyListGridToolbar
+        toolbar: DependentsListGridToolbar
       },
       slotProps: {
         toolbar: {
@@ -237,15 +267,15 @@ export var DependencyList = function DependencyList(_ref3) {
       }
     })), /*#__PURE__*/_jsx(Alert, {
       title: /*#__PURE__*/_jsx(FormattedMessage, {
-        id: "comet.dam.file.dependents.info.title",
+        id: "comet.dependencies.dependents.info.title",
         defaultMessage: "What are dependents?"
       }),
       sx: {
         marginTop: 4
       },
       children: /*#__PURE__*/_jsx(FormattedMessage, {
-        id: "comet.dam.file.dependents.info.content",
-        defaultMessage: "Dependents are all pages, snippets and content in which a particular asset is used, linked or included. With this list, it's easy to manage or reorganize the integration of your assets."
+        id: "comet.dependencies.dependents.info.content",
+        defaultMessage: "Dependents are all content items that reference or use this item \u2014 such as pages, snippets, or other content. Use this list to see where this item is used."
       })
     })]
   });

package/lib/dependencies/getDisplayNameString.d.ts

@@ -0,0 +1,4 @@
+import { type ReactNode } from "react";
+import { type IntlShape } from "react-intl";
+export declare function getDisplayNameString(displayName: ReactNode, intl: IntlShape, fallback: string): string;
+//# sourceMappingURL=getDisplayNameString.d.ts.map

package/lib/dependencies/getDisplayNameString.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"getDisplayNameString.d.ts","sourceRoot":"","sources":["../../src/dependencies/getDisplayNameString.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqC,KAAK,SAAS,EAAE,MAAM,OAAO,CAAC;AAC1E,OAAO,EAAoB,KAAK,SAAS,EAA0B,MAAM,YAAY,CAAC;AAMtF,wBAAgB,oBAAoB,CAAC,WAAW,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAMtG"}

package/lib/dependencies/getDisplayNameString.js

@@ -0,0 +1,12 @@
+import { isValidElement } from "react";
+import { FormattedMessage } from "react-intl";
+function isFormattedMessage(node) {
+  return /*#__PURE__*/isValidElement(node) && node.type === FormattedMessage;
+}
+export function getDisplayNameString(displayName, intl, fallback) {
+  if (typeof displayName === "string") return displayName;
+  if (isFormattedMessage(displayName)) {
+    return intl.formatMessage(displayName.props);
+  }
+  return fallback;
+}

package/lib/graphql.generated.d.ts

@@ -154,6 +154,7 @@ export type GQLDamFiledependentsArgs = {
     forceRefresh?: Scalars['Boolean']['input'];
     limit?: Scalars['Int']['input'];
     offset?: Scalars['Int']['input'];
+    sort?: InputMaybe<Array<GQLDependencySort>>;
 };
 export type GQLDamFileImage = {
     __typename?: 'DamFileImage';
@@ -253,14 +254,29 @@ export type GQLDependency = {
     visible: Scalars['Boolean']['output'];
 };
 export type GQLDependencyFilter = {
+    and?: InputMaybe<Array<GQLDependencyFilter>>;
+    name?: InputMaybe<GQLStringFilter>;
+    or?: InputMaybe<Array<GQLDependencyFilter>>;
     rootColumnName?: InputMaybe<Scalars['String']['input']>;
-    targetGraphqlObjectType?: InputMaybe<Scalars['String']['input']>;
+    secondaryInformation?: InputMaybe<GQLStringFilter>;
+    targetGraphqlObjectType?: InputMaybe<GQLStringFilter>;
     targetId?: InputMaybe<Scalars['String']['input']>;
+    visible?: InputMaybe<GQLBooleanFilter>;
+};
+export type GQLDependencySort = {
+    direction?: GQLSortDirection;
+    field: GQLDependencySortField;
 };
+export type GQLDependencySortField = 'graphqlObjectType' | 'name' | 'secondaryInformation' | 'visible';
 export type GQLDependentFilter = {
+    and?: InputMaybe<Array<GQLDependentFilter>>;
+    name?: InputMaybe<GQLStringFilter>;
+    or?: InputMaybe<Array<GQLDependentFilter>>;
     rootColumnName?: InputMaybe<Scalars['String']['input']>;
-    rootGraphqlObjectType?: InputMaybe<Scalars['String']['input']>;
+    rootGraphqlObjectType?: InputMaybe<GQLStringFilter>;
     rootId?: InputMaybe<Scalars['String']['input']>;
+    secondaryInformation?: InputMaybe<GQLStringFilter>;
+    visible?: InputMaybe<GQLBooleanFilter>;
 };
 export type GQLDocumentInterface = {
     id: Scalars['ID']['output'];
@@ -583,6 +599,7 @@ export type GQLPageTreeNodedependentsArgs = {
     forceRefresh?: Scalars['Boolean']['input'];
     limit?: Scalars['Int']['input'];
     offset?: Scalars['Int']['input'];
+    sort?: InputMaybe<Array<GQLDependencySort>>;
 };
 export type GQLPageTreeNodeCreateInput = {
     attachedDocument: GQLAttachedDocumentInput;
@@ -919,6 +936,7 @@ export type GQLRedirectdependenciesArgs = {
     forceRefresh?: Scalars['Boolean']['input'];
     limit?: Scalars['Int']['input'];
     offset?: Scalars['Int']['input'];
+    sort?: InputMaybe<Array<GQLDependencySort>>;
 };
 export type GQLRedirectFilter = {
     activatedAt?: InputMaybe<GQLDateTimeFilter>;
@@ -928,6 +946,7 @@ export type GQLRedirectFilter = {
     generationType?: InputMaybe<GQLStringFilter>;
     or?: InputMaybe<Array<GQLRedirectFilter>>;
     source?: InputMaybe<GQLStringFilter>;
+    sourceType?: InputMaybe<GQLRedirectSourceTypeEnumFilter>;
     target?: InputMaybe<GQLStringFilter>;
     updatedAt?: InputMaybe<GQLDateTimeFilter>;
 };
@@ -948,7 +967,12 @@ export type GQLRedirectSort = {
     field: GQLRedirectSortField;
 };
 export type GQLRedirectSortField = 'createdAt' | 'source' | 'updatedAt';
-export type GQLRedirectSourceTypeValues = 'path';
+export type GQLRedirectSourceTypeEnumFilter = {
+    equal?: InputMaybe<GQLRedirectSourceTypeValues>;
+    isAnyOf?: InputMaybe<Array<GQLRedirectSourceTypeValues>>;
+    notEqual?: InputMaybe<GQLRedirectSourceTypeValues>;
+};
+export type GQLRedirectSourceTypeValues = 'domain' | 'path';
 export type GQLRedirectUpdateActivenessInput = {
     active: Scalars['Boolean']['input'];
 };