From f9ae3d922d1d898ec9f3af19fa6b1d03b38d9b53 Mon Sep 17 00:00:00 2001 From: Jason Madigan Date: Mon, 14 Oct 2024 10:54:37 +0100 Subject: [PATCH 1/2] Change cancel on resource create pages to navigate back, rather than go back to the all policies page. Signed-off-by: Jason Madigan --- src/components/KuadrantDNSPolicyCreatePage.tsx | 2 +- src/components/KuadrantRateLimitPolicyCreatePage.tsx | 2 +- src/utils/cancel.tsx | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/components/KuadrantDNSPolicyCreatePage.tsx b/src/components/KuadrantDNSPolicyCreatePage.tsx index f660aca..7ff1b78 100644 --- a/src/components/KuadrantDNSPolicyCreatePage.tsx +++ b/src/components/KuadrantDNSPolicyCreatePage.tsx @@ -197,7 +197,7 @@ const KuadrantDNSPolicyCreatePage: React.FC = () => { }; const handleCancel = () => { - history.push('/kuadrant/all-namespaces/policies'); + history.goBack(); }; return ( diff --git a/src/components/KuadrantRateLimitPolicyCreatePage.tsx b/src/components/KuadrantRateLimitPolicyCreatePage.tsx index 6954f3c..cb403b2 100644 --- a/src/components/KuadrantRateLimitPolicyCreatePage.tsx +++ b/src/components/KuadrantRateLimitPolicyCreatePage.tsx @@ -151,7 +151,7 @@ const KuadrantRateLimitPolicyCreatePage: React.FC = () => { }; const handleCancel = () => { - history.push('/kuadrant/all-namespaces/policies'); + history.goBack(); }; return ( diff --git a/src/utils/cancel.tsx b/src/utils/cancel.tsx index 5c5929e..7bb5b5c 100644 --- a/src/utils/cancel.tsx +++ b/src/utils/cancel.tsx @@ -1,5 +1,5 @@ import { History } from 'history'; -export function handleCancel (namespace: string ,data , history: History) { - history.push(`/kuadrant/all-namespaces/policies`) - }; \ No newline at end of file +export function handleCancel(namespace: string, data, history: History) { + history.goBack(); +} From c37fefc576037a2139c886ef81e8e039767a7177 Mon Sep 17 00:00:00 2001 From: Jason Madigan Date: Mon, 14 Oct 2024 11:58:57 +0100 Subject: [PATCH 2/2] fix i18n & rename i18n source Signed-off-by: Jason Madigan --- README.md | 10 +- console-extensions.json | 16 +- i18next-parser.config.js | 2 +- install.yaml | 66 +++--- ...n => plugin__kuadrant-console-plugin.json} | 189 +++++++++--------- package.json | 8 +- .../KuadrantAuthPolicyCreatePage.tsx | 2 +- src/components/KuadrantCreateUpdate.tsx | 2 +- .../KuadrantDNSPolicyCreatePage.tsx | 2 +- src/components/KuadrantOverviewPage.tsx | 8 +- src/components/KuadrantPoliciesPage.tsx | 18 +- .../KuadrantRateLimitPolicyCreatePage.tsx | 2 +- src/components/KuadrantTLSCreatePage.tsx | 2 +- src/components/ResourceList.tsx | 12 +- src/components/dnspolicy/HealthCheckField.tsx | 2 +- .../dnspolicy/LoadBalancingField.tsx | 2 +- src/components/gateway/GatewaySelect.tsx | 2 +- src/components/httproute/HTTPRouteSelect.tsx | 2 +- src/components/issuer/clusterIssuerSelect.tsx | 2 +- src/components/issuer/issuerSelect.tsx | 2 +- src/components/namespace/NamespaceSelect.tsx | 2 +- .../ratelimitpolicy/AddLimitModal.tsx | 4 +- .../ratelimitpolicy/LimitSelect.tsx | 2 +- 23 files changed, 182 insertions(+), 177 deletions(-) rename locales/en/{plugin__console-plugin-template.json => plugin__kuadrant-console-plugin.json} (67%) diff --git a/README.md b/README.md index 412cf72..9b60e1a 100644 --- a/README.md +++ b/README.md @@ -100,19 +100,19 @@ Install via the [`kuadrant-operator`](https://www.github.com/kuadrant/kuadrant-o The plugin template demonstrates how you can translate messages in with [react-i18next](https://react.i18next.com/). The i18n namespace must match the name of the `ConsolePlugin` resource with the `plugin__` prefix to avoid naming conflicts. For example, the plugin template uses the -`plugin__console-plugin-template` namespace. You can use the `useTranslation` hook +`plugin__kuadrant-console` namespace. You can use the `useTranslation` hook with this namespace as follows: ```tsx conster Header: React.FC = () => { - const { t } = useTranslation('plugin__console-plugin-template'); + const { t } = useTranslation('plugin__kuadrant-console-plugin'); return

{t('Hello, World!')}

; }; ``` For labels in `console-extensions.json`, you can use the format -`%plugin__console-plugin-template~My Label%`. Console will replace the value with -the message for the current language from the `plugin__console-plugin-template` +`%plugin__kuadrant-console-plugin~My Label%`. Console will replace the value with +the message for the current language from the `plugin__kuadrant-console` namespace. For example: ```json @@ -121,7 +121,7 @@ namespace. For example: "properties": { "id": "admin-demo-section", "perspective": "admin", - "name": "%plugin__console-plugin-template~Plugin Template%" + "name": "%plugin__kuadrant-console-plugin~Plugin Template%" } } ``` diff --git a/console-extensions.json b/console-extensions.json index 333e2cc..2214041 100644 --- a/console-extensions.json +++ b/console-extensions.json @@ -74,7 +74,7 @@ "type": "console.navigation/section", "properties": { "id": "kuadrant-section-admin", - "name": "%plugin__console-plugin-template~Kuadrant%", + "name": "%plugin__kuadrant-console-plugin~Kuadrant%", "perspective": "admin" } }, @@ -82,7 +82,7 @@ "type": "console.navigation/href", "properties": { "id": "kuadrant-overview-admin", - "name": "%plugin__console-plugin-template~Overview%", + "name": "%plugin__kuadrant-console-plugin~Overview%", "href": "/kuadrant/overview", "perspective": "admin", "section": "kuadrant-section-admin" @@ -92,7 +92,7 @@ "type": "console.navigation/href", "properties": { "id": "kuadrant-policies-admin", - "name": "%plugin__console-plugin-template~Policies%", + "name": "%plugin__kuadrant-console-plugin~Policies%", "href": "/kuadrant/all-namespaces/policies", "perspective": "admin", "section": "kuadrant-section-admin" @@ -102,7 +102,7 @@ "type": "console.navigation/href", "properties": { "id": "kuadrant-policy-topology-admin", - "name": "%plugin__console-plugin-template~Policy Topology%", + "name": "%plugin__kuadrant-console-plugin~Policy Topology%", "href": "/kuadrant/policy-topology", "perspective": "admin", "section": "kuadrant-section-admin", @@ -113,7 +113,7 @@ "type": "console.navigation/section", "properties": { "id": "kuadrant-section-dev", - "name": "%plugin__console-plugin-template~Kuadrant%", + "name": "%plugin__kuadrant-console-plugin~Kuadrant%", "perspective": "dev" } }, @@ -121,7 +121,7 @@ "type": "console.navigation/href", "properties": { "id": "kuadrant-dashboard-dev", - "name": "%plugin__console-plugin-template~Overview%", + "name": "%plugin__kuadrant-console-plugin~Overview%", "href": "/kuadrant/overview", "perspective": "dev", "section": "kuadrant-section-dev" @@ -131,7 +131,7 @@ "type": "console.navigation/href", "properties": { "id": "kuadrant-policies-dev", - "name": "%plugin__console-plugin-template~Policies%", + "name": "%plugin__kuadrant-console-plugin~Policies%", "href": "/kuadrant/all-namespaces/policies", "perspective": "dev", "section": "kuadrant-section-dev" @@ -141,7 +141,7 @@ "type": "console.navigation/href", "properties": { "id": "kuadrant-policy-topology-dev", - "name": "%plugin__console-plugin-template~Policy Topology%", + "name": "%plugin__kuadrant-console-plugin~Policy Topology%", "href": "/kuadrant/policy-topology", "perspective": "dev", "section": "kuadrant-section-dev", diff --git a/i18next-parser.config.js b/i18next-parser.config.js index f4373a3..76bfb47 100644 --- a/i18next-parser.config.js +++ b/i18next-parser.config.js @@ -9,7 +9,7 @@ module.exports = { locales: ['en'], namespaceSeparator: '~', reactNamespace: false, - defaultNamespace: 'plugin__console-plugin-template', + defaultNamespace: 'plugin__kuadrant-console-plugin', useKeysAsDefaultValue: true, // see below for more details diff --git a/install.yaml b/install.yaml index 61f1521..08329c3 100644 --- a/install.yaml +++ b/install.yaml @@ -1,36 +1,36 @@ apiVersion: v1 kind: Namespace metadata: - name: kuadrant-console + name: kuadrant-console-plugin --- apiVersion: apps/v1 kind: Deployment metadata: - name: kuadrant-console - namespace: kuadrant-console + name: kuadrant-console-plugin + namespace: kuadrant-console-plugin labels: - app: kuadrant-console - app.kubernetes.io/component: kuadrant-console - app.kubernetes.io/instance: kuadrant-console - app.kubernetes.io/name: kuadrant-console - app.kubernetes.io/part-of: kuadrant-console - app.openshift.io/runtime-namespace: kuadrant-console + app: kuadrant-console-plugin + app.kubernetes.io/component: kuadrant-console-plugin + app.kubernetes.io/instance: kuadrant-console-plugin + app.kubernetes.io/name: kuadrant-console-plugin + app.kubernetes.io/part-of: kuadrant-console-plugin + app.openshift.io/runtime-namespace: kuadrant-console-plugin spec: replicas: 1 selector: matchLabels: - app: kuadrant-console + app: kuadrant-console-plugin template: metadata: labels: - app: kuadrant-console - app.kubernetes.io/component: kuadrant-console - app.kubernetes.io/instance: kuadrant-console - app.kubernetes.io/name: kuadrant-console - app.kubernetes.io/part-of: kuadrant-console + app: kuadrant-console-plugin + app.kubernetes.io/component: kuadrant-console-plugin + app.kubernetes.io/instance: kuadrant-console-plugin + app.kubernetes.io/name: kuadrant-console-plugin + app.kubernetes.io/part-of: kuadrant-console-plugin spec: containers: - - name: kuadrant-console + - name: kuadrant-console-plugin image: quay.io/kuadrant/console-plugin:latest ports: - containerPort: 9443 @@ -70,13 +70,13 @@ apiVersion: v1 kind: ConfigMap metadata: name: nginx-conf - namespace: kuadrant-console + namespace: kuadrant-console-plugin labels: - app: kuadrant-console - app.kubernetes.io/component: kuadrant-console - app.kubernetes.io/instance: kuadrant-console - app.kubernetes.io/name: kuadrant-console - app.kubernetes.io/part-of: kuadrant-console + app: kuadrant-console-plugin + app.kubernetes.io/component: kuadrant-console-plugin + app.kubernetes.io/instance: kuadrant-console-plugin + app.kubernetes.io/name: kuadrant-console-plugin + app.kubernetes.io/part-of: kuadrant-console-plugin data: nginx.conf: | error_log /dev/stdout; @@ -111,14 +111,14 @@ kind: Service metadata: annotations: service.alpha.openshift.io/serving-cert-secret-name: plugin-serving-cert - name: kuadrant-console - namespace: kuadrant-console + name: kuadrant-console-plugin + namespace: kuadrant-console-plugin labels: - app: kuadrant-console - app.kubernetes.io/component: kuadrant-console - app.kubernetes.io/instance: kuadrant-console - app.kubernetes.io/name: kuadrant-console - app.kubernetes.io/part-of: kuadrant-console + app: kuadrant-console-plugin + app.kubernetes.io/component: kuadrant-console-plugin + app.kubernetes.io/instance: kuadrant-console-plugin + app.kubernetes.io/name: kuadrant-console-plugin + app.kubernetes.io/part-of: kuadrant-console-plugin spec: ports: - name: 9443-tcp @@ -126,19 +126,19 @@ spec: port: 9443 targetPort: 9443 selector: - app: kuadrant-console + app: kuadrant-console-plugin type: ClusterIP sessionAffinity: None --- apiVersion: console.openshift.io/v1alpha1 kind: ConsolePlugin metadata: - name: kuadrant-console + name: kuadrant-console-plugin spec: displayName: 'Kuadrant Console Plugin' service: - name: kuadrant-console - namespace: kuadrant-console + name: kuadrant-console-plugin + namespace: kuadrant-console-plugin port: 9443 basePath: '/' diff --git a/locales/en/plugin__console-plugin-template.json b/locales/en/plugin__kuadrant-console-plugin.json similarity index 67% rename from locales/en/plugin__console-plugin-template.json rename to locales/en/plugin__kuadrant-console-plugin.json index 32c00be..c5976ef 100644 --- a/locales/en/plugin__console-plugin-template.json +++ b/locales/en/plugin__kuadrant-console-plugin.json @@ -1,111 +1,116 @@ { - "After cloning this project, replace references to": "After cloning this project, replace references to", - "and other plugin metadata in package.json with values for your plugin.": "and other plugin metadata in package.json with values for your plugin.", - "console-template-plugin": "console-template-plugin", - "exposedModules": "exposedModules", - "Hello, Plugin!": "Hello, Plugin!", - "in package.json mapping the reference to the module.": "in package.json mapping the reference to the module.", - "Connectivity Link": "Connectivity Link", - "Kuadrant": "Kuadrant", - "Success!": "Success!", - "This is a custom page contributed by the console plugin template. The extension that adds the page is declared in console-extensions.json in the project root along with the corresponding nav item. Update console-extensions.json to change or add extensions. Code references in console-extensions.json must have a corresponding property": "This is a custom page contributed by the console plugin template. The extension that adds the page is declared in console-extensions.json in the project root along with the corresponding nav item. Update console-extensions.json to change or add extensions. Code references in console-extensions.json must have a corresponding property", - "Your plugin is working.": "Your plugin is working.", - "Loading...": "Loading...", - "Age": "Age", - "Name": "Name", - "Namespace": "Namespace", - "Select a Namespace": "Select a Namespace", - "Address": "Address", - "Overview": "Overview", - "Policies": "Policies", - "Policy Topology": "Policy Topology", - "TLS": "TLS", - "Are you sure you want to delete the policy": "Are you sure you want to delete the policy", + "6 min read": "6 min read", + "Add a new Gateway": "Add a new Gateway", + "Add Custom Weight Selector": "Add Custom Weight Selector", + "Add Limit": "Add Limit", + "Add Match Expression": "Add Match Expression", + "Add Match Label": "Add Match Label", + "Add Value": "Add Value", "All Policies": "All Policies", - "DNS": "DNS", + "API Designer": "API Designer", + "APIs / HTTPRoutes": "APIs / HTTPRoutes", "Auth": "Auth", - "RateLimit": "RateLimit", - "Edit": "Edit", - "Delete": "Delete", + "Cancel": "Cancel", + "Cert manager issuer type": "Cert manager issuer type", + "cert-manager Operator": "cert-manager Operator", + "Cluster issuer": "Cluster issuer", + "Cluster Issuer: Reference to the cluster issuer for the created certificate. To create an additional ClusterIssuer go to": "Cluster Issuer: Reference to the cluster issuer for the created certificate. To create an additional ClusterIssuer go to", + "ClusterIssuer API Target Reference": "ClusterIssuer API Target Reference", + "Collapse Getting Started": "Collapse Getting Started", + "Configure via": "Configure via", + "Configured Limits": "Configured Limits", + "Create": "Create", + "Create AuthPolicy": "Create AuthPolicy", "Create DNSPolicy": "Create DNSPolicy", - "Policy Name": "Policy Name", - "DNSPolicy configures how North-South based traffic should be balanced and reach the gateways": "DNSPolicy configures how North-South based traffic should be balanced and reach the gateways", - "Unique name of the DNS Policy": "Unique name of the DNS Policy", - "Health Check": "Health Check", - "Routing Strategy": "Routing Strategy", - "Routing Strategy to use": "Routing Strategy to use", - "Error creating DNSPolicy": "Error creating DNSPolicy", - "Select a gateway": "Select a gateway", - "You can view and create Gateways": "You can view and create Gateways", - "Gateway API Target Reference": "Gateway API Target Reference", - "Select Gateway": "Select Gateway", + "Create Policies in": "Create Policies in", + "Create RateLimitPolicy": "Create RateLimitPolicy", + "Create TLS Policy": "Create TLS Policy", + "Created": "Created", + "Custom Weight Selectors": "Custom Weight Selectors", "Default Geo": "Default Geo", "Default Weight": "Default Weight", - "Custom Weight Selectors": "Custom Weight Selectors", + "Define Rate Limit": "Define Rate Limit", + "DNS": "DNS", + "DNSPolicy configures how North-South based traffic should be balanced and reach the gateways": "DNSPolicy configures how North-South based traffic should be balanced and reach the gateways", + "Duration": "Duration", + "Ease operational complexity with API management and App Connectivity by using additional Operators and tools.": "Ease operational complexity with API management and App Connectivity by using additional Operators and tools.", + "Edit TLS Policy": "Edit TLS Policy", + "Endpoint": "Endpoint", + "Enhance Your Work": "Enhance Your Work", + "Error creating AuthPolicy": "Error creating AuthPolicy", + "Error creating DNSPolicy": "Error creating DNSPolicy", + "Error creating RateLimitPolicy": "Error creating RateLimitPolicy", + "Error parsing YAML:": "Error parsing YAML:", + "Expand Getting Started": "Expand Getting Started", "Expression Key": "Key", "Expression Operator": "Operator", "Expression Values": "Values", - "Remove Value": "Remove Value", - "Add Value": "Add Value", - "Add Match Expression": "Add Match Expression", - "Remove Match Expression": "Remove Match Expression", - "Add Match Label": "Add Match Label", - "Remove Match Label": "Remove Match Label", - "Remove Custom Selector": "Remove Custom Selector", - "Add Custom Weight Selector": "Add Custom Weight Selector", - "Endpoint": "Endpoint", "Failure Threshold": "Failure Threshold", - "Port": "Port", - "Protocol": "Protocol", - "Add Limit": "Add Limit", - "Define Rate Limit": "Define Rate Limit", - "OK": "OK", - "Cancel": "Cancel", - "Error creating RateLimitPolicy": "Error creating RateLimitPolicy", - "Create RateLimitPolicy": "Create RateLimitPolicy", + "Feature Highlights": "Feature Highlights", + "Form View": "Form View", + "Gateway API Target Reference": "Gateway API Target Reference", + "Gateway: Reference to a Kubernetes resource that the policy attaches to. To create an additional gateway go to": "Gateway: Reference to a Kubernetes resource that the policy attaches to. To create an additional gateway go to", + "Gateways": "Gateways", + "Getting started resources": "Getting started resources", + "Health Check": "Health Check", + "Hide for session": "Hide for session", + "highlights": "highlights", + "HTTPRoute API Target Reference": "HTTPRoute API Target Reference", + "Info about this page": "Info about this page", + "Issuer": "Issuer", + "Issuer API Target Reference": "Issuer API Target Reference", + "Issuer: Reference to the issuer for the created certificate. To create an additional Issuer go to": "Issuer: Reference to the issuer for the created certificate. To create an additional Issuer go to", + "Kuadrant": "Kuadrant", + "Learn how to create, import and use Kuadrant policies on OpenShift with step-by-step instructions and tasks.": "Learn how to create, import and use Kuadrant policies on OpenShift with step-by-step instructions and tasks.", + "Learning Resources": "Learning Resources", + "Limit": "Limit", + "Limit Name": "Limit Name", "Limit Name is required!": "Limit Name is required!", + "Loading..": "Loading..", + "Name": "Name", + "Namespace": "Namespace", "No limits configured yet": "No limits configured yet", - "Configured Limits": "Configured Limits", - "Target reference type": "Target reference type", - "Unique name of the RateLimitPolicy": "Unique name of the RateLimitPolicy", + "OK": "OK", + "Overview": "Overview", + "Policies": "Policies", + "Policy name": "Policy name", + "Policy Name": "Policy Name", + "Policy Topology": "Policy Topology", + "Port": "Port", + "Protocol": "Protocol", + "RateLimit": "RateLimit", "RateLimitPolicy enables rate limiting for service workloads in a Gateway API network": "RateLimitPolicy enables rate limiting for service workloads in a Gateway API network", - "To set defaults, overrides, and more complex limits, use the YAML view.": "To set defaults, overrides, and more complex limits, use the YAML view.", - "Learn how to create, import and use Kuadrant policies on OpenShift with step-by-step instructions and tasks.": "Learn how to create, import and use Kuadrant policies on OpenShift with step-by-step instructions and tasks.", - "Learning Resources": "Learning Resources", - "Create Policies in": "Create Policies in", - "Add a new Gateway": "Add a new Gateway", - "View Documentation": "View Documentation", - "View all quick starts": "View all quick starts", - "Feature Highlights": "Feature Highlights", "Read about the latest information and key features in the Kuadrant highlights.": "Read about the latest information and key features in the Kuadrant highlights.", - "highlights": "highlights", - "Visit the blog": "Visit the blog", - "Getting started resources": "Getting started resources", - "6 min read": "6 min read", "Release Notes": "Release Notes", - "Enhance Your Work": "Enhance Your Work", - "Ease operational complexity with API management and App Connectivity by using additional Operators and tools.": "Ease operational complexity with API management and App Connectivity by using additional Operators and tools.", - "API Designer": "API Designer", - "cert-manager Operator": "cert-manager Operator", - "APIs / HTTPRoutes": "APIs / HTTPRoutes", - "Hide for session": "Hide for session", + "Remove Custom Selector": "Remove Custom Selector", + "Remove Match Expression": "Remove Match Expression", + "Remove Match Label": "Remove Match Label", + "Remove Value": "Remove Value", + "Routing Strategy": "Routing Strategy", + "Routing Strategy to use": "Routing Strategy to use", + "Save": "Save", + "Select a gateway": "Select a gateway", + "Select a Namespace": "Select a Namespace", + "Select an ClusterIssuer": "Select an ClusterIssuer", + "Select an HTTPRoute": "Select an HTTPRoute", + "Select an Issuer": "Select an Issuer", + "Select ClusterIssuer": "Select ClusterIssuer", + "Select Gateway": "Select Gateway", + "Select HTTPRoute": "Select HTTPRoute", + "Select Issuer": "Select Issuer", + "Status": "Status", + "Target reference type": "Target reference type", "Targets Gateway API networking resources Gateways to provide TLS for gateway listeners by managing the lifecycle of TLS certificates using cert-manager": "Targets Gateway API networking resources Gateways to provide TLS for gateway listeners by managing the lifecycle of TLS certificates using cert-manager", - "Create TLS Policy": "Create TLS Policy", - "Configure via": "Configure via", + "TLS": "TLS", + "To set defaults, overrides, and more complex limits, use the YAML view.": "To set defaults, overrides, and more complex limits, use the YAML view.", + "Type": "Type", + "Unique name of the DNS Policy": "Unique name of the DNS Policy", + "Unique name of the RateLimitPolicy": "Unique name of the RateLimitPolicy", "Unique name of the TLSPolicy.": "Unique name of the TLSPolicy.", - "Reference to a Kubernetes resource that the policy attaches to. To create an additional gateway go to": "Reference to a Kubernetes resource that the policy attaches to. To create an additional gateway go to", - "CertIssuer Issuer Reference": "CertIssuer Issuer Reference", - "Reference to the issuer for the created certificate. To create an additional Issuer go to": "Reference to the issuer for the created certificate. To create an additional Issuer go to", - "Issuer API Target Reference": "Issuer API Target Reference", - "You can view and create Issuers": "You can view and create Issuers", - "ClusterIssuer API Target Reference": "ClusterIssuer API Target Reference", - "You can view and create ClusterIssuers": "You can view and create ClusterIssuers", - "Error parsing YAM:L": "Error parsing YAML:", - "Edit TLS Policy": "Edit TLS Policy", - "Form View": "Form View", + "Unit": "Unit", + "View all quick starts": "View all quick starts", + "View Documentation": "View Documentation", + "Visit the blog": "Visit the blog", "YAML View": "YAML View", - "Cert manager issuer type": "Cert manager issuer type", - "Cluster issuer": "Cluster issuer", - "Issuer": "Issuer", - "Loading..": "Loading.." + "You can view and create HTTPRoutes": "You can view and create HTTPRoutes" } \ No newline at end of file diff --git a/package.json b/package.json index 5a609e2..29f52f1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { - "name": "kuadrant-console", - "version": "0.0.2", + "name": "kuadrant-console-plugin", + "version": "0.0.3", "description": "Kuadrant OpenShift Console plugin", "private": true, "license": "Apache-2.0", @@ -69,8 +69,8 @@ "webpack-dev-server": "^4.7.4" }, "consolePlugin": { - "name": "kuadrant-console", - "version": "0.0.2", + "name": "kuadrant-console-plugin", + "version": "0.0.3", "displayName": "Kuadrant OpenShift Console Plugin", "description": "Kuadrant OpenShift Console Plugin", "exposedModules": { diff --git a/src/components/KuadrantAuthPolicyCreatePage.tsx b/src/components/KuadrantAuthPolicyCreatePage.tsx index 9d9fcbf..fb020bb 100644 --- a/src/components/KuadrantAuthPolicyCreatePage.tsx +++ b/src/components/KuadrantAuthPolicyCreatePage.tsx @@ -5,7 +5,7 @@ import { useTranslation } from 'react-i18next'; import { ResourceYAMLEditor, useActiveNamespace } from '@openshift-console/dynamic-plugin-sdk'; const KuadrantAuthPolicyCreatePage: React.FC = () => { - const { t } = useTranslation('plugin__console-plugin-template'); + const { t } = useTranslation('plugin__kuadrant-console-plugin'); const [selectedNamespace] = useActiveNamespace(); const yamlResource = { diff --git a/src/components/KuadrantCreateUpdate.tsx b/src/components/KuadrantCreateUpdate.tsx index a81fbbf..947818a 100644 --- a/src/components/KuadrantCreateUpdate.tsx +++ b/src/components/KuadrantCreateUpdate.tsx @@ -24,7 +24,7 @@ interface GenericPolicyForm { } const KuadrantCreateUpdate: React.FC = ({ model, resource, policyType, history }) => { - const { t } = useTranslation('plugin__console-plugin-template'); + const { t } = useTranslation('plugin__kuadrant-console-plugin'); const [errorAlertMsg, setErrorAlertMsg] = React.useState('') const update = !!resource.metadata.creationTimestamp diff --git a/src/components/KuadrantDNSPolicyCreatePage.tsx b/src/components/KuadrantDNSPolicyCreatePage.tsx index 7ff1b78..56acef5 100644 --- a/src/components/KuadrantDNSPolicyCreatePage.tsx +++ b/src/components/KuadrantDNSPolicyCreatePage.tsx @@ -32,7 +32,7 @@ import NamespaceSelect from './namespace/NamespaceSelect'; import { removeUndefinedFields, convertMatchLabelsArrayToObject } from '../utils/modelUtils'; const KuadrantDNSPolicyCreatePage: React.FC = () => { - const { t } = useTranslation('plugin__console-plugin-template'); + const { t } = useTranslation('plugin__kuadrant-console-plugin'); const [createView, setCreateView] = React.useState<'form' | 'yaml'>('form'); const [policy, setPolicy] = React.useState(''); const [selectedNamespace, setSelectedNamespace] = React.useState(''); diff --git a/src/components/KuadrantOverviewPage.tsx b/src/components/KuadrantOverviewPage.tsx index 9de70f8..9433c9a 100644 --- a/src/components/KuadrantOverviewPage.tsx +++ b/src/components/KuadrantOverviewPage.tsx @@ -37,7 +37,7 @@ import { sortable } from '@patternfly/react-table'; import { INTERNAL_LINKS, EXTERNAL_LINKS } from '../constants/links'; const KuadrantOverviewPage: React.FC = () => { - const { t } = useTranslation('plugin__console-plugin-template'); + const { t } = useTranslation('plugin__kuadrant-console-plugin'); const { ns } = useParams<{ ns: string }>(); const [activeNamespace, setActiveNamespace] = useActiveNamespace(); const [isExpanded, setIsExpanded] = React.useState(true); @@ -91,17 +91,17 @@ const KuadrantOverviewPage: React.FC = () => { ); const columns = [{ - title: t('plugin__console-plugin-template~Name'), + title: t('plugin__kuadrant-console-plugin~Name'), id: 'name', sort: 'metadata.name', transforms: [sortable], }, { - title: t('plugin__console-plugin-template~Namespace'), + title: t('plugin__kuadrant-console-plugin~Namespace'), id: 'namespace', sort: 'metadata.namespace', transforms: [sortable], }, { - title: t('plugin__console-plugin-template~Status'), + title: t('plugin__kuadrant-console-plugin~Status'), id: 'Status', }, { title: '', diff --git a/src/components/KuadrantPoliciesPage.tsx b/src/components/KuadrantPoliciesPage.tsx index 510f748..e3cc884 100644 --- a/src/components/KuadrantPoliciesPage.tsx +++ b/src/components/KuadrantPoliciesPage.tsx @@ -40,7 +40,7 @@ export const AllPoliciesListPage: React.FC<{ showAlertGroup?: boolean; paginationLimit?: number; }> = ({ activeNamespace, columns, showAlertGroup = false, paginationLimit }) => { - const { t } = useTranslation(); + const { t } = useTranslation('plugin__kuadrant-console-plugin'); return ( <> @@ -64,7 +64,7 @@ export const AllPoliciesListPage: React.FC<{ }; const PoliciesListPage: React.FC<{ resource: Resource; activeNamespace: string }> = ({ resource, activeNamespace }) => { - const { t } = useTranslation(); + const { t } = useTranslation('plugin__kuadrant-console-plugin'); const resolvedNamespace = activeNamespace === '#ALL_NS#' ? 'default' : activeNamespace; return ( @@ -80,7 +80,7 @@ const PoliciesListPage: React.FC<{ resource: Resource; activeNamespace: string }
- {t(`plugin__console-plugin-template~Create ${resource.gvk.kind}`)} + {t(`plugin__kuadrant-console-plugin~Create ${resource.gvk.kind}`)}
@@ -90,7 +90,7 @@ const PoliciesListPage: React.FC<{ resource: Resource; activeNamespace: string } }; const KuadrantPoliciesPage: React.FC = () => { - const { t } = useTranslation('plugin__console-plugin-template'); + const { t } = useTranslation('plugin__kuadrant-console-plugin'); const { ns } = useParams<{ ns: string }>(); const [activeNamespace, setActiveNamespace] = useActiveNamespace(); const [activePerspective] = useActivePerspective(); @@ -103,29 +103,29 @@ const KuadrantPoliciesPage: React.FC = () => { const defaultColumns: TableColumn[] = [ { - title: t('plugin__console-plugin-template~Name'), + title: t('plugin__kuadrant-console-plugin~Name'), id: 'name', sort: 'metadata.name', transforms: [sortable], }, { - title: t('plugin__console-plugin-template~Type'), + title: t('plugin__kuadrant-console-plugin~Type'), id: 'type', sort: 'kind', transforms: [sortable], }, { - title: t('plugin__console-plugin-template~Namespace'), + title: t('plugin__kuadrant-console-plugin~Namespace'), id: 'namespace', sort: 'metadata.namespace', transforms: [sortable], }, { - title: t('plugin__console-plugin-template~Status'), + title: t('plugin__kuadrant-console-plugin~Status'), id: 'Status', }, { - title: t('plugin__console-plugin-template~Created'), + title: t('plugin__kuadrant-console-plugin~Created'), id: 'Created', sort: 'metadata.creationTimestamp', transforms: [sortable], diff --git a/src/components/KuadrantRateLimitPolicyCreatePage.tsx b/src/components/KuadrantRateLimitPolicyCreatePage.tsx index cb403b2..901e156 100644 --- a/src/components/KuadrantRateLimitPolicyCreatePage.tsx +++ b/src/components/KuadrantRateLimitPolicyCreatePage.tsx @@ -30,7 +30,7 @@ import { HTTPRoute } from './httproute/types'; import LimitSelect from './ratelimitpolicy/LimitSelect'; const KuadrantRateLimitPolicyCreatePage: React.FC = () => { - const { t } = useTranslation('plugin__console-plugin-template'); + const { t } = useTranslation('plugin__kuadrant-console-plugin'); const [createView, setCreateView] = React.useState<'form' | 'yaml'>('form'); const [policy, setPolicy] = React.useState(''); const [selectedNamespace] = useActiveNamespace(); diff --git a/src/components/KuadrantTLSCreatePage.tsx b/src/components/KuadrantTLSCreatePage.tsx index 1649882..d4f1ef8 100644 --- a/src/components/KuadrantTLSCreatePage.tsx +++ b/src/components/KuadrantTLSCreatePage.tsx @@ -46,7 +46,7 @@ const KuadrantTLSCreatePage: React.FC = () => { const [selectedClusterIssuers, setSelectedClusterIssuers] = React.useState({ name: '' }); const [selectedIssuer, setSelectedIssuers] = React.useState({ name: '', namespace: '' }); const [certIssuerType, setCertIssuerType] = React.useState<'clusterissuer' | 'issuer'>('clusterissuer'); - const { t } = useTranslation('plugin__console-plugin-template'); + const { t } = useTranslation('plugin__kuadrant-console-plugin'); const location = useLocation(); const pathSplit = location.pathname.split('/') const nameEdit = pathSplit[6] diff --git a/src/components/ResourceList.tsx b/src/components/ResourceList.tsx index a21d7dd..6765ce4 100644 --- a/src/components/ResourceList.tsx +++ b/src/components/ResourceList.tsx @@ -169,7 +169,7 @@ const ResourceList: React.FC = ({ paginationLimit = 10, columns, }) => { - const { t } = useTranslation(); + const { t } = useTranslation('plugin__kuadrant-console-plugin'); const resourceDescriptors: { [key: string]: WatchK8sResource } = resources.reduce( (acc, resource, index) => { @@ -209,29 +209,29 @@ const ResourceList: React.FC = ({ const defaultColumns: TableColumn[] = [ { - title: t('plugin__console-plugin-template~Name'), + title: t('plugin__kuadrant-console-plugin~Name'), id: 'name', sort: 'metadata.name', transforms: [sortable], }, { - title: t('plugin__console-plugin-template~Type'), + title: t('plugin__kuadrant-console-plugin~Type'), id: 'type', sort: 'kind', transforms: [sortable], }, { - title: t('plugin__console-plugin-template~Namespace'), + title: t('plugin__kuadrant-console-plugin~Namespace'), id: 'namespace', sort: 'metadata.namespace', transforms: [sortable], }, { - title: t('plugin__console-plugin-template~Status'), + title: t('plugin__kuadrant-console-plugin~Status'), id: 'Status', }, { - title: t('plugin__console-plugin-template~Created'), + title: t('plugin__kuadrant-console-plugin~Created'), id: 'Created', sort: 'metadata.creationTimestamp', transforms: [sortable], diff --git a/src/components/dnspolicy/HealthCheckField.tsx b/src/components/dnspolicy/HealthCheckField.tsx index adaf041..e268cc9 100644 --- a/src/components/dnspolicy/HealthCheckField.tsx +++ b/src/components/dnspolicy/HealthCheckField.tsx @@ -10,7 +10,7 @@ interface HealthCheckProps { } const HealthCheckField: React.FC = ({ healthCheck, onChange }) => { - const { t } = useTranslation('plugin__console-plugin-template'); + const { t } = useTranslation('plugin__kuadrant-console-plugin'); return ( <> diff --git a/src/components/dnspolicy/LoadBalancingField.tsx b/src/components/dnspolicy/LoadBalancingField.tsx index 90c2815..c5585f5 100644 --- a/src/components/dnspolicy/LoadBalancingField.tsx +++ b/src/components/dnspolicy/LoadBalancingField.tsx @@ -10,7 +10,7 @@ interface LoadBalancingProps { } const LoadBalancingField: React.FC = ({ loadBalancing, onChange }) => { - const { t } = useTranslation('plugin__console-plugin-template'); + const { t } = useTranslation('plugin__kuadrant-console-plugin'); const operatorOptions = ['In', 'NotIn', 'Exists', 'DoesNotExist']; const [customWeights, setCustomWeights] = React.useState(loadBalancing.weighted.custom || []); diff --git a/src/components/gateway/GatewaySelect.tsx b/src/components/gateway/GatewaySelect.tsx index 63b61c1..1fb4dc2 100644 --- a/src/components/gateway/GatewaySelect.tsx +++ b/src/components/gateway/GatewaySelect.tsx @@ -10,7 +10,7 @@ interface GatewaySelectProps { } const GatewaySelect: React.FC = ({ selectedGateway, onChange }) => { - const { t } = useTranslation('plugin__console-plugin-template'); + const { t } = useTranslation('plugin__kuadrant-console-plugin'); const [gateways, setGateways] = React.useState([]); const gvk = { group: 'gateway.networking.k8s.io', version: 'v1', kind: 'Gateway' } diff --git a/src/components/httproute/HTTPRouteSelect.tsx b/src/components/httproute/HTTPRouteSelect.tsx index da2f306..0983ef6 100644 --- a/src/components/httproute/HTTPRouteSelect.tsx +++ b/src/components/httproute/HTTPRouteSelect.tsx @@ -10,7 +10,7 @@ interface HTTPRouteSelectProps { } const HTTPRouteSelect: React.FC = ({ selectedHTTPRoute, onChange }) => { - const { t } = useTranslation('plugin__console-plugin-template'); + const { t } = useTranslation('plugin__kuadrant-console-plugin'); const [httpRoutes, setHTTPRoutes] = React.useState([]); const gvk = { group: 'gateway.networking.k8s.io', version: 'v1', kind: 'HTTPRoute' }; diff --git a/src/components/issuer/clusterIssuerSelect.tsx b/src/components/issuer/clusterIssuerSelect.tsx index 586903c..ab0e275 100644 --- a/src/components/issuer/clusterIssuerSelect.tsx +++ b/src/components/issuer/clusterIssuerSelect.tsx @@ -10,7 +10,7 @@ interface ClusterIssuerSelectProps { } const ClusterIssuerSelect: React.FC = ({ selectedClusterIssuer, onChange }) => { - const { t } = useTranslation('plugin__console-plugin-template'); + const { t } = useTranslation('plugin__kuadrant-console-plugin'); const [clusterIssuers, setClusterIssuers] = React.useState([]); const gvk = { group: 'cert-manager.io', version: 'v1', kind: 'ClusterIssuer' }; diff --git a/src/components/issuer/issuerSelect.tsx b/src/components/issuer/issuerSelect.tsx index 2174d45..52cca35 100644 --- a/src/components/issuer/issuerSelect.tsx +++ b/src/components/issuer/issuerSelect.tsx @@ -10,7 +10,7 @@ interface IssuerSelectProps { } const IssuerSelect: React.FC = ({ selectedIssuer, onChange }) => { - const { t } = useTranslation('plugin__console-plugin-template'); + const { t } = useTranslation('plugin__kuadrant-console-plugin'); const [issuers, setIssuers] = React.useState([]); const gvk = { group: 'cert-manager.io', version: 'v1', kind: 'Issuer' }; diff --git a/src/components/namespace/NamespaceSelect.tsx b/src/components/namespace/NamespaceSelect.tsx index 27a1269..2ba082f 100644 --- a/src/components/namespace/NamespaceSelect.tsx +++ b/src/components/namespace/NamespaceSelect.tsx @@ -10,7 +10,7 @@ interface NamespaceSelectProps { } const NamespaceSelect: React.FC = ({ selectedNamespace, onChange, formDisabled }) => { - const { t } = useTranslation('plugin__console-plugin-template'); + const { t } = useTranslation('plugin__kuadrant-console-plugin'); const [namespaces, setNamespaces] = React.useState([]); const namespaceResource = { diff --git a/src/components/ratelimitpolicy/AddLimitModal.tsx b/src/components/ratelimitpolicy/AddLimitModal.tsx index d1343fc..c5a6ba0 100644 --- a/src/components/ratelimitpolicy/AddLimitModal.tsx +++ b/src/components/ratelimitpolicy/AddLimitModal.tsx @@ -9,7 +9,7 @@ const LimitConfigForm: React.FC<{ rateName: string; setRateName: (name: string) => void; }> = ({ newLimit, setNewLimit, rateName, setRateName }) => { - const { t } = useTranslation('plugin__console-plugin-template'); + const { t } = useTranslation('plugin__kuadrant-console-plugin'); return ( <> @@ -65,7 +65,7 @@ const AddLimitModal: React.FC<{ setRateName: (name: string) => void; handleSave: () => void; }> = ({ isOpen, onClose, newLimit, setNewLimit, rateName, setRateName, handleSave }) => { - const { t } = useTranslation('plugin__console-plugin-template'); + const { t } = useTranslation('plugin__kuadrant-console-plugin'); return ( = ({ limits, setLimits }) => { - const { t } = useTranslation('plugin__console-plugin-template'); + const { t } = useTranslation('plugin__kuadrant-console-plugin'); const [isAddLimitModalOpen, setIsAddLimitModalOpen] = React.useState(false); const [isLimitNameAlertModalOpen, setIsLimitNameAlertModalOpen] = React.useState(false); const [newLimit, setNewLimit] = React.useState({