chore(ts): organize shared components

src/app/Agent/AgentLiveProbes.tsx

@@ -15,10 +15,10 @@
  */
 import { ErrorView } from '@app/ErrorView/ErrorView';
 import { authFailMessage, isAuthFail } from '@app/ErrorView/types';
-import { LoadingView } from '@app/LoadingView/LoadingView';
 import { DeleteWarningModal } from '@app/Modal/DeleteWarningModal';
 import { DeleteOrDisableWarningType } from '@app/Modal/types';
-import { LoadingPropsType } from '@app/Shared/ProgressIndicator';
+import { LoadingView } from '@app/Shared/Components/LoadingView';
+import { LoadingProps } from '@app/Shared/Components/types';
 import { EventProbe } from '@app/Shared/Services/Api.service';
 import { NotificationCategory } from '@app/Shared/Services/NotificationChannel.service';
 import { ServiceContext } from '@app/Shared/Services/Services';
@@ -284,13 +284,13 @@ export const AgentLiveProbes: React.FC<AgentLiveProbesProps> = (_) => {
     [filteredProbes],
   );
 
-  const actionLoadingProps = React.useMemo<Record<LiveProbeActions, LoadingPropsType>>(
+  const actionLoadingProps = React.useMemo<Record<LiveProbeActions, LoadingProps>>(
     () => ({
       REMOVE: {
         spinnerAriaValueText: 'Removing',
         spinnerAriaLabel: 'removing-all-probes',
         isLoading: actionLoadings['REMOVE'],
-      } as LoadingPropsType,
+      } as LoadingProps,
     }),
     [actionLoadings],
   );

src/app/Agent/AgentProbeTemplates.tsx

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 import { ErrorView } from '@app/ErrorView/ErrorView';
-import { LoadingView } from '@app/LoadingView/LoadingView';
 import { DeleteWarningModal } from '@app/Modal/DeleteWarningModal';
 import { DeleteOrDisableWarningType } from '@app/Modal/types';
-import { FUpload, MultiFileUpload, UploadCallbacks } from '@app/Shared/FileUploads';
-import { LoadingPropsType } from '@app/Shared/ProgressIndicator';
+import { FUpload, MultiFileUpload, UploadCallbacks } from '@app/Shared/Components/FileUploads';
+import { LoadingView } from '@app/Shared/Components/LoadingView';
+import { LoadingProps } from '@app/Shared/Components/types';
 import { ProbeTemplate } from '@app/Shared/Services/Api.service';
 import { NotificationCategory } from '@app/Shared/Services/NotificationChannel.service';
 import { ServiceContext } from '@app/Shared/Services/Services';
@@ -439,7 +439,7 @@ export const AgentProbeTemplateUploadModal: React.FC<AgentProbeTemplateUploadMod
         spinnerAriaValueText: 'Submitting',
         spinnerAriaLabel: 'submitting-probe-template',
         isLoading: uploading,
-      }) as LoadingPropsType,
+      }) as LoadingProps,
     [uploading],
   );
 

src/app/AppLayout/AppLayout.tsx

@@ -21,10 +21,10 @@ import { NotificationCenter } from '@app/Notifications/NotificationCenter';
 import { Notification, NotificationsContext } from '@app/Notifications/Notifications';
 import { IAppRoute, navGroups, routes } from '@app/routes';
 import { selectTab, SettingTab, tabAsParam, ThemeSetting } from '@app/Settings/SettingsUtils';
-import { DynamicFeatureFlag, FeatureFlag } from '@app/Shared/FeatureFlag/FeatureFlag';
+import { DynamicFeatureFlag, FeatureFlag } from '@app/Shared/Components/FeatureFlag';
 import { NotificationCategory } from '@app/Shared/Services/NotificationChannel.service';
 import { ServiceContext } from '@app/Shared/Services/Services';
