Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

MGDCTRS-1726 feat: pricing tier additions #662

Merged
merged 1 commit into from
Jan 10, 2023
Merged

MGDCTRS-1726 feat: pricing tier additions #662

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions .storybook/preview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
import "@patternfly/patternfly/patternfly.css";
import "@patternfly/react-core/dist/styles/base.css";
import "@patternfly/react-catalog-view-extension/dist/css/react-catalog-view-extension.css";
import "@patternfly/patternfly/utilities/Accessibility/accessibility.css";
import "@patternfly/patternfly/utilities/BackgroundColor/BackgroundColor.css";
import "@patternfly/patternfly/utilities/Display/display.css";
import "@patternfly/patternfly/utilities/Flex/flex.css";
import "@patternfly/patternfly/utilities/Sizing/sizing.css";
import "@patternfly/patternfly/utilities/Spacing/spacing.css";
import "@patternfly/patternfly/utilities/Text/text.css";
import "@patternfly/patternfly/patternfly-addons.css";
import "@patternfly/react-core/dist/styles/base.css";
import "@patternfly/react-catalog-view-extension/dist/css/react-catalog-view-extension.css";

import { addDecorator } from '@storybook/react'
import { initialize, mswDecorator } from 'msw-storybook-addon'
Expand Down
2 changes: 1 addition & 1 deletion cypress.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export default defineConfig({
connectorsActionApiPath:
'/localhost/api/connector_mgmt/v1/kafka_connectors/',
connectorTypesApiPath:
'/localhost/api/connector_mgmt/v1/kafka_connector_types?page=1&size=20&orderBy=&search=',
'/localhost/api/connector_mgmt/v1/kafka_connector_types?page=1&size=10&orderBy=+featured_rank+desc%2C+name+asc&search=',
kafkasApiPath:
'/localhost/api/kafkas_mgmt/v1/kafkas?page=1&size=20&search=',
namespaceApiPath:
Expand Down
7 changes: 3 additions & 4 deletions cypress/e2e/connector-create.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ describe('Connector creation', () => {
},
CLICK_CONNECTOR: () => {
cy.findByLabelText('filter by connector name').type('telegram');
cy.findByText('Telegram source').click();
cy.findByText('Telegram source').click({ force: true });
cy.findByText('Next').click();
},
CLICK_KAFKA_INSTANCE: () => {
Expand Down Expand Up @@ -299,8 +299,7 @@ describe('Connector creation', () => {
).withEvents({
CLICK_CONNECTOR: () => {
cy.findByLabelText('filter by connector name').type('telegram');
cy.findByText('Telegram source').click();

cy.findByText('Telegram source').click({ force: true });
cy.findByText('Next').click();
},
ON_CLOSE: () => {
Expand Down Expand Up @@ -332,7 +331,7 @@ describe('Connector creation', () => {
).withEvents({
CLICK_CONNECTOR: () => {
cy.findByLabelText('filter by connector name').type('telegram');
cy.findByText('Telegram source').click();
cy.findByText('Telegram source').click({ force: true });
cy.findByText('Next').click();
},
CLICK_KAFKA_INSTANCE: () => {
Expand Down
314 changes: 157 additions & 157 deletions cypress/fixtures/connectorTypes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,163 @@
"size": 6,
"total": 6,
"items": [
{
"id": "telegram_source_0.1",
"kind": "ConnectorType",
"href": "/api/connector_mgmt/v1/kafka_connector_types/telegram_source_0.1",
"name": "Telegram source",
"version": "0.1",
"channels": [
"stable"
],
"description": "Receive all messages that people send to your Telegram bot.",
"icon_href": "TODO",
"labels": [
"source"
],
"capabilities": [
"data_shape",
"error_handler",
"processors"
],
"schema": {
"$defs": {
"data_shape": {
"produces": {
"additionalProperties": false,
"properties": {
"format": {
"default": "application/json",
"description": "The format of the data that the source connector sends to Kafka.",
"enum": [
"application/json"
],
"type": "string"
}
},
"required": [
"format"
],
"type": "object"
}
},
"error_handler": {
"dead_letter_queue": {
"additionalProperties": false,
"properties": {
"topic": {
"description": "The name of the Kafka topic that serves as a destination for messages which were not processed correctly due to an error.",
"title": "Dead Letter Topic Name",
"type": "string"
}
},
"required": [
"topic"
],
"type": "object"
},
"log": {
"additionalProperties": false,
"type": "object"
},
"stop": {
"additionalProperties": false,
"type": "object"
}
}
},
"additionalProperties": false,
"properties": {
"data_shape": {
"additionalProperties": false,
"properties": {
"produces": {
"$ref": "#/$defs/data_shape/produces"
}
},
"type": "object"
},
"error_handler": {
"default": {
"stop": {

}
},
"oneOf": [
{
"additionalProperties": false,
"properties": {
"log": {
"$ref": "#/$defs/error_handler/log"
}
},
"required": [
"log"
],
"type": "object"
},
{
"additionalProperties": false,
"properties": {
"stop": {
"$ref": "#/$defs/error_handler/stop"
}
},
"required": [
"stop"
],
"type": "object"
},
{
"additionalProperties": false,
"properties": {
"dead_letter_queue": {
"$ref": "#/$defs/error_handler/dead_letter_queue"
}
},
"required": [
"dead_letter_queue"
],
"type": "object"
}
],
"type": "object"
},
"kafka_topic": {
"description": "The name of the Kafka Topic to use.",
"title": "Topic Name",
"type": "string"
},
"processors": {

},
"telegram_authorization_token": {
"oneOf": [
{
"description": "The token to access your bot on Telegram. You you can obtain it from the Telegram @botfather.",
"format": "password",
"title": "Token",
"type": "string"
},
{
"description": "An opaque reference to the telegram_authorization_token",
"properties": {

},
"type": "object"
}
],
"title": "Token",
"x-group": "credentials"
}
},
"required": [
"telegram_authorization_token",
"kafka_topic"
],
"type": "object"
}
},
{
"id": "aws-kinesis-source",
"labels": [
Expand Down Expand Up @@ -603,163 +760,6 @@
],
"title": "Slack Source"
}
},
{
"id": "telegram_source_0.1",
"kind": "ConnectorType",
"href": "/api/connector_mgmt/v1/kafka_connector_types/telegram_source_0.1",
"name": "Telegram source",
"version": "0.1",
"channels": [
"stable"
],
"description": "Receive all messages that people send to your Telegram bot.",
"icon_href": "TODO",
"labels": [
"source"
],
"capabilities": [
"data_shape",
"error_handler",
"processors"
],
"schema": {
"$defs": {
"data_shape": {
"produces": {
"additionalProperties": false,
"properties": {
"format": {
"default": "application/json",
"description": "The format of the data that the source connector sends to Kafka.",
"enum": [
"application/json"
],
"type": "string"
}
},
"required": [
"format"
],
"type": "object"
}
},
"error_handler": {
"dead_letter_queue": {
"additionalProperties": false,
"properties": {
"topic": {
"description": "The name of the Kafka topic that serves as a destination for messages which were not processed correctly due to an error.",
"title": "Dead Letter Topic Name",
"type": "string"
}
},
"required": [
"topic"
],
"type": "object"
},
"log": {
"additionalProperties": false,
"type": "object"
},
"stop": {
"additionalProperties": false,
"type": "object"
}
}
},
"additionalProperties": false,
"properties": {
"data_shape": {
"additionalProperties": false,
"properties": {
"produces": {
"$ref": "#/$defs/data_shape/produces"
}
},
"type": "object"
},
"error_handler": {
"default": {
"stop": {

}
},
"oneOf": [
{
"additionalProperties": false,
"properties": {
"log": {
"$ref": "#/$defs/error_handler/log"
}
},
"required": [
"log"
],
"type": "object"
},
{
"additionalProperties": false,
"properties": {
"stop": {
"$ref": "#/$defs/error_handler/stop"
}
},
"required": [
"stop"
],
"type": "object"
},
{
"additionalProperties": false,
"properties": {
"dead_letter_queue": {
"$ref": "#/$defs/error_handler/dead_letter_queue"
}
},
"required": [
"dead_letter_queue"
],
"type": "object"
}
],
"type": "object"
},
"kafka_topic": {
"description": "The name of the Kafka Topic to use.",
"title": "Topic Name",
"type": "string"
},
"processors": {

},
"telegram_authorization_token": {
"oneOf": [
{
"description": "The token to access your bot on Telegram. You you can obtain it from the Telegram @botfather.",
"format": "password",
"title": "Token",
"type": "string"
},
{
"description": "An opaque reference to the telegram_authorization_token",
"properties": {

},
"type": "object"
}
],
"title": "Token",
"x-group": "credentials"
}
},
"required": [
"telegram_authorization_token",
"kafka_topic"
],
"type": "object"
}
}
]
}
2 changes: 2 additions & 0 deletions src/AppFederated.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ import React, {
} from 'react';
import { BrowserRouter as Router } from 'react-router-dom';

import '@patternfly/react-catalog-view-extension/dist/css/react-catalog-view-extension.css';

import { I18nextProvider } from '@rhoas/app-services-ui-components';
import { useAuth, useBasename, useConfig } from '@rhoas/app-services-ui-shared';

Expand Down