@backstage/plugin-catalog-react 1.2.4 → 1.3.0-next.1

package/CHANGELOG.md

@@ -1,5 +1,40 @@
 # @backstage/plugin-catalog-react
 
+## 1.3.0-next.1
+
+### Minor Changes
+
+- fab93c2fe8: Aligned buttons on "Unregister entity" dialog to keep them on the same line
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.4-next.0
+  - @backstage/catalog-client@1.3.1-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2
+  - @backstage/theme@0.2.16
+  - @backstage/types@1.0.2
+  - @backstage/version-bridge@1.0.3
+  - @backstage/plugin-catalog-common@1.0.11-next.0
+  - @backstage/plugin-permission-common@0.7.3
+  - @backstage/plugin-permission-react@0.4.9
+
+## 1.3.0-next.0
+
+### Minor Changes
+
+- 929e1afe1b: Add `initialFilter` prop to EntityLifecyclePicker. This allows you to set an initial lifecycle for the catalog.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/catalog-client@1.3.1-next.0
+  - @backstage/plugin-catalog-common@1.0.11-next.0
+
 ## 1.2.4
 
 ### Patch Changes

package/alpha/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-react",
-  "version": "1.2.4",
+  "version": "1.3.0-next.1",
   "main": "../dist/index.esm.js",
   "types": "../dist/index.alpha.d.ts"
 }

package/dist/index.alpha.d.ts

@@ -212,7 +212,9 @@ export declare class EntityLifecycleFilter implements EntityFilter {
 }
 
 /** @public */
-export declare const EntityLifecyclePicker: () => JSX.Element | null;
+export declare const EntityLifecyclePicker: (props: {
+    initialFilter?: string[];
+}) => JSX.Element | null;
 
 /**
  * Creates new context for entity listing and filtering.

package/dist/index.beta.d.ts

@@ -212,7 +212,9 @@ export declare class EntityLifecycleFilter implements EntityFilter {
 }
 
 /** @public */
-export declare const EntityLifecyclePicker: () => JSX.Element | null;
+export declare const EntityLifecyclePicker: (props: {
+    initialFilter?: string[];
+}) => JSX.Element | null;
 
 /**
  * Creates new context for entity listing and filtering.

package/dist/index.d.ts

@@ -212,7 +212,9 @@ export declare class EntityLifecycleFilter implements EntityFilter {
 }
 
 /** @public */
-export declare const EntityLifecyclePicker: () => JSX.Element | null;
+export declare const EntityLifecyclePicker: (props: {
+    initialFilter?: string[];
+}) => JSX.Element | null;
 
 /**
  * Creates new context for entity listing and filtering.

package/dist/index.esm.js

@@ -974,8 +974,9 @@ const useStyles$d = makeStyles(
 );
 const icon$3 = /* @__PURE__ */ React.createElement(CheckBoxOutlineBlankIcon, { fontSize: "small" });
 const checkedIcon$3 = /* @__PURE__ */ React.createElement(CheckBoxIcon, { fontSize: "small" });
-const EntityLifecyclePicker = () => {
+const EntityLifecyclePicker = (props) => {
   var _a, _b;
+  const { initialFilter = [] } = props;
   const classes = useStyles$d();
   const {
     updateFilters,
@@ -988,7 +989,7 @@ const EntityLifecyclePicker = () => {
     [lifecyclesParameter]
   );
   const [selectedLifecycles, setSelectedLifecycles] = useState(
-    queryParamLifecycles.length ? queryParamLifecycles : (_b = (_a = filters.lifecycles) == null ? void 0 : _a.values) != null ? _b : []
+    queryParamLifecycles.length ? queryParamLifecycles : (_b = (_a = filters.lifecycles) == null ? void 0 : _a.values) != null ? _b : initialFilter
   );
   useEffect(() => {
     if (queryParamLifecycles.length) {
@@ -2182,11 +2183,15 @@ function useUnregisterEntityDialogState(entity) {
 const useStyles$2 = makeStyles({
   advancedButton: {
     fontSize: "0.7em"
+  },
+  dialogActions: {
+    display: "inline-block"
   }
 });
 const Contents = ({
   entity,
-  onConfirm
+  onConfirm,
+  onClose
 }) => {
   var _a;
   const alertApi = useApi(alertApiRef);
@@ -2230,6 +2235,7 @@ const Contents = ({
     },
     [alertApi, onConfirm, state]
   );
+  const DialogActionsPanel = () => /* @__PURE__ */ React.createElement(DialogActions, { className: classes.dialogActions }, /* @__PURE__ */ React.createElement(Button, { onClick: onClose, color: "primary" }, "Cancel"));
   if (state.type === "loading") {
     return /* @__PURE__ */ React.createElement(Progress, null);
   }
@@ -2237,7 +2243,7 @@ const Contents = ({
     return /* @__PURE__ */ React.createElement(ResponseErrorPanel, { error: state.error });
   }
   if (state.type === "bootstrap") {
-    return /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(Alert$1, { severity: "info" }, 'You cannot unregister this entity, since it originates from a protected Backstage configuration (location "', state.location, '"). If you believe this is in error, please contact the ', appTitle, " ", "integrator."), /* @__PURE__ */ React.createElement(Box, { marginTop: 2 }, !showDelete && /* @__PURE__ */ React.createElement(
+    return /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(Alert$1, { severity: "info" }, 'You cannot unregister this entity, since it originates from a protected Backstage configuration (location "', state.location, '"). If you believe this is in error, please contact the ', appTitle, " ", "integrator."), /* @__PURE__ */ React.createElement(Box, { marginTop: 2 }, !showDelete && /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(
       Button,
       {
         variant: "text",
@@ -2247,7 +2253,7 @@ const Contents = ({
         onClick: () => setShowDelete(true)
       },
       "Advanced Options"
-    ), showDelete && /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(DialogContentText, null, "You have the option to delete the entity itself from the catalog. Note that this should only be done if you know that the catalog file has been deleted at, or moved from, its origin location. If that is not the case, the entity will reappear shortly as the next refresh round is performed by the catalog."), /* @__PURE__ */ React.createElement(
+    ), /* @__PURE__ */ React.createElement(DialogActionsPanel, null)), showDelete && /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(DialogContentText, null, "You have the option to delete the entity itself from the catalog. Note that this should only be done if you know that the catalog file has been deleted at, or moved from, its origin location. If that is not the case, the entity will reappear shortly as the next refresh round is performed by the catalog."), /* @__PURE__ */ React.createElement(
       Button,
       {
         variant: "contained",
@@ -2256,7 +2262,7 @@ const Contents = ({
         onClick: onDelete
       },
       "Delete Entity"
-    ))));
+    ), /* @__PURE__ */ React.createElement(DialogActionsPanel, null))));
   }
   if (state.type === "only-delete") {
     return /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(DialogContentText, null, "This entity does not seem to originate from a registered location. You therefore only have the option to delete it outright from the catalog."), /* @__PURE__ */ React.createElement(
@@ -2268,7 +2274,7 @@ const Contents = ({
         onClick: onDelete
       },
       "Delete Entity"
-    ));
+    ), /* @__PURE__ */ React.createElement(DialogActionsPanel, null));
   }
   if (state.type === "unregister") {
     return /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(DialogContentText, null, "This action will unregister the following entities:"), /* @__PURE__ */ React.createElement(DialogContentText, { component: "ul" }, state.colocatedEntities.map((e) => /* @__PURE__ */ React.createElement("li", { key: `${e.kind}:${e.namespace}/${e.name}` }, /* @__PURE__ */ React.createElement(EntityRefLink, { entityRef: e })))), /* @__PURE__ */ React.createElement(DialogContentText, null, "Located at the following location:"), /* @__PURE__ */ React.createElement(DialogContentText, { component: "ul" }, /* @__PURE__ */ React.createElement("li", null, state.location)), /* @__PURE__ */ React.createElement(DialogContentText, null, "To undo, just re-register the entity in ", appTitle, "."), /* @__PURE__ */ React.createElement(Box, { marginTop: 2 }, /* @__PURE__ */ React.createElement(
@@ -2305,7 +2311,7 @@ const Contents = ({
 };
 const UnregisterEntityDialog = (props) => {
   const { open, onConfirm, onClose, entity } = props;
-  return /* @__PURE__ */ React.createElement(Dialog, { open, onClose }, /* @__PURE__ */ React.createElement(DialogTitle, { id: "responsive-dialog-title" }, "Are you sure you want to unregister this entity?"), /* @__PURE__ */ React.createElement(DialogContent, null, /* @__PURE__ */ React.createElement(Contents, { entity, onConfirm })), /* @__PURE__ */ React.createElement(DialogActions, null, /* @__PURE__ */ React.createElement(Button, { onClick: onClose, color: "primary" }, "Cancel")));
+  return /* @__PURE__ */ React.createElement(Dialog, { open, onClose }, /* @__PURE__ */ React.createElement(DialogTitle, { id: "responsive-dialog-title" }, "Are you sure you want to unregister this entity?"), /* @__PURE__ */ React.createElement(DialogContent, null, /* @__PURE__ */ React.createElement(Contents, { entity, onConfirm, onClose })));
 };
 
 const useStyles$1 = makeStyles(
@@ -2381,8 +2387,10 @@ const UserListPicker = (props) => {
   const filterGroups = getFilterGroups(orgName).map((filterGroup) => ({
     ...filterGroup,
     items: filterGroup.items.filter(
-      ({ id }) => // TODO: avoid hardcoding kinds here
-      ["group", "user"].some((kind) => kind === kindParameter) ? userAndGroupFilterIds.includes(id) : !availableFilters || availableFilters.includes(id)
+      ({ id }) => (
+        // TODO: avoid hardcoding kinds here
+        ["group", "user"].some((kind) => kind === kindParameter) ? userAndGroupFilterIds.includes(id) : !availableFilters || availableFilters.includes(id)
+      )
     )
   })).filter(({ items }) => !!items.length);
   const { isStarredEntity } = useStarredEntities();