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

Bump eslint-config-airbnb-typescript from 12.3.1 to 14.0.2 in /kafka-ui-react-app #1294

Merged
merged 4 commits into from
Jan 21, 2022
Merged

Bump eslint-config-airbnb-typescript from 12.3.1 to 14.0.2 in /kafka-ui-react-app #1294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0d11606
Bump eslint-config-airbnb-typescript in /kafka-ui-react-app
dependabot[bot] Jan 21, 2022
e58f152
Update Eslint config
workshur Jan 21, 2022
e92bae1
Update eslint
workshur Jan 21, 2022
bcfb7ed
Merge branch 'master' of github.com:provectus/kafka-ui into dependabo…
workshur Jan 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions kafka-ui-react-app/.eslintrc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
"prettier"
],
"extends": [
"airbnb",
"airbnb-typescript",
"plugin:@typescript-eslint/recommended",
"plugin:jest-dom/recommended",
Expand Down Expand Up @@ -70,7 +71,15 @@
"state"
]
}
]
],
"react/function-component-definition": [
2,
{
"namedComponents": "arrow-function",
"unnamedComponents": "arrow-function"
}
],
"react/jsx-no-constructed-context-values": "off"
},
"overrides": [
{
Expand All @@ -90,4 +99,4 @@
}
}
]
}
}
884 changes: 460 additions & 424 deletions kafka-ui-react-app/package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

19 changes: 9 additions & 10 deletions kafka-ui-react-app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
"@rooks/use-outside-click-ref": "^4.10.1",
"@testing-library/react": "^12.0.0",
"@types/eventsource": "^1.1.6",
"@types/styled-components": "^5.1.14",
"@types/yup": "^0.29.13",
"ace-builds": "^1.4.12",
"ajv": "^8.6.3",
Expand Down Expand Up @@ -99,22 +98,22 @@
"@types/redux-mock-store": "^1.0.3",
"@types/styled-components": "^5.1.13",
"@types/uuid": "^8.3.1",
"@typescript-eslint/eslint-plugin": "^4.29.1",
"@typescript-eslint/parser": "^4.29.1",
"@typescript-eslint/eslint-plugin": "^5.10.0",
"@typescript-eslint/parser": "^5.10.0",
"@wojtekmaj/enzyme-adapter-react-17": "^0.6.3",
"dotenv": "^10.0.0",
"enzyme": "^3.11.0",
"enzyme-to-json": "^3.6.1",
"eslint": "^7.32.0",
"eslint-config-airbnb": "^18.2.1",
"eslint-config-airbnb-typescript": "^12.3.1",
"eslint": "^8.7.0",
"eslint-config-airbnb": "^19.0.0",
"eslint-config-airbnb-typescript": "^16.1.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-import": "^2.24.0",
"eslint-plugin-jest-dom": "^3.9.2",
"eslint-plugin-jsx-a11y": "^6.4.1",
"eslint-plugin-import": "^2.25.4",
"eslint-plugin-jest-dom": "^4.0.1",
"eslint-plugin-jsx-a11y": "^6.5.1",
"eslint-plugin-prettier": "^4.0.0",
"eslint-plugin-react": "^7.28.0",
"eslint-plugin-react-hooks": "^4.2.0",
"eslint-plugin-react-hooks": "^4.3.0",
"esprint": "^3.1.0",
"fetch-mock-jest": "^1.5.1",
"history": "^5.0.0",
Expand Down
8 changes: 4 additions & 4 deletions kafka-ui-react-app/src/components/Dashboard/ClustersWidget/__test__/fixtures.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ export const onlineCluster: Cluster = {
brokerCount: 1,
onlinePartitionCount: 6,
topicCount: 3,
bytesInPerSec: 0.000030618196853764715,
bytesOutPerSec: 5.737800890036267075817,
bytesInPerSec: 0.00003061819685376471,
bytesOutPerSec: 5.737800890036267,
readOnly: false,
};

Expand All @@ -19,8 +19,8 @@ export const offlineCluster: Cluster = {
brokerCount: 1,
onlinePartitionCount: 2,
topicCount: 2,
bytesInPerSec: 8000.0000067376808542600021,
bytesOutPerSec: 0.8153063567297119490871,
bytesInPerSec: 8000.00000673768,
bytesOutPerSec: 0.8153063567297119,
readOnly: true,
};

