Skip to content

Commit f1697c9

Browse files
authored
feat(Kiali): Fix theme header font colors (#6107)
* Updat e theme Signed-off-by: josunect <[email protected]> * Fix missing files Signed-off-by: josunect <[email protected]> * Fix metrics Signed-off-by: josunect <[email protected]> * Update api docs Signed-off-by: josunect <[email protected]> * Add changeset Signed-off-by: josunect <[email protected]> * Update report types Signed-off-by: josunect <[email protected]> * Update comments Signed-off-by: josunect <[email protected]> * Fix Signed-off-by: josunect <[email protected]> * Update babel Signed-off-by: josunect <[email protected]> * prettier Signed-off-by: josunect <[email protected]> * Remove file Signed-off-by: josunect <[email protected]> * Update api docs Signed-off-by: josunect <[email protected]> * Update docs Signed-off-by: josunect <[email protected]> * Update md Signed-off-by: josunect <[email protected]> * Prettier Signed-off-by: josunect <[email protected]> * Exclude MD Signed-off-by: josunect <[email protected]> * Revert "prettier" This reverts commit b45036c. Signed-off-by: josunect <[email protected]> * Prettier Signed-off-by: josunect <[email protected]> * Update docs Signed-off-by: josunect <[email protected]> * Exclude warnings Signed-off-by: josunect <[email protected]> * Update api-reports Signed-off-by: josunect <[email protected]> * Revert change Signed-off-by: josunect <[email protected]> --------- Signed-off-by: josunect <[email protected]>
1 parent 3e77dc3 commit f1697c9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+4668
-5510
lines changed
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
'@backstage-community/plugin-kiali-common': minor
3+
'@backstage-community/plugin-kiali': minor
4+
---
5+
6+
Fix header styles for OpenShift. Use new cluster metrics API.

workspaces/kiali/.prettierignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,7 @@ dist-types
33
coverage
44
.vscode
55
.eslintrc.js
6+
7+
# Generated API reports
8+
**/report*.api.md
9+
**/knip-report.md

workspaces/kiali/package.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"tsc:full": "tsc --skipLibCheck true --incremental false",
1414
"build:all": "CI=true backstage-cli repo build --all",
1515
"build:api-reports": "yarn build:api-reports:only",
16-
"build:api-reports:only": "backstage-repo-tools api-reports --allow-all-warnings -o ae-wrong-input-file-type,ae-undocumented --validate-release-tags",
16+
"build:api-reports:only": "backstage-repo-tools api-reports --allow-all-warnings -o ae-wrong-input-file-type,ae-undocumented,ae-missing-release-tag,ae-forgotten-export --validate-release-tags",
1717
"build:knip-reports": "backstage-repo-tools knip-reports",
1818
"clean": "backstage-cli repo clean",
1919
"test": "backstage-cli repo test",
@@ -39,16 +39,20 @@
3939
"directory": "workspaces/kiali"
4040
},
4141
"devDependencies": {
42+
"@babel/core": "^7.28.5",
43+
"@babel/preset-typescript": "^7.28.5",
4244
"@backstage/cli": "^0.34.4",
4345
"@backstage/e2e-test-utils": "^0.1.1",
4446
"@backstage/repo-tools": "^0.15.3",
4547
"@changesets/cli": "^2.27.1",
4648
"@ianvs/prettier-plugin-sort-imports": "^4.3.1",
49+
"@types/babel__core": "^7",
4750
"@types/deep-freeze": "^0.1.5",
4851
"concurrently": "^9.0.0",
4952
"knip": "^5.27.4",
5053
"node-gyp": "^9.0.0",
51-
"prettier": "^2.3.2",
54+
"prettier": "^3.6.2",
55+
"prettier-plugin-sort-imports": "^1.8.8",
5256
"typescript": "~5.3.0"
5357
},
5458
"resolutions": {

workspaces/kiali/packages/app/public/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!DOCTYPE html>
1+
<!doctype html>
22
<html lang="en">
33
<head>
44
<meta charset="utf-8" />

workspaces/kiali/plugins/kiali-backend/report.api.md

Lines changed: 33 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
44
55
```ts
6+
67
import { BackendFeature } from '@backstage/backend-plugin-api';
78
import { Config } from '@backstage/config';
89
import express from 'express';
@@ -11,45 +12,45 @@ import type { LoggerService } from '@backstage/backend-plugin-api';
1112
// @public (undocumented)
1213
export function createRouter(options: RouterOptions): Promise<express.Router>;
1314

14-
// Warning: (ae-missing-release-tag) "kialiPlugin" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
15-
//
16-
// @public (undocumented)
15+
// @public
16+
export class KialiApiImpl implements KialiApi {
17+
constructor(options: Options);
18+
// (undocumented)
19+
cleanVersion: (version: string) => Number[] | undefined;
20+
// (undocumented)
21+
compareVersions: (v1: string, v2: string) => number;
22+
// (undocumented)
23+
proxy(endpoint: string): Promise<any>;
24+
// (undocumented)
25+
status(): Promise<any>;
26+
// (undocumented)
27+
supportedVersion: (version: string) => string | undefined;
28+
}
29+
30+
// @public
1731
const kialiPlugin: BackendFeature;
1832
export default kialiPlugin;
19-
export { kialiPlugin };
33+
export { kialiPlugin }
2034

21-
// Warning: (ae-missing-release-tag) "KialiProvidersApi" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
22-
//
23-
// @public (undocumented)
35+
// @public
2436
export interface KialiProvidersApi {
25-
// Warning: (ae-forgotten-export) The symbol "KialiApiImpl" needs to be exported by the entry point index.d.ts
26-
//
27-
// (undocumented)
28-
api: KialiApiImpl;
29-
// (undocumented)
30-
name: string;
31-
// (undocumented)
32-
urlExternal: string;
37+
// (undocumented)
38+
api: KialiApiImpl;
39+
// (undocumented)
40+
name: string;
41+
// (undocumented)
42+
urlExternal: string;
3343
}
3444

35-
// Warning: (ae-missing-release-tag) "makeRouter" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
36-
//
37-
// @public (undocumented)
38-
export const makeRouter: (
39-
logger: LoggerService,
40-
kialiApis: KialiProvidersApi[],
41-
config: Config,
42-
) => express.Router;
43-
44-
// Warning: (ae-missing-release-tag) "RouterOptions" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
45-
//
46-
// @public (undocumented)
45+
// @public
46+
export const makeRouter: (logger: LoggerService, kialiApis: KialiProvidersApi[], config: Config) => express.Router;
47+
48+
// @public
4749
export interface RouterOptions {
48-
// (undocumented)
49-
config: Config;
50-
// (undocumented)
51-
logger: LoggerService;
50+
// (undocumented)
51+
config: Config;
52+
// (undocumented)
53+
logger: LoggerService;
5254
}
5355

54-
// (No @packageDocumentation comment for this package)
5556
```

workspaces/kiali/plugins/kiali-backend/src/clients/KialiAPIConnector.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,12 @@ interface StatusState {
3434
export interface KialiApi {
3535
proxy(endpoint: string, method?: string): Promise<any>;
3636
}
37+
38+
/**
39+
* Implementation of the Kiali API client.
40+
*
41+
* @public
42+
*/
3743
export class KialiApiImpl implements KialiApi {
3844
private kialiFetcher: KialiFetcher;
3945
private logger: LoggerService;

workspaces/kiali/plugins/kiali-backend/src/index.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,14 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16+
17+
/**
18+
* Backend plugin for Kiali integration in Backstage.
19+
*
20+
* @packageDocumentation
21+
*/
22+
1623
export * from './service/router';
1724
export * from './plugin';
1825
export { kialiPlugin as default } from './plugin';
26+
export { KialiApiImpl } from './clients/KialiAPIConnector';

workspaces/kiali/plugins/kiali-backend/src/plugin.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@ import {
1919
} from '@backstage/backend-plugin-api';
2020
import { createRouter } from './service/router';
2121

22+
/**
23+
* Kiali backend plugin.
24+
*
25+
* @public
26+
*/
2227
export const kialiPlugin = createBackendPlugin({
2328
pluginId: 'kiali',
2429
register(env) {

workspaces/kiali/plugins/kiali-backend/src/service/router.ts

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,32 @@ import { ValidationCategory } from '../clients/fetch';
2222
import { KialiApiImpl } from '../clients/KialiAPIConnector';
2323
import { readKialiConfigs } from './config';
2424

25+
/**
26+
* Options for creating the Kiali router.
27+
*
28+
* @public
29+
*/
2530
export interface RouterOptions {
2631
logger: LoggerService;
2732
config: Config;
2833
}
2934

35+
/**
36+
* Configuration for a Kiali provider API.
37+
*
38+
* @public
39+
*/
3040
export interface KialiProvidersApi {
3141
name: string;
3242
urlExternal: string;
3343
api: KialiApiImpl;
3444
}
3545

46+
/**
47+
* Creates an Express router for Kiali API endpoints.
48+
*
49+
* @public
50+
*/
3651
export const makeRouter = (
3752
logger: LoggerService,
3853
kialiApis: KialiProvidersApi[],

0 commit comments

Comments
 (0)