Revert 2844 (#2980)

* Revert "review comments"

This reverts commit 97f2ecd88d.

* Revert "Switch to I, remove type parameter default"

This reverts commit a3073cc99b.

* Revert "Improve Table typing and remove annotations on callbacks"

This reverts commit defb0ea0dd.
This commit is contained in:
Sebastian Malton authored and GitHub committed 2021-06-07 12:02:15 -04:00
1 parent 97f2ecd88d
commit 60a19143b4
55 files changed
+471 -479

No files matched your search

@@ -25,6 +25,7 @@ import React from "react";
import { observer } from "mobx-react";
import type { RouteComponentProps } from "react-router-dom";
import type { IngressRouteParams } from "./ingresses.route";
import type { Ingress } from "../../api/endpoints/ingress.api";
import { ingressStore } from "./ingress.store";
import { KubeObjectListLayout } from "../kube-object";
import { KubeObjectStatusIcon } from "../kube-object-status-icon";
@@ -49,13 +50,13 @@ export class Ingresses extends React.Component<Props> {
tableId="network_ingresses"
className="Ingresses" store={ingressStore}
sortingCallbacks={{
[columnId.name]: ingress => ingress.getName(),
[columnId.namespace]: ingress => ingress.getNs(),
[columnId.age]: ingress => ingress.getTimeDiffFromNow(),
[columnId.name]: (ingress: Ingress) => ingress.getName(),
[columnId.namespace]: (ingress: Ingress) => ingress.getNs(),
[columnId.age]: (ingress: Ingress) => ingress.getTimeDiffFromNow(),
}}
searchFilters={[
ingress => ingress.getSearchFields(),
ingress => ingress.getPorts(),
(ingress: Ingress) => ingress.getSearchFields(),
(ingress: Ingress) => ingress.getPorts(),
]}
renderHeaderTitle="Ingresses"
renderTableHeader={[
@@ -66,7 +67,7 @@ export class Ingresses extends React.Component<Props> {
{ title: "Rules", className: "rules", id: columnId.rules },
{ title: "Age", className: "age", sortBy: columnId.age, id: columnId.age },
]}
renderTableContents={ingress => [
renderTableContents={(ingress: Ingress) => [
ingress.getName(),
<KubeObjectStatusIcon key="icon" object={ingress} />,
ingress.getNs(),
@@ -75,7 +76,7 @@ export class Ingresses extends React.Component<Props> {
ingress.getAge(),
]}
tableProps={{
customRowHeights: (item, lineHeight, paddings) => {
customRowHeights: (item: Ingress, lineHeight, paddings) => {
const lines = item.getRoutes().length || 1;
return lines * lineHeight + paddings;