From b35467fb3d6fe557cda7cd9c459fb65cc6ac833d Mon Sep 17 00:00:00 2001 From: Sebastian Malton Date: Thu, 4 May 2023 13:26:44 -0400 Subject: [PATCH] chore: Turn on react/jsx-closing-bracket-location Signed-off-by: Sebastian Malton --- packages/core/.eslintrc.js | 1 + .../adding-of-public-helm-repository.tsx | 3 ++- .../terminal-font-size/terminal-font-size.tsx | 3 ++- .../preference-navigation/preferences-navigation.tsx | 3 ++- .../catalog/columns/default-category.injectable.tsx | 3 ++- .../components/cluster-settings/icon-settings.tsx | 3 ++- packages/core/src/renderer/components/dock/dock.tsx | 3 ++- .../renderer/components/dock/install-chart/view.tsx | 3 ++- .../components/extensions/installed-extensions.tsx | 3 ++- .../release-details/release-details-content.tsx | 3 ++- .../src/renderer/components/hotbar/hotbar-menu.tsx | 9 ++++++--- .../window-controls/window-controls.tsx | 3 ++- .../ingress-class-menu.injectable.tsx | 3 ++- .../components/network-ingresses/ingresses.tsx | 3 ++- .../components/resource-metrics/resource-metrics.tsx | 3 ++- .../renderer/components/status-bar/status-bar.tsx | 6 ++++-- .../workloads-deployments/deployment-details.tsx | 3 ++- .../columns/pods-node-column.injectable.tsx | 3 ++- .../volumes/variants/container-storage-interface.tsx | 12 ++++++++---- .../workloads-pods/pod-details-container.tsx | 3 ++- .../replication-controllers.tsx | 3 ++- 21 files changed, 53 insertions(+), 26 deletions(-) diff --git a/packages/core/.eslintrc.js b/packages/core/.eslintrc.js index 7e42c43b92..bf3a48626b 100644 --- a/packages/core/.eslintrc.js +++ b/packages/core/.eslintrc.js @@ -150,6 +150,7 @@ module.exports = { }, ], }], + "react/jsx-closing-bracket-location": ["error", "line-aligned"], "@typescript-eslint/member-delimiter-style": ["error", { "multiline": { "delimiter": "semi", diff --git a/packages/core/src/features/helm-charts/child-features/preferences/renderer/adding-of-public-helm-repository/adding-of-public-helm-repository.tsx b/packages/core/src/features/helm-charts/child-features/preferences/renderer/adding-of-public-helm-repository/adding-of-public-helm-repository.tsx index fd3113f395..3cd63518f0 100644 --- a/packages/core/src/features/helm-charts/child-features/preferences/renderer/adding-of-public-helm-repository/adding-of-public-helm-repository.tsx +++ b/packages/core/src/features/helm-charts/child-features/preferences/renderer/adding-of-public-helm-repository/adding-of-public-helm-repository.tsx @@ -74,7 +74,8 @@ const formatOptionLabel = ({ value, isSelected }: SelectOption) => ( + className="box right" + /> )} ); diff --git a/packages/core/src/features/preferences/renderer/preference-items/terminal/terminal-font-size/terminal-font-size.tsx b/packages/core/src/features/preferences/renderer/preference-items/terminal/terminal-font-size/terminal-font-size.tsx index 75a6a35242..eb0516485d 100644 --- a/packages/core/src/features/preferences/renderer/preference-items/terminal/terminal-font-size/terminal-font-size.tsx +++ b/packages/core/src/features/preferences/renderer/preference-items/terminal/terminal-font-size/terminal-font-size.tsx @@ -25,7 +25,8 @@ const NonInjectedTerminalFontSize = observer(({ min={10} max={50} defaultValue={state.terminalConfig.fontSize.toString()} - onChange={(value) => state.terminalConfig.fontSize = Number(value)} /> + onChange={(value) => state.terminalConfig.fontSize = Number(value)} + /> )); diff --git a/packages/core/src/features/preferences/renderer/preference-navigation/preferences-navigation.tsx b/packages/core/src/features/preferences/renderer/preference-navigation/preferences-navigation.tsx index 30c5776054..fc38dfbdb9 100644 --- a/packages/core/src/features/preferences/renderer/preference-navigation/preferences-navigation.tsx +++ b/packages/core/src/features/preferences/renderer/preference-navigation/preferences-navigation.tsx @@ -66,7 +66,8 @@ const toNavigationHierarchy = (composite: Composite + className="mr-3" + /> )} {value.label} diff --git a/packages/core/src/renderer/components/catalog/columns/default-category.injectable.tsx b/packages/core/src/renderer/components/catalog/columns/default-category.injectable.tsx index e33ff1ce7f..6e9fe49cba 100644 --- a/packages/core/src/renderer/components/catalog/columns/default-category.injectable.tsx +++ b/packages/core/src/renderer/components/catalog/columns/default-category.injectable.tsx @@ -9,6 +9,7 @@ import type { RegisteredAdditionalCategoryColumn } from "../custom-category-colu import { KubeObject } from "@k8slens/kube-object"; import { getInjectable } from "@ogre-tools/injectable"; import getLabelBadgesInjectable from "../get-label-badges.injectable"; +import { cssNames } from "@k8slens/utilities"; const defaultCategoryColumnsInjectable = getInjectable({ id: "default-category-columns", @@ -37,7 +38,7 @@ const defaultCategoryColumnsInjectable = getInjectable({ titleProps: { id: "labels", title: "Labels", - className: `${styles.labelsCell} scrollable`, + className: cssNames(styles.labelsCell, "scrollable"), "data-testid": "catalog-labels-column", }, searchFilter: entity => KubeObject.stringifyLabels(entity.metadata.labels), diff --git a/packages/core/src/renderer/components/cluster-settings/icon-settings.tsx b/packages/core/src/renderer/components/cluster-settings/icon-settings.tsx index 1f862fbb49..a67e1604a7 100644 --- a/packages/core/src/renderer/components/cluster-settings/icon-settings.tsx +++ b/packages/core/src/renderer/components/cluster-settings/icon-settings.tsx @@ -92,7 +92,8 @@ const NonInjectedClusterIconSetting = observer((props: ClusterIconSettingProps & item.onClick(cluster.preferences)} key={item.id} - disabled={item.disabled?.(cluster.preferences)}> + disabled={item.disabled?.(cluster.preferences)} + > {item.title} ), diff --git a/packages/core/src/renderer/components/dock/dock.tsx b/packages/core/src/renderer/components/dock/dock.tsx index ef30675b5e..c99cf67f1d 100644 --- a/packages/core/src/renderer/components/dock/dock.tsx +++ b/packages/core/src/renderer/components/dock/dock.tsx @@ -127,7 +127,8 @@ class NonInjectedDock extends React.Component {
+ data-testid={`dock-tab-content-for-${selectedTab.id}`} + > {this.renderTab(selectedTab)}
); diff --git a/packages/core/src/renderer/components/dock/install-chart/view.tsx b/packages/core/src/renderer/components/dock/install-chart/view.tsx index d5025ba81d..8f1da56bc3 100644 --- a/packages/core/src/renderer/components/dock/install-chart/view.tsx +++ b/packages/core/src/renderer/components/dock/install-chart/view.tsx @@ -41,7 +41,8 @@ const NonInjectedInstallChart = observer( + sticker + />

Installation complete!

diff --git a/packages/core/src/renderer/components/extensions/installed-extensions.tsx b/packages/core/src/renderer/components/extensions/installed-extensions.tsx index 2b7df32c2c..207c9f4a6c 100644 --- a/packages/core/src/renderer/components/extensions/installed-extensions.tsx +++ b/packages/core/src/renderer/components/extensions/installed-extensions.tsx @@ -139,7 +139,8 @@ const NonInjectedInstalledExtensions = observer(({ + toolbar={false} + > {isCompatible && ( + labelsOnly + > + size={40} + /> ) : ( + size={40} + /> )}
)} @@ -159,7 +161,8 @@ const NonInjectedHotbarMenu = observer((props: Dependencies & HotbarMenuProps) =
onDragStart()} - onDragEnd={(result) => onDragEnd(result)}> + onDragEnd={(result) => onDragEnd(result)} + > {renderGrid()}
diff --git a/packages/core/src/renderer/components/layout/top-bar/top-bar-items/window-controls/window-controls.tsx b/packages/core/src/renderer/components/layout/top-bar/top-bar-items/window-controls/window-controls.tsx index 669958c7eb..7e354ef2ce 100644 --- a/packages/core/src/renderer/components/layout/top-bar/top-bar-items/window-controls/window-controls.tsx +++ b/packages/core/src/renderer/components/layout/top-bar/top-bar-items/window-controls/window-controls.tsx @@ -41,7 +41,8 @@ const NonInjectedWindowControls = ({ width="10" height="1" x="1" - y="9" /> + y="9" + /> diff --git a/packages/core/src/renderer/components/network-ingresses/ingress-class-menu.injectable.tsx b/packages/core/src/renderer/components/network-ingresses/ingress-class-menu.injectable.tsx index b297ae956a..dd704c0f4f 100644 --- a/packages/core/src/renderer/components/network-ingresses/ingress-class-menu.injectable.tsx +++ b/packages/core/src/renderer/components/network-ingresses/ingress-class-menu.injectable.tsx @@ -42,7 +42,8 @@ export function NonInjectedIngressClassMenu(props: IngressClassMenuProps & Depen + interactive={toolbar} + /> Set as default diff --git a/packages/core/src/renderer/components/network-ingresses/ingresses.tsx b/packages/core/src/renderer/components/network-ingresses/ingresses.tsx index ea0c59ba46..3c62bf10dd 100644 --- a/packages/core/src/renderer/components/network-ingresses/ingresses.tsx +++ b/packages/core/src/renderer/components/network-ingresses/ingresses.tsx @@ -93,7 +93,8 @@ const NonInjectedIngresses = observer((props: Dependencies) => { return lines * lineHeight + paddings; }, - } } /> + } } + /> ); }); diff --git a/packages/core/src/renderer/components/resource-metrics/resource-metrics.tsx b/packages/core/src/renderer/components/resource-metrics/resource-metrics.tsx index acac2e0cc3..69fe7d09bd 100644 --- a/packages/core/src/renderer/components/resource-metrics/resource-metrics.tsx +++ b/packages/core/src/renderer/components/resource-metrics/resource-metrics.tsx @@ -61,7 +61,8 @@ export const ResourceMetrics = observer(({ key={index} className="box grow" label={tab} - value={tab} /> + value={tab} + /> ))} diff --git a/packages/core/src/renderer/components/status-bar/status-bar.tsx b/packages/core/src/renderer/components/status-bar/status-bar.tsx index 300ea3e220..0f1d84eb4f 100644 --- a/packages/core/src/renderer/components/status-bar/status-bar.tsx +++ b/packages/core/src/renderer/components/status-bar/status-bar.tsx @@ -38,7 +38,8 @@ const NonInjectedStatusBar = observer((props: Dependencies) => {
+ data-origin={Item.origin} + > {}
))} @@ -48,7 +49,8 @@ const NonInjectedStatusBar = observer((props: Dependencies) => {
+ data-origin={Item.origin} + > {}
))} diff --git a/packages/core/src/renderer/components/workloads-deployments/deployment-details.tsx b/packages/core/src/renderer/components/workloads-deployments/deployment-details.tsx index f5894c686c..d9253c88b2 100644 --- a/packages/core/src/renderer/components/workloads-deployments/deployment-details.tsx +++ b/packages/core/src/renderer/components/workloads-deployments/deployment-details.tsx @@ -104,7 +104,8 @@ class NonInjectedDeploymentDetails extends React.Component"}`}