-import { FeatureLevel } from '@app/Shared/Services/Settings.service';
+import { FeatureLevel } from '@app/Shared/Services/types';
 import { saveToLocalStorage } from '@app/utils/LocalStorage';
 import { useLogin } from '@app/utils/useLogin';
 import { useSubscriptions } from '@app/utils/useSubscriptions';

src/app/AppLayout/CredentialAuthForm.tsx

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { LoadingPropsType } from '@app/Shared/ProgressIndicator';
+import { LoadingProps } from '@app/Shared/Components/types';
 import { ActionGroup, Button, Form, FormGroup, TextInput } from '@patternfly/react-core';
 import * as React from 'react';
 
@@ -69,7 +69,7 @@ export const CredentialAuthForm: React.FC<CredentialAuthFormProps> = ({
         spinnerAriaValueText: 'Saving',
         spinnerAriaLabel: 'saving-credentials',
         isLoading: loading,
-      }) as LoadingPropsType,
+      }) as LoadingProps,
     [loading],
   );
 

src/app/Archives/AllArchivedRecordingsTable.tsx

@@ -13,8 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { LoadingView } from '@app/LoadingView/LoadingView';
 import { ArchivedRecordingsTable } from '@app/Recordings/ArchivedRecordingsTable';
+import { LoadingView } from '@app/Shared/Components/LoadingView';
 import { ArchivedRecording, RecordingDirectory } from '@app/Shared/Services/Api.service';
 import { NotificationCategory } from '@app/Shared/Services/NotificationChannel.service';
 import { ServiceContext } from '@app/Shared/Services/Services';

src/app/Archives/AllTargetsArchivedRecordingsTable.tsx

@@ -13,8 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { LoadingView } from '@app/LoadingView/LoadingView';
 import { ArchivedRecordingsTable } from '@app/Recordings/ArchivedRecordingsTable';
+import { LoadingView } from '@app/Shared/Components/LoadingView';
 import { NotificationCategory } from '@app/Shared/Services/NotificationChannel.service';
 import { ServiceContext } from '@app/Shared/Services/Services';
 import { includesTarget, indexOfTarget, isEqualTarget, Target } from '@app/Shared/Services/Target.service';

src/app/Archives/ArchiveUploadModal.tsx

@@ -15,8 +15,8 @@
  */
 import { RecordingLabelFields } from '@app/RecordingMetadata/RecordingLabelFields';
 import { RecordingLabel } from '@app/RecordingMetadata/types';
-import { FUpload, MultiFileUpload, UploadCallbacks } from '@app/Shared/FileUploads';
-import { LoadingPropsType } from '@app/Shared/ProgressIndicator';
+import { FUpload, MultiFileUpload, UploadCallbacks } from '@app/Shared/Components/FileUploads';
+import { LoadingProps } from '@app/Shared/Components/types';
 import { ServiceContext } from '@app/Shared/Services/Services';
 import { useSubscriptions } from '@app/utils/useSubscriptions';
 import { portalRoot } from '@app/utils/utils';
@@ -139,7 +139,7 @@ export const ArchiveUploadModal: React.FC<ArchiveUploadModalProps> = ({ onClose,
         spinnerAriaValueText: 'Submitting',
         spinnerAriaLabel: 'submitting-uploaded-recording',
         isLoading: uploading,
-      }) as LoadingPropsType,
+      }) as LoadingProps,
     [uploading],
   );
 

src/app/CreateRecording/CustomRecordingForm.tsx

@@ -20,8 +20,8 @@ import { EventTemplate } from '@app/Events/types';
 import { NotificationsContext } from '@app/Notifications/Notifications';
 import { RecordingLabelFields } from '@app/RecordingMetadata/RecordingLabelFields';
 import { RecordingLabel } from '@app/RecordingMetadata/types';
