Skip to content

Commit a84619a

Browse files
gansheergansheer
committed
Linter fix
1 parent 3f470e1 commit a84619a

29 files changed

+1530
-1172
lines changed

‎plugin/integration-tests/plugins/index.ts

+1-3
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,7 @@ module.exports = (on, config) => {
1919
};
2020
on('file:preprocessor', wp(options));
2121
// `config` is the resolved Cypress config
22-
config.baseUrl = `${
23-
process.env.BRIDGE_BASE_ADDRESS || 'http://localhost:9000/'
24-
}`;
22+
config.baseUrl = `${process.env.BRIDGE_BASE_ADDRESS || 'http://localhost:9000/'}`;
2523
config.env.BRIDGE_KUBEADMIN_PASSWORD = process.env.BRIDGE_KUBEADMIN_PASSWORD;
2624
return config;
2725
};

‎plugin/integration-tests/support/login.ts

+2-6
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@ declare global {
88
}
99

1010
const KUBEADMIN_USERNAME = 'kubeadmin';
11-
const loginUsername = Cypress.env('BRIDGE_KUBEADMIN_PASSWORD')
12-
? 'user-dropdown'
13-
: 'username';
11+
const loginUsername = Cypress.env('BRIDGE_KUBEADMIN_PASSWORD') ? 'user-dropdown' : 'username';
1412

1513
// This will add 'cy.login(...)'
1614
// ex: cy.login('my-user', 'my-password')
@@ -26,9 +24,7 @@ Cypress.Commands.add('login', (username: string, password: string) => {
2624
cy.clearCookie('openshift-session-token');
2725

2826
cy.get('#inputUsername').type(username || KUBEADMIN_USERNAME);
29-
cy.get('#inputPassword').type(
30-
password || Cypress.env('BRIDGE_KUBEADMIN_PASSWORD'),
31-
);
27+
cy.get('#inputPassword').type(password || Cypress.env('BRIDGE_KUBEADMIN_PASSWORD'));
3228
cy.get('button[type=submit]').click();
3329

3430
cy.get(`[data-test="${loginUsername}"]`).should('be.visible');

‎plugin/integration-tests/tests/example-page.cy.ts

+3-10
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ import { checkErrors } from '../support';
22

33
const PLUGIN_TEMPLATE_NAME = 'camel-openshift-console-plugin';
44
const PLUGIN_TEMPLATE_PULL_SPEC = Cypress.env('PLUGIN_TEMPLATE_PULL_SPEC');
5-
export const isLocalDevEnvironment =
6-
Cypress.config('baseUrl').includes('localhost');
5+
export const isLocalDevEnvironment = Cypress.config('baseUrl').includes('localhost');
76

87
const installHelmChart = (path: string) => {
98
cy.exec(
@@ -44,10 +43,7 @@ describe('Console plugin template test', () => {
4443
failOnNonZeroExit: false,
4544
}).then((result) => {
4645
cy.log('Error installing helm binary: ', result.stderr);
47-
cy.log(
48-
'Successfully installed helm binary in "/tmp" directory: ',
49-
result.stdout,
50-
);
46+
cy.log('Successfully installed helm binary in "/tmp" directory: ', result.stdout);
5147

5248
installHelmChart('/tmp/helm');
5349
});
@@ -75,9 +71,6 @@ describe('Console plugin template test', () => {
7571
cy.get('[data-quickstart-id="qs-nav-home"]').click();
7672
cy.get('[data-test="nav"]').contains('Plugin Example').click();
7773
cy.url().should('include', '/example');
78-
cy.get('[data-test="example-page-title"]').should(
79-
'contain',
80-
'Hello, Plugin!',
81-
);
74+
cy.get('[data-test="example-page-title"]').should('contain', 'Hello, Plugin!');
8275
});
8376
});

‎plugin/src/actions.ts

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { SetFeatureFlag } from '@openshift-console/dynamic-plugin-sdk';
22
import { FLAG_OPENSHIFT_CAMEL } from './const';
33

4-
54
export const enableCamelPlugin = (setFeatureFlag: SetFeatureFlag) => {
65
setFeatureFlag(FLAG_OPENSHIFT_CAMEL, true);
76
};

‎plugin/src/components/ApplicationConfigurationCard.tsx

+30-36
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,17 @@
11
import * as React from 'react';
22
import { useEffect, useState } from 'react';
3-
import {
4-
Card,
5-
CardBody,
6-
CardTitle,
7-
Text,
8-
TextContent,
9-
Tooltip
10-
} from '@patternfly/react-core';
3+
import { Card, CardBody, CardTitle, Text, TextContent, Tooltip } from '@patternfly/react-core';
114
import { Application } from '../types';
12-
import { extractEnvironmentVariables, extractMountedConfigMaps, extractMountedSecrets } from '../utils';
5+
import {
6+
extractEnvironmentVariables,
7+
extractMountedConfigMaps,
8+
extractMountedSecrets,
9+
} from '../utils';
1310
import { ResourceLink } from '@openshift-console/dynamic-plugin-sdk';
1411

15-
const ApplicationConfigurationCard: React.FC<{application: Application }> = ({ application }) => {
16-
12+
const ApplicationConfigurationCard: React.FC<{ application: Application }> = ({ application }) => {
1713
type Description = {
18-
[key: string]: string
14+
[key: string]: string;
1915
};
2016

2117
const [envVars, setEnvVars] = useState({});
@@ -27,9 +23,9 @@ const ApplicationConfigurationCard: React.FC<{application: Application }> = ({ a
2723
useEffect(() => {
2824
Object.entries(envVars).forEach(([key, _]) => {
2925
fetchCamelConfigInfo(envVarToProperty(key)).then((description) => {
30-
setDescriptions(prevDescriptions => ({
26+
setDescriptions((prevDescriptions) => ({
3127
...prevDescriptions,
32-
[key]: description
28+
[key]: description,
3329
}));
3430
});
3531
});
@@ -43,7 +39,6 @@ const ApplicationConfigurationCard: React.FC<{application: Application }> = ({ a
4339
}
4440
}, [application]);
4541

46-
4742
function descriptionSafe(key: string): string {
4843
return descriptions && descriptions[key] ? descriptions[key] : key;
4944
}
@@ -58,10 +53,9 @@ const ApplicationConfigurationCard: React.FC<{application: Application }> = ({ a
5853
}
5954
*/
6055

61-
6256
async function fetchCamelConfigInfo(propertyName: string): Promise<string> {
6357
// Split the property to find the last segment which is usually the actual property name
64-
// const envVarName = propertyToEnvVar(propertyName);
58+
// const envVarName = propertyToEnvVar(propertyName);
6559

6660
// Fetch the Camel configuration guide page
6761
const response = await fetch('https://quarkus.io/guides/all-config');
@@ -88,13 +82,14 @@ const ApplicationConfigurationCard: React.FC<{application: Application }> = ({ a
8882

8983
if (keyCell && descriptionCell && keyCell.textContent.includes(propertyName)) {
9084
// If the config key matches the property name, get the description
91-
info = descriptionCell.textContent.split('\n')
85+
info =
86+
descriptionCell.textContent
87+
.split('\n')
9288
.filter((line) => !line.startsWith(propertyName))
9389
.filter((line) => !line.startsWith('Environment Variable'))
9490
.filter((line) => !line.startsWith('Show more'))
95-
.join('\n') + ' \n'
96-
'Defaults to (' + typeCell.textContent.trim() + '): ' + defaultCell.textContent.trim();
97-
91+
.join('\n') + ' \n';
92+
'Defaults to (' + typeCell.textContent.trim() + '): ' + defaultCell.textContent.trim();
9893
}
9994
});
10095
});
@@ -105,22 +100,20 @@ const ApplicationConfigurationCard: React.FC<{application: Application }> = ({ a
105100
<Card>
106101
<CardTitle>Configuration</CardTitle>
107102
<CardBody>
108-
{application &&
103+
{application && (
109104
<TextContent>
110105
<Text component="p">Name: {application.metadata.name}</Text>
111106
<Text component="p">Environment Variables:</Text>
112107
<ul>
113-
{Object.entries(envVars).map(
114-
([key, value]) => (
115-
<li key={key}>
116-
<Tooltip content={descriptionSafe(key)}>
117-
<>
108+
{Object.entries(envVars).map(([key, value]) => (
109+
<li key={key}>
110+
<Tooltip content={descriptionSafe(key)}>
111+
<>
118112
<strong>{key}:</strong> {value}
119-
</>
120-
</Tooltip>
121-
</li>
122-
)
123-
)}
113+
</>
114+
</Tooltip>
115+
</li>
116+
))}
124117
</ul>
125118
<Text component="p">Secrets:</Text>
126119
<ul>
@@ -131,7 +124,8 @@ const ApplicationConfigurationCard: React.FC<{application: Application }> = ({ a
131124
kind="Secret"
132125
name={secret}
133126
namespace={application.metadata.namespace}
134-
linkTo={true}/>
127+
linkTo={true}
128+
/>
135129
</li>
136130
))}
137131
</ul>
@@ -144,16 +138,16 @@ const ApplicationConfigurationCard: React.FC<{application: Application }> = ({ a
144138
kind="ConfigMap"
145139
name={configMap}
146140
namespace={application.metadata.namespace}
147-
linkTo={true}/>
141+
linkTo={true}
142+
/>
148143
</li>
149144
))}
150145
</ul>
151146
</TextContent>
152-
}
147+
)}
153148
</CardBody>
154149
</Card>
155150
);
156151
};
157152

158153
export default ApplicationConfigurationCard;
159-

0 commit comments

Comments
 (0)