@backstage/plugin-scaffolder 1.10.1 → 1.11.0-next.1

package/CHANGELOG.md

@@ -1,12 +1,57 @@
 # @backstage/plugin-scaffolder
 
-## 1.10.1
+## 1.11.0-next.1
 
 ### Patch Changes
 
-- 021233c215: lock versions of `@rjsf/*-beta` packages
+- 04f717a8e1: `scaffolder/next`: bump `react-jsonschema-form` libraries to `v5-stable`
+- 346d6b6630: Upgrade `@rjsf` version 5 dependencies to `beta.18`
+- 0f0da2f256: Prefer schema ordering of template properties during review content generation.
+- 38992bdbaf: Fixed bug in review step refactor that caused schema-based display settings for individual property values to be discarded.
 - Updated dependencies
-  - @backstage/plugin-scaffolder-react@1.0.1
+  - @backstage/plugin-scaffolder-react@1.1.0-next.1
+  - @backstage/core-components@0.12.4-next.0
+  - @backstage/plugin-catalog-react@1.3.0-next.1
+  - @backstage/catalog-client@1.3.1-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/config@1.0.6
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2
+  - @backstage/integration-react@1.1.10-next.0
+  - @backstage/theme@0.2.16
+  - @backstage/types@1.0.2
+  - @backstage/plugin-catalog-common@1.0.11-next.0
+  - @backstage/plugin-permission-react@0.4.9
+  - @backstage/plugin-scaffolder-common@1.2.5-next.0
+
+## 1.11.0-next.0
+
+### Minor Changes
+
+- d6bb12a2e7: - **Deprecation** - Deprecated the following exports, please import them directly from `@backstage/plugin-scaffolder-react` instead
+
+  ```
+  createScaffolderLayout
+  ScaffolderLayouts
+  LayoutOptions
+  LayoutTemplate
+  ```
+
+- 8c2966536b: Embed scaffolder workflow in other components
+
+### Patch Changes
+
+- cbab8ac107: lock versions of `@rjsf/*-beta` packages
+- d2ddde2108: Add `ScaffolderLayouts` to `NextScaffolderPage`
+- Updated dependencies
+  - @backstage/plugin-scaffolder-react@1.1.0-next.0
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @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
+  - @backstage/plugin-scaffolder-common@1.2.5-next.0
+  - @backstage/integration-react@1.1.9
 
 ## 1.10.0
 

package/alpha/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-scaffolder",
-  "version": "1.10.1",
+  "version": "1.11.0-next.1",
   "main": "../dist/index.esm.js",
   "types": "../dist/index.alpha.d.ts"
 }

package/dist/esm/{Router-77e86b6b.esm.js → Router-aedb6d68.esm.js}

@@ -1,14 +1,14 @@
 import React, { useState, useCallback, Fragment, createContext, useEffect, useContext, useRef, useMemo, Component, Children } from 'react';
 import { useNavigate, Navigate, useOutlet, Routes, Route } from 'react-router-dom';
 import { ItemCardHeader, MarkdownContent, Button, Link, ContentHeader, Progress, WarningPanel, Content, ItemCardGrid, Page, Header, CreateButton, SupportButton, StructuredMetadataTable, InfoCard, ErrorPage, CodeSnippet, ErrorPanel, LogViewer, StatusError, StatusOK, StatusPending, Lifecycle, EmptyState, Table as Table$1 } from '@backstage/core-components';