-import { LoadingPropsType } from '@app/Shared/ProgressIndicator';
-import { SelectTemplateSelectorForm } from '@app/Shared/SelectTemplateSelectorForm';
+import { SelectTemplateSelectorForm } from '@app/Shared/Components/SelectTemplateSelectorForm';
+import { LoadingProps } from '@app/Shared/Components/types';
 import { ServiceContext } from '@app/Shared/Services/Services';
 import { isTargetAgentHttp, NO_TARGET, Target } from '@app/Shared/Services/Target.service';
 import { useSubscriptions } from '@app/utils/useSubscriptions';
@@ -332,7 +332,7 @@ export const CustomRecordingForm: React.FC = () => {
         spinnerAriaValueText: 'Creating',
         spinnerAriaLabel: 'create-active-recording',
         isLoading: loading,
-      }) as LoadingPropsType,
+      }) as LoadingProps,
     [loading],
   );
 

src/app/CreateRecording/SnapshotRecordingForm.tsx

@@ -15,7 +15,7 @@
  */
 import { ErrorView } from '@app/ErrorView/ErrorView';
 import { authFailMessage, isAuthFail, missingSSLMessage } from '@app/ErrorView/types';
-import { LoadingPropsType } from '@app/Shared/ProgressIndicator';
+import { LoadingProps } from '@app/Shared/Components/types';
 import { ServiceContext } from '@app/Shared/Services/Services';
 import { useSubscriptions } from '@app/utils/useSubscriptions';
 import { ActionGroup, Button, Form, Text, TextVariants } from '@patternfly/react-core';
@@ -53,7 +53,7 @@ export const SnapshotRecordingForm: React.FC<SnapshotRecordingFormProps> = (_) =
         spinnerAriaValueText: 'Creating',
         spinnerAriaLabel: 'create-snapshot-recording',
         isLoading: loading,
-      }) as LoadingPropsType,
+      }) as LoadingProps,
     [loading],
   );
 

src/app/Dashboard/AddCard.tsx

@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import { EmptyText } from '@app/Shared/Components/EmptyText';
+import QuickSearchIcon from '@app/Shared/Components/QuickSearchIcon';
 import { dashboardConfigAddCardIntent, StateDispatch } from '@app/Shared/Redux/ReduxStore';
 import { ServiceContext } from '@app/Shared/Services/Services';
-import { EmptyText } from '@app/Topology/Shared/EmptyText';
-import QuickSearchIcon from '@app/Topology/Shared/QuickSearchIcon';
 import { fakeChartContext, fakeServices } from '@app/utils/fakeData';
 import { useFeatureLevel } from '@app/utils/useFeatureLevel';
 import { useSubscriptions } from '@app/utils/useSubscriptions';

src/app/Dashboard/AutomatedAnalysis/AutomatedAnalysisCard.tsx

@@ -15,7 +15,7 @@
  */
 import { ErrorView } from '@app/ErrorView/ErrorView';
 import { authFailMessage, isAuthFail } from '@app/ErrorView/types';
