Merge branch 'master' into scaffolder-page-contextmenu-props-bugfix

Signed-off-by: Juan Escalada <97265671+jescalada@users.noreply.github.com>

plugins/scaffolder/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @backstage/plugin-scaffolder
 
+## 1.26.3-next.2
+
+### Patch Changes
+
+- 8e4bed4: Updated dependency `idb-keyval` to `5.1.5`.
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/plugin-catalog-react@1.14.1-next.2
+  - @backstage/plugin-scaffolder-react@1.13.3-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-compat-api@0.3.2-next.1
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-plugin-api@0.9.1-next.1
+  - @backstage/integration@1.15.1
+  - @backstage/integration-react@1.2.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-permission-react@0.4.27
+  - @backstage/plugin-scaffolder-common@1.5.6
+
 ## 1.26.3-next.1
 
 ### Patch Changes

plugins/scaffolder/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-scaffolder",
-  "version": "1.26.3-next.1",
+  "version": "1.26.3-next.2",
   "description": "The Backstage plugin that helps you create new things",
   "backstage": {
     "role": "frontend-plugin",
@@ -89,7 +89,7 @@
     "classnames": "^2.2.6",
     "git-url-parse": "^15.0.0",
     "humanize-duration": "^3.25.1",
-    "idb-keyval": "5.0.2",
+    "idb-keyval": "5.1.5",
     "json-schema": "^0.4.0",
     "json-schema-library": "^9.0.0",
     "jszip": "^3.10.1",

plugins/scaffolder/src/components/Router/Router.tsx

@@ -61,6 +61,7 @@ import {
 } from '../../alpha/components/TemplateEditorPage';
 import { RequirePermission } from '@backstage/plugin-permission-react';
 import { taskReadPermission } from '@backstage/plugin-scaffolder-common/alpha';
+import { templateManagementPermission } from '@backstage/plugin-scaffolder-common/alpha';
 
 /**
  * The Props for the Scaffolder Router
@@ -176,29 +177,35 @@ export const Router = (props: PropsWithChildren<RouterProps>) => {
       <Route
         path={editRouteRef.path}
         element={
-          <SecretsContextProvider>
-            <TemplateIntroPage />
-          </SecretsContextProvider>
+          <RequirePermission permission={templateManagementPermission}>
+            <SecretsContextProvider>
+              <TemplateIntroPage />
+            </SecretsContextProvider>
+          </RequirePermission>
         }
       />
       <Route
         path={customFieldsRouteRef.path}
         element={
-          <SecretsContextProvider>
-            <CustomFieldsPage fieldExtensions={fieldExtensions} />
-          </SecretsContextProvider>
+          <RequirePermission permission={templateManagementPermission}>
+            <SecretsContextProvider>
+              <CustomFieldsPage fieldExtensions={fieldExtensions} />
+            </SecretsContextProvider>
+          </RequirePermission>
         }
       />
       <Route
         path={templateFormRouteRef.path}
         element={
-          <SecretsContextProvider>
-            <TemplateFormPage
-              layouts={customLayouts}
-              formProps={props.formProps}
-              fieldExtensions={fieldExtensions}
-            />
-          </SecretsContextProvider>
+          <RequirePermission permission={templateManagementPermission}>
+            <SecretsContextProvider>
+              <TemplateFormPage
+                layouts={customLayouts}
+                formProps={props.formProps}
+                fieldExtensions={fieldExtensions}
+              />
+            </SecretsContextProvider>
+          </RequirePermission>
         }
       />
 
@@ -217,13 +224,15 @@ export const Router = (props: PropsWithChildren<RouterProps>) => {
       <Route
         path={editorRouteRef.path}
         element={
-          <SecretsContextProvider>
-            <TemplateEditorPage
-              layouts={customLayouts}
-              formProps={props.formProps}
-              fieldExtensions={fieldExtensions}
-            />
-          </SecretsContextProvider>
+          <RequirePermission permission={templateManagementPermission}>
+            <SecretsContextProvider>
+              <TemplateEditorPage
+                layouts={customLayouts}
+                formProps={props.formProps}
+                fieldExtensions={fieldExtensions}
+              />
+            </SecretsContextProvider>
+          </RequirePermission>
         }
       />
       <Route