diff --git a/pkg/apps/application-list.jsx b/pkg/apps/application-list.jsx index f31d28eb776f..d0323e70bbf7 100644 --- a/pkg/apps/application-list.jsx +++ b/pkg/apps/application-list.jsx @@ -28,10 +28,10 @@ import { Page, PageSection, PageSectionVariants } from "@patternfly/react-core/d import { RebootingIcon } from "@patternfly/react-icons"; import * as PackageKit from "./packagekit.js"; -import { read_os_release } from "os-release.js"; +import { read_os_release } from "os-release"; import { icon_url, show_error, launch, ProgressBar, CancelButton } from "./utils.jsx"; import { ActionButton } from "./application.jsx"; -import { EmptyStatePanel } from "cockpit-components-empty-state.jsx"; +import { EmptyStatePanel } from "cockpit-components-empty-state"; const _ = cockpit.gettext; diff --git a/pkg/apps/apps.jsx b/pkg/apps/apps.jsx index 565163a853e1..f2d4e24eed21 100644 --- a/pkg/apps/apps.jsx +++ b/pkg/apps/apps.jsx @@ -26,7 +26,7 @@ import cockpit from "cockpit"; import React, { useState } from "react"; import { createRoot } from 'react-dom/client'; -import { EmptyStatePanel } from "cockpit-components-empty-state.jsx"; +import { EmptyStatePanel } from "cockpit-components-empty-state"; import { ApplicationList } from "./application-list.jsx"; import { Application } from "./application.jsx"; import { get_metainfo_db } from "./appstream.js"; diff --git a/pkg/apps/appstream.js b/pkg/apps/appstream.js index ad023208d935..1718a7ed2fd9 100644 --- a/pkg/apps/appstream.js +++ b/pkg/apps/appstream.js @@ -18,8 +18,8 @@ */ import cockpit from "cockpit"; -import * as python from "python.js"; -import inotify_py from "inotify.py"; +import * as python from "python"; +import inotify_py from "../lib/inotify.py"; import watch_appstream_py from "./watch-appstream.py"; let metainfo_db = null; diff --git a/pkg/apps/packagekit.js b/pkg/apps/packagekit.js index 059233c88456..ac06381abd4c 100644 --- a/pkg/apps/packagekit.js +++ b/pkg/apps/packagekit.js @@ -18,7 +18,7 @@ */ import cockpit from "cockpit"; -import * as PK from "packagekit.js"; +import * as PK from "packagekit"; class ProgressReporter { constructor(base, range, callback) { diff --git a/pkg/apps/utils.jsx b/pkg/apps/utils.jsx index 0a3266a6b733..fdf9eb62b8f0 100644 --- a/pkg/apps/utils.jsx +++ b/pkg/apps/utils.jsx @@ -23,7 +23,7 @@ import { Button } from "@patternfly/react-core/dist/esm/components/Button/index. import { Progress } from "@patternfly/react-core/dist/esm/components/Progress/index.js"; import { Split, SplitItem } from "@patternfly/react-core/dist/esm/layouts/Split/index.js"; import { Spinner } from "@patternfly/react-core/dist/esm/components/Spinner/index.js"; -import { show_modal_dialog } from "cockpit-components-dialog.jsx"; +import { show_modal_dialog } from "cockpit-components-dialog"; const _ = cockpit.gettext; diff --git a/pkg/kdump/kdump-view.jsx b/pkg/kdump/kdump-view.jsx index 6c70c323f401..5999730d3085 100644 --- a/pkg/kdump/kdump-view.jsx +++ b/pkg/kdump/kdump-view.jsx @@ -40,9 +40,9 @@ import { Title } from "@patternfly/react-core/dist/esm/components/Title/index.js import { Tooltip, TooltipPosition } from "@patternfly/react-core/dist/esm/components/Tooltip/index.js"; import { OutlinedQuestionCircleIcon } from "@patternfly/react-icons"; -import { useDialogs, DialogsContext } from "dialogs.jsx"; -import { show_modal_dialog } from "cockpit-components-dialog.jsx"; -import { ModalError } from 'cockpit-components-inline-notification.jsx'; +import { useDialogs, DialogsContext } from "dialogs"; +import { show_modal_dialog } from "cockpit-components-dialog"; +import { ModalError } from 'cockpit-components-inline-notification'; const _ = cockpit.gettext; diff --git a/pkg/kdump/kdump.js b/pkg/kdump/kdump.js index a19421cc0cf7..13719fb145fb 100644 --- a/pkg/kdump/kdump.js +++ b/pkg/kdump/kdump.js @@ -29,7 +29,7 @@ import { createRoot } from "react-dom/client"; import { KdumpPage } from "./kdump-view.jsx"; import * as kdumpClient from "./kdump-client.js"; import { superuser } from "superuser"; -import { WithDialogs } from "dialogs.jsx"; +import { WithDialogs } from "dialogs"; import './kdump.scss'; diff --git a/pkg/lib/cockpit-components-context-menu.jsx b/pkg/lib/cockpit-components-context-menu.jsx index 3d0b32a8f273..1dcab220e763 100644 --- a/pkg/lib/cockpit-components-context-menu.jsx +++ b/pkg/lib/cockpit-components-context-menu.jsx @@ -21,7 +21,7 @@ import cockpit from "cockpit"; import React from "react"; import PropTypes from "prop-types"; -import "context-menu.css"; +import "context-menu"; const _ = cockpit.gettext; diff --git a/pkg/lib/cockpit-components-dialog.jsx b/pkg/lib/cockpit-components-dialog.jsx index 0b2c0113342a..3038803e1fa2 100644 --- a/pkg/lib/cockpit-components-dialog.jsx +++ b/pkg/lib/cockpit-components-dialog.jsx @@ -29,7 +29,7 @@ import { Spinner } from "@patternfly/react-core/dist/esm/components/Spinner/inde import { Stack, StackItem } from "@patternfly/react-core/dist/esm/layouts/Stack/index.js"; import { HelpIcon, ExternalLinkAltIcon } from '@patternfly/react-icons'; -import "cockpit-components-dialog.scss"; +import "./cockpit-components-dialog.scss"; const _ = cockpit.gettext; diff --git a/pkg/lib/cockpit-components-install-dialog.jsx b/pkg/lib/cockpit-components-install-dialog.jsx index 1b3e918653dc..cffb46344964 100644 --- a/pkg/lib/cockpit-components-install-dialog.jsx +++ b/pkg/lib/cockpit-components-install-dialog.jsx @@ -22,10 +22,10 @@ import React from "react"; import { WarningTriangleIcon } from "@patternfly/react-icons"; -import { show_modal_dialog } from "cockpit-components-dialog.jsx"; -import * as PK from "packagekit.js"; +import { show_modal_dialog } from "cockpit-components-dialog"; +import * as PK from "packagekit"; -import "cockpit-components-install-dialog.css"; +import "cockpit-components-install-dialog"; const _ = cockpit.gettext; diff --git a/pkg/lib/cockpit-components-logs-panel.jsx b/pkg/lib/cockpit-components-logs-panel.jsx index 9aa6e44392bb..73e131ce30e6 100644 --- a/pkg/lib/cockpit-components-logs-panel.jsx +++ b/pkg/lib/cockpit-components-logs-panel.jsx @@ -26,8 +26,8 @@ import { Card, CardActions, CardBody, CardHeader, CardTitle } from "@patternfly/ import { ExclamationTriangleIcon, TimesCircleIcon } from '@patternfly/react-icons'; import { journal } from "journal"; -import "journal.css"; -import "cockpit-components-logs-panel.scss"; +import "./journal.css"; +import "./cockpit-components-logs-panel.scss"; const _ = cockpit.gettext; diff --git a/pkg/lib/cockpit-components-modifications.jsx b/pkg/lib/cockpit-components-modifications.jsx index 3e902738246f..b495b6a9441c 100644 --- a/pkg/lib/cockpit-components-modifications.jsx +++ b/pkg/lib/cockpit-components-modifications.jsx @@ -29,7 +29,7 @@ import { TextArea } from "@patternfly/react-core/dist/esm/components/TextArea/in import { CheckIcon, CopyIcon, ExternalLinkAltIcon, OutlinedQuestionCircleIcon } from '@patternfly/react-icons'; import cockpit from "cockpit"; -import 'cockpit-components-modifications.css'; +import './cockpit-components-modifications.css'; const _ = cockpit.gettext; diff --git a/pkg/lib/cockpit-components-plot.jsx b/pkg/lib/cockpit-components-plot.jsx index 30424079f5c0..5e57417c99cb 100644 --- a/pkg/lib/cockpit-components-plot.jsx +++ b/pkg/lib/cockpit-components-plot.jsx @@ -20,7 +20,7 @@ import cockpit from "cockpit"; import React, { useState, useRef, useLayoutEffect } from 'react'; -import { useEvent } from "hooks.js"; +import { useEvent } from "hooks"; import { Button } from "@patternfly/react-core/dist/esm/components/Button/index.js"; import { Dropdown, DropdownItem, DropdownSeparator, DropdownToggle } from "@patternfly/react-core/dist/esm/components/Dropdown/index.js"; @@ -29,7 +29,7 @@ import { AngleLeftIcon, AngleRightIcon, SearchMinusIcon } from '@patternfly/reac import * as timeformat from "timeformat"; import '@patternfly/patternfly/patternfly-charts.scss'; -import "cockpit-components-plot.scss"; +import "cockpit-components-plot"; const _ = cockpit.gettext; diff --git a/pkg/lib/cockpit-components-shutdown.jsx b/pkg/lib/cockpit-components-shutdown.jsx index 28f04ce84a75..a03b80a8b593 100644 --- a/pkg/lib/cockpit-components-shutdown.jsx +++ b/pkg/lib/cockpit-components-shutdown.jsx @@ -30,11 +30,11 @@ import { TextArea } from "@patternfly/react-core/dist/esm/components/TextArea/in import { DatePicker } from "@patternfly/react-core/dist/esm/components/DatePicker/index.js"; import { TimePicker } from "@patternfly/react-core/dist/esm/components/TimePicker/index.js"; -import { ServerTime } from 'serverTime.js'; -import * as timeformat from "timeformat.js"; -import { DialogsContext } from "dialogs.jsx"; +import { ServerTime } from 'serverTime'; +import * as timeformat from "timeformat"; +import { DialogsContext } from "dialogs"; -import "cockpit-components-shutdown.scss"; +import "./cockpit-components-shutdown.scss"; const _ = cockpit.gettext; diff --git a/pkg/lib/cockpit-components-terminal.jsx b/pkg/lib/cockpit-components-terminal.jsx index 167533faca77..4111cf934ab6 100644 --- a/pkg/lib/cockpit-components-terminal.jsx +++ b/pkg/lib/cockpit-components-terminal.jsx @@ -24,10 +24,10 @@ import { Button } from "@patternfly/react-core/dist/esm/components/Button/index. import { Terminal as Term } from "xterm"; import { CanvasAddon } from 'xterm-addon-canvas'; -import { ContextMenu } from "cockpit-components-context-menu.jsx"; +import { ContextMenu } from "cockpit-components-context-menu"; import cockpit from "cockpit"; -import "console.css"; +import "console"; const _ = cockpit.gettext; diff --git a/pkg/lib/credentials-ssh-private-keys.sh b/pkg/lib/credentials-ssh-private-keys.sh index e6ffc8404793..2f61b63b1fc9 100644 --- a/pkg/lib/credentials-ssh-private-keys.sh +++ b/pkg/lib/credentials-ssh-private-keys.sh @@ -28,7 +28,7 @@ cd "$1" || exit 0 # After that each .pub file gets its on set of blocks for file in *.pub; do printf "\v" - cat "$file" - printf "\v%s\v" "$file" - ssh-keygen -l -f "$file" || true + cat "${file%.*}" + printf "\v%s\v" "${file%.*}" + ssh-keygen -l -f "${file%.*}" || true done diff --git a/pkg/lib/credentials.js b/pkg/lib/credentials.js index d4a12aa17d8c..4c13478d2492 100644 --- a/pkg/lib/credentials.js +++ b/pkg/lib/credentials.js @@ -19,8 +19,8 @@ import cockpit from "cockpit"; -import lister from "credentials-ssh-private-keys.sh"; -import remove_key from "credentials-ssh-remove-key.sh"; +import lister from "./credentials-ssh-private-keys.sh"; +import remove_key from "./credentials-ssh-remove-key.sh"; const _ = cockpit.gettext; diff --git a/pkg/lib/ct-card.scss b/pkg/lib/ct-card.scss index 2f0d9633d2e6..8d56db07b6e1 100644 --- a/pkg/lib/ct-card.scss +++ b/pkg/lib/ct-card.scss @@ -1,4 +1,4 @@ -@use "_global-variables.scss" as *; +@use "_global-variables" as *; /* Rely on the margin from the Card for spacing */ .ct-card.pf-c-card .table { diff --git a/pkg/lib/dialogs.jsx b/pkg/lib/dialogs.jsx index a802bdcdd9f0..917a5836ef2b 100644 --- a/pkg/lib/dialogs.jsx +++ b/pkg/lib/dialogs.jsx @@ -21,7 +21,7 @@ * * Example: * - * import { WithDialogs, useDialogs } from "dialogs.jsx"; + * import { WithDialogs, useDialogs } from "dialogs"; * * const App = () => * @@ -71,7 +71,7 @@ * A class component can declare a static context type and then use * "this.context" to find the Dialogs object: * - * import { DialogsContext } from "dialogs.jsx"; + * import { DialogsContext } from "dialogs"; * * class ExampleButton extends React.Component { * static contextType = DialogsContext; diff --git a/pkg/lib/serverTime.js b/pkg/lib/serverTime.js index 2dac4edc625f..2d8df9891740 100644 --- a/pkg/lib/serverTime.js +++ b/pkg/lib/serverTime.js @@ -28,17 +28,17 @@ import { Spinner } from "@patternfly/react-core/dist/esm/components/Spinner/inde import { TimePicker } from "@patternfly/react-core/dist/esm/components/TimePicker/index.js"; import { TextInput } from "@patternfly/react-core/dist/esm/components/TextInput/index.js"; import { CloseIcon, ExclamationCircleIcon, InfoCircleIcon, PlusIcon } from "@patternfly/react-icons"; -import { show_modal_dialog } from "cockpit-components-dialog.jsx"; -import { useObject, useEvent } from "hooks.js"; +import { show_modal_dialog } from "cockpit-components-dialog"; +import { useObject, useEvent } from "hooks"; -import * as service from "service.js"; -import * as timeformat from "timeformat.js"; -import * as python from "python.js"; +import * as service from "service"; +import * as timeformat from "timeformat"; +import * as python from "python"; import get_timesync_backend_py from "./get-timesync-backend.py"; -import { superuser } from "superuser.js"; +import { superuser } from "superuser"; -import "serverTime.scss"; +import "serverTime"; const _ = cockpit.gettext; diff --git a/pkg/metrics/metrics.jsx b/pkg/metrics/metrics.jsx index 97f2fe583927..c3859023197f 100644 --- a/pkg/metrics/metrics.jsx +++ b/pkg/metrics/metrics.jsx @@ -44,22 +44,21 @@ import { import cockpit from 'cockpit'; import * as machine_info from "../lib/machine-info.js"; -import * as packagekit from "packagekit.js"; +import * as packagekit from "packagekit"; import * as service from "service"; import * as timeformat from "timeformat"; import { superuser } from "superuser"; import { journal } from "journal"; -import { useObject, useEvent, useInit } from "hooks.js"; -import { WithDialogs, useDialogs } from "dialogs.jsx"; +import { useObject, useEvent, useInit } from "hooks"; +import { WithDialogs, useDialogs } from "dialogs"; -import { EmptyStatePanel } from "../lib/cockpit-components-empty-state.jsx"; -import { JournalOutput } from "cockpit-components-logs-panel.jsx"; -import { install_dialog } from "cockpit-components-install-dialog.jsx"; -import { ModalError } from "cockpit-components-inline-notification.jsx"; -import { FirewalldRequest } from "cockpit-components-firewalld-request.jsx"; +import { EmptyStatePanel } from "cockpit-components-empty-state"; +import { JournalOutput } from "cockpit-components-logs-panel"; +import { install_dialog } from "cockpit-components-install-dialog"; +import { ModalError } from "cockpit-components-inline-notification"; +import { FirewalldRequest } from "cockpit-components-firewalld-request"; import "./metrics.scss"; -import "journal.css"; const MSEC_PER_H = 3600000; const INTERVAL = 5000; diff --git a/pkg/metrics/metrics.scss b/pkg/metrics/metrics.scss index 987c64b7f138..10a0b1d5956a 100644 --- a/pkg/metrics/metrics.scss +++ b/pkg/metrics/metrics.scss @@ -6,6 +6,8 @@ // utilities for `pf-u...` classes @import "@patternfly/patternfly/utilities/Spacing/spacing.css"; +@import "../lib/journal.css"; + #app { section.pf-c-page__main-breadcrumb { padding-bottom: var(--pf-c-page__main-breadcrumb--PaddingTop); diff --git a/pkg/networkmanager/bond.jsx b/pkg/networkmanager/bond.jsx index aad5c95fc91d..7485b852585e 100644 --- a/pkg/networkmanager/bond.jsx +++ b/pkg/networkmanager/bond.jsx @@ -28,7 +28,7 @@ import { ExternalLinkSquareAltIcon, HelpIcon } from '@patternfly/react-icons'; import { MacMenu, MemberInterfaceChoices, NetworkModal, Name, dialogSave } from './dialogs-common.jsx'; import { ModelContext } from './model-context.jsx'; -import { useDialogs } from "dialogs.jsx"; +import { useDialogs } from "dialogs"; import { v4 as uuidv4 } from 'uuid'; import { diff --git a/pkg/networkmanager/bridge.jsx b/pkg/networkmanager/bridge.jsx index 78004350ba9c..fa445d7470b5 100644 --- a/pkg/networkmanager/bridge.jsx +++ b/pkg/networkmanager/bridge.jsx @@ -26,7 +26,7 @@ import { TextInput } from "@patternfly/react-core/dist/esm/components/TextInput/ import { MemberInterfaceChoices, NetworkModal, Name, dialogSave } from './dialogs-common.jsx'; import { ModelContext } from './model-context.jsx'; -import { useDialogs } from "dialogs.jsx"; +import { useDialogs } from "dialogs"; import { v4 as uuidv4 } from 'uuid'; import { diff --git a/pkg/networkmanager/bridgeport.jsx b/pkg/networkmanager/bridgeport.jsx index be1bcb50ad28..1e391db384be 100644 --- a/pkg/networkmanager/bridgeport.jsx +++ b/pkg/networkmanager/bridgeport.jsx @@ -25,7 +25,7 @@ import { TextInput } from "@patternfly/react-core/dist/esm/components/TextInput/ import { NetworkModal, dialogSave } from './dialogs-common.jsx'; import { ModelContext } from './model-context.jsx'; -import { useDialogs } from "dialogs.jsx"; +import { useDialogs } from "dialogs"; const _ = cockpit.gettext; diff --git a/pkg/networkmanager/dialogs-common.jsx b/pkg/networkmanager/dialogs-common.jsx index 6dae051de2a1..c8d2cec0e991 100644 --- a/pkg/networkmanager/dialogs-common.jsx +++ b/pkg/networkmanager/dialogs-common.jsx @@ -37,9 +37,9 @@ import { TeamPortDialog } from './teamport.jsx'; import { VlanDialog, getGhostSettings as getVlanGhostSettings } from './vlan.jsx'; import { MtuDialog } from './mtu.jsx'; import { MacDialog } from './mac.jsx'; -import { ModalError } from 'cockpit-components-inline-notification.jsx'; +import { ModalError } from 'cockpit-components-inline-notification'; import { ModelContext } from './model-context.jsx'; -import { useDialogs } from "dialogs.jsx"; +import { useDialogs } from "dialogs"; import { apply_group_member, diff --git a/pkg/networkmanager/firewall.jsx b/pkg/networkmanager/firewall.jsx index 7c56ef901a7f..576e0a57193c 100644 --- a/pkg/networkmanager/firewall.jsx +++ b/pkg/networkmanager/firewall.jsx @@ -41,13 +41,13 @@ import { Modal } from "@patternfly/react-core/dist/esm/components/Modal/index.js import { ExclamationCircleIcon } from '@patternfly/react-icons'; import firewall from "./firewall-client.js"; -import { ListingTable } from 'cockpit-components-table.jsx'; -import { ModalError } from "cockpit-components-inline-notification.jsx"; -import { EmptyStatePanel } from "cockpit-components-empty-state.jsx"; +import { ListingTable } from 'cockpit-components-table'; +import { ModalError } from "cockpit-components-inline-notification"; +import { EmptyStatePanel } from "cockpit-components-empty-state"; import { FirewallSwitch } from "./firewall-switch.jsx"; import { superuser } from "superuser"; -import { WithDialogs, DialogsContext } from "dialogs.jsx"; +import { WithDialogs, DialogsContext } from "dialogs"; import "./networking.scss"; diff --git a/pkg/networkmanager/interfaces.js b/pkg/networkmanager/interfaces.js index ec01f446183d..e9e44333a711 100644 --- a/pkg/networkmanager/interfaces.js +++ b/pkg/networkmanager/interfaces.js @@ -21,13 +21,13 @@ import cockpit from 'cockpit'; import { Button } from "@patternfly/react-core/dist/esm/components/Button/index.js"; -import { fmt_to_fragments } from 'utils.jsx'; +import { fmt_to_fragments } from 'utils'; import * as utils from './utils.js'; import { v4 as uuidv4 } from 'uuid'; import "./networking.scss"; -import { show_modal_dialog } from "cockpit-components-dialog.jsx"; +import { show_modal_dialog } from "cockpit-components-dialog"; const _ = cockpit.gettext; diff --git a/pkg/networkmanager/ip-settings.jsx b/pkg/networkmanager/ip-settings.jsx index 3ca83a99e708..bcb9beea978b 100644 --- a/pkg/networkmanager/ip-settings.jsx +++ b/pkg/networkmanager/ip-settings.jsx @@ -31,7 +31,7 @@ import { MinusIcon, PlusIcon } from '@patternfly/react-icons'; import { NetworkModal, dialogSave } from './dialogs-common.jsx'; import { ModelContext } from './model-context.jsx'; -import { useDialogs } from "dialogs.jsx"; +import { useDialogs } from "dialogs"; const _ = cockpit.gettext; diff --git a/pkg/networkmanager/mac.jsx b/pkg/networkmanager/mac.jsx index 36e29337956b..ed5d6896cf72 100644 --- a/pkg/networkmanager/mac.jsx +++ b/pkg/networkmanager/mac.jsx @@ -23,7 +23,7 @@ import { FormGroup } from "@patternfly/react-core/dist/esm/components/Form/index import { MacMenu, NetworkModal, dialogSave } from './dialogs-common.jsx'; import { ModelContext } from './model-context.jsx'; -import { useDialogs } from "dialogs.jsx"; +import { useDialogs } from "dialogs"; const _ = cockpit.gettext; diff --git a/pkg/networkmanager/mtu.jsx b/pkg/networkmanager/mtu.jsx index d21567859b53..49ac6597f2f2 100644 --- a/pkg/networkmanager/mtu.jsx +++ b/pkg/networkmanager/mtu.jsx @@ -24,7 +24,7 @@ import { TextInput } from "@patternfly/react-core/dist/esm/components/TextInput/ import { NetworkModal, dialogSave } from './dialogs-common.jsx'; import { ModelContext } from './model-context.jsx'; -import { useDialogs } from "dialogs.jsx"; +import { useDialogs } from "dialogs"; const _ = cockpit.gettext; diff --git a/pkg/networkmanager/network-interface-members.jsx b/pkg/networkmanager/network-interface-members.jsx index f881e185e149..c1cf8ac11f38 100644 --- a/pkg/networkmanager/network-interface-members.jsx +++ b/pkg/networkmanager/network-interface-members.jsx @@ -25,7 +25,7 @@ import { Switch } from "@patternfly/react-core/dist/esm/components/Switch/index. import { Text, TextVariants } from "@patternfly/react-core/dist/esm/components/Text/index.js"; import { MinusIcon } from '@patternfly/react-icons'; -import { ListingTable } from "cockpit-components-table.jsx"; +import { ListingTable } from "cockpit-components-table"; import { ModelContext } from './model-context.jsx'; import { useEvent } from "hooks"; @@ -40,7 +40,7 @@ import { with_checkpoint, is_managed, } from './interfaces.js'; -import { fmt_to_fragments } from 'utils.jsx'; +import { fmt_to_fragments } from 'utils'; const _ = cockpit.gettext; diff --git a/pkg/networkmanager/network-interface.jsx b/pkg/networkmanager/network-interface.jsx index 2c8ddc9d99d4..8fce8bf0c9b4 100644 --- a/pkg/networkmanager/network-interface.jsx +++ b/pkg/networkmanager/network-interface.jsx @@ -31,7 +31,7 @@ import { ModelContext } from './model-context.jsx'; import { NetworkInterfaceMembers } from "./network-interface-members.jsx"; import { NetworkAction } from './dialogs-common.jsx'; import { NetworkPlots } from "./plots"; -import { fmt_to_fragments } from 'utils.jsx'; +import { fmt_to_fragments } from 'utils'; import { array_join, diff --git a/pkg/networkmanager/network-main.jsx b/pkg/networkmanager/network-main.jsx index 0a087564c146..3d215d148d31 100644 --- a/pkg/networkmanager/network-main.jsx +++ b/pkg/networkmanager/network-main.jsx @@ -29,9 +29,9 @@ import { Page, PageSection, PageSectionVariants } from "@patternfly/react-core/d import { Text, TextVariants } from "@patternfly/react-core/dist/esm/components/Text/index.js"; import { FirewallSwitch } from "./firewall-switch.jsx"; -import { ListingTable } from "cockpit-components-table.jsx"; +import { ListingTable } from "cockpit-components-table"; import { NetworkAction } from "./dialogs-common.jsx"; -import { LogsPanel } from "cockpit-components-logs-panel.jsx"; +import { LogsPanel } from "cockpit-components-logs-panel"; import { NetworkPlots } from "./plots"; import firewall from './firewall-client.js'; diff --git a/pkg/networkmanager/networkmanager.jsx b/pkg/networkmanager/networkmanager.jsx index 3551671ef4c4..be950ce3661e 100644 --- a/pkg/networkmanager/networkmanager.jsx +++ b/pkg/networkmanager/networkmanager.jsx @@ -25,19 +25,19 @@ import { createRoot } from "react-dom/client"; import { Button } from "@patternfly/react-core/dist/esm/components/Button/index.js"; import { ExclamationCircleIcon } from "@patternfly/react-icons"; -import { EmptyStatePanel } from "cockpit-components-empty-state.jsx"; +import { EmptyStatePanel } from "cockpit-components-empty-state"; import { ModelContext } from './model-context.jsx'; import { NetworkInterfacePage } from './network-interface.jsx'; import { NetworkPage } from './network-main.jsx'; import { UsageMonitor } from './helpers.js'; -import * as service from 'service.js'; +import * as service from 'service'; import { init as initDialogs, NetworkManagerModel } from './interfaces.js'; import { superuser } from 'superuser'; import { PlotState } from 'plot'; import { useObject, useEvent, usePageLocation } from "hooks"; -import { WithDialogs } from "dialogs.jsx"; +import { WithDialogs } from "dialogs"; const _ = cockpit.gettext; diff --git a/pkg/networkmanager/plots.js b/pkg/networkmanager/plots.js index a2780a643d1f..6e5fb03a54aa 100644 --- a/pkg/networkmanager/plots.js +++ b/pkg/networkmanager/plots.js @@ -21,7 +21,7 @@ import React from "react"; import { Split, SplitItem } from "@patternfly/react-core/dist/esm/layouts/Split/index.js"; import { Grid, GridItem } from "@patternfly/react-core/dist/esm/layouts/Grid/index.js"; -import { ZoomControls, SvgPlot, bits_per_sec_config } from "cockpit-components-plot.jsx"; +import { ZoomControls, SvgPlot, bits_per_sec_config } from "cockpit-components-plot"; import cockpit from "cockpit"; const _ = cockpit.gettext; diff --git a/pkg/networkmanager/team.jsx b/pkg/networkmanager/team.jsx index 2b8bb6cfa025..c5056e4c64b4 100644 --- a/pkg/networkmanager/team.jsx +++ b/pkg/networkmanager/team.jsx @@ -26,7 +26,7 @@ import { TextInput } from "@patternfly/react-core/dist/esm/components/TextInput/ import { MemberInterfaceChoices, NetworkModal, Name, dialogSave } from './dialogs-common.jsx'; import { ModelContext } from './model-context.jsx'; -import { useDialogs } from "dialogs.jsx"; +import { useDialogs } from "dialogs"; import { v4 as uuidv4 } from 'uuid'; import { diff --git a/pkg/networkmanager/teamport.jsx b/pkg/networkmanager/teamport.jsx index ef337c8aac38..8664926be9e9 100644 --- a/pkg/networkmanager/teamport.jsx +++ b/pkg/networkmanager/teamport.jsx @@ -25,7 +25,7 @@ import { TextInput } from "@patternfly/react-core/dist/esm/components/TextInput/ import { NetworkModal, dialogSave } from './dialogs-common.jsx'; import { ModelContext } from './model-context.jsx'; -import { useDialogs } from "dialogs.jsx"; +import { useDialogs } from "dialogs"; const _ = cockpit.gettext; diff --git a/pkg/networkmanager/vlan.jsx b/pkg/networkmanager/vlan.jsx index 25a446c8306d..1921e6989bbd 100644 --- a/pkg/networkmanager/vlan.jsx +++ b/pkg/networkmanager/vlan.jsx @@ -26,7 +26,7 @@ import { TextInput } from "@patternfly/react-core/dist/esm/components/TextInput/ import { Name, NetworkModal, dialogSave } from './dialogs-common.jsx'; import { ModelContext } from './model-context.jsx'; -import { useDialogs } from "dialogs.jsx"; +import { useDialogs } from "dialogs"; import { v4 as uuidv4 } from 'uuid'; import { diff --git a/pkg/packagekit/autoupdates.jsx b/pkg/packagekit/autoupdates.jsx index ad9837530064..e7dc5e68def2 100644 --- a/pkg/packagekit/autoupdates.jsx +++ b/pkg/packagekit/autoupdates.jsx @@ -28,8 +28,8 @@ import { Modal } from "@patternfly/react-core/dist/esm/components/Modal/index.js import { Radio } from "@patternfly/react-core/dist/esm/components/Radio/index.js"; import { TimePicker } from "@patternfly/react-core/dist/esm/components/TimePicker/index.js"; -import { install_dialog } from "cockpit-components-install-dialog.jsx"; -import { useDialogs } from "dialogs.jsx"; +import { install_dialog } from "cockpit-components-install-dialog"; +import { useDialogs } from "dialogs"; import { useInit } from "hooks"; const _ = cockpit.gettext; diff --git a/pkg/packagekit/history.jsx b/pkg/packagekit/history.jsx index 9b2619b0a7e7..215f544f419e 100644 --- a/pkg/packagekit/history.jsx +++ b/pkg/packagekit/history.jsx @@ -22,8 +22,8 @@ import PropTypes from "prop-types"; import { Tooltip } from "@patternfly/react-core/dist/esm/components/Tooltip/index.js"; import { BundleIcon } from "@patternfly/react-icons"; -import { ListingTable } from "cockpit-components-table.jsx"; -import * as timeformat from "timeformat.js"; +import { ListingTable } from "cockpit-components-table"; +import * as timeformat from "timeformat"; import cockpit from "cockpit"; diff --git a/pkg/packagekit/kpatch.jsx b/pkg/packagekit/kpatch.jsx index 383ac8dca524..a4714afa45cd 100644 --- a/pkg/packagekit/kpatch.jsx +++ b/pkg/packagekit/kpatch.jsx @@ -35,9 +35,9 @@ import { InfoIcon, InfoCircleIcon } from "@patternfly/react-icons"; import cockpit from "cockpit"; import { proxy as serviceProxy } from "service"; -import { check_missing_packages } from "packagekit.js"; -import { install_dialog } from "cockpit-components-install-dialog.jsx"; -import { read_os_release } from "os-release.js"; +import { check_missing_packages } from "packagekit"; +import { install_dialog } from "cockpit-components-install-dialog"; +import { read_os_release } from "os-release"; const _ = cockpit.gettext; diff --git a/pkg/packagekit/updates.jsx b/pkg/packagekit/updates.jsx index 93b7746f5ab7..009cc71def7f 100644 --- a/pkg/packagekit/updates.jsx +++ b/pkg/packagekit/updates.jsx @@ -62,17 +62,17 @@ import { AutoUpdates, getBackend } from "./autoupdates.jsx"; import { KpatchSettings, KpatchStatus } from "./kpatch.jsx"; import { History, PackageList } from "./history.jsx"; import { page_status } from "notifications"; -import { EmptyStatePanel } from "cockpit-components-empty-state.jsx"; -import { ListingTable } from 'cockpit-components-table.jsx'; -import { ModalError } from 'cockpit-components-inline-notification.jsx'; -import { ShutdownModal } from 'cockpit-components-shutdown.jsx'; -import { WithDialogs } from "dialogs.jsx"; +import { EmptyStatePanel } from "cockpit-components-empty-state"; +import { ListingTable } from 'cockpit-components-table'; +import { ModalError } from 'cockpit-components-inline-notification'; +import { ShutdownModal } from 'cockpit-components-shutdown'; +import { WithDialogs } from "dialogs"; import { superuser } from 'superuser'; -import * as PK from "packagekit.js"; -import * as timeformat from "timeformat.js"; +import * as PK from "packagekit"; +import * as timeformat from "timeformat"; -import * as python from "python.js"; +import * as python from "python"; import callTracerScript from './callTracer.py'; import "./updates.scss"; diff --git a/pkg/playground/journal.html b/pkg/playground/journal.html index 6c02c6fb2c31..9faa24d4a976 100644 --- a/pkg/playground/journal.html +++ b/pkg/playground/journal.html @@ -4,9 +4,9 @@ Cockpit Journal Box - + - + diff --git a/pkg/playground/journal.jsx b/pkg/playground/journal.jsx index fa62dabaa3b1..5523b0d9918f 100644 --- a/pkg/playground/journal.jsx +++ b/pkg/playground/journal.jsx @@ -21,9 +21,9 @@ import React from "react"; import { createRoot } from 'react-dom/client'; import '../lib/patternfly/patternfly-4-cockpit.scss'; -import "page.scss"; +import "../lib/page.scss"; -import { LogsPanel } from "cockpit-components-logs-panel.jsx"; +import { LogsPanel } from "cockpit-components-logs-panel"; document.addEventListener("DOMContentLoaded", function() { const cur_unit_id = "certmonger.service"; diff --git a/pkg/playground/plot.html b/pkg/playground/plot.html index 835ad31d9398..c6596923471d 100644 --- a/pkg/playground/plot.html +++ b/pkg/playground/plot.html @@ -6,7 +6,7 @@ - +
diff --git a/pkg/playground/plot.js b/pkg/playground/plot.js index 28ed469d9d23..96e45fbcbef3 100644 --- a/pkg/playground/plot.js +++ b/pkg/playground/plot.js @@ -3,8 +3,8 @@ import './plot.css'; import React from 'react'; import { createRoot } from 'react-dom/client'; -import { PlotState } from "plot.js"; -import { SvgPlot, bytes_config } from "cockpit-components-plot.jsx"; +import { PlotState } from "plot"; +import { SvgPlot, bytes_config } from "cockpit-components-plot"; const direct_metric = { direct: ["mem.util.available"], diff --git a/pkg/playground/react-demo-file-autocomplete.jsx b/pkg/playground/react-demo-file-autocomplete.jsx index 846fc2e8b856..21b4c31bfc01 100644 --- a/pkg/playground/react-demo-file-autocomplete.jsx +++ b/pkg/playground/react-demo-file-autocomplete.jsx @@ -20,7 +20,7 @@ import React from "react"; import { createRoot } from 'react-dom/client'; -import { FileAutoComplete } from "cockpit-components-file-autocomplete.jsx"; +import { FileAutoComplete } from "cockpit-components-file-autocomplete"; export function showFileAcDemo(rootElement) { const root = createRoot(rootElement); diff --git a/pkg/playground/react-patterns.js b/pkg/playground/react-patterns.js index ab28250e7861..8ca62a5f5145 100644 --- a/pkg/playground/react-patterns.js +++ b/pkg/playground/react-patterns.js @@ -23,7 +23,7 @@ import React from "react"; import '../lib/patternfly/patternfly-4-cockpit.scss'; import "../../node_modules/@patternfly/patternfly/components/Page/page.css"; -import { show_modal_dialog } from "cockpit-components-dialog.jsx"; +import { show_modal_dialog } from "cockpit-components-dialog"; import { PatternDialogBody } from "./react-demo-dialog.jsx"; import { showCardsDemo } from "./react-demo-cards.jsx"; diff --git a/pkg/playground/seddwXF1p b/pkg/playground/seddwXF1p new file mode 100644 index 000000000000..add74a4f0212 Binary files /dev/null and b/pkg/playground/seddwXF1p differ diff --git a/pkg/playground/service.html b/pkg/playground/service.html index c33aee37f7ac..a9814e0f3266 100644 --- a/pkg/playground/service.html +++ b/pkg/playground/service.html @@ -5,7 +5,7 @@ Cockpit Generic Service Monitor - + diff --git a/pkg/selinux/setroubleshoot-view.jsx b/pkg/selinux/setroubleshoot-view.jsx index 2d432fe0b096..07b866bbfda2 100644 --- a/pkg/selinux/setroubleshoot-view.jsx +++ b/pkg/selinux/setroubleshoot-view.jsx @@ -35,10 +35,10 @@ import { Text, TextVariants } from "@patternfly/react-core/dist/esm/components/T import { TextArea } from "@patternfly/react-core/dist/esm/components/TextArea/index.js"; import { ExclamationCircleIcon, ExclamationTriangleIcon, InfoCircleIcon } from "@patternfly/react-icons"; -import { Modifications } from "cockpit-components-modifications.jsx"; -import { EmptyStatePanel } from "cockpit-components-empty-state.jsx"; -import { ListingTable } from "cockpit-components-table.jsx"; -import { ListingPanel } from 'cockpit-components-listing-panel.jsx'; +import { Modifications } from "cockpit-components-modifications"; +import { EmptyStatePanel } from "cockpit-components-empty-state"; +import { ListingTable } from "cockpit-components-table"; +import { ListingPanel } from 'cockpit-components-listing-panel'; import * as timeformat from 'timeformat'; const _ = cockpit.gettext; diff --git a/pkg/shell/active-pages-modal.jsx b/pkg/shell/active-pages-modal.jsx index 205471adf200..a25352f0f394 100644 --- a/pkg/shell/active-pages-modal.jsx +++ b/pkg/shell/active-pages-modal.jsx @@ -20,12 +20,12 @@ import cockpit from "cockpit"; import React, { useState } from "react"; -import { ListingTable } from "cockpit-components-table.jsx"; +import { ListingTable } from "cockpit-components-table"; import { Button } from "@patternfly/react-core/dist/esm/components/Button/index.js"; import { Label } from "@patternfly/react-core/dist/esm/components/Label/index.js"; import { Split, SplitItem } from "@patternfly/react-core/dist/esm/layouts/Split/index.js"; import { Modal } from "@patternfly/react-core/dist/esm/components/Modal/index.js"; -import { useDialogs } from "dialogs.jsx"; +import { useDialogs } from "dialogs"; import { useInit } from "hooks"; const _ = cockpit.gettext; diff --git a/pkg/shell/credentials.jsx b/pkg/shell/credentials.jsx index 9f35a0c6a793..c33e95861a61 100644 --- a/pkg/shell/credentials.jsx +++ b/pkg/shell/credentials.jsx @@ -34,12 +34,12 @@ import { TextInput } from "@patternfly/react-core/dist/esm/components/TextInput/ import { InfoCircleIcon } from '@patternfly/react-icons'; import * as credentials from "credentials"; -import { FileAutoComplete } from "cockpit-components-file-autocomplete.jsx"; -import { ListingPanel } from 'cockpit-components-listing-panel.jsx'; -import { ListingTable } from 'cockpit-components-table.jsx'; -import { ModalError } from 'cockpit-components-inline-notification.jsx'; +import { FileAutoComplete } from "cockpit-components-file-autocomplete"; +import { ListingPanel } from 'cockpit-components-listing-panel'; +import { ListingTable } from 'cockpit-components-table'; +import { ModalError } from 'cockpit-components-inline-notification'; import { useEvent, useObject } from 'hooks'; -import { useDialogs } from "dialogs.jsx"; +import { useDialogs } from "dialogs"; import "./credentials.scss"; diff --git a/pkg/shell/failures.jsx b/pkg/shell/failures.jsx index 44d8a789aef3..02f23c099871 100644 --- a/pkg/shell/failures.jsx +++ b/pkg/shell/failures.jsx @@ -26,7 +26,7 @@ import { Page, PageSection, PageSectionVariants } from "@patternfly/react-core/d import { Stack } from "@patternfly/react-core/dist/esm/layouts/Stack/index.js"; import { ExclamationCircleIcon } from "@patternfly/react-icons"; -import { EmptyStatePanel } from "cockpit-components-empty-state.jsx"; +import { EmptyStatePanel } from "cockpit-components-empty-state"; const _ = cockpit.gettext; diff --git a/pkg/shell/hosts_dialog.jsx b/pkg/shell/hosts_dialog.jsx index 0fc782b0dd3a..0ef7e7bb98be 100644 --- a/pkg/shell/hosts_dialog.jsx +++ b/pkg/shell/hosts_dialog.jsx @@ -37,7 +37,7 @@ import { Radio } from "@patternfly/react-core/dist/esm/components/Radio/index.js import { Stack } from "@patternfly/react-core/dist/esm/layouts/Stack/index.js"; import { TextInput } from "@patternfly/react-core/dist/esm/components/TextInput/index.js"; -import { ModalError } from "cockpit-components-inline-notification.jsx"; +import { ModalError } from "cockpit-components-inline-notification"; const _ = cockpit.gettext; diff --git a/pkg/shell/indexes.jsx b/pkg/shell/indexes.jsx index 26397654361e..842d0fcb0930 100644 --- a/pkg/shell/indexes.jsx +++ b/pkg/shell/indexes.jsx @@ -27,7 +27,7 @@ import { TopNav } from ".//topnav.jsx"; import { CockpitHosts } from "./hosts.jsx"; import { codes, HostModal } from "./hosts_dialog.jsx"; import { EarlyFailure, EarlyFailureReady } from './failures.jsx'; -import { WithDialogs } from "dialogs.jsx"; +import { WithDialogs } from "dialogs"; import * as base_index from "./base_index"; diff --git a/pkg/shell/shell-modals.jsx b/pkg/shell/shell-modals.jsx index 4e38bc006253..5d334939146f 100644 --- a/pkg/shell/shell-modals.jsx +++ b/pkg/shell/shell-modals.jsx @@ -29,9 +29,9 @@ import { TextInput } from "@patternfly/react-core/dist/esm/components/TextInput/ import { TextContent, TextList, TextListItem } from "@patternfly/react-core/dist/esm/components/Text/index.js"; import { useInit } from "hooks"; -import { useDialogs } from "dialogs.jsx"; +import { useDialogs } from "dialogs"; -import "menu-select-widget.scss"; +import "../lib/menu-select-widget.scss"; const _ = cockpit.gettext; diff --git a/pkg/shell/superuser.jsx b/pkg/shell/superuser.jsx index dc29b46aa1ab..4bf091b4b2a0 100644 --- a/pkg/shell/superuser.jsx +++ b/pkg/shell/superuser.jsx @@ -20,7 +20,7 @@ import cockpit from "cockpit"; import React, { useState } from "react"; import { useObject, useInit, useEvent } from "hooks"; -import { useDialogs } from "dialogs.jsx"; +import { useDialogs } from "dialogs"; import { Alert } from "@patternfly/react-core/dist/esm/components/Alert/index.js"; import { Button } from "@patternfly/react-core/dist/esm/components/Button/index.js"; import { Form, FormGroup } from "@patternfly/react-core/dist/esm/components/Form/index.js"; @@ -28,7 +28,7 @@ import { Modal } from "@patternfly/react-core/dist/esm/components/Modal/index.js import { TextInput } from "@patternfly/react-core/dist/esm/components/TextInput/index.js"; import { FormSelect, FormSelectOption } from "@patternfly/react-core/dist/esm/components/FormSelect/index.js"; import { Stack, StackItem } from "@patternfly/react-core/dist/esm/layouts/Stack/index.js"; -import { ModalError } from 'cockpit-components-inline-notification.jsx'; +import { ModalError } from 'cockpit-components-inline-notification'; import { host_superuser_storage_key } from './machines/machines'; import { LockIcon } from '@patternfly/react-icons'; diff --git a/pkg/shell/topnav.jsx b/pkg/shell/topnav.jsx index fbce3d5fa6cc..e7b2c560c8f0 100644 --- a/pkg/shell/topnav.jsx +++ b/pkg/shell/topnav.jsx @@ -31,8 +31,8 @@ import { ActivePagesDialog } from "./active-pages-modal.jsx"; import { CredentialsModal } from './credentials.jsx'; import { AboutCockpitModal, LangModal, OopsModal } from "./shell-modals.jsx"; import { SuperuserIndicator } from "./superuser.jsx"; -import { read_os_release } from "os-release.js"; -import { DialogsContext } from "dialogs.jsx"; +import { read_os_release } from "os-release"; +import { DialogsContext } from "dialogs"; const _ = cockpit.gettext; diff --git a/pkg/sosreport/sosreport.jsx b/pkg/sosreport/sosreport.jsx index 0d9b074aac71..4c915fededcb 100644 --- a/pkg/sosreport/sosreport.jsx +++ b/pkg/sosreport/sosreport.jsx @@ -41,8 +41,8 @@ import { Checkbox } from "@patternfly/react-core/dist/esm/components/Checkbox/in import { Text, TextVariants } from "@patternfly/react-core/dist/esm/components/Text/index.js"; import { EyeIcon, EyeSlashIcon } from '@patternfly/react-icons'; -import { EmptyStatePanel } from "cockpit-components-empty-state.jsx"; -import { ListingTable } from "cockpit-components-table.jsx"; +import { EmptyStatePanel } from "cockpit-components-empty-state"; +import { ListingTable } from "cockpit-components-table"; import cockpit from "cockpit"; import { superuser } from "superuser"; @@ -50,9 +50,9 @@ import { useObject, useEvent } from "hooks"; import { SuperuserButton } from "../shell/superuser.jsx"; -import { fmt_to_fragments } from "utils.jsx"; +import { fmt_to_fragments } from "utils"; import * as timeformat from "timeformat"; -import { WithDialogs, useDialogs } from "dialogs.jsx"; +import { WithDialogs, useDialogs } from "dialogs"; const _ = cockpit.gettext; diff --git a/pkg/sosreport/sosreport.scss b/pkg/sosreport/sosreport.scss index 67a56afeb9c7..7bd46b366f45 100644 --- a/pkg/sosreport/sosreport.scss +++ b/pkg/sosreport/sosreport.scss @@ -1,5 +1,5 @@ @use "page"; -@use "ct-card.scss"; +@use "ct-card"; @use "../../node_modules/@patternfly/patternfly/utilities/Text/text.css"; @import "global-variables"; diff --git a/pkg/storaged/client.js b/pkg/storaged/client.js index f37dc5c93847..30ea11cf5a93 100644 --- a/pkg/storaged/client.js +++ b/pkg/storaged/client.js @@ -18,17 +18,17 @@ */ import cockpit from 'cockpit'; -import * as PK from 'packagekit.js'; +import * as PK from 'packagekit'; import { superuser } from 'superuser'; import * as utils from './utils.js'; -import * as python from "python.js"; -import { read_os_release } from "os-release.js"; +import * as python from "python"; +import { read_os_release } from "os-release"; import { find_warnings } from "./warnings.jsx"; -import inotify_py from "inotify.py"; +import inotify_py from "../lib/inotify.py"; import mount_users_py from "./mount-users.py"; import nfs_mounts_py from "./nfs-mounts.py"; import vdo_monitor_py from "./vdo-monitor.py"; diff --git a/pkg/storaged/content-views.jsx b/pkg/storaged/content-views.jsx index 3cc47f35d090..395c044338fc 100644 --- a/pkg/storaged/content-views.jsx +++ b/pkg/storaged/content-views.jsx @@ -32,10 +32,10 @@ import { Text, TextVariants } from "@patternfly/react-core/dist/esm/components/T import { DropdownSeparator } from "@patternfly/react-core/dist/esm/components/Dropdown/index.js"; import { ExclamationTriangleIcon } from "@patternfly/react-icons"; -import { ListingTable } from "cockpit-components-table.jsx"; -import { ListingPanel } from 'cockpit-components-listing-panel.jsx'; +import { ListingTable } from "cockpit-components-table"; +import { ListingPanel } from 'cockpit-components-listing-panel'; import { StorageButton, StorageLink, StorageBarMenu, StorageMenuItem, StorageUsageBar } from "./storage-controls.jsx"; -import * as PK from "packagekit.js"; +import * as PK from "packagekit"; import { format_dialog, parse_options, extract_option, unparse_options } from "./format-dialog.jsx"; diff --git a/pkg/storaged/crypto-keyslots.jsx b/pkg/storaged/crypto-keyslots.jsx index 14ba5ea7c8b1..8733c5410821 100644 --- a/pkg/storaged/crypto-keyslots.jsx +++ b/pkg/storaged/crypto-keyslots.jsx @@ -40,7 +40,7 @@ import { SelectOneRadio, TextInput, PassInput, Skip } from "./dialog.jsx"; import { array_find, decode_filename, encode_filename, block_name, for_each_async } from "./utils.js"; -import { fmt_to_fragments } from "utils.jsx"; +import { fmt_to_fragments } from "utils"; import { StorageButton } from "./storage-controls.jsx"; import { parse_options, unparse_options } from "./format-dialog.jsx"; import { edit_config } from "./crypto-tab.jsx"; diff --git a/pkg/storaged/crypto-panel.jsx b/pkg/storaged/crypto-panel.jsx index 5c13f28ee3cb..7ff0448d77a1 100644 --- a/pkg/storaged/crypto-panel.jsx +++ b/pkg/storaged/crypto-panel.jsx @@ -21,7 +21,7 @@ import cockpit from "cockpit"; import React from "react"; import { SortByDirection } from '@patternfly/react-table'; -import { ListingTable } from "cockpit-components-table.jsx"; +import { ListingTable } from "cockpit-components-table"; import { block_name, get_block_link_parts, go_to_block } from "./utils.js"; import { OptionalPanel } from "./optional-panel.jsx"; import { get_fstab_config } from "./fsys-tab.jsx"; diff --git a/pkg/storaged/crypto-tab.jsx b/pkg/storaged/crypto-tab.jsx index d2dfbaa67a70..ce6b881d055d 100644 --- a/pkg/storaged/crypto-tab.jsx +++ b/pkg/storaged/crypto-tab.jsx @@ -28,9 +28,9 @@ import { is_mounted } from "./fsys-tab.jsx"; import React from "react"; import { StorageLink } from "./storage-controls.jsx"; -import * as python from "python.js"; +import * as python from "python"; import luksmeta_monitor_hack_py from "./luksmeta-monitor-hack.py"; -import * as timeformat from "timeformat.js"; +import * as timeformat from "timeformat"; import { CryptoKeyslots } from "./crypto-keyslots.jsx"; diff --git a/pkg/storaged/dialog.jsx b/pkg/storaged/dialog.jsx index 932dd5a06107..7ce3753855ee 100644 --- a/pkg/storaged/dialog.jsx +++ b/pkg/storaged/dialog.jsx @@ -235,11 +235,11 @@ import { HelperText, HelperTextItem } from "@patternfly/react-core/dist/esm/comp import { List, ListItem } from "@patternfly/react-core/dist/esm/components/List/index.js"; import { ExclamationTriangleIcon, InfoIcon, HelpIcon } from "@patternfly/react-icons"; -import { show_modal_dialog, apply_modal_dialog } from "cockpit-components-dialog.jsx"; -import { ListingTable } from "cockpit-components-table.jsx"; +import { show_modal_dialog, apply_modal_dialog } from "cockpit-components-dialog"; +import { ListingTable } from "cockpit-components-table"; import { fmt_size, block_name, format_size_and_text, format_delay, for_each_async } from "./utils.js"; -import { fmt_to_fragments } from "utils.jsx"; +import { fmt_to_fragments } from "utils"; import client from "./client.js"; const _ = cockpit.gettext; diff --git a/pkg/storaged/fsys-panel.jsx b/pkg/storaged/fsys-panel.jsx index 2e69b95c3845..d83fdd0450a7 100644 --- a/pkg/storaged/fsys-panel.jsx +++ b/pkg/storaged/fsys-panel.jsx @@ -21,7 +21,7 @@ import cockpit from "cockpit"; import React from "react"; import { SortByDirection } from '@patternfly/react-table'; -import { ListingTable } from "cockpit-components-table.jsx"; +import { ListingTable } from "cockpit-components-table"; import { StorageUsageBar } from "./storage-controls.jsx"; import { block_name, fmt_size, go_to_block, flatten, is_snap } from "./utils.js"; import { OptionalPanel } from "./optional-panel.jsx"; diff --git a/pkg/storaged/logs-panel.jsx b/pkg/storaged/logs-panel.jsx index 033abefb0fd6..7a9c3c5676b8 100644 --- a/pkg/storaged/logs-panel.jsx +++ b/pkg/storaged/logs-panel.jsx @@ -20,7 +20,7 @@ import cockpit from "cockpit"; import React from "react"; -import { LogsPanel } from "cockpit-components-logs-panel.jsx"; +import { LogsPanel } from "cockpit-components-logs-panel"; const _ = cockpit.gettext; diff --git a/pkg/storaged/nfs-panel.jsx b/pkg/storaged/nfs-panel.jsx index f84abdda3222..b1b7bceb4541 100644 --- a/pkg/storaged/nfs-panel.jsx +++ b/pkg/storaged/nfs-panel.jsx @@ -22,7 +22,7 @@ import React from "react"; import { SortByDirection } from '@patternfly/react-table'; import { PlusIcon } from '@patternfly/react-icons'; -import { ListingTable } from "cockpit-components-table.jsx"; +import { ListingTable } from "cockpit-components-table"; import { StorageButton, StorageUsageBar } from "./storage-controls.jsx"; import { nfs_fstab_dialog } from "./nfs-details.jsx"; import { OptionalPanel } from "./optional-panel.jsx"; diff --git a/pkg/storaged/optional-panel.jsx b/pkg/storaged/optional-panel.jsx index f8301bac8787..a606addfd824 100644 --- a/pkg/storaged/optional-panel.jsx +++ b/pkg/storaged/optional-panel.jsx @@ -24,7 +24,7 @@ import { Card, CardActions, CardBody, CardHeader, CardTitle } from "@patternfly/ import { EmptyState, EmptyStateBody, EmptyStateVariant } from "@patternfly/react-core/dist/esm/components/EmptyState/index.js"; import { Text, TextVariants } from "@patternfly/react-core/dist/esm/components/Text/index.js"; -import { install_dialog } from "cockpit-components-install-dialog.jsx"; +import { install_dialog } from "cockpit-components-install-dialog"; import { StorageButton } from "./storage-controls.jsx"; const _ = cockpit.gettext; diff --git a/pkg/storaged/plot.jsx b/pkg/storaged/plot.jsx index c41629a2f381..db6d5e9bff1d 100644 --- a/pkg/storaged/plot.jsx +++ b/pkg/storaged/plot.jsx @@ -23,7 +23,7 @@ import React from "react"; import { Split, SplitItem } from "@patternfly/react-core/dist/esm/layouts/Split/index.js"; import { Grid, GridItem } from "@patternfly/react-core/dist/esm/layouts/Grid/index.js"; -import { ZoomControls, SvgPlot, bytes_per_sec_config } from "cockpit-components-plot.jsx"; +import { ZoomControls, SvgPlot, bytes_per_sec_config } from "cockpit-components-plot"; import { decode_filename, get_other_devices } from "./utils.js"; diff --git a/pkg/storaged/sed3q1rLN b/pkg/storaged/sed3q1rLN new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/pkg/storaged/storage-controls.jsx b/pkg/storaged/storage-controls.jsx index 5eececcb88b9..ff88e99124ce 100644 --- a/pkg/storaged/storage-controls.jsx +++ b/pkg/storaged/storage-controls.jsx @@ -30,7 +30,7 @@ import * as utils from "./utils.js"; import client from "./client.js"; import { dialog_open } from "./dialog.jsx"; -import { fmt_to_fragments } from "utils.jsx"; +import { fmt_to_fragments } from "utils"; const _ = cockpit.gettext; diff --git a/pkg/storaged/storaged.jsx b/pkg/storaged/storaged.jsx index bb4ab886c6f4..68b1cd7f3426 100644 --- a/pkg/storaged/storaged.jsx +++ b/pkg/storaged/storaged.jsx @@ -25,8 +25,8 @@ import React from "react"; import { createRoot } from 'react-dom/client'; import { ExclamationCircleIcon } from "@patternfly/react-icons"; -import { EmptyStatePanel } from "cockpit-components-empty-state.jsx"; -import { PlotState } from "plot.js"; +import { EmptyStatePanel } from "cockpit-components-empty-state"; +import { PlotState } from "plot"; import client from "./client"; import { MultipathAlert } from "./multipath.jsx"; diff --git a/pkg/storaged/stratis-details.jsx b/pkg/storaged/stratis-details.jsx index 3cc4f1cdb711..689ee093e9a4 100644 --- a/pkg/storaged/stratis-details.jsx +++ b/pkg/storaged/stratis-details.jsx @@ -27,8 +27,8 @@ import { List, ListItem } from "@patternfly/react-core/dist/esm/components/List/ import { PlusIcon, ExclamationTriangleIcon } from "@patternfly/react-icons"; import { FilesystemTab, mounting_dialog, is_mounted, is_valid_mount_point, get_fstab_config } from "./fsys-tab.jsx"; -import { ListingTable } from "cockpit-components-table.jsx"; -import { ListingPanel } from 'cockpit-components-listing-panel.jsx'; +import { ListingTable } from "cockpit-components-table"; +import { ListingPanel } from 'cockpit-components-listing-panel'; import { StdDetailsLayout } from "./details.jsx"; import { StorageButton, StorageBarMenu, StorageMenuItem, StorageUsageBar } from "./storage-controls.jsx"; import { SidePanel } from "./side-panel.jsx"; @@ -47,7 +47,7 @@ import { get_available_spaces, prepare_available_spaces, reload_systemd, for_each_async } from "./utils.js"; -import { fmt_to_fragments } from "utils.jsx"; +import { fmt_to_fragments } from "utils"; import { mount_explanation } from "./format-dialog.jsx"; const _ = cockpit.gettext; diff --git a/pkg/storaged/things-panel.jsx b/pkg/storaged/things-panel.jsx index 3ed5e737acde..27891163a848 100644 --- a/pkg/storaged/things-panel.jsx +++ b/pkg/storaged/things-panel.jsx @@ -19,7 +19,7 @@ import cockpit from "cockpit"; import React from "react"; -import { install_dialog } from "cockpit-components-install-dialog.jsx"; +import { install_dialog } from "cockpit-components-install-dialog"; import { SidePanel } from "./side-panel.jsx"; import { create_mdraid, mdraid_rows } from "./mdraids-panel.jsx"; diff --git a/pkg/storaged/vdo-details.jsx b/pkg/storaged/vdo-details.jsx index b8b6a719fb05..4a8e3dcfd013 100644 --- a/pkg/storaged/vdo-details.jsx +++ b/pkg/storaged/vdo-details.jsx @@ -31,7 +31,7 @@ import { StdDetailsLayout } from "./details.jsx"; import { Block } from "./content-views.jsx"; import { StorageButton, StorageOnOff, StorageBlockNavLink } from "./storage-controls.jsx"; -import inotify_py from "inotify.py"; +import inotify_py from "../lib/inotify.py"; import vdo_monitor_py from "./vdo-monitor.py"; const _ = cockpit.gettext; diff --git a/pkg/storaged/vgroup-details.jsx b/pkg/storaged/vgroup-details.jsx index 228a85138483..77f2235320b3 100644 --- a/pkg/storaged/vgroup-details.jsx +++ b/pkg/storaged/vgroup-details.jsx @@ -26,7 +26,7 @@ import { DescriptionList, DescriptionListDescription, DescriptionListGroup, Desc import { PlusIcon, MinusIcon } from "@patternfly/react-icons"; import * as utils from "./utils.js"; -import { fmt_to_fragments } from "utils.jsx"; +import { fmt_to_fragments } from "utils"; import { StdDetailsLayout } from "./details.jsx"; import { SidePanel } from "./side-panel.jsx"; import { VGroup } from "./content-views.jsx"; diff --git a/pkg/systemd/abrtLog.jsx b/pkg/systemd/abrtLog.jsx index d5eb8fe8f675..8bd5dcdae031 100644 --- a/pkg/systemd/abrtLog.jsx +++ b/pkg/systemd/abrtLog.jsx @@ -28,7 +28,7 @@ import { Button } from "@patternfly/react-core/dist/esm/components/Button/index. import { Tab, Tabs } from "@patternfly/react-core/dist/esm/components/Tabs/index.js"; import { GalleryItem } from "@patternfly/react-core/dist/esm/layouts/Gallery/index.js"; -import { ListingTable } from 'cockpit-components-table.jsx'; +import { ListingTable } from 'cockpit-components-table'; import { ReportingTable } from "./reporting.jsx"; import { journal } from "journal"; diff --git a/pkg/systemd/hw-detect.js b/pkg/systemd/hw-detect.js index 925116defcc7..b7a030477946 100644 --- a/pkg/systemd/hw-detect.js +++ b/pkg/systemd/hw-detect.js @@ -18,7 +18,7 @@ */ import cockpit from "cockpit"; -import * as machine_info from "machine-info.js"; +import * as machine_info from "machine-info"; const _ = cockpit.gettext; // map an info.system key to a /sys/class/dmi/id/* attribute name diff --git a/pkg/systemd/hwinfo.jsx b/pkg/systemd/hwinfo.jsx index d68ee4e2c9c5..35fe8502d427 100644 --- a/pkg/systemd/hwinfo.jsx +++ b/pkg/systemd/hwinfo.jsx @@ -42,14 +42,14 @@ import { Modal } from "@patternfly/react-core/dist/esm/components/Modal/index.js import { Switch } from "@patternfly/react-core/dist/esm/components/Switch/index.js"; import { ExternalLinkAltIcon } from "@patternfly/react-icons"; import { SortByDirection } from "@patternfly/react-table"; -import { ListingTable } from "cockpit-components-table.jsx"; -import { WithDialogs, DialogsContext } from "dialogs.jsx"; +import { ListingTable } from "cockpit-components-table"; +import { WithDialogs, DialogsContext } from "dialogs"; import kernelopt_sh from "./kernelopt.sh"; import detect from "./hw-detect.js"; import { superuser } from "superuser"; -import { PrivilegedButton } from "cockpit-components-privileged.jsx"; +import { PrivilegedButton } from "cockpit-components-privileged"; import "./hwinfo.scss"; diff --git a/pkg/systemd/logDetails.jsx b/pkg/systemd/logDetails.jsx index 357795048a08..f95e7d30c518 100644 --- a/pkg/systemd/logDetails.jsx +++ b/pkg/systemd/logDetails.jsx @@ -22,7 +22,7 @@ import { journal } from "journal"; import * as timeformat from "timeformat"; import React from 'react'; -import { EmptyStatePanel } from "cockpit-components-empty-state.jsx"; +import { EmptyStatePanel } from "cockpit-components-empty-state"; import { AbrtLogDetails } from "./abrtLog.jsx"; import { ExclamationCircleIcon } from '@patternfly/react-icons'; import { Breadcrumb, BreadcrumbItem } from "@patternfly/react-core/dist/esm/components/Breadcrumb/index.js"; diff --git a/pkg/systemd/logsJournal.jsx b/pkg/systemd/logsJournal.jsx index 92535609094f..bcca19d951e9 100644 --- a/pkg/systemd/logsJournal.jsx +++ b/pkg/systemd/logsJournal.jsx @@ -23,8 +23,8 @@ import { superuser } from "superuser"; import React from 'react'; import { Alert, AlertActionCloseButton } from "@patternfly/react-core/dist/esm/components/Alert/index.js"; -import { EmptyStatePanel } from "cockpit-components-empty-state.jsx"; -import { JournalOutput } from "cockpit-components-logs-panel.jsx"; +import { EmptyStatePanel } from "cockpit-components-empty-state"; +import { JournalOutput } from "cockpit-components-logs-panel"; import { ExclamationCircleIcon } from '@patternfly/react-icons'; import { getGrepFiltersFromOptions, getFilteredQuery } from "./logsHelpers.js"; diff --git a/pkg/systemd/overview-cards/configurationCard.jsx b/pkg/systemd/overview-cards/configurationCard.jsx index 3c7278fd4101..4e687365a817 100644 --- a/pkg/systemd/overview-cards/configurationCard.jsx +++ b/pkg/systemd/overview-cards/configurationCard.jsx @@ -28,14 +28,13 @@ import { TextInput } from "@patternfly/react-core/dist/esm/components/TextInput/ import host_keys_script from "./ssh-list-host-keys.sh"; import cockpit from "cockpit"; import { superuser } from "superuser"; -import { useObject, useEvent } from "hooks.js"; -import { EmptyStatePanel } from "cockpit-components-empty-state.jsx"; -import { ServerTimeConfig } from 'serverTime.js'; +import { useInit, useObject, useEvent } from "hooks"; +import { EmptyStatePanel } from "cockpit-components-empty-state"; +import { ServerTimeConfig } from 'serverTime'; import { RealmdClient, RealmButton } from "./realmd.jsx"; import { TunedPerformanceProfile } from './tuned-dialog.jsx'; import { CryptoPolicyRow } from './cryptoPolicies.jsx'; -import { useDialogs } from "dialogs.jsx"; -import { useInit } from "hooks"; +import { useDialogs } from "dialogs"; import "./configurationCard.scss"; diff --git a/pkg/systemd/overview-cards/cryptoPolicies.jsx b/pkg/systemd/overview-cards/cryptoPolicies.jsx index e89dde648601..571916d8296f 100644 --- a/pkg/systemd/overview-cards/cryptoPolicies.jsx +++ b/pkg/systemd/overview-cards/cryptoPolicies.jsx @@ -25,10 +25,10 @@ import { Modal } from "@patternfly/react-core/dist/esm/components/Modal/index.js import { Popover } from "@patternfly/react-core/dist/esm/components/Popover/index.js"; import { ExclamationTriangleIcon, ExternalLinkSquareAltIcon, HelpIcon } from '@patternfly/react-icons'; -import { ModalError } from 'cockpit-components-inline-notification.jsx'; -import { PrivilegedButton } from "cockpit-components-privileged.jsx"; +import { ModalError } from 'cockpit-components-inline-notification'; +import { PrivilegedButton } from "cockpit-components-privileged"; import { ProfilesMenuDialogBody } from "./profiles-menu-dialog-body.jsx"; -import { useDialogs } from "dialogs.jsx"; +import { useDialogs } from "dialogs"; import "./cryptoPolicies.scss"; diff --git a/pkg/systemd/overview-cards/insights.jsx b/pkg/systemd/overview-cards/insights.jsx index 1d8377763f56..f306441e6f8e 100644 --- a/pkg/systemd/overview-cards/insights.jsx +++ b/pkg/systemd/overview-cards/insights.jsx @@ -23,7 +23,7 @@ import { Flex } from "@patternfly/react-core/dist/esm/layouts/Flex/index.js"; import { CheckIcon, ExclamationTriangleIcon, ExternalLinkAltIcon } from '@patternfly/react-icons'; import cockpit from "cockpit"; -import * as service from "service.js"; +import * as service from "service"; import { superuser } from "superuser"; import insights_poll_hack_sh from "./insights-poll-hack.sh"; diff --git a/pkg/systemd/overview-cards/motdCard.jsx b/pkg/systemd/overview-cards/motdCard.jsx index b972a0a13d33..c5c1372ac476 100644 --- a/pkg/systemd/overview-cards/motdCard.jsx +++ b/pkg/systemd/overview-cards/motdCard.jsx @@ -25,9 +25,9 @@ import { Modal } from "@patternfly/react-core/dist/esm/components/Modal/index.js import { Stack } from "@patternfly/react-core/dist/esm/layouts/Stack/index.js"; import { TextArea } from "@patternfly/react-core/dist/esm/components/TextArea/index.js"; import { EditIcon } from '@patternfly/react-icons'; -import { ModalError } from 'cockpit-components-inline-notification.jsx'; +import { ModalError } from 'cockpit-components-inline-notification'; import { superuser } from "superuser"; -import { useDialogs } from "dialogs.jsx"; +import { useDialogs } from "dialogs"; import { useInit } from "hooks"; import cockpit from "cockpit"; diff --git a/pkg/systemd/overview-cards/profiles-menu-dialog-body.jsx b/pkg/systemd/overview-cards/profiles-menu-dialog-body.jsx index 177717ab9c32..8f0a37f2321f 100644 --- a/pkg/systemd/overview-cards/profiles-menu-dialog-body.jsx +++ b/pkg/systemd/overview-cards/profiles-menu-dialog-body.jsx @@ -26,7 +26,7 @@ import { LabelGroup } from "@patternfly/react-core/dist/esm/components/LabelGrou import { Menu, MenuContent, MenuItem, MenuList } from "@patternfly/react-core/dist/esm/components/Menu/index.js"; import { Flex, FlexItem } from "@patternfly/react-core/dist/esm/layouts/Flex/index.js"; -import "menu-select-widget.scss"; +import "../../lib/menu-select-widget.scss"; const _ = cockpit.gettext; diff --git a/pkg/systemd/overview-cards/realmd.jsx b/pkg/systemd/overview-cards/realmd.jsx index c365382a4796..1e5e79296ad4 100644 --- a/pkg/systemd/overview-cards/realmd.jsx +++ b/pkg/systemd/overview-cards/realmd.jsx @@ -30,12 +30,12 @@ import { TextInput } from "@patternfly/react-core/dist/esm/components/TextInput/ import { CheckIcon, ExclamationCircleIcon, InProgressIcon } from "@patternfly/react-icons"; import cockpit from "cockpit"; -import { Privileged } from "cockpit-components-privileged.jsx"; +import { Privileged } from "cockpit-components-privileged"; import { superuser } from "superuser"; -import { useEvent } from "hooks.js"; -import { install_dialog } from "cockpit-components-install-dialog.jsx"; -import * as packagekit from "packagekit.js"; -import { useDialogs } from "dialogs.jsx"; +import { useEvent } from "hooks"; +import { install_dialog } from "cockpit-components-install-dialog"; +import * as packagekit from "packagekit"; +import { useDialogs } from "dialogs"; import "./realmd.scss"; diff --git a/pkg/systemd/overview-cards/systemInformationCard.jsx b/pkg/systemd/overview-cards/systemInformationCard.jsx index 00b1e77d71c4..dfa0da796055 100644 --- a/pkg/systemd/overview-cards/systemInformationCard.jsx +++ b/pkg/systemd/overview-cards/systemInformationCard.jsx @@ -21,8 +21,8 @@ import { Button } from "@patternfly/react-core/dist/esm/components/Button/index. import { Card, CardBody, CardFooter, CardTitle } from "@patternfly/react-core/dist/esm/components/Card/index.js"; import cockpit from "cockpit"; -import * as machine_info from "machine-info.js"; -import * as timeformat from "timeformat.js"; +import * as machine_info from "machine-info"; +import * as timeformat from "timeformat"; import "./systemInformationCard.scss"; diff --git a/pkg/systemd/overview-cards/tuned-dialog.jsx b/pkg/systemd/overview-cards/tuned-dialog.jsx index 97847dd430a7..494592b5a9bb 100644 --- a/pkg/systemd/overview-cards/tuned-dialog.jsx +++ b/pkg/systemd/overview-cards/tuned-dialog.jsx @@ -27,12 +27,12 @@ import { Tooltip } from "@patternfly/react-core/dist/esm/components/Tooltip/inde import { ExternalLinkSquareAltIcon, HelpIcon } from '@patternfly/react-icons'; import * as service from "service"; -import { EmptyStatePanel } from 'cockpit-components-empty-state.jsx'; -import { ModalError } from 'cockpit-components-inline-notification.jsx'; +import { EmptyStatePanel } from 'cockpit-components-empty-state'; +import { ModalError } from 'cockpit-components-inline-notification'; import { ProfilesMenuDialogBody } from './profiles-menu-dialog-body.jsx'; import { superuser } from 'superuser'; import { useObject, useEvent } from "hooks"; -import { useDialogs } from "dialogs.jsx"; +import { useDialogs } from "dialogs"; const _ = cockpit.gettext; diff --git a/pkg/systemd/overview-cards/usageCard.jsx b/pkg/systemd/overview-cards/usageCard.jsx index 150791c4e814..4dcc61ed97bb 100644 --- a/pkg/systemd/overview-cards/usageCard.jsx +++ b/pkg/systemd/overview-cards/usageCard.jsx @@ -21,7 +21,7 @@ import { Button } from "@patternfly/react-core/dist/esm/components/Button/index. import { Card, CardBody, CardFooter, CardTitle } from "@patternfly/react-core/dist/esm/components/Card/index.js"; import { Progress, ProgressMeasureLocation, ProgressVariant } from "@patternfly/react-core/dist/esm/components/Progress/index.js"; -import * as machine_info from "machine-info.js"; +import * as machine_info from "machine-info"; import cockpit from "cockpit"; import "./usageCard.scss"; diff --git a/pkg/systemd/overview.jsx b/pkg/systemd/overview.jsx index dca3c7a38a61..d09c0baf9672 100644 --- a/pkg/systemd/overview.jsx +++ b/pkg/systemd/overview.jsx @@ -37,8 +37,8 @@ import { MotdCard } from './overview-cards/motdCard.jsx'; import { UsageCard } from './overview-cards/usageCard.jsx'; import { SuperuserAlert } from './superuser-alert.jsx'; import { SuperuserIndicator } from "../shell/superuser.jsx"; -import { ShutdownModal } from 'cockpit-components-shutdown.jsx'; -import { WithDialogs, DialogsContext } from "dialogs.jsx"; +import { ShutdownModal } from 'cockpit-components-shutdown'; +import { WithDialogs, DialogsContext } from "dialogs"; import "./overview.scss"; diff --git a/pkg/systemd/reporting.jsx b/pkg/systemd/reporting.jsx index a04fce828a2a..213c28ef84dc 100644 --- a/pkg/systemd/reporting.jsx +++ b/pkg/systemd/reporting.jsx @@ -24,7 +24,7 @@ import { Card, CardBody, CardTitle } from "@patternfly/react-core/dist/esm/compo import { Split, SplitItem } from "@patternfly/react-core/dist/esm/layouts/Split/index.js"; import { Spinner } from "@patternfly/react-core/dist/esm/components/Spinner/index.js"; import { ExternalLinkAltIcon } from "@patternfly/react-icons"; -import { show_modal_dialog } from "cockpit-components-dialog.jsx"; +import { show_modal_dialog } from "cockpit-components-dialog"; import './reporting.scss'; diff --git a/pkg/systemd/service-details.jsx b/pkg/systemd/service-details.jsx index 9fb57fe5e9ad..987864c62646 100644 --- a/pkg/systemd/service-details.jsx +++ b/pkg/systemd/service-details.jsx @@ -43,9 +43,9 @@ import cockpit from "cockpit"; import s_bus from "./busnames.js"; import { systemd_client, MAX_UINT64 } from "./services.jsx"; import * as timeformat from "timeformat"; -import { EmptyStatePanel } from "cockpit-components-empty-state.jsx"; -import { useDialogs, DialogsContext } from "dialogs.jsx"; -import { ModalError } from 'cockpit-components-inline-notification.jsx'; +import { EmptyStatePanel } from "cockpit-components-empty-state"; +import { useDialogs, DialogsContext } from "dialogs"; +import { ModalError } from 'cockpit-components-inline-notification'; import './service-details.scss'; diff --git a/pkg/systemd/service-details.scss b/pkg/systemd/service-details.scss index b61f916171cb..6aab846cf8f6 100644 --- a/pkg/systemd/service-details.scss +++ b/pkg/systemd/service-details.scss @@ -1,6 +1,6 @@ @use "ct-card"; @use "../lib/journal.css"; -@use "_global-variables.scss"; +@use "_global-variables"; #service-details .pf-l-gallery { --pf-l-gallery--GridTemplateColumns: 1fr; diff --git a/pkg/systemd/service.jsx b/pkg/systemd/service.jsx index bb26e17aac7c..585d296bbaf7 100644 --- a/pkg/systemd/service.jsx +++ b/pkg/systemd/service.jsx @@ -23,11 +23,11 @@ import { Page, PageSection } from "@patternfly/react-core/dist/esm/components/Pa import { Gallery, GalleryItem } from "@patternfly/react-core/dist/esm/layouts/Gallery/index.js"; import { ExclamationCircleIcon } from '@patternfly/react-icons'; -import { EmptyStatePanel } from "cockpit-components-empty-state.jsx"; +import { EmptyStatePanel } from "cockpit-components-empty-state"; import { ServiceDetails } from "./service-details.jsx"; -import { LogsPanel } from "cockpit-components-logs-panel.jsx"; +import { LogsPanel } from "cockpit-components-logs-panel"; import { superuser } from 'superuser'; -import { WithDialogs } from "dialogs.jsx"; +import { WithDialogs } from "dialogs"; import cockpit from "cockpit"; import { useObject } from "hooks"; diff --git a/pkg/systemd/services-list.jsx b/pkg/systemd/services-list.jsx index 6773753f8b58..5afff6efaf99 100644 --- a/pkg/systemd/services-list.jsx +++ b/pkg/systemd/services-list.jsx @@ -23,10 +23,10 @@ import { Button } from "@patternfly/react-core/dist/esm/components/Button/index. import { Flex, FlexItem } from "@patternfly/react-core/dist/esm/layouts/Flex/index.js"; import { Tooltip, TooltipPosition } from "@patternfly/react-core/dist/esm/components/Tooltip/index.js"; import { Badge } from "@patternfly/react-core/dist/esm/components/Badge/index.js"; -import { ListingTable } from 'cockpit-components-table.jsx'; +import { ListingTable } from 'cockpit-components-table'; import { ExclamationCircleIcon, SearchIcon, ThumbtackIcon } from '@patternfly/react-icons'; -import { EmptyStatePanel } from "cockpit-components-empty-state.jsx"; +import { EmptyStatePanel } from "cockpit-components-empty-state"; import cockpit from "cockpit"; diff --git a/pkg/systemd/services.jsx b/pkg/systemd/services.jsx index 6239c92bad5d..7c2a50e20ffd 100644 --- a/pkg/systemd/services.jsx +++ b/pkg/systemd/services.jsx @@ -32,7 +32,7 @@ import { ToggleGroup, ToggleGroupItem } from "@patternfly/react-core/dist/esm/co import { Toolbar, ToolbarContent, ToolbarFilter, ToolbarItem, ToolbarToggleGroup } from "@patternfly/react-core/dist/esm/components/Toolbar/index.js"; import { ExclamationCircleIcon, FilterIcon } from '@patternfly/react-icons'; -import { EmptyStatePanel } from "cockpit-components-empty-state.jsx"; +import { EmptyStatePanel } from "cockpit-components-empty-state"; import { Service } from "./service.jsx"; import { ServiceTabs, service_tabs_suffixes } from "./service-tabs.jsx"; import { ServicesList } from "./services-list.jsx"; @@ -43,7 +43,7 @@ import * as timeformat from "timeformat"; import cockpit from "cockpit"; import { superuser } from 'superuser'; import { useEvent, usePageLocation } from "hooks"; -import { WithDialogs } from "dialogs.jsx"; +import { WithDialogs } from "dialogs"; import s_bus from "./busnames.js"; import "./services.scss"; diff --git a/pkg/systemd/superuser-alert.jsx b/pkg/systemd/superuser-alert.jsx index e90d278245eb..ca1f2b390ab7 100644 --- a/pkg/systemd/superuser-alert.jsx +++ b/pkg/systemd/superuser-alert.jsx @@ -25,7 +25,7 @@ import { Alert } from "@patternfly/react-core/dist/esm/components/Alert/index.js import { LockIcon } from '@patternfly/react-icons'; import { SuperuserButton } from "../shell/superuser.jsx"; -import { superuser } from "superuser.js"; +import { superuser } from "superuser"; const _ = cockpit.gettext; diff --git a/pkg/systemd/terminal.jsx b/pkg/systemd/terminal.jsx index c26ec3987463..17f671ab74f0 100644 --- a/pkg/systemd/terminal.jsx +++ b/pkg/systemd/terminal.jsx @@ -10,7 +10,7 @@ import { Toolbar, ToolbarContent, ToolbarGroup, ToolbarItem } from "@patternfly/ import "./terminal.scss"; -import { Terminal } from "cockpit-components-terminal.jsx"; +import { Terminal } from "cockpit-components-terminal"; const _ = cockpit.gettext; diff --git a/pkg/systemd/timer-dialog.jsx b/pkg/systemd/timer-dialog.jsx index 9bc73a64cfe7..eaccd3e8d131 100644 --- a/pkg/systemd/timer-dialog.jsx +++ b/pkg/systemd/timer-dialog.jsx @@ -31,12 +31,12 @@ import { TextInput } from "@patternfly/react-core/dist/esm/components/TextInput/ import { TimePicker } from "@patternfly/react-core/dist/esm/components/TimePicker/index.js"; import { MinusIcon, PlusIcon } from '@patternfly/react-icons'; -import { ModalError } from 'cockpit-components-inline-notification.jsx'; -import { useDialogs } from "dialogs.jsx"; +import { ModalError } from 'cockpit-components-inline-notification'; +import { useDialogs } from "dialogs"; import { updateTime } from './services.jsx'; import { create_timer } from './timer-dialog-helpers.js'; -import * as timeformat from "timeformat.js"; +import * as timeformat from "timeformat"; import "./timers.scss"; diff --git a/pkg/users/account-create-dialog.js b/pkg/users/account-create-dialog.js index b81b00bc03d9..383d552f7a1e 100644 --- a/pkg/users/account-create-dialog.js +++ b/pkg/users/account-create-dialog.js @@ -30,8 +30,8 @@ import { Radio } from "@patternfly/react-core/dist/esm/components/Radio/index.js import { Spinner } from "@patternfly/react-core/dist/esm/components/Spinner/index.js"; import { has_errors, is_valid_char_name } from "./dialog-utils.js"; import { passwd_change } from "./password-dialogs.js"; -import { password_quality, PasswordFormFields } from "cockpit-components-password.jsx"; -import { show_modal_dialog, apply_modal_dialog } from "cockpit-components-dialog.jsx"; +import { password_quality, PasswordFormFields } from "cockpit-components-password"; +import { show_modal_dialog, apply_modal_dialog } from "cockpit-components-dialog"; import { HelpIcon } from '@patternfly/react-icons'; const _ = cockpit.gettext; diff --git a/pkg/users/account-details.js b/pkg/users/account-details.js index c8da29b01125..51f65e39edc4 100644 --- a/pkg/users/account-details.js +++ b/pkg/users/account-details.js @@ -20,7 +20,7 @@ import cockpit from 'cockpit'; import React, { useState, useEffect, useRef } from 'react'; import { superuser } from "superuser"; -import { apply_modal_dialog } from "cockpit-components-dialog.jsx"; +import { apply_modal_dialog } from "cockpit-components-dialog"; import { Button } from "@patternfly/react-core/dist/esm/components/Button/index.js"; import { Checkbox } from "@patternfly/react-core/dist/esm/components/Checkbox/index.js"; @@ -47,7 +47,7 @@ import { account_expiration_dialog, password_expiration_dialog } from "./expirat import { set_password_dialog, reset_password_dialog } from "./password-dialogs.js"; import { AccountLogs } from "./account-logs-panel.jsx"; import { AuthorizedKeys } from "./authorized-keys-panel.js"; -import * as timeformat from "timeformat.js"; +import * as timeformat from "timeformat"; const _ = cockpit.gettext; diff --git a/pkg/users/account-logs-panel.jsx b/pkg/users/account-logs-panel.jsx index 2d805805cf74..0a52f452895e 100644 --- a/pkg/users/account-logs-panel.jsx +++ b/pkg/users/account-logs-panel.jsx @@ -22,9 +22,9 @@ import React, { useState } from 'react'; import { Card, CardBody, CardTitle } from "@patternfly/react-core/dist/esm/components/Card/index.js"; import { Text } from "@patternfly/react-core/dist/esm/components/Text/index.js"; -import { ListingTable } from 'cockpit-components-table.jsx'; +import { ListingTable } from 'cockpit-components-table'; -import * as timeformat from "timeformat.js"; +import * as timeformat from "timeformat"; import { useInit } from "hooks"; const _ = cockpit.gettext; diff --git a/pkg/users/accounts-list.js b/pkg/users/accounts-list.js index 974caaf21dea..0e308dee817b 100644 --- a/pkg/users/accounts-list.js +++ b/pkg/users/accounts-list.js @@ -34,9 +34,9 @@ import { SearchInput } from "@patternfly/react-core/dist/esm/components/SearchIn import { Stack } from "@patternfly/react-core/dist/esm/layouts/Stack/index.js"; import { Text, TextContent, TextVariants } from "@patternfly/react-core/dist/esm/components/Text/index.js"; import { Toolbar, ToolbarContent, ToolbarItem } from "@patternfly/react-core/dist/esm/components/Toolbar/index.js"; -import * as timeformat from "timeformat.js"; -import { EmptyStatePanel } from 'cockpit-components-empty-state.jsx'; -import { ListingTable } from 'cockpit-components-table.jsx'; +import * as timeformat from "timeformat"; +import { EmptyStatePanel } from 'cockpit-components-empty-state'; +import { ListingTable } from 'cockpit-components-table'; import { SearchIcon } from '@patternfly/react-icons'; import { SortByDirection } from "@patternfly/react-table"; import { account_create_dialog } from "./account-create-dialog.js"; diff --git a/pkg/users/authorized-keys-panel.js b/pkg/users/authorized-keys-panel.js index a995de039b90..3f176ffcc1af 100644 --- a/pkg/users/authorized-keys-panel.js +++ b/pkg/users/authorized-keys-panel.js @@ -19,7 +19,7 @@ import cockpit from 'cockpit'; import React, { useState } from 'react'; -import { useObject, useEvent } from 'hooks.js'; +import { useObject, useEvent } from 'hooks'; import { Button } from "@patternfly/react-core/dist/esm/components/Button/index.js"; import { Card, CardActions, CardHeader, CardTitle } from "@patternfly/react-core/dist/esm/components/Card/index.js"; @@ -27,8 +27,8 @@ import { Dropdown, KebabToggle } from "@patternfly/react-core/dist/esm/component import { OverflowMenu, OverflowMenuContent, OverflowMenuControl, OverflowMenuDropdownItem, OverflowMenuGroup, OverflowMenuItem } from "@patternfly/react-core/dist/esm/components/OverflowMenu/index.js"; import { Text, TextVariants } from "@patternfly/react-core/dist/esm/components/Text/index.js"; import { TextArea } from "@patternfly/react-core/dist/esm/components/TextArea/index.js"; -import { show_modal_dialog } from "cockpit-components-dialog.jsx"; -import { ListingTable } from 'cockpit-components-table.jsx'; +import { show_modal_dialog } from "cockpit-components-dialog"; +import { ListingTable } from 'cockpit-components-table'; import { show_unexpected_error } from "./dialog-utils.js"; import * as authorized_keys from './authorized-keys.js'; diff --git a/pkg/users/delete-account-dialog.js b/pkg/users/delete-account-dialog.js index bec18c333d19..2a715bdb6050 100644 --- a/pkg/users/delete-account-dialog.js +++ b/pkg/users/delete-account-dialog.js @@ -21,7 +21,7 @@ import cockpit from 'cockpit'; import React from 'react'; import { Checkbox } from "@patternfly/react-core/dist/esm/components/Checkbox/index.js"; -import { show_modal_dialog } from "cockpit-components-dialog.jsx"; +import { show_modal_dialog } from "cockpit-components-dialog"; const _ = cockpit.gettext; diff --git a/pkg/users/delete-group-dialog.js b/pkg/users/delete-group-dialog.js index ce307d82fd30..76eb1cfb8fea 100644 --- a/pkg/users/delete-group-dialog.js +++ b/pkg/users/delete-group-dialog.js @@ -23,7 +23,7 @@ import { List, ListItem } from "@patternfly/react-core/dist/esm/components/List/ import { Stack } from "@patternfly/react-core/dist/esm/layouts/Stack/index.js"; import { Text, TextContent } from "@patternfly/react-core/dist/esm/components/Text/index.js"; -import { show_modal_dialog } from "cockpit-components-dialog.jsx"; +import { show_modal_dialog } from "cockpit-components-dialog"; const _ = cockpit.gettext; diff --git a/pkg/users/dialog-utils.js b/pkg/users/dialog-utils.js index 56f585623c3e..5ff1c3237775 100644 --- a/pkg/users/dialog-utils.js +++ b/pkg/users/dialog-utils.js @@ -20,7 +20,7 @@ import cockpit from 'cockpit'; import React from 'react'; -import { show_modal_dialog } from "cockpit-components-dialog.jsx"; +import { show_modal_dialog } from "cockpit-components-dialog"; const _ = cockpit.gettext; diff --git a/pkg/users/expiration-dialogs.js b/pkg/users/expiration-dialogs.js index 21e630c7db55..25f67a979979 100644 --- a/pkg/users/expiration-dialogs.js +++ b/pkg/users/expiration-dialogs.js @@ -26,8 +26,8 @@ import { TextInput } from "@patternfly/react-core/dist/esm/components/TextInput/ import { DatePicker } from "@patternfly/react-core/dist/esm/components/DatePicker/index.js"; import { has_errors } from "./dialog-utils.js"; -import { show_modal_dialog, apply_modal_dialog } from "cockpit-components-dialog.jsx"; -import * as timeformat from "timeformat.js"; +import { show_modal_dialog, apply_modal_dialog } from "cockpit-components-dialog"; +import * as timeformat from "timeformat"; const _ = cockpit.gettext; diff --git a/pkg/users/group-create-dialog.js b/pkg/users/group-create-dialog.js index 182e94009a80..d6f6dc853a57 100644 --- a/pkg/users/group-create-dialog.js +++ b/pkg/users/group-create-dialog.js @@ -22,7 +22,7 @@ import React from 'react'; import { Form, FormGroup } from "@patternfly/react-core/dist/esm/components/Form/index.js"; import { TextInput } from "@patternfly/react-core/dist/esm/components/TextInput/index.js"; -import { show_modal_dialog, apply_modal_dialog } from "cockpit-components-dialog.jsx"; +import { show_modal_dialog, apply_modal_dialog } from "cockpit-components-dialog"; import { has_errors, is_valid_char_name } from "./dialog-utils.js"; diff --git a/pkg/users/lock-account-dialog.js b/pkg/users/lock-account-dialog.js index 3528999ed398..f14fb7929738 100644 --- a/pkg/users/lock-account-dialog.js +++ b/pkg/users/lock-account-dialog.js @@ -19,7 +19,7 @@ import cockpit from 'cockpit'; -import { show_modal_dialog } from "cockpit-components-dialog.jsx"; +import { show_modal_dialog } from "cockpit-components-dialog"; const _ = cockpit.gettext; diff --git a/pkg/users/logout-account-dialog.js b/pkg/users/logout-account-dialog.js index 07936d9c3458..a50ac2967825 100644 --- a/pkg/users/logout-account-dialog.js +++ b/pkg/users/logout-account-dialog.js @@ -19,7 +19,7 @@ import cockpit from 'cockpit'; -import { show_modal_dialog } from "cockpit-components-dialog.jsx"; +import { show_modal_dialog } from "cockpit-components-dialog"; const _ = cockpit.gettext; diff --git a/pkg/users/password-dialogs.js b/pkg/users/password-dialogs.js index fb5cfc287b9f..f9e41cc1fdc3 100644 --- a/pkg/users/password-dialogs.js +++ b/pkg/users/password-dialogs.js @@ -24,8 +24,8 @@ import { Form, FormGroup } from "@patternfly/react-core/dist/esm/components/Form import { TextInput } from "@patternfly/react-core/dist/esm/components/TextInput/index.js"; import { has_errors } from "./dialog-utils.js"; -import { show_modal_dialog, apply_modal_dialog } from "cockpit-components-dialog.jsx"; -import { password_quality, PasswordFormFields } from "cockpit-components-password.jsx"; +import { show_modal_dialog, apply_modal_dialog } from "cockpit-components-dialog"; +import { password_quality, PasswordFormFields } from "cockpit-components-password"; const _ = cockpit.gettext; diff --git a/pkg/users/rename-group-dialog.jsx b/pkg/users/rename-group-dialog.jsx index 0dc2a25c406d..b54b24fec190 100644 --- a/pkg/users/rename-group-dialog.jsx +++ b/pkg/users/rename-group-dialog.jsx @@ -23,7 +23,7 @@ import { Form, FormGroup } from "@patternfly/react-core/dist/esm/components/Form import { HelperText, HelperTextItem } from "@patternfly/react-core/dist/esm/components/HelperText/index.js"; import { TextInput } from "@patternfly/react-core/dist/esm/components/TextInput/index.js"; -import { apply_modal_dialog, show_modal_dialog } from "cockpit-components-dialog.jsx"; +import { apply_modal_dialog, show_modal_dialog } from "cockpit-components-dialog"; const _ = cockpit.gettext; diff --git a/pkg/users/users.js b/pkg/users/users.js index b0a17d705a1c..e3685d4dcdbe 100755 --- a/pkg/users/users.js +++ b/pkg/users/users.js @@ -25,11 +25,11 @@ import React, { useMemo, useState, useEffect } from 'react'; import { createRoot } from 'react-dom/client'; import { superuser } from "superuser"; -import { usePageLocation, useLoggedInUser, useFile, useInit } from "hooks.js"; +import { usePageLocation, useLoggedInUser, useFile, useInit } from "hooks"; import { etc_passwd_syntax, etc_group_syntax, etc_shells_syntax } from "./parsers.js"; import { AccountsMain } from "./accounts-list.js"; import { AccountDetails } from "./account-details.js"; -import { EmptyStatePanel } from "cockpit-components-empty-state.jsx"; +import { EmptyStatePanel } from "cockpit-components-empty-state"; import "./users.scss";