-import { LoadingView } from '@app/LoadingView/LoadingView';
+import { LoadingView } from '@app/Shared/Components/LoadingView';
 import {
   automatedAnalysisAddGlobalFilterIntent,
   emptyAutomatedAnalysisFilters,
@@ -47,8 +47,9 @@ import {
   TEMPLATE_UNSUPPORTED_MESSAGE,
 } from '@app/Shared/Services/Report.service';
 import { ServiceContext } from '@app/Shared/Services/Services';
-import { automatedAnalysisConfigToRecordingAttributes, FeatureLevel } from '@app/Shared/Services/Settings.service';
+import { automatedAnalysisConfigToRecordingAttributes } from '@app/Shared/Services/Settings.service';
 import { NO_TARGET } from '@app/Shared/Services/Target.service';
+import { FeatureLevel } from '@app/Shared/Services/types';
 import { useSubscriptions } from '@app/utils/useSubscriptions';
 import { calculateAnalysisTimer, portalRoot } from '@app/utils/utils';
 import {

src/app/Dashboard/AutomatedAnalysis/AutomatedAnalysisConfigDrawer.tsx

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import { RecordingAttributes } from '@app/CreateRecording/types';
-import { LoadingView } from '@app/LoadingView/LoadingView';
+import { LoadingView } from '@app/Shared/Components/LoadingView';
 import { RECORDING_FAILURE_MESSAGE, TEMPLATE_UNSUPPORTED_MESSAGE } from '@app/Shared/Services/Report.service';
 import { ServiceContext } from '@app/Shared/Services/Services';
 import { automatedAnalysisConfigToRecordingAttributes } from '@app/Shared/Services/Settings.service';

src/app/Dashboard/AutomatedAnalysis/AutomatedAnalysisConfigForm.tsx

@@ -17,15 +17,15 @@ import { AuthModal } from '@app/AppLayout/AuthModal';
 import { ErrorView } from '@app/ErrorView/ErrorView';
 import { authFailMessage, isAuthFail } from '@app/ErrorView/types';
 import { EventTemplate } from '@app/Events/types';
-import { SelectTemplateSelectorForm } from '@app/Shared/SelectTemplateSelectorForm';
+import { SelectTemplateSelectorForm } from '@app/Shared/Components/SelectTemplateSelectorForm';
+import { TargetSelect } from '@app/Shared/Components/Target/TargetSelect';
 import {
   AutomatedAnalysisRecordingConfig,
   automatedAnalysisRecordingName,
   isHttpError,
 } from '@app/Shared/Services/Api.service';
 import { ServiceContext } from '@app/Shared/Services/Services';
 import { NO_TARGET, Target } from '@app/Shared/Services/Target.service';
-import { TargetSelect } from '@app/Shared/TargetSelect';
 import { useSubscriptions } from '@app/utils/useSubscriptions';
 import {
   Button,

src/app/Dashboard/Charts/jfr/JFRMetricsChartCard.tsx

@@ -21,9 +21,9 @@ import {
   DashboardCardSizes,
   DashboardCardTypeProps,
 } from '@app/Dashboard/dashboard-utils';
-import { LoadingView } from '@app/LoadingView/LoadingView';
+import { LoadingView } from '@app/Shared/Components/LoadingView';
 import { ServiceContext } from '@app/Shared/Services/Services';
-import { FeatureLevel } from '@app/Shared/Services/Settings.service';
+import { FeatureLevel } from '@app/Shared/Services/types';
 import { useSubscriptions } from '@app/utils/useSubscriptions';
 import { useTheme } from '@app/utils/useTheme';
 import {

src/app/Dashboard/Charts/mbean/MBeanMetricsChartCard.tsx

@@ -23,7 +23,7 @@ import {
 import { ThemeSetting, ThemeType } from '@app/Settings/SettingsUtils';
 import { MBeanMetrics } from '@app/Shared/Services/Api.service';
 import { ServiceContext } from '@app/Shared/Services/Services';
-import { FeatureLevel } from '@app/Shared/Services/Settings.service';
+import { FeatureLevel } from '@app/Shared/Services/types';
 import useDayjs from '@app/utils/useDayjs';
 import { useSubscriptions } from '@app/utils/useSubscriptions';
 import { useTheme } from '@app/utils/useTheme';

src/app/Dashboard/Dashboard.tsx

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { FeatureFlag } from '@app/Shared/FeatureFlag/FeatureFlag';
+import { FeatureFlag } from '@app/Shared/Components/FeatureFlag';
 import { DashboardConfig } from '@app/Shared/Redux/Configurations/DashboardConfigSlice';
 import {
   dashboardConfigDeleteCardIntent,
@@ -23,7 +23,7 @@ import {
   StateDispatch,
 } from '@app/Shared/Redux/ReduxStore';
 import { ServiceContext } from '@app/Shared/Services/Services';
-import { FeatureLevel } from '@app/Shared/Services/Settings.service';
+import { FeatureLevel } from '@app/Shared/Services/types';
 import { TargetView } from '@app/TargetView/TargetView';
 import { getFromLocalStorage } from '@app/utils/LocalStorage';
 import { Grid, GridItem } from '@patternfly/react-core';

src/app/Dashboard/JvmDetails/JvmDetailsCard.tsx

@@ -15,10 +15,10 @@
  */
 
 import { ServiceContext } from '@app/Shared/Services/Services';
-import { FeatureLevel } from '@app/Shared/Services/Settings.service';
 import { Target } from '@app/Shared/Services/Target.service';
+import { FeatureLevel } from '@app/Shared/Services/types';
 import { NodeAction } from '@app/Topology/Actions/NodeActions';
-import EntityDetails from '@app/Topology/Shared/Entity/EntityDetails';
+import EntityDetails from '@app/Topology/Entity/EntityDetails';
 import { NodeType } from '@app/Topology/types';
 import { useSubscriptions } from '@app/utils/useSubscriptions';
 import { CardActions, CardBody, CardHeader } from '@patternfly/react-core';

src/app/Dashboard/LayoutTemplateGroup.tsx

@@ -15,7 +15,7 @@
  */
 import { dashboardConfigTemplateHistoryClearIntent } from '@app/Shared/Redux/ReduxStore';
 import { ServiceContext } from '@app/Shared/Services/Services';
-import { FeatureLevel } from '@app/Shared/Services/Settings.service';
+import { FeatureLevel } from '@app/Shared/Services/types';
 import { portalRoot } from '@app/utils/utils';
 import { CatalogTile } from '@patternfly/react-catalog-view-extension';
 import {

src/app/Dashboard/LayoutTemplateUploadModal.tsx

@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { FUpload, MultiFileUpload, UploadCallbacks } from '@app/Shared/FileUploads';
-import { LoadingPropsType } from '@app/Shared/ProgressIndicator';
+import { FUpload, MultiFileUpload, UploadCallbacks } from '@app/Shared/Components/FileUploads';
+import { LoadingProps } from '@app/Shared/Components/types';
 import { dashboardConfigCreateTemplateIntent, RootState } from '@app/Shared/Redux/ReduxStore';
-import { FeatureLevel } from '@app/Shared/Services/Settings.service';
+import { FeatureLevel } from '@app/Shared/Services/types';
 import { useSubscriptions } from '@app/utils/useSubscriptions';
 import { portalRoot } from '@app/utils/utils';
 import { ActionGroup, Button, Form, FormGroup, Modal, ModalVariant, Popover, Text } from '@patternfly/react-core';
@@ -222,7 +222,7 @@ export const LayoutTemplateUploadModal: React.FC<LayoutTemplateUploadModalProps>
         spinnerAriaValueText: t('SUBMITTING', { ns: 'common' }),
         spinnerAriaLabel: 'submitting-layout-templates',
         isLoading: uploading,
-      }) as LoadingPropsType,
+      }) as LoadingProps,
     [t, uploading],
   );
 

src/app/Dashboard/dashboard-utils.tsx

@@ -17,7 +17,7 @@
 import cryostatLogo from '@app/assets/cryostat_icon_rgb_default.svg';
 import cryostatLogoDark from '@app/assets/cryostat_icon_rgb_reverse.svg';
 import { dashboardConfigDeleteCardIntent } from '@app/Shared/Redux/ReduxStore';
-import { FeatureLevel } from '@app/Shared/Services/Settings.service';
+import { FeatureLevel } from '@app/Shared/Services/types';
 import { withThemedIcon } from '@app/utils/withThemedIcon';
 import { LabelProps, gridSpans, Button, ButtonVariant } from '@patternfly/react-core';
 import { FileIcon, UnknownIcon, UserIcon } from '@patternfly/react-icons';

src/app/Events/EventTemplates.tsx

@@ -17,11 +17,11 @@
 import { CustomRecordingFormData } from '@app/CreateRecording/types';
 import { ErrorView } from '@app/ErrorView/ErrorView';
 import { authFailMessage, isAuthFail } from '@app/ErrorView/types';
-import { LoadingView } from '@app/LoadingView/LoadingView';
 import { DeleteWarningModal } from '@app/Modal/DeleteWarningModal';
 import { DeleteOrDisableWarningType } from '@app/Modal/types';
-import { FUpload, MultiFileUpload, UploadCallbacks } from '@app/Shared/FileUploads';
-import { LoadingPropsType } from '@app/Shared/ProgressIndicator';
+import { FUpload, MultiFileUpload, UploadCallbacks } from '@app/Shared/Components/FileUploads';
+import { LoadingView } from '@app/Shared/Components/LoadingView';
+import { LoadingProps } from '@app/Shared/Components/types';
 import { NotificationCategory } from '@app/Shared/Services/NotificationChannel.service';
 import { ServiceContext } from '@app/Shared/Services/Services';
 import { NO_TARGET } from '@app/Shared/Services/Target.service';
@@ -501,7 +501,7 @@ export const EventTemplatesUploadModal: React.FC<EventTemplatesUploadModalProps>
         spinnerAriaValueText: 'Submitting',
         spinnerAriaLabel: 'submitting-custom-event-template',
         isLoading: uploading,
-      }) as LoadingPropsType,
+      }) as LoadingProps,
     [uploading],
   );
 

