chore: Turn on react/jsx-closing-bracket-location

Signed-off-by: Sebastian Malton <sebastian@malton.name>
2025-05-20 05:10:56 +00:00 · 2023-05-04 13:26:44 -04:00 · 2023-05-04 13:26:44 -04:00 · b35467fb3d
commit b35467fb3d
parent 1675c56e59
21 changed files with 53 additions and 26 deletions
--- 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",
--- 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<HelmRepo>) => (
      <Icon
        small
        material="check"
-        className="box right" />
+        className="box right"
+      />
    )}
  </div>
 );
--- 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)}
+    />
  </section>
 ));

--- 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<PreferenceItemTypes | Prefer
              <Icon
                material={value.iconName}
                smallest
-                className="mr-3" />
+                className="mr-3"
+              />
            )}
            {value.label}
          </div>
--- 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),
--- 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 &
            <MenuItem
              onClick={() => item.onClick(cluster.preferences)}
              key={item.id}
-              disabled={item.disabled?.(cluster.preferences)}>
+              disabled={item.disabled?.(cluster.preferences)}
+            >
              {item.title}
            </MenuItem>
          ),
--- 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<DockProps & Dependencies> {
      <div
        className={`tab-content ${selectedTab.kind}`}
        style={{ flexBasis: height }}
-        data-testid={`dock-tab-content-for-${selectedTab.id}`}>
+        data-testid={`dock-tab-content-for-${selectedTab.id}`}
+      >
        {this.renderTab(selectedTab)}
      </div>
    );
--- 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(
            <Icon
              material="check"
              big
-              sticker />
+              sticker
+            />
          </p>
          <p>Installation complete!</p>
          <div className="flex gaps align-center">
--- 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(({
              <MenuActions
                id={`menu-actions-for-installed-extensions-for-${id}`}
                usePortal
-                toolbar={false}>
+                toolbar={false}
+              >
                {isCompatible && (
                  <MenuItem
                    disabled={isUninstalling}
--- a/packages/core/src/renderer/components/helm-releases/release-details/release-details-content.tsx
+++ b/packages/core/src/renderer/components/helm-releases/release-details/release-details-content.tsx
@ -77,7 +77,8 @@ const NonInjectedReleaseDetailsContent = observer(({ model }: Dependencies & Rel
      <DrawerItem
        name="Status"
        className="status"
-        labelsOnly>
+        labelsOnly
+      >
        <Badge
          label={model.release.getStatus()}
          className={kebabCase(model.release.getStatus())}
--- a/packages/core/src/renderer/components/hotbar/hotbar-menu.tsx
+++ b/packages/core/src/renderer/components/hotbar/hotbar-menu.tsx
@ -127,7 +127,8 @@ const NonInjectedHotbarMenu = observer((props: Dependencies & HotbarMenuProps) =
                        className={cssNames({ isDragging: snapshot.isDragging })}
                        remove={removeItem}
                        add={addItem}
-                        size={40} />
+                        size={40}
+                      />
                    ) : (
                      <HotbarIcon
                        uid={`hotbar-icon-${item.entity.uid}`}
@ -141,7 +142,8 @@ const NonInjectedHotbarMenu = observer((props: Dependencies & HotbarMenuProps) =
                          },
                        ]}
                        disabled
-                        size={40} />
+                        size={40}
+                      />
                    )}
                  </div>
                )}
@ -159,7 +161,8 @@ const NonInjectedHotbarMenu = observer((props: Dependencies & HotbarMenuProps) =
      <div className="HotbarItems flex column gaps">
        <DragDropContext
          onDragStart={() => onDragStart()}
-          onDragEnd={(result) => onDragEnd(result)}>
+          onDragEnd={(result) => onDragEnd(result)}
+        >
          {renderGrid()}
        </DragDropContext>
      </div>
--- 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"
+        />
      </svg>
    </div>

--- 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
        <Icon
          material="star"
          tooltip="Set as default"
-          interactive={toolbar} />
+          interactive={toolbar}
+        />
        <span className="title">Set as default</span>
      </MenuItem>
    </>
--- 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;
          },
-        } } />
+        } }
+      />
    </SiblingsInTabLayout>
  );
 });
--- 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(<Keys extends string>({
              key={index}
              className="box grow"
              label={tab}
-              value={tab} />
+              value={tab}
+            />
          ))}
        </RadioGroup>
      </div>
--- 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) => {
          <div
            className={styles.item}
            key={index}
-            data-origin={Item.origin}>
+            data-origin={Item.origin}
+          >
            {<Item.component/>}
          </div>
        ))}
@ -48,7 +49,8 @@ const NonInjectedStatusBar = observer((props: Dependencies) => {
          <div
            className={styles.item}
            key={index}
-            data-origin={Item.origin}>
+            data-origin={Item.origin}
+          >
            {<Item.component/>}
          </div>
        ))}
--- 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<KubeObjectDetailsProp
                        {`Last transition time: ${lastTransitionTime ?? "<unknown>"}`}
                      </p>
                    </>
-                  )} />
+                  )}
+                />
              ))
          }
        </DrawerItem>
--- 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({
            >
              <Link
                to={getDetailsUrl(nodeApi.formatUrlForNotListing({ name: pod.getNodeName() }))}
-                onClick={stopPropagation}>
+                onClick={stopPropagation}
+              >
                {pod.getNodeName()}
              </Link>
            </Badge>
--- 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}
+      />
      <LocalRef
        pod={pod}
        title="Controller Expand Secret"
        kubeRef={controllerExpandSecretRef}
-        api={secretApi} />
+        api={secretApi}
+      />
      <LocalRef
        pod={pod}
        title="Node Publish Secret"
        kubeRef={nodePublishSecretRef}
-        api={secretApi} />
+        api={secretApi}
+      />
      <LocalRef
        pod={pod}
        title="Node Stage Secret"
        kubeRef={nodeStageSecretRef}
-        api={secretApi} />
+        api={secretApi}
+      />
      {Object.entries(volumeAttributes)
        .map(([key, value]) => (
          <DrawerItem key={key} name={key}>
--- 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<PodDetailsContainer
              <ContainerMetrics.Component
                key={ContainerMetrics.id}
                container={container}
-                pod={pod}/>
+                pod={pod}
+              />
            ))}
          </>
        )}
--- 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 => (<Badge key={label} label={label} />)),
-      ]} />
+      ]}
+    />
  </SiblingsInTabLayout>
 ));