Fixed lint

uyuni-project · Jan 14, 2025 · d62b39d · d62b39d
1 parent f137ab6
commit d62b39d
Show file tree

Hide file tree

Showing 13 changed files with 51 additions and 51 deletions.
diff --git a/testsuite/features/secondary/min_action_chain.feature b/testsuite/features/secondary/min_action_chain.feature
@@ -76,7 +76,7 @@ Feature: Action chains on Salt minions
     And I enter "virgo-dummy" as the filtered package name
     And I click on the filter button
     And I check "virgo-dummy" in the list
-    And I click on "Install Selected Packages"
+    And I click on "Install Packages"
     And I check radio button "schedule-by-action-chain"
     And I click on "Confirm"
     Then I should see a "Action has been successfully added to the Action Chain" text

diff --git a/web/html/src/branding/css/base/components/buttons.suma.scss b/web/html/src/branding/css/base/components/buttons.suma.scss
@@ -202,6 +202,7 @@
 }
 
 .panel-heading,
+th > a,
 th .orderBy {
   border: none;
   padding: 0;

diff --git a/web/html/src/components/buttons.tsx b/web/html/src/components/buttons.tsx
@@ -5,8 +5,6 @@ import * as React from "react";
  * @module buttons
  */
 
-type ButtonVariant = "btn-primary" | "btn-default" | "btn-tertiary" | "btn-danger";
-
 type BaseProps = {
   /** Text to display on the button. */
   text?: React.ReactNode;
@@ -27,9 +25,6 @@ type BaseProps = {
   /** If true, disable the button. */
   disabled?: boolean;
 
-  /** If true, add unstyled button style */
-  unstyled?: boolean;
-
   /**
    * Any additional css classes for the button, `"btn"` is prepended automatically
    */
@@ -174,12 +169,12 @@ export class Button extends _ButtonBase<ButtonProps> {
         onClick={this.props.handler}
         disabled={this.props.disabled}
       >
-        {(
+        {
           <>
             {this.renderIcon()}
             {text}
           </>
-        )}
+        }
       </button>
     );
   }
@@ -202,18 +197,17 @@ type LinkProps = BaseProps & {
 export class LinkButton extends _ButtonBase<LinkProps> {
   render() {
     const text = this.props.text ?? this.props.children;
-    const cssClasses = this.props.unstyled
-      ? "btn-tertiary " + (this.props.className ?? "")
-      : "btn " + this.props.className;
+    const cssClasses = "btn " + (this.props.className ?? "btn-default");
+
     const targetProps: Partial<React.HTMLProps<HTMLAnchorElement>> =
       this.props.target === "_blank"
         ? {
-          target: "_blank",
-          rel: "noopener noreferrer",
-        }
+            target: "_blank",
+            rel: "noopener noreferrer",
+          }
         : {
-          target: this.props.target,
-        };
+            target: this.props.target,
+          };
     return (
       <a
         role="button"
@@ -224,14 +218,12 @@ export class LinkButton extends _ButtonBase<LinkProps> {
         onClick={this.props.handler}
         {...targetProps}
       >
-        {this.props.unstyled ? (
-          <>{this.renderIcon()}</>
-        ) : (
+        {
           <>
             {this.renderIcon()}
             {text}
           </>
-        )}
+        }
       </a>
     );
   }

diff --git a/web/html/src/components/dialog/ModalLink.tsx b/web/html/src/components/dialog/ModalLink.tsx
@@ -1,7 +1,8 @@
 import * as React from "react";
 
-import { showDialog } from "./util";
 import { Button } from "components/buttons";
+
+import { showDialog } from "./util";
 type Props = {
   target: string;
   id?: string;
@@ -19,9 +20,6 @@ type Props = {
  * Link to launch a modal dialog
  */
 export function ModalLink(props: Props) {
-  const margin = props.text ? "" : " no-margin";
-  var icon = props.icon && <i className={"fa " + props.icon + margin} />;
-
   return (
     <Button
       id={props.id}

diff --git a/web/html/src/components/table/Header.tsx b/web/html/src/components/table/Header.tsx
@@ -41,12 +41,9 @@ export function Header(props: HeaderProps) {
 
     return (
       <th style={thStyle} className={thClass}>
-        <a
-          className="orderBy"
-          onClick={() => props.onSortChange?.(props.columnKey || null, newDirection)}
-        >
+        <button className="orderBy" onClick={() => props.onSortChange?.(props.columnKey || null, newDirection)}>
           {props.children}
-        </a>
+        </button>
       </th>
     );
   }

diff --git a/web/html/src/components/table/SearchPanel.tsx b/web/html/src/components/table/SearchPanel.tsx
@@ -1,9 +1,9 @@
 import * as React from "react";
 
+import { Button } from "components/buttons";
 import { cloneReactElement } from "components/utils";
 
 import styles from "./SearchPanel.module.scss";
-import { Button } from "components/buttons";
 
 type SearchPanelProps = {
   /** number representing the number of the first displayed item */
@@ -67,9 +67,7 @@ export function SearchPanel(props: SearchPanelProps) {
             &nbsp;/&nbsp;
           </span>
         )}
-        {props.selectable && (
-          <Button className="btn-tertiary" handler={props.onSelectAll} text={t("Select All")} />
-        )}
+        {props.selectable && <Button className="btn-tertiary" handler={props.onSelectAll} text={t("Select All")} />}
       </div>
     </div>
   );

diff --git a/web/html/src/core/spa/spa-engine.tsx b/web/html/src/core/spa/spa-engine.tsx
@@ -7,8 +7,8 @@ import App, { HtmlScreen } from "senna";
 
 import SpaRenderer from "core/spa/spa-renderer";
 
-import { showErrorToastr } from "components/toastr";
 import { Button } from "components/buttons";
+import { showErrorToastr } from "components/toastr";
 
 function isLoginPage(pathName) {
   const allLoginPossiblePaths = ["/", "/rhn/manager/login"];
@@ -102,7 +102,11 @@ window.pageRenderers.spaengine.init = function init(timeout?: number) {
           const message = (
             <>
               Request has timed out, please
-              <Button className="btn-tertiary" text="reload the page" handler={() => (window.location = navigation.path)} />
+              <Button
+                className="btn-tertiary"
+                text="reload the page"
+                handler={() => (window.location = navigation.path)}
+              />
             </>
           );
           showErrorToastr(message, { autoHide: false, containerId: "global" });

diff --git a/web/html/src/manager/admin/setup/products/products.tsx b/web/html/src/manager/admin/setup/products/products.tsx
@@ -336,8 +336,8 @@ class ProductsPageWrapper extends React.Component {
       const submitButtonTitle = this.state.sccSyncRunning
         ? t("The product catalog is still refreshing, please wait.")
         : this.state.selectedItems.length === 0
-          ? t("Select some product first.")
-          : undefined;
+        ? t("Select some product first.")
+        : undefined;
       const addProductButton =
         this.state.sccSyncRunning || this.state.selectedItems.length === 0 || this.state.addingProducts ? (
           <Button

diff --git a/web/html/src/manager/appstreams/channel-appstreams.tsx b/web/html/src/manager/appstreams/channel-appstreams.tsx
@@ -1,6 +1,7 @@
+import { Button } from "components/buttons";
+
 import { AppStreamModule, Channel } from "./appstreams.type";
 import { getStreamName } from "./utils";
-import { Button } from "components/buttons";
 
 interface Props {
   channel: Channel;

diff --git a/web/html/src/manager/content-management/list-filters/appstreams/appstreams.tsx b/web/html/src/manager/content-management/list-filters/appstreams/appstreams.tsx
@@ -1,13 +1,13 @@
 import * as React from "react";
 import { useState } from "react";
 
+import { Button } from "components/buttons";
 import { showErrorToastr } from "components/toastr/toastr";
 
 import Network from "utils/network";
 
 import SelectInput from "./select-input";
 import TextInput from "./text-input";
-import { Button } from "components/buttons";
 
 export default function AppStreams({ matcher }) {
   const [channels, setChannels] = useState<{ id: string; name: string }[]>([]);
@@ -36,7 +36,8 @@ export default function AppStreams({ matcher }) {
               className="btn-tertiary"
               handler={enableBrowse}
               icon={isLoading ? "fa-refresh fa-spin fa-fw" : "fa-search fa-fw"}
-              text="Browse available modules" />
+              text="Browse available modules"
+            />
           </div>
         </div>
         <TextInput />

diff --git a/web/html/src/manager/content-management/list-filters/filter-form.tsx b/web/html/src/manager/content-management/list-filters/filter-form.tsx
@@ -1,6 +1,7 @@
 import * as React from "react";
 import { useEffect, useState } from "react";
 
+import { Button } from "components/buttons";
 import { DateTime, Form, Radio, Select, Text } from "components/input";
 
 import { localizedMoment } from "utils";
@@ -10,7 +11,6 @@ import { clmFilterOptions, findClmFilterByKey, getClmFiltersOptions } from "../s
 import { FilterFormType } from "../shared/type/filter.type";
 import AppStreamsForm from "./appstreams/appstreams";
 import TemplatesForm from "./templates";
-import { Button } from "components/buttons";
 
 enum FilterBy {
   Type = "Type",
@@ -101,10 +101,19 @@ const FilterForm = (props: Props) => {
           <div className="row form-group">
             <div className="col-md-6 col-md-offset-3 offset-md-3">
               {filterBy === FilterBy.Type ? (
-                <Button className="btn-tertiary" handler={() => setFilterBy(FilterBy.Template)} icon="fa-file-text-o" text={t("Use a template")} />
+                <Button
+                  className="btn-tertiary"
+                  handler={() => setFilterBy(FilterBy.Template)}
+                  icon="fa-file-text-o"
+                  text={t("Use a template")}
+                />
               ) : (
-                <Button className="btn-tertiary" handler={() => setFilterBy(FilterBy.Type)}
-                  icon="fa-filter" text={t("Use a manual filter")} />
+                <Button
+                  className="btn-tertiary"
+                  handler={() => setFilterBy(FilterBy.Type)}
+                  icon="fa-filter"
+                  text={t("Use a manual filter")}
+                />
               )}
             </div>
           </div>
@@ -311,7 +320,7 @@ const FilterForm = (props: Props) => {
 
         {filterBy === FilterBy.Template ? <TemplatesForm {...props} /> : null}
       </React.Fragment>
-    </Form >
+    </Form>
   );
 };
 

diff --git a/web/html/src/manager/images/image-build.tsx b/web/html/src/manager/images/image-build.tsx
@@ -252,8 +252,7 @@ class BuildImage extends React.Component<Props, State> {
                     "?url_bounce=" +
                     this.getBounceUrl()
                   }
-                  className="pull-right"
-                  unstyled
+                  className="btn-tertiary pull-right"
                 />
               )}
             </div>

diff --git a/web/html/src/manager/minion/ansible/accordion-path-content.tsx b/web/html/src/manager/minion/ansible/accordion-path-content.tsx
@@ -228,10 +228,10 @@ class AccordionPathContent extends React.Component<PropsType, StateType> {
               {this.state.errors.length > 0
                 ? errors
                 : this.isPlaybookContent(this.state.content)
-                  ? this.renderPlaybookPathContent(this.state.content)
-                  : this.isInventoryContent(this.state.content)
-                    ? this.renderInventoryPathContent(this.state.content)
-                    : null}
+                ? this.renderPlaybookPathContent(this.state.content)
+                : this.isInventoryContent(this.state.content)
+                ? this.renderInventoryPathContent(this.state.content)
+                : null}
             </>
           ) : null}
         </div>