src/app/Events/EventTypes.tsx

@@ -15,7 +15,7 @@
  */
 import { ErrorView } from '@app/ErrorView/ErrorView';
 import { authFailMessage, isAuthFail } from '@app/ErrorView/types';
-import { LoadingView } from '@app/LoadingView/LoadingView';
+import { LoadingView } from '@app/Shared/Components/LoadingView';
 import { ServiceContext } from '@app/Shared/Services/Services';
 import { NO_TARGET } from '@app/Shared/Services/Target.service';
 import { useSort } from '@app/utils/useSort';

src/app/Login/Login.tsx

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 import { Language } from '@app/Settings/Language';
-import { FeatureFlag } from '@app/Shared/FeatureFlag/FeatureFlag';
+import { FeatureFlag } from '@app/Shared/Components/FeatureFlag';
 import { AuthMethod } from '@app/Shared/Services/Login.service';
 import { ServiceContext } from '@app/Shared/Services/Services';
-import { FeatureLevel } from '@app/Shared/Services/Settings.service';
+import { FeatureLevel } from '@app/Shared/Services/types';
 import { useSubscriptions } from '@app/utils/useSubscriptions';
 import {
   Card,

src/app/NotFound/NotFound.tsx

@@ -16,7 +16,7 @@
 import '@app/app.css';
 import { IAppRoute, routes, flatten } from '@app/routes';
 import { ServiceContext } from '@app/Shared/Services/Services';
-import { FeatureLevel } from '@app/Shared/Services/Settings.service';
+import { FeatureLevel } from '@app/Shared/Services/types';
 import { useSubscriptions } from '@app/utils/useSubscriptions';
 import {
   Button,

src/app/QuickStarts/QuickStartDrawer.tsx

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 import build from '@app/build.json';
-import { LoadingView } from '@app/LoadingView/LoadingView';
 import { allQuickStarts } from '@app/QuickStarts/all-quickstarts';
+import { LoadingView } from '@app/Shared/Components/LoadingView';
 import { SessionState } from '@app/Shared/Services/Login.service';
 import { ServiceContext } from '@app/Shared/Services/Services';
 import { useFeatureLevel } from '@app/utils/useFeatureLevel';

src/app/QuickStarts/quickstarts/automated-rules-quickstart.tsx

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { FeatureLevel } from '@app/Shared/Services/Settings.service';
+import { FeatureLevel } from '@app/Shared/Services/types';
 import { QuickStart } from '@patternfly/quickstarts';
 import React from 'react';
 import { CryostatIcon, conclusion } from '../quickstart-utils';