- )} /> + )} + /> )) } diff --git a/packages/core/src/renderer/components/workloads-pods/columns/pods-node-column.injectable.tsx b/packages/core/src/renderer/components/workloads-pods/columns/pods-node-column.injectable.tsx index 6a18559f76..e602bff214 100644 --- a/packages/core/src/renderer/components/workloads-pods/columns/pods-node-column.injectable.tsx +++ b/packages/core/src/renderer/components/workloads-pods/columns/pods-node-column.injectable.tsx @@ -35,7 +35,8 @@ export const podsNodeColumnInjectable = getInjectable({ > + onClick={stopPropagation} + > {pod.getNodeName()} diff --git a/packages/core/src/renderer/components/workloads-pods/details/volumes/variants/container-storage-interface.tsx b/packages/core/src/renderer/components/workloads-pods/details/volumes/variants/container-storage-interface.tsx index 2c3f2b4bfb..5f43ff2d90 100644 --- a/packages/core/src/renderer/components/workloads-pods/details/volumes/variants/container-storage-interface.tsx +++ b/packages/core/src/renderer/components/workloads-pods/details/volumes/variants/container-storage-interface.tsx @@ -46,22 +46,26 @@ const NonInjectedContainerStorageInterface = (props: PodVolumeVariantSpecificPro pod={pod} title="Controller Publish Secret" kubeRef={controllerPublishSecretRef} - api={secretApi} /> + api={secretApi} + /> + api={secretApi} + /> + api={secretApi} + /> + api={secretApi} + /> {Object.entries(volumeAttributes) .map(([key, value]) => ( diff --git a/packages/core/src/renderer/components/workloads-pods/pod-details-container.tsx b/packages/core/src/renderer/components/workloads-pods/pod-details-container.tsx index 230c4ee1c0..54cdc8fb40 100644 --- a/packages/core/src/renderer/components/workloads-pods/pod-details-container.tsx +++ b/packages/core/src/renderer/components/workloads-pods/pod-details-container.tsx @@ -108,7 +108,8 @@ class NonInjectedPodDetailsContainer extends React.Component + pod={pod} + /> ))} )} diff --git a/packages/core/src/renderer/components/workloads-replication-controllers/replication-controllers.tsx b/packages/core/src/renderer/components/workloads-replication-controllers/replication-controllers.tsx index ea979d0d2a..e63b81bf99 100644 --- a/packages/core/src/renderer/components/workloads-replication-controllers/replication-controllers.tsx +++ b/packages/core/src/renderer/components/workloads-replication-controllers/replication-controllers.tsx @@ -71,7 +71,8 @@ const NonInjectedReplicationControllers = observer((props: Dependencies) => ( item.getReplicas(), item.getDesiredReplicas(), item.getSelectorLabels().map(label => ()), - ]} /> + ]} + /> ));