add generic attribute field to NotificationPayload
Signed-off-by: Frank Ye <franky@spotify.com>
This commit is contained in:
@@ -0,0 +1,6 @@
|
||||
---
|
||||
'@backstage/plugin-notifications-backend': minor
|
||||
'@backstage/plugin-notifications-common': minor
|
||||
---
|
||||
|
||||
Add an optional generic object `attributes` field to `NotificationPayload`. Attributes can be used to store additional unstructured data for the notification, and are stored in the database.
|
||||
@@ -0,0 +1,33 @@
|
||||
/*
|
||||
* Copyright 2024 The Backstage Authors
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
exports.up = async function up(knex) {
|
||||
await knex.schema.alterTable('notification', table => {
|
||||
table.text('attributes').nullable();
|
||||
});
|
||||
await knex.schema.alterTable('broadcast', table => {
|
||||
table.text('attributes').nullable();
|
||||
});
|
||||
};
|
||||
|
||||
exports.down = async function down(knex) {
|
||||
await knex.schema.alterTable('notification', table => {
|
||||
table.dropColumn('attributes');
|
||||
});
|
||||
await knex.schema.alterTable('broadcast', table => {
|
||||
table.dropColumn('attributes');
|
||||
});
|
||||
};
|
||||
@@ -6,6 +6,7 @@
|
||||
|
||||
| Column | Type | Nullable | Max Length | Default |
|
||||
| ------------- | -------------------------- | -------- | ---------- | ------------------- |
|
||||
| `attributes` | `text` | true | - | - |
|
||||
| `created` | `timestamp with time zone` | false | - | `CURRENT_TIMESTAMP` |
|
||||
| `description` | `text` | true | - | - |
|
||||
| `icon` | `character varying` | true | 255 | - |
|
||||
@@ -40,6 +41,7 @@
|
||||
|
||||
| Column | Type | Nullable | Max Length | Default |
|
||||
| ------------- | -------------------------- | -------- | ---------- | ------------------- |
|
||||
| `attributes` | `text` | true | - | - |
|
||||
| `created` | `timestamp with time zone` | false | - | `CURRENT_TIMESTAMP` |
|
||||
| `description` | `text` | true | - | - |
|
||||
| `icon` | `character varying` | true | 255 | - |
|
||||
|
||||
@@ -69,6 +69,9 @@ const testNotification1: Notification = {
|
||||
link: '/catalog',
|
||||
severity: 'critical',
|
||||
icon: 'docs',
|
||||
attributes: {
|
||||
attribute1: 'attributeValue',
|
||||
},
|
||||
},
|
||||
};
|
||||
const testNotification2: Notification = {
|
||||
@@ -209,6 +212,9 @@ describe.each(databases.eachSupportedId())(
|
||||
expect(notification?.payload?.link).toBe('/catalog');
|
||||
expect(notification?.payload?.severity).toBe('critical');
|
||||
expect(notification?.payload?.icon).toBe('docs');
|
||||
expect(notification?.payload?.attributes).toEqual({
|
||||
attribute1: 'attributeValue',
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
@@ -53,6 +53,7 @@ const NOTIFICATION_COLUMNS = [
|
||||
'user',
|
||||
'read',
|
||||
'saved',
|
||||
'attributes',
|
||||
];
|
||||
|
||||
type NotificationRowType = {
|
||||
@@ -164,6 +165,7 @@ export class DatabaseNotificationsStore implements NotificationsStore {
|
||||
severity: row.severity,
|
||||
scope: row.scope,
|
||||
icon: row.icon,
|
||||
attributes: row.attributes ? JSON.parse(row.attributes) : undefined,
|
||||
},
|
||||
}));
|
||||
};
|
||||
@@ -224,9 +226,12 @@ export class DatabaseNotificationsStore implements NotificationsStore {
|
||||
description: notification.payload?.description,
|
||||
severity: normalizeSeverity(notification.payload?.severity),
|
||||
scope: notification.payload?.scope,
|
||||
icon: notification.payload.icon,
|
||||
icon: notification.payload?.icon,
|
||||
saved: notification.saved,
|
||||
read: notification.read,
|
||||
attributes: notification.payload?.attributes
|
||||
? JSON.stringify(notification.payload.attributes)
|
||||
: undefined,
|
||||
};
|
||||
};
|
||||
|
||||
@@ -242,6 +247,9 @@ export class DatabaseNotificationsStore implements NotificationsStore {
|
||||
severity: normalizeSeverity(notification.payload?.severity),
|
||||
icon: notification.payload.icon,
|
||||
scope: notification.payload?.scope,
|
||||
attributes: notification.payload?.attributes
|
||||
? JSON.stringify(notification.payload.attributes)
|
||||
: undefined,
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -529,6 +529,9 @@ describe.each(databases.eachSupportedId())('createRouter (%s)', databaseId => {
|
||||
title: 'Test broadcast notification',
|
||||
created: new Date(),
|
||||
severity: 'high',
|
||||
attributes: {
|
||||
attr1: 'attrValue',
|
||||
},
|
||||
});
|
||||
await client('notification').insert({
|
||||
id: uuid(),
|
||||
@@ -537,6 +540,9 @@ describe.each(databases.eachSupportedId())('createRouter (%s)', databaseId => {
|
||||
title: 'Test notification',
|
||||
created: new Date(),
|
||||
severity: 'normal',
|
||||
attributes: {
|
||||
attr1: 'attrValue',
|
||||
},
|
||||
});
|
||||
|
||||
const response = await request(app).get('/');
|
||||
@@ -555,6 +561,9 @@ describe.each(databases.eachSupportedId())('createRouter (%s)', databaseId => {
|
||||
severity: 'normal',
|
||||
title: 'Test notification',
|
||||
topic: null,
|
||||
attributes: {
|
||||
attr1: 'attrValue',
|
||||
},
|
||||
},
|
||||
read: null,
|
||||
saved: null,
|
||||
@@ -573,6 +582,9 @@ describe.each(databases.eachSupportedId())('createRouter (%s)', databaseId => {
|
||||
severity: 'high',
|
||||
title: 'Test broadcast notification',
|
||||
topic: null,
|
||||
attributes: {
|
||||
attr1: 'attrValue',
|
||||
},
|
||||
},
|
||||
read: null,
|
||||
saved: null,
|
||||
|
||||
@@ -31,7 +31,9 @@ export type NewNotificationSignal = {
|
||||
};
|
||||
|
||||
// @public (undocumented)
|
||||
type Notification_2 = {
|
||||
type Notification_2<
|
||||
T extends Record<string, unknown> = Record<string, unknown>,
|
||||
> = {
|
||||
id: string;
|
||||
user: string | null;
|
||||
created: Date;
|
||||
@@ -39,12 +41,14 @@ type Notification_2 = {
|
||||
read?: Date;
|
||||
updated?: Date;
|
||||
origin: string;
|
||||
payload: NotificationPayload;
|
||||
payload: NotificationPayload<T>;
|
||||
};
|
||||
export { Notification_2 as Notification };
|
||||
|
||||
// @public (undocumented)
|
||||
export type NotificationPayload = {
|
||||
export type NotificationPayload<
|
||||
T extends Record<string, unknown> = Record<string, unknown>,
|
||||
> = {
|
||||
title: string;
|
||||
description?: string;
|
||||
link?: string;
|
||||
@@ -52,6 +56,7 @@ export type NotificationPayload = {
|
||||
topic?: string;
|
||||
scope?: string;
|
||||
icon?: string;
|
||||
attributes?: T;
|
||||
};
|
||||
|
||||
// @public (undocumented)
|
||||
|
||||
@@ -18,7 +18,9 @@
|
||||
export type NotificationSeverity = 'critical' | 'high' | 'normal' | 'low';
|
||||
|
||||
/** @public */
|
||||
export type NotificationPayload = {
|
||||
export type NotificationPayload<
|
||||
T extends Record<string, unknown> = Record<string, unknown>,
|
||||
> = {
|
||||
/**
|
||||
* Notification title
|
||||
*/
|
||||
@@ -50,10 +52,16 @@ export type NotificationPayload = {
|
||||
* Optional notification icon
|
||||
*/
|
||||
icon?: string;
|
||||
/**
|
||||
* Optional additional customizable attributes.
|
||||
*/
|
||||
attributes?: T;
|
||||
};
|
||||
|
||||
/** @public */
|
||||
export type Notification = {
|
||||
export type Notification<
|
||||
T extends Record<string, unknown> = Record<string, unknown>,
|
||||
> = {
|
||||
/**
|
||||
* Unique identifier for the notification
|
||||
*/
|
||||
@@ -87,7 +95,7 @@ export type Notification = {
|
||||
/**
|
||||
* Actual notification payload
|
||||
*/
|
||||
payload: NotificationPayload;
|
||||
payload: NotificationPayload<T>;
|
||||
};
|
||||
|
||||
/** @public */
|
||||
|
||||
Reference in New Issue
Block a user