-import { useApp, useRouteRef, useApi, useRouteRefParams, useAnalytics, errorApiRef, featureFlagsApiRef, useApiHolder, AnalyticsContext, alertApiRef, useElementFilter } from '@backstage/core-plugin-api';
+import { useApp, useRouteRef, useApi, useRouteRefParams, useAnalytics, errorApiRef, featureFlagsApiRef, useApiHolder, AnalyticsContext, alertApiRef } from '@backstage/core-plugin-api';
 import { getEntityRelations, getEntitySourceLocation, FavoriteEntity, EntityRefLinks, useEntityList, EntityListProvider, CatalogFilterLayout, EntitySearchBar, EntityKindPicker, UserListPicker, EntityTagPicker, catalogApiRef, humanizeEntityRef, EntityRefLink } from '@backstage/plugin-catalog-react';
 import { RELATION_OWNED_BY, parseEntityRef, stringifyEntityRef, DEFAULT_NAMESPACE } from '@backstage/catalog-model';
 import { makeStyles, useTheme, Card, CardMedia, CardContent, Box, Typography, Chip, CardActions, Tooltip, IconButton, Paper, Button as Button$1, Stepper, Step, StepLabel, StepContent, LinearProgress, Accordion, AccordionSummary, AccordionDetails, Grid, TableContainer, Table, TableHead, TableRow, TableCell, TableBody, FormControl, InputLabel, Select, MenuItem as MenuItem$1, CardHeader, Divider as Divider$1, List as List$2, ListItemIcon as ListItemIcon$1, ListItemText as ListItemText$1 } from '@material-ui/core';
 import { scmIntegrationsApiRef, ScmIntegrationIcon } from '@backstage/integration-react';
 import LanguageIcon from '@material-ui/icons/Language';
 import WarningIcon from '@material-ui/icons/Warning';
-import { s as selectedTemplateRouteRef, v as viewTechDocRouteRef, e as editRouteRef, a as actionsRouteRef, b as scaffolderListTaskRouteRef, r as registerComponentRouteRef, T as TemplateTypePicker, c as scaffolderTaskRouteRef, d as rootRouteRef, f as TaskStatusStepper, g as TaskPageLinks, L as LAYOUTS_WRAPPER_KEY, h as LAYOUTS_KEY, l as legacySelectedTemplateRouteRef, i as TaskPage } from './index-4dbb353c.esm.js';
+import { s as selectedTemplateRouteRef, v as viewTechDocRouteRef, e as editRouteRef, a as actionsRouteRef, b as scaffolderListTaskRouteRef, r as registerComponentRouteRef, T as TemplateTypePicker, c as scaffolderTaskRouteRef, d as rootRouteRef, f as TaskStatusStepper, g as TaskPageLinks, l as legacySelectedTemplateRouteRef, h as TaskPage } from './index-e0e59ed8.esm.js';
 import { catalogEntityCreatePermission } from '@backstage/plugin-catalog-common';
 import { usePermission } from '@backstage/plugin-permission-react';
 import IconButton$1 from '@material-ui/core/IconButton';
@@ -24,7 +24,7 @@ import List from '@material-ui/icons/List';
 import MoreVert from '@material-ui/icons/MoreVert';
 import qs from 'qs';
 import useAsync from 'react-use/lib/useAsync';
-import { extractSchemaFromStep, useTemplateSecrets, scaffolderApiRef, useCustomFieldExtensions, SecretsContextProvider } from '@backstage/plugin-scaffolder-react';
+import { extractSchemaFromStep, useTemplateSecrets, scaffolderApiRef, useCustomFieldExtensions, useCustomLayouts, SecretsContextProvider } from '@backstage/plugin-scaffolder-react';
 import { withTheme } from '@rjsf/core';
 import { Theme } from '@rjsf/material-ui';
 import cloneDeep from 'lodash/cloneDeep';
@@ -63,7 +63,7 @@ import TreeItem from '@material-ui/lab/TreeItem';
 import RefreshIcon from '@material-ui/icons/Refresh';
 import SaveIcon from '@material-ui/icons/Save';
 import { showPanel } from '@codemirror/view';
-import { D as DEFAULT_SCAFFOLDER_FIELD_EXTENSIONS } from './default-40114591.esm.js';
+import { D as DEFAULT_SCAFFOLDER_FIELD_EXTENSIONS } from './default-ad36f5e9.esm.js';
 import SettingsIcon from '@material-ui/icons/Settings';
 import AllIcon from '@material-ui/icons/FontDownload';
 import { DateTime, Interval } from 'luxon';
@@ -511,31 +511,32 @@ var fieldOverrides = /*#__PURE__*/Object.freeze({
 
 function getReviewData(formData, uiSchemas) {
   const reviewData = {};
-  for (const key in formData) {
-    if (formData.hasOwnProperty(key)) {
-      const uiSchema = uiSchemas.find((us) => us.name === key);
-      if (!uiSchema) {
-        reviewData[key] = formData[key];
-        continue;
-      }
-      if (uiSchema["ui:widget"] === "password") {
-        reviewData[key] = "******";
-        continue;
-      }
-      if (!uiSchema["ui:backstage"] || !uiSchema["ui:backstage"].review) {
-        reviewData[key] = formData[key];
-        continue;
-      }
-      const review = uiSchema["ui:backstage"].review;
-      if (review.mask) {
-        reviewData[key] = review.mask;
-        continue;
-      }
-      if (!review.show) {
-        continue;
-      }
+  const orderedReviewProperties = new Set(
+    uiSchemas.map((us) => us.name).concat(Object.getOwnPropertyNames(formData))
+  );
+  for (const key of orderedReviewProperties) {
+    const uiSchema = uiSchemas.find((us) => us.name === key);
+    if (!uiSchema) {
+      reviewData[key] = formData[key];
+      continue;
+    }
+    if (uiSchema["ui:widget"] === "password") {
+      reviewData[key] = "******";
+      continue;
+    }
+    if (!uiSchema["ui:backstage"] || !uiSchema["ui:backstage"].review) {
       reviewData[key] = formData[key];
+      continue;
     }
+    const review = uiSchema["ui:backstage"].review;
+    if (review.mask) {
+      reviewData[key] = review.mask;
+      continue;
+    }
+    if (!review.show) {
+      continue;
+    }
+    reviewData[key] = formData[key];
   }
   return reviewData;
 }
@@ -566,7 +567,12 @@ const ReviewStep = (props) => {
     StructuredMetadataTable,
     {
       dense: true,
-      metadata: getReviewData(formData, getUiSchemasFromSteps(steps))
+      metadata: getReviewData(
+        formData,
+        getUiSchemasFromSteps(
+          steps.map(({ mergedSchema }) => ({ schema: mergedSchema }))
+        )
+      )
     }
   ), /* @__PURE__ */ React.createElement(Box, { mb: 4 }), /* @__PURE__ */ React.createElement(Button$1, { onClick: handleBack, disabled: disableButtons }, "Back"), /* @__PURE__ */ React.createElement(Button$1, { onClick: handleReset, disabled: disableButtons }, "Reset"), /* @__PURE__ */ React.createElement(
     Button$1,
@@ -2634,21 +2640,16 @@ const Router = (props) => {
       )
     )
   ];
-  const customLayouts = useElementFilter(
-    outlet,
-    (elements) => elements.selectByComponentData({
-      key: LAYOUTS_WRAPPER_KEY
-    }).findComponentData({
-      key: LAYOUTS_KEY
-    })
-  );
+  const customLayouts = useCustomLayouts(outlet);
   const RedirectingComponent = () => {
     const { templateName } = useRouteRefParams(legacySelectedTemplateRouteRef);
     const newLink = useRouteRef(selectedTemplateRouteRef);
     useEffect(
-      () => // eslint-disable-next-line no-console
-      console.warn(
-        "The route /template/:templateName is deprecated, please use the new /template/:namespace/:templateName route instead"
+      () => (
+        // eslint-disable-next-line no-console
+        console.warn(
+          "The route /template/:templateName is deprecated, please use the new /template/:namespace/:templateName route instead"
+        )
       ),
       []
     );
@@ -2711,4 +2712,4 @@ const Router = (props) => {
 };
 
 export { Router };
-//# sourceMappingURL=Router-77e86b6b.esm.js.map
+//# sourceMappingURL=Router-aedb6d68.esm.js.map