Expand Down
28 changes: 13 additions & 15 deletions kafka-ui-react-app/src/components/Topics/List/ListItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,22 +112,20 @@ const ListItem: React.FC<ListItemProps> = ({
</td>
<td className="topic-action-block" style={{ width: '4%' }}>
{!internal && !isReadOnly && vElipsisVisble ? (
<>
<div className="has-text-right">
<Dropdown label={<VerticalElipsisIcon />} right>
<DropdownItem onClick={clearTopicMessagesHandler}>
<span className="has-text-danger">Clear Messages</span>
<div className="has-text-right">
<Dropdown label={<VerticalElipsisIcon />} right>
<DropdownItem onClick={clearTopicMessagesHandler}>
<span className="has-text-danger">Clear Messages</span>
</DropdownItem>
{isTopicDeletionAllowed && (
<DropdownItem
onClick={() => setDeleteTopicConfirmationVisible(true)}
>
<span className="has-text-danger">Remove Topic</span>
</DropdownItem>
{isTopicDeletionAllowed && (
<DropdownItem
onClick={() => setDeleteTopicConfirmationVisible(true)}
>
<span className="has-text-danger">Remove Topic</span>
</DropdownItem>
)}
</Dropdown>
</div>
</>
)}
</Dropdown>
</div>
) : null}
<ConfirmationModal
isOpen={isDeleteTopicConfirmationVisible}
Expand Down
61 changes: 29 additions & 32 deletions kafka-ui-react-app/src/components/Topics/shared/Form/CustomParams/CustomParamField.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,39 +58,36 @@ const CustomParamField: React.FC<Props> = ({

return (
<C.Column>
<>
<div>
<InputLabel>Custom Parameter</InputLabel>
<Controller
control={control}
rules={{ required: 'Custom Parameter is required.' }}
name={`customParams.${index}.name`}
render={({ field: { name, onChange } }) => (
<Select
name={name}
placeholder="Select"
disabled={isDisabled}
minWidth="270px"
onChange={onChange}
options={Object.keys(TOPIC_CUSTOM_PARAMS)
.sort()
.map((opt) => ({
value: opt,
label: opt,
disabled: existingFields.includes(opt),
}))}
/>
)}
/>
<FormError>
<ErrorMessage
errors={errors}
name={`customParams.${index}.name` as const}
<div>
<InputLabel>Custom Parameter</InputLabel>
<Controller
control={control}
rules={{ required: 'Custom Parameter is required.' }}
name={`customParams.${index}.name`}
render={({ field: { name, onChange } }) => (
<Select
name={name}
placeholder="Select"
disabled={isDisabled}
minWidth="270px"
onChange={onChange}
options={Object.keys(TOPIC_CUSTOM_PARAMS)
.sort()
.map((opt) => ({
value: opt,
label: opt,
disabled: existingFields.includes(opt),
}))}
/>
</FormError>
</div>
</>

)}
/>
<FormError>
<ErrorMessage
errors={errors}
name={`customParams.${index}.name` as const}
/>
</FormError>
</div>
<div>
<InputLabel>Value</InputLabel>
<Input
Expand Down
2 changes: 1 addition & 1 deletion kafka-ui-react-app/src/components/common/Breadcrumb/Breadcrumb.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ const Breadcrumb: React.FC<Props> = () => {
);

if (links.length < 2) {
return <></>;
return null;
}
return (
<BreadcrumbWrapper role="list">
Expand Down
4 changes: 2 additions & 2 deletions kafka-ui-react-app/src/lib/constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ export const BASE_PARAMS: ConfigurationParameters = {
},
};

export const TOPIC_NAME_VALIDATION_PATTERN = RegExp(/^[.,A-Za-z0-9_-]+$/);
export const SCHEMA_NAME_VALIDATION_PATTERN = RegExp(/^[.,A-Za-z0-9_-]+$/);
export const TOPIC_NAME_VALIDATION_PATTERN = /^[.,A-Za-z0-9_-]+$/;
export const SCHEMA_NAME_VALIDATION_PATTERN = /^[.,A-Za-z0-9_-]+$/;

export const TOPIC_CUSTOM_PARAMS: Record<string, string> = {
'compression.type': 'producer',
Expand Down
1 change: 1 addition & 0 deletions kafka-ui-react-app/src/redux/reducers/alerts/reducer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { addError, removeAlert } from './utils';

export const initialState: AlertsState = {};

// eslint-disable-next-line @typescript-eslint/default-param-last
const reducer = (state = initialState, action: Action): AlertsState => {
const { type } = action;

Expand Down
1 change: 1 addition & 0 deletions kafka-ui-react-app/src/redux/reducers/connect/reducer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ export const initialState: ConnectState = {
search: '',
};

// eslint-disable-next-line @typescript-eslint/default-param-last
const reducer = (state = initialState, action: Action): ConnectState => {
switch (action.type) {
case getType(actions.fetchConnectsAction.success):
Expand Down
1 change: 1 addition & 0 deletions kafka-ui-react-app/src/redux/reducers/ksqlDb/reducer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ export const initialState: KsqlState = {
executionResult: null,
};

// eslint-disable-next-line @typescript-eslint/default-param-last
const reducer = (state = initialState, action: Action): KsqlState => {
switch (action.type) {
case getType(actions.fetchKsqlDbTablesAction.success):
Expand Down
1 change: 1 addition & 0 deletions kafka-ui-react-app/src/redux/reducers/loader/reducer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { Action, LoaderState } from 'redux/interfaces';

export const initialState: LoaderState = {};

// eslint-disable-next-line @typescript-eslint/default-param-last
const reducer = (state = initialState, action: Action): LoaderState => {
const { type } = action;
const splitType = type.split('__');
Expand Down
1 change: 1 addition & 0 deletions kafka-ui-react-app/src/redux/reducers/topicMessages/reducer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ export const initialState: TopicMessagesState = {
isFetching: false,
};

// eslint-disable-next-line @typescript-eslint/default-param-last
const reducer = (state = initialState, action: Action): TopicMessagesState => {
switch (action.type) {
case getType(actions.addTopicMessage): {
Expand Down
1 change: 1 addition & 0 deletions kafka-ui-react-app/src/redux/reducers/topics/reducer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ export const initialState: TopicsState = {
consumerGroups: [],
};

// eslint-disable-next-line @typescript-eslint/default-param-last
const reducer = (state = initialState, action: Action): TopicsState => {
switch (action.type) {
case getType(actions.fetchTopicsListAction.success):
Expand Down