Enable object-shorthand rule (#1500)

Signed-off-by: Panu Horsmalahti <phorsmalahti@mirantis.com>

.eslintrc.js

@@ -26,6 +26,7 @@ module.exports = {
         }],
         "no-unused-vars": "off",
         "semi": ["error", "always"],
+        "object-shorthand": "error",
       }
     },
     {
@@ -58,6 +59,7 @@ module.exports = {
         }],
         "semi": "off",
         "@typescript-eslint/semi": ["error"],
+        "object-shorthand": "error",
       },
     },
     {
@@ -90,6 +92,7 @@ module.exports = {
         }],
         "semi": "off",
         "@typescript-eslint/semi": ["error"],
+        "object-shorthand": "error",
       },
     }
   ]

src/common/cluster-store.ts

@@ -84,7 +84,7 @@ export class ClusterStore extends BaseStore<ClusterStoreModel> {
     super({
       configName: "lens-cluster-store",
       accessPropertiesByDotNotation: false, // To make dots safe in cluster context names
-      migrations: migrations,
+      migrations,
     });
 
     this.pushStateToViewsAutomatically();

src/common/user-store.ts

@@ -36,7 +36,7 @@ export class UserStore extends BaseStore<UserStoreModel> {
   private constructor() {
     super({
       // configName: "lens-user-store", // todo: migrate from default "config.json"
-      migrations: migrations,
+      migrations,
     });
 
     this.handleOnLoad();

src/extensions/lens-main-extension.ts

@@ -11,7 +11,7 @@ export class LensMainExtension extends LensExtension {
     const windowManager = WindowManager.getInstance<WindowManager>();
     const pageUrl = getExtensionPageUrl({
       extensionId: this.name,
-      pageId: pageId,
+      pageId,
       params: params ?? {}, // compile to url with params
     });
     await windowManager.navigate(pageUrl, frameId);

src/extensions/lens-renderer-extension.ts

@@ -19,7 +19,7 @@ export class LensRendererExtension extends LensExtension {
     const { navigate } = await import("../renderer/navigation");
     const pageUrl = getExtensionPageUrl({
       extensionId: this.name,
-      pageId: pageId,
+      pageId,
       params: params ?? {}, // compile to url with params
     });
     navigate(pageUrl);

src/main/cluster-detectors/cluster-id-detector.ts

@@ -13,7 +13,7 @@ export class ClusterIdDetector extends BaseClusterDetector {
       id = this.cluster.apiUrl;
     }
     const value = createHash("sha256").update(id).digest("hex");
-    return { value: value, accuracy: 100 };
+    return { value, accuracy: 100 };
   }
 
   protected async getDefaultNamespaceId() {

src/main/context-handler.ts

@@ -91,7 +91,7 @@ export class ContextHandler {
     return {
       target: proxyUrl,
       changeOrigin: true,
-      timeout: timeout,
+      timeout,
       headers: {
         "Host": this.clusterUrl.hostname,
       },

src/main/helm/helm-cli.ts

@@ -8,7 +8,7 @@ export class HelmCli extends LensBinary {
   public constructor(baseDir: string, version: string) {
     const opts: LensBinaryOpts = {
       version,
-      baseDir: baseDir,
+      baseDir,
       originalBinaryName: "helm",
       newBinaryName: "helm3"
     };

src/main/helm/helm-release-manager.ts

@@ -40,7 +40,7 @@ export class HelmReleaseManager {
         log: stdout,
         release: {
           name: releaseName,
-          namespace: namespace
+          namespace
         }
       };
     } finally {

src/main/router.ts

@@ -67,15 +67,15 @@ export class Router {
       output: "data",
     });
     return {
-      cluster: cluster,
+      cluster,
       path: url.pathname,
       raw: {
-        req: req,
+        req,
       },
       response: res,
       query: url.searchParams,
-      payload: payload,
-      params: params
+      payload,
+      params
     };
   }
 

src/main/routes/port-forward-route.ts

@@ -78,16 +78,16 @@ class PortForwardRoute extends LensApi {
 
     let portForward = PortForward.getPortforward({
       clusterId: cluster.id, kind: resourceType, name: resourceName,
-      namespace: namespace, port: port
+      namespace, port
     });
     if (!portForward) {
       logger.info(`Creating a new port-forward ${namespace}/${resourceType}/${resourceName}:${port}`);
       portForward = new PortForward({
         clusterId: cluster.id,
         kind: resourceType,
-        namespace: namespace,
+        namespace,
         name: resourceName,
-        port: port,
+        port,
         kubeConfig: cluster.getProxyKubeconfigPath()
       });
       const started = await portForward.start();

src/main/shell-session.ts

@@ -47,7 +47,7 @@ export class ShellSession extends EventEmitter {
     this.shellProcess = pty.spawn(shell, args, {
       cols: 80,
       cwd: this.cwd() || env.HOME,
-      env: env,
+      env,
       name: "xterm-256color",
       rows: 30,
     });

src/main/window-manager.ts

@@ -124,7 +124,7 @@ export class WindowManager extends Singleton {
     await this.ensureMainWindow();
     this.sendToView({
       channel: "renderer:navigate",
-      frameId: frameId,
+      frameId,
       data: [url],
     });
   }

src/migrations/cluster-store/2.6.0-beta.3.ts

@@ -26,7 +26,7 @@ export default migration({
           user["auth-provider"].config = authConfig;
           kubeConfig.users = [{
             name: userObj.name,
-            user: user
+            user
           }];
           cluster.kubeConfig = yaml.safeDump(kubeConfig);
           store.set(clusterKey, cluster);

src/renderer/api/endpoints/cluster.api.ts

@@ -8,7 +8,7 @@ export class ClusterApi extends KubeApi<Cluster> {
 
   async getMetrics(nodeNames: string[], params?: IMetricsReqParams): Promise<IClusterMetrics> {
     const nodes = nodeNames.join("|");
-    const opts = { category: "cluster", nodes: nodes };
+    const opts = { category: "cluster", nodes };
 
     return metricsApi.getMetrics({
       memoryUsage: opts,

src/renderer/api/endpoints/deployment.api.ts

@@ -20,7 +20,7 @@ export class DeploymentApi extends KubeApi<Deployment> {
       data: {
         metadata: params,
         spec: {
-          replicas: replicas
+          replicas
         }
       }
     });

src/renderer/api/endpoints/helm-releases.api.ts

@@ -119,7 +119,7 @@ export const helmReleasesApi = {
     const path = endpoint({ name, namespace }) + "/rollback";
     return apiBase.put(path, {
       data: {
-        revision: revision
+        revision
       }
     });
   }

src/renderer/api/json-api.ts

@@ -84,8 +84,8 @@ export class JsonApi<D = JsonApiData, P extends JsonApiParams = JsonApiParams> {
     }
     const infoLog: JsonApiLog = {
       method: reqInit.method.toUpperCase(),
-      reqUrl: reqUrl,
-      reqInit: reqInit,
+      reqUrl,
+      reqInit,
     };
     return cancelableFetch(reqUrl, reqInit).then(res => {
       return this.parseResponse<D>(res, infoLog);

src/renderer/api/kube-api.ts

@@ -73,7 +73,7 @@ export function forCluster<T extends KubeObject>(cluster: IKubeApiCluster, kubeC
   });
   return new KubeApi({
     objectConstructor: kubeClass,
-    request: request
+    request
   });
 }
 
@@ -228,7 +228,7 @@ export class KubeApi<T extends KubeObject = any> {
       apiVersion: this.apiVersionWithGroup,
       resource: this.apiResource,
       namespace: this.isNamespaced ? namespace : undefined,
-      name: name,
+      name,
     });
     return resourcePath + (query ? `?` + stringify(this.normalizeQuery(query)) : "");
   }
@@ -256,7 +256,7 @@ export class KubeApi<T extends KubeObject = any> {
       this.setResourceVersion("", metadata.resourceVersion);
       return items.map(item => new KubeObjectConstructor({
         kind: this.kind,
-        apiVersion: apiVersion,
+        apiVersion,
         ...item,
       }));
     }

src/renderer/components/+add-cluster/add-cluster.tsx

@@ -152,7 +152,7 @@ export class AddCluster extends React.Component {
           : ClusterStore.embedCustomKubeConfig(clusterId, kubeConfig); // save in app-files folder
         return {
           id: clusterId,
-          kubeConfigPath: kubeConfigPath,
+          kubeConfigPath,
           workspace: workspaceStore.currentWorkspaceId,
           contextName: kubeConfig.currentContext,
           preferences: {

src/renderer/components/+apps-helm-charts/helm-chart.store.ts

@@ -36,7 +36,7 @@ export class HelmChartStore extends ItemStore<HelmChart> {
     const loadVersions = (repo: string) => {
       return helmChartsApi.get(repo, chartName).then(({ versions }) => {
         return versions.map(chart => ({
-          repo: repo,
+          repo,
           version: chart.getVersion()
         }));
       });

src/renderer/components/+cluster/cluster-metrics.tsx

@@ -27,7 +27,7 @@ export const ClusterMetrics = observer(() => {
     id: metricType + metricNodeRole,
     label: metricType.toUpperCase() + " usage",
     borderColor: colors[metricType],
-    data: data
+    data
   }];
   const cpuOptions: ChartOptions = {
     scales: {

src/renderer/components/+config-secrets/add-secret-dialog.tsx

@@ -92,11 +92,11 @@ export class AddSecretDialog extends React.Component<Props> {
     const { name, namespace, type } = this;
     const { data = [], labels = [], annotations = [] } = this.secret[type];
     const secret: Partial<Secret> = {
-      type: type,
+      type,
       data: this.getDataFromFields(data, val => val ? base64.encode(val) : ""),
       metadata: {
-        name: name,
-        namespace: namespace,
+        name,
+        namespace,
         annotations: this.getDataFromFields(annotations),
         labels: this.getDataFromFields(labels),
       } as IKubeObjectMetadata

src/renderer/components/+namespaces/namespace.store.ts

@@ -60,7 +60,7 @@ export class NamespaceStore extends KubeObjectStore<Namespace> {
       kind: "Namespace",
       apiVersion: "v1",
       metadata: {
-        name: name,
+        name,
         uid: "",
         resourceVersion: "",
         selfLink: `/api/v1/namespaces/${name}`

src/renderer/components/+user-management-roles-bindings/add-role-binding-dialog.tsx

@@ -137,7 +137,7 @@ export class AddRoleBindingDialog extends React.Component<Props> {
       else {
         const name = useRoleForBindingName ? selectedRole.getName() : bindingName;
         roleBinding = await roleBindingsStore.create({ name, namespace }, {
-          subjects: subjects,
+          subjects,
           roleRef: {
             name: selectedRole.getName(),
             kind: selectedRole.kind,

src/renderer/components/+user-management-service-accounts/service-accounts-details.tsx

@@ -88,7 +88,7 @@ export class ServiceAccountsDetails extends React.Component<Props> {
       apiVersion: "v1",
       kind: "Secret",
       metadata: {
-        name: name,
+        name,
         uid: null,
         selfLink: null,
         resourceVersion: null

src/renderer/components/app.tsx

@@ -59,7 +59,7 @@ export class App extends React.Component {
       name: "cluster",
       action: "open",
       params: {
-        clusterId: clusterId
+        clusterId
       }
     });
     window.addEventListener("online", () => {

src/renderer/components/checkbox/checkbox.tsx

@@ -30,7 +30,7 @@ export class Checkbox extends React.PureComponent<CheckboxProps> {
   render() {
     const { label, inline, className, value, theme, children, ...inputProps } = this.props;
     const componentClass = cssNames('Checkbox flex', className, {
-      inline: inline,
+      inline,
       checked: value,
       disabled: this.props.disabled,
       ["theme-" + theme]: theme,

src/renderer/components/dock/edit-resource.tsx

@@ -55,7 +55,7 @@ export class EditResource extends React.Component<Props> {
     }
     editResourceStore.setData(this.tabId, {
       ...this.tabData,
-      draft: draft,
+      draft,
     });
   }
 

src/renderer/components/input/file-input.tsx

@@ -38,7 +38,7 @@ export class FileInput extends React.Component<Props> {
           const reader = new FileReader();
           reader.onloadend = () => {
             resolve({
-              file: file,
+              file,
               data: reader.result,
               error: reader.error ? String(reader.error) : null,
             });

src/renderer/components/input/input.tsx

@@ -149,7 +149,7 @@ export class Input extends React.Component<InputProps, State> {
     this.setState({
       validating: false,
       valid: !errors.length,
-      errors: errors,
+      errors,
     });
   }
 
@@ -273,11 +273,11 @@ export class Input extends React.Component<InputProps, State> {
 
     const className = cssNames("Input", this.props.className, {
       [`theme ${theme}`]: theme,
-      focused: focused,
-      disabled: disabled,
+      focused,
+      disabled,
       invalid: !valid,
-      dirty: dirty,
-      validating: validating,
+      dirty,
+      validating,
       validatingLine: validating && showValidationLine,
     });
 

src/renderer/components/menu/menu-actions.tsx

@@ -81,7 +81,7 @@ export class MenuActions extends React.Component<MenuActionsProps> {
       ...menuProps
     } = this.props;
     const menuClassName = cssNames("MenuActions flex", className, {
-      toolbar: toolbar,
+      toolbar,
       gaps: toolbar, // add spacing for .flex
     });
     const autoClose = !toolbar;

src/renderer/components/notifications/notifications.tsx

@@ -15,7 +15,7 @@ export class Notifications extends React.Component {
 
   static ok(message: NotificationMessage) {
     notificationsStore.add({
-      message: message,
+      message,
       timeout: 2500,
       status: NotificationStatus.OK
     });
@@ -23,7 +23,7 @@ export class Notifications extends React.Component {
 
   static error(message: NotificationMessage) {
     notificationsStore.add({
-      message: message,
+      message,
       timeout: 10000,
       status: NotificationStatus.ERROR
     });
@@ -33,7 +33,7 @@ export class Notifications extends React.Component {
     return notificationsStore.add({
       status: NotificationStatus.INFO,
       timeout: 0,
-      message: message,
+      message,
       ...customOpts,
     });
   }

src/renderer/components/radio/radio.tsx

@@ -24,10 +24,10 @@ export class RadioGroup extends React.Component<RadioGroupProps, {}> {
       <div className={className}>
         {radios.map(radio => {
           return React.cloneElement(radio, {
-            name: name,
+            name,
             disabled: disabled !== undefined ? disabled : radio.props.disabled,
             checked: radio.props.value === value,
-            onChange: onChange
+            onChange
           } as any);
         })}
       </div>
@@ -66,7 +66,7 @@ export class Radio extends React.Component<RadioProps> {
   render() {
     const { className, label, checked, children, ...inputProps } = this.props;
     const componentClass = cssNames('Radio flex align-center', className, {
-      checked: checked,
+      checked,
       disabled: this.props.disabled,
     });
     return (

src/renderer/components/table/table-cell.tsx

@@ -60,7 +60,7 @@ export class TableCell extends React.Component<TableCellProps> {
   render() {
     const { className, checkbox, isChecked, sortBy, _sort, _sorting, _nowrap, children, title, renderBoolean: displayBoolean, ...cellProps } = this.props;
     const classNames = cssNames("TableCell", className, {
-      checkbox: checkbox,
+      checkbox,
       nowrap: _nowrap,
       sorting: this.isSortable,
     });

src/renderer/components/table/table.tsx

@@ -82,7 +82,7 @@ export class Table extends React.Component<TableProps> {
               typeof elem.props.children === "string" ? elem.props.children : undefined
             );
             return React.cloneElement(elem, {
-              title: title,
+              title,
               _sort: this.sort,
               _sorting: this.sortParams,
               _nowrap: headElem.props.nowrap,

src/renderer/components/tabs/tabs.tsx

@@ -32,10 +32,10 @@ export class Tabs extends React.PureComponent<TabsProps> {
   render() {
     const { center, wrap, onChange, value, autoFocus, scrollable = true, withBorder, ...elemProps } = this.props;
     const className = cssNames("Tabs", this.props.className, {
-      center: center,
-      wrap: wrap,
-      scrollable: scrollable,
-      withBorder: withBorder,
+      center,
+      wrap,
+      scrollable,
+      withBorder,
     });
     return (
       <TabsContext.Provider value={{ autoFocus, value, onChange }}>
@@ -120,7 +120,7 @@ export class Tab extends React.PureComponent<TabProps> {
     let { className } = this.props;
     className = cssNames("Tab flex gaps align-center", className, {
       "active": this.isActive,
-      "disabled": disabled,
+      disabled,
     });
     return (
       <div

src/renderer/components/tooltip/tooltip.tsx

@@ -180,8 +180,8 @@ export class Tooltip extends React.Component<TooltipProps> {
         break;
     }
     return {
-      left: left,
-      top: top,
+      left,
+      top,
       right: left + tooltipBounds.width,
       bottom: top + tooltipBounds.height,
     };

src/renderer/kube-object.store.ts

@@ -146,7 +146,7 @@ export abstract class KubeObjectStore<T extends KubeObject = any> extends ItemSt
 
   protected bindWatchEventsUpdater(delay = 1000) {
     return reaction(() => this.eventsBuffer.toJS()[0], this.updateFromEventsBuffer, {
-      delay: delay
+      delay
     });
   }
 

src/renderer/navigation.ts

@@ -67,7 +67,7 @@ export function getSelectedDetails() {
 export function getDetailsUrl(details: string) {
   if (!details) return "";
   return getQueryString({
-    details: details,
+    details,
     selected: getSelectedDetails(),
   });
 }

src/renderer/utils/downloadFile.ts

@@ -1,5 +1,5 @@
 export function downloadFile(filename: string, contents: any, type: string) {
-  const data = new Blob([contents], { type: type });
+  const data = new Blob([contents], { type });
   const url = URL.createObjectURL(data);
   const link = document.createElement("a");
   link.href = url;

src/renderer/utils/interval.ts

@@ -7,19 +7,19 @@ export function interval(timeSec = 1, callback: IntervalCallback, autoRun = fals
   let timer = -1;
   let isRunning = false;
   const intervalManager = {
-    start: function (runImmediately = false) {
+    start (runImmediately = false) {
       if (isRunning) return;
       const tick = () => callback(++count);
       isRunning = true;
       timer = window.setInterval(tick, 1000 * timeSec);
       if (runImmediately) tick();
     },
-    stop: function () {
+    stop () {
       count = 0;
       isRunning = false;
       clearInterval(timer);
     },
-    restart: function (runImmediately = false) {
+    restart (runImmediately = false) {
       this.stop();
       this.start(runImmediately);
     },