diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index b12d7f1212..ac4b43fb1d 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -27,4 +27,6 @@ yarn.lock @janus-idp/maintainers-plugins /plugins/tekton/ @janus-idp/maintainers-plugins @debsmita1 @divyanshiGupta /plugins/rbac-backend/ @janus-idp/maintainers-plugins @gorkem @AndrienkoAleksandr @PatAKnight /plugins/rbac-common/ @janus-idp/maintainers-plugins @gorkem @AndrienkoAleksandr @PatAKnight -/plugins/notifications-frontend @janus-idp/maintainers-plugins @mareklibra +/plugins/notifications @janus-idp/maintainers-plugins @mareklibra +/plugins/notifications-backend @janus-idp/maintainers-plugins @mareklibra @ydayagi + diff --git a/packages/app/package.json b/packages/app/package.json index 6cca6281c7..d326784f41 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -37,7 +37,6 @@ "@backstage/plugin-catalog-import": "^0.10.1", "@backstage/plugin-catalog-react": "^1.8.5", "@backstage/plugin-github-actions": "^0.6.6", - "@backstage/plugin-notifications-frontend": "0.1.0", "@backstage/plugin-org": "^0.6.15", "@backstage/plugin-permission-react": "^0.4.16", "@backstage/plugin-scaffolder": "^1.15.1", diff --git a/packages/backend/package.json b/packages/backend/package.json index 3bf6ef2ded..65628d5914 100644 --- a/packages/backend/package.json +++ b/packages/backend/package.json @@ -27,7 +27,6 @@ "@backstage/plugin-auth-backend": "^0.19.3", "@backstage/plugin-auth-node": "^0.4.0", "@backstage/plugin-catalog-backend": "^1.14.0", - "@backstage/plugin-notifications-backend": "^0.1.0", "@backstage/plugin-permission-backend": "^0.5.29", "@backstage/plugin-permission-common": "^0.7.9", "@backstage/plugin-permission-node": "^0.7.17", diff --git a/plugins/notifications-backend/README.md b/plugins/notifications-backend/README.md index 9b71cc4923..b8bcefaa76 100644 --- a/plugins/notifications-backend/README.md +++ b/plugins/notifications-backend/README.md @@ -163,7 +163,7 @@ It is up to particular deployment to provide corresponding permission policies b #### Service-to-service and External Calls -The notification-backend is expected to be called by FE plugins (including the notifications-frontend), other backend plugins or external services. +The notification-backend is expected to be called by FE plugins (including the Notifications frontend-end plugin), other backend plugins or external services. To configure those two flows, refer diff --git a/plugins/notifications-backend/package.json b/plugins/notifications-backend/package.json index 37a3aa3b50..b27dd860c6 100644 --- a/plugins/notifications-backend/package.json +++ b/plugins/notifications-backend/package.json @@ -4,7 +4,6 @@ "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", - "private": true, "publishConfig": { "access": "public", "main": "dist/index.cjs.js", diff --git a/plugins/notifications-frontend/.eslintrc.js b/plugins/notifications/.eslintrc.js similarity index 100% rename from plugins/notifications-frontend/.eslintrc.js rename to plugins/notifications/.eslintrc.js diff --git a/plugins/notifications-frontend/README.md b/plugins/notifications/README.md similarity index 92% rename from plugins/notifications-frontend/README.md rename to plugins/notifications/README.md index 2c37d0be7a..2624bc5967 100644 --- a/plugins/notifications-frontend/README.md +++ b/plugins/notifications/README.md @@ -17,7 +17,7 @@ Have `@backstage/plugin-notifications-backend` installed and running. ``` cd packages/app -yarn add @backstage/plugin-notifications-frontend +yarn add @backstage/plugin-notifications ``` ### Add left-side menu item @@ -25,7 +25,7 @@ yarn add @backstage/plugin-notifications-frontend In the `packages/app/src/components/Root/Root.tsx`: ``` -import { NotificationsSidebarItem } from '@backstage/plugin-notifications-frontend'; +import { NotificationsSidebarItem } from '@backstage/plugin-notifications'; ... export const Root = ({ children }: PropsWithChildren<{}>) => ( @@ -48,7 +48,7 @@ export const Root = ({ children }: PropsWithChildren<{}>) => ( In the `packages/app/src/App.tsx`: ``` -import { NOTIFICATIONS_ROUTE, NotificationsPage } from '@backstage/plugin-notifications-frontend'; +import { NOTIFICATIONS_ROUTE, NotificationsPage } from '@backstage/plugin-notifications'; ... export const AppBase = () => { @@ -60,7 +60,7 @@ export const AppBase = () => { ## How to use the NotificationApi ``` -import { notificationsApiRef, Notification } from '@backstage/plugin-notifications-frontend'; +import { notificationsApiRef, Notification } from '@backstage/plugin-notifications'; ... diff --git a/plugins/notifications-frontend/dev/index.tsx b/plugins/notifications/dev/index.tsx similarity index 100% rename from plugins/notifications-frontend/dev/index.tsx rename to plugins/notifications/dev/index.tsx diff --git a/plugins/notifications-frontend/openapitools.json b/plugins/notifications/openapitools.json similarity index 100% rename from plugins/notifications-frontend/openapitools.json rename to plugins/notifications/openapitools.json diff --git a/plugins/notifications-frontend/package.json b/plugins/notifications/package.json similarity index 96% rename from plugins/notifications-frontend/package.json rename to plugins/notifications/package.json index befd2c26e9..60a64db6e9 100644 --- a/plugins/notifications-frontend/package.json +++ b/plugins/notifications/package.json @@ -1,11 +1,10 @@ { - "name": "@backstage/plugin-notifications-frontend", + "name": "@backstage/plugin-notifications", "description": "Frontend part of the notifications providing the Notifications API, Notifications page, left-side menu item and other REACT components.", "version": "0.1.0", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", - "private": true, "publishConfig": { "access": "public", "main": "dist/index.esm.js", diff --git a/plugins/notifications-frontend/src/api/NotificationsApiImpl.ts b/plugins/notifications/src/api/NotificationsApiImpl.ts similarity index 100% rename from plugins/notifications-frontend/src/api/NotificationsApiImpl.ts rename to plugins/notifications/src/api/NotificationsApiImpl.ts diff --git a/plugins/notifications-frontend/src/api/index.ts b/plugins/notifications/src/api/index.ts similarity index 100% rename from plugins/notifications-frontend/src/api/index.ts rename to plugins/notifications/src/api/index.ts diff --git a/plugins/notifications-frontend/src/api/notificationsApi.ts b/plugins/notifications/src/api/notificationsApi.ts similarity index 100% rename from plugins/notifications-frontend/src/api/notificationsApi.ts rename to plugins/notifications/src/api/notificationsApi.ts diff --git a/plugins/notifications-frontend/src/components/NotificationsPage/NotificationsPage.tsx b/plugins/notifications/src/components/NotificationsPage/NotificationsPage.tsx similarity index 100% rename from plugins/notifications-frontend/src/components/NotificationsPage/NotificationsPage.tsx rename to plugins/notifications/src/components/NotificationsPage/NotificationsPage.tsx diff --git a/plugins/notifications-frontend/src/components/NotificationsPage/index.ts b/plugins/notifications/src/components/NotificationsPage/index.ts similarity index 100% rename from plugins/notifications-frontend/src/components/NotificationsPage/index.ts rename to plugins/notifications/src/components/NotificationsPage/index.ts diff --git a/plugins/notifications-frontend/src/components/NotificationsSidebarItem.tsx b/plugins/notifications/src/components/NotificationsSidebarItem.tsx similarity index 100% rename from plugins/notifications-frontend/src/components/NotificationsSidebarItem.tsx rename to plugins/notifications/src/components/NotificationsSidebarItem.tsx diff --git a/plugins/notifications-frontend/src/components/NotificationsTable/MarkAsUnreadIcon.tsx b/plugins/notifications/src/components/NotificationsTable/MarkAsUnreadIcon.tsx similarity index 100% rename from plugins/notifications-frontend/src/components/NotificationsTable/MarkAsUnreadIcon.tsx rename to plugins/notifications/src/components/NotificationsTable/MarkAsUnreadIcon.tsx diff --git a/plugins/notifications-frontend/src/components/NotificationsTable/NotificationsTable.tsx b/plugins/notifications/src/components/NotificationsTable/NotificationsTable.tsx similarity index 100% rename from plugins/notifications-frontend/src/components/NotificationsTable/NotificationsTable.tsx rename to plugins/notifications/src/components/NotificationsTable/NotificationsTable.tsx diff --git a/plugins/notifications-frontend/src/components/NotificationsTable/NotificationsToolbar.tsx b/plugins/notifications/src/components/NotificationsTable/NotificationsToolbar.tsx similarity index 100% rename from plugins/notifications-frontend/src/components/NotificationsTable/NotificationsToolbar.tsx rename to plugins/notifications/src/components/NotificationsTable/NotificationsToolbar.tsx diff --git a/plugins/notifications-frontend/src/components/NotificationsTable/index.ts b/plugins/notifications/src/components/NotificationsTable/index.ts similarity index 100% rename from plugins/notifications-frontend/src/components/NotificationsTable/index.ts rename to plugins/notifications/src/components/NotificationsTable/index.ts diff --git a/plugins/notifications-frontend/src/components/PersonalNotifications/PersonalNotifications.tsx b/plugins/notifications/src/components/PersonalNotifications/PersonalNotifications.tsx similarity index 100% rename from plugins/notifications-frontend/src/components/PersonalNotifications/PersonalNotifications.tsx rename to plugins/notifications/src/components/PersonalNotifications/PersonalNotifications.tsx diff --git a/plugins/notifications-frontend/src/components/PersonalNotifications/index.ts b/plugins/notifications/src/components/PersonalNotifications/index.ts similarity index 100% rename from plugins/notifications-frontend/src/components/PersonalNotifications/index.ts rename to plugins/notifications/src/components/PersonalNotifications/index.ts diff --git a/plugins/notifications-frontend/src/components/SendNotification/SendNotification.tsx b/plugins/notifications/src/components/SendNotification/SendNotification.tsx similarity index 100% rename from plugins/notifications-frontend/src/components/SendNotification/SendNotification.tsx rename to plugins/notifications/src/components/SendNotification/SendNotification.tsx diff --git a/plugins/notifications-frontend/src/components/SendNotification/index.ts b/plugins/notifications/src/components/SendNotification/index.ts similarity index 100% rename from plugins/notifications-frontend/src/components/SendNotification/index.ts rename to plugins/notifications/src/components/SendNotification/index.ts diff --git a/plugins/notifications-frontend/src/components/SystemNotifications/SystemNotifications.tsx b/plugins/notifications/src/components/SystemNotifications/SystemNotifications.tsx similarity index 100% rename from plugins/notifications-frontend/src/components/SystemNotifications/SystemNotifications.tsx rename to plugins/notifications/src/components/SystemNotifications/SystemNotifications.tsx diff --git a/plugins/notifications-frontend/src/components/SystemNotifications/index.ts b/plugins/notifications/src/components/SystemNotifications/index.ts similarity index 100% rename from plugins/notifications-frontend/src/components/SystemNotifications/index.ts rename to plugins/notifications/src/components/SystemNotifications/index.ts diff --git a/plugins/notifications-frontend/src/components/usePollingEffect.ts b/plugins/notifications/src/components/usePollingEffect.ts similarity index 100% rename from plugins/notifications-frontend/src/components/usePollingEffect.ts rename to plugins/notifications/src/components/usePollingEffect.ts diff --git a/plugins/notifications-frontend/src/constants.ts b/plugins/notifications/src/constants.ts similarity index 100% rename from plugins/notifications-frontend/src/constants.ts rename to plugins/notifications/src/constants.ts diff --git a/plugins/notifications-frontend/src/index.ts b/plugins/notifications/src/index.ts similarity index 100% rename from plugins/notifications-frontend/src/index.ts rename to plugins/notifications/src/index.ts diff --git a/plugins/notifications-frontend/src/openapi/.openapi-generator-ignore b/plugins/notifications/src/openapi/.openapi-generator-ignore similarity index 100% rename from plugins/notifications-frontend/src/openapi/.openapi-generator-ignore rename to plugins/notifications/src/openapi/.openapi-generator-ignore diff --git a/plugins/notifications-frontend/src/openapi/.openapi-generator/FILES b/plugins/notifications/src/openapi/.openapi-generator/FILES similarity index 100% rename from plugins/notifications-frontend/src/openapi/.openapi-generator/FILES rename to plugins/notifications/src/openapi/.openapi-generator/FILES diff --git a/plugins/notifications-frontend/src/openapi/.openapi-generator/VERSION b/plugins/notifications/src/openapi/.openapi-generator/VERSION similarity index 100% rename from plugins/notifications-frontend/src/openapi/.openapi-generator/VERSION rename to plugins/notifications/src/openapi/.openapi-generator/VERSION diff --git a/plugins/notifications-frontend/src/openapi/README.md b/plugins/notifications/src/openapi/README.md similarity index 77% rename from plugins/notifications-frontend/src/openapi/README.md rename to plugins/notifications/src/openapi/README.md index f97dfb852a..cffcba1945 100644 --- a/plugins/notifications-frontend/src/openapi/README.md +++ b/plugins/notifications/src/openapi/README.md @@ -3,6 +3,6 @@ The content of this folder is generated, do not update it manually. Generated by: ``` -cd plugins/notifications-frontend +cd plugins/notifications yarn openapi:generate ``` diff --git a/plugins/notifications-frontend/src/openapi/apis/NotificationsApi.ts b/plugins/notifications/src/openapi/apis/NotificationsApi.ts similarity index 100% rename from plugins/notifications-frontend/src/openapi/apis/NotificationsApi.ts rename to plugins/notifications/src/openapi/apis/NotificationsApi.ts diff --git a/plugins/notifications-frontend/src/openapi/apis/index.ts b/plugins/notifications/src/openapi/apis/index.ts similarity index 100% rename from plugins/notifications-frontend/src/openapi/apis/index.ts rename to plugins/notifications/src/openapi/apis/index.ts diff --git a/plugins/notifications-frontend/src/openapi/index.ts b/plugins/notifications/src/openapi/index.ts similarity index 100% rename from plugins/notifications-frontend/src/openapi/index.ts rename to plugins/notifications/src/openapi/index.ts diff --git a/plugins/notifications-frontend/src/openapi/models/Action.ts b/plugins/notifications/src/openapi/models/Action.ts similarity index 100% rename from plugins/notifications-frontend/src/openapi/models/Action.ts rename to plugins/notifications/src/openapi/models/Action.ts diff --git a/plugins/notifications-frontend/src/openapi/models/CreateBody.ts b/plugins/notifications/src/openapi/models/CreateBody.ts similarity index 100% rename from plugins/notifications-frontend/src/openapi/models/CreateBody.ts rename to plugins/notifications/src/openapi/models/CreateBody.ts diff --git a/plugins/notifications-frontend/src/openapi/models/CreateBodyActionsInner.ts b/plugins/notifications/src/openapi/models/CreateBodyActionsInner.ts similarity index 100% rename from plugins/notifications-frontend/src/openapi/models/CreateBodyActionsInner.ts rename to plugins/notifications/src/openapi/models/CreateBodyActionsInner.ts diff --git a/plugins/notifications-frontend/src/openapi/models/CreateNotification200Response.ts b/plugins/notifications/src/openapi/models/CreateNotification200Response.ts similarity index 100% rename from plugins/notifications-frontend/src/openapi/models/CreateNotification200Response.ts rename to plugins/notifications/src/openapi/models/CreateNotification200Response.ts diff --git a/plugins/notifications-frontend/src/openapi/models/GetNotificationsCount200Response.ts b/plugins/notifications/src/openapi/models/GetNotificationsCount200Response.ts similarity index 100% rename from plugins/notifications-frontend/src/openapi/models/GetNotificationsCount200Response.ts rename to plugins/notifications/src/openapi/models/GetNotificationsCount200Response.ts diff --git a/plugins/notifications-frontend/src/openapi/models/Notification.ts b/plugins/notifications/src/openapi/models/Notification.ts similarity index 100% rename from plugins/notifications-frontend/src/openapi/models/Notification.ts rename to plugins/notifications/src/openapi/models/Notification.ts diff --git a/plugins/notifications-frontend/src/openapi/models/index.ts b/plugins/notifications/src/openapi/models/index.ts similarity index 100% rename from plugins/notifications-frontend/src/openapi/models/index.ts rename to plugins/notifications/src/openapi/models/index.ts diff --git a/plugins/notifications-frontend/src/openapi/runtime.ts b/plugins/notifications/src/openapi/runtime.ts similarity index 100% rename from plugins/notifications-frontend/src/openapi/runtime.ts rename to plugins/notifications/src/openapi/runtime.ts diff --git a/plugins/notifications-frontend/src/plugin.test.ts b/plugins/notifications/src/plugin.test.ts similarity index 100% rename from plugins/notifications-frontend/src/plugin.test.ts rename to plugins/notifications/src/plugin.test.ts diff --git a/plugins/notifications-frontend/src/plugin.ts b/plugins/notifications/src/plugin.ts similarity index 100% rename from plugins/notifications-frontend/src/plugin.ts rename to plugins/notifications/src/plugin.ts diff --git a/plugins/notifications-frontend/src/routes.ts b/plugins/notifications/src/routes.ts similarity index 100% rename from plugins/notifications-frontend/src/routes.ts rename to plugins/notifications/src/routes.ts diff --git a/plugins/notifications-frontend/src/setupTests.ts b/plugins/notifications/src/setupTests.ts similarity index 100% rename from plugins/notifications-frontend/src/setupTests.ts rename to plugins/notifications/src/setupTests.ts diff --git a/plugins/notifications-frontend/tsconfig.json b/plugins/notifications/tsconfig.json similarity index 73% rename from plugins/notifications-frontend/tsconfig.json rename to plugins/notifications/tsconfig.json index 1964526a24..1aaa41c456 100644 --- a/plugins/notifications-frontend/tsconfig.json +++ b/plugins/notifications/tsconfig.json @@ -3,7 +3,7 @@ "include": ["src", "dev", "migrations"], "exclude": ["node_modules"], "compilerOptions": { - "outDir": "../../dist-types/plugins/notifications-frontend", + "outDir": "../../dist-types/plugins/notifications", "rootDir": "." } } diff --git a/plugins/notifications-frontend/turbo.json b/plugins/notifications/turbo.json similarity index 55% rename from plugins/notifications-frontend/turbo.json rename to plugins/notifications/turbo.json index ff7afb3c84..7b7180c80b 100644 --- a/plugins/notifications-frontend/turbo.json +++ b/plugins/notifications/turbo.json @@ -2,7 +2,7 @@ "extends": ["//"], "pipeline": { "tsc": { - "outputs": ["../../dist-types/plugins/notifications-frontend/**"], + "outputs": ["../../dist-types/plugins/notifications/**"], "dependsOn": ["^tsc"] } }