Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 3 additions & 3 deletions apps/ocp-plugin/src/components/AppContext/AppContext.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import * as React from 'react';
import {
AppContext,
AppContextProps,
type AppContextProps,
FlightCtlApp,
NavLinkFC,
PromptFC,
type NavLinkFC,
type PromptFC,
} from '@flightctl/ui-components/src/hooks/useAppContext';
import { ROUTE } from '@flightctl/ui-components/src/hooks/useNavigate';
import {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import DeviceDetails from '@flightctl/ui-components/src/components/Device/Device
import WithTooltip from '@flightctl/ui-components/src/components/common/WithTooltip';
import WithPageLayout from '../common/WithPageLayout';
import { getWatchK8sResourceResult, isMicroShiftCluster } from '../../utils/clusters';
import { ManagedCluster } from '../../types/k8s';
import { type ManagedCluster } from '../../types/k8s';

type K8sWatchResourceError = string | object;

Expand Down
2 changes: 1 addition & 1 deletion apps/ocp-plugin/src/hooks/useFetch.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
putData,
wsEndpoint,
} from '../utils/apiCalls';
import { PatchRequest } from '@flightctl/types';
import { type PatchRequest } from '@flightctl/types';

export const useFetch = () => {
const get = React.useCallback(
Expand Down
2 changes: 1 addition & 1 deletion apps/ocp-plugin/src/types/k8s.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { K8sResourceCommon } from '@openshift-console/dynamic-plugin-sdk';
import { type K8sResourceCommon } from '@openshift-console/dynamic-plugin-sdk';

export type ManagedCluster = K8sResourceCommon & {
status?: {
Expand Down
2 changes: 1 addition & 1 deletion apps/ocp-plugin/src/utils/apiCalls.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* eslint-disable no-console */

import { PatchRequest } from '@flightctl/types';
import { type PatchRequest } from '@flightctl/types';
import { getCSRFToken } from '@openshift-console/dynamic-plugin-sdk/lib/utils/fetch/console-fetch-utils';
import {
getErrorMsgFromAlertsApiResponse,
Expand Down
2 changes: 1 addition & 1 deletion apps/ocp-plugin/src/utils/clusters.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ManagedCluster } from '../types/k8s';
import { type ManagedCluster } from '../types/k8s';
import { getErrorMessage } from '@flightctl/ui-components/src/utils/error';

const isMicroShiftCluster = (mc: ManagedCluster) =>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
DropdownItem,
DropdownList,
MenuToggle,
MenuToggleElement,
type MenuToggleElement,
ModalBody,
ModalFooter,
ModalHeader,
Expand Down
2 changes: 1 addition & 1 deletion apps/standalone/src/app/components/Login/LoginPage.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as React from 'react';
import { Alert, Bullseye, Spinner } from '@patternfly/react-core';

import { AuthConfig, AuthProvider } from '@flightctl/types';
import { type AuthConfig, type AuthProvider } from '@flightctl/types';
import { ProviderType } from '@flightctl/ui-components/src/types/extraTypes';
import ProviderSelector from '@flightctl/ui-components/src/components/Login/ProviderSelector';
import TokenLoginForm from '@flightctl/ui-components/src/components/Login/TokenLoginForm';
Expand Down
2 changes: 1 addition & 1 deletion apps/standalone/src/app/hooks/useFetch.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
putData,
wsEndpoint,
} from '../utils/apiCalls';
import { PatchRequest } from '@flightctl/types';
import { type PatchRequest } from '@flightctl/types';

export const useFetch = () => {
const get = React.useCallback(
Expand Down
7 changes: 6 additions & 1 deletion apps/standalone/src/app/hooks/useStandaloneAppContext.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
import * as React from 'react';
import { AppContextProps, FlightCtlApp, NavLinkFC, appRoutes } from '@flightctl/ui-components/src/hooks/useAppContext';
import {
type AppContextProps,
FlightCtlApp,
type NavLinkFC,
appRoutes,
} from '@flightctl/ui-components/src/hooks/useAppContext';
import {
Link,
NavLink,
Expand Down
11 changes: 9 additions & 2 deletions apps/standalone/src/app/routes.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,15 @@ import {
Stack,
StackItem,
} from '@patternfly/react-core';
import { Navigate, RouteObject, RouterProvider, createBrowserRouter, useParams, useRouteError } from 'react-router-dom';
import { TFunction } from 'i18next';
import {
Navigate,
type RouteObject,
RouterProvider,
createBrowserRouter,
useParams,
useRouteError,
} from 'react-router-dom';
import { type TFunction } from 'i18next';
import { PathMissingIcon } from '@patternfly/react-icons/dist/js/icons/path-missing-icon';

import { useDocumentTitle } from '@flightctl/ui-components/src/hooks/useDocumentTitle';
Expand Down
2 changes: 1 addition & 1 deletion apps/standalone/src/app/utils/apiCalls.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* eslint-disable no-console */
import { PatchRequest } from '@flightctl/types';
import { type PatchRequest } from '@flightctl/types';
import {
getErrorMsgFromAlertsApiResponse,
getErrorMsgFromApiResponse,
Expand Down
7 changes: 7 additions & 0 deletions eslint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,13 @@ module.exports = defineConfig([
'@typescript-eslint/no-floating-promises': 'off',
'@typescript-eslint/no-unsafe-enum-comparison': 'off',
'@typescript-eslint/no-unused-vars': 'error',
'@typescript-eslint/consistent-type-imports': [
'error',
{
prefer: 'type-imports',
fixStyle: 'inline-type-imports',
},
],
},
},
globalIgnores(['**/*.json']),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as React from 'react';
import { Table, Tbody, Td, Th, Thead, Tr } from '@patternfly/react-table';

import { ApplicationPort } from '@flightctl/types';
import { type ApplicationPort } from '@flightctl/types';
import { useTranslation } from '../../hooks/useTranslation';
import { toFormPortMappingWithProtocol } from '../Device/EditDeviceWizard/deviceSpecUtils';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as React from 'react';
import { DropdownItem, Tab } from '@patternfly/react-core';

import { AuthProvider } from '@flightctl/types';
import { type AuthProvider } from '@flightctl/types';

import { useFetchPeriodically } from '../../../hooks/useFetchPeriodically';
import DetailsPage from '../../DetailsPage/DetailsPage';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ import {
StackItem,
Title,
} from '@patternfly/react-core';
import { AuthProvider } from '@flightctl/types';
import { type AuthProvider } from '@flightctl/types';

import { useTranslation } from '../../../hooks/useTranslation';
import { DEFAULT_USERNAME_CLAIM, OrgAssignmentType, isOAuth2Provider } from '../CreateAuthProvider/types';
import { getAssignmentTypeLabel, getProviderTypeLabel } from '../CreateAuthProvider/utils';
import RoleAssigmentDetails from './RoleAssigmentDetails';
import { DynamicAuthProviderSpec } from '../../../types/extraTypes';
import { type DynamicAuthProviderSpec } from '../../../types/extraTypes';

const Scopes = ({ scopes }: { scopes: string[] | undefined }) => {
if (!scopes || scopes.length === 0) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as React from 'react';
import { Label, LabelGroup } from '@patternfly/react-core';

import { AuthRoleAssignment } from '@flightctl/types';
import { type AuthRoleAssignment } from '@flightctl/types';
import { getAssignmentTypeLabel } from '../CreateAuthProvider/utils';
import { useTranslation } from '../../../hooks/useTranslation';
import {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import * as React from 'react';
import { ActionsColumn, IAction, Td, Tr } from '@patternfly/react-table';
import { ActionsColumn, type IAction, Td, Tr } from '@patternfly/react-table';
import { Label } from '@patternfly/react-core';
import CheckCircleIcon from '@patternfly/react-icons/dist/js/icons/check-circle-icon';
import TimesCircleIcon from '@patternfly/react-icons/dist/js/icons/times-circle-icon';
import { AuthProvider } from '@flightctl/types';
import { type AuthProvider } from '@flightctl/types';
import { useTranslation } from '../../hooks/useTranslation';
import { Link, ROUTE, useNavigate } from '../../hooks/useNavigate';
import { RESOURCE, VERB } from '../../types/rbac';
import { DynamicAuthProviderSpec, ProviderType } from '../../types/extraTypes';
import { type DynamicAuthProviderSpec, ProviderType } from '../../types/extraTypes';
import { isOAuth2Provider } from './CreateAuthProvider/types';
import { getProviderTypeLabel } from './CreateAuthProvider/utils';
import { usePermissionsContext } from '../common/PermissionsContext';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import {
ToolbarItem,
} from '@patternfly/react-core';
import { Tbody } from '@patternfly/react-table';
import { TFunction } from 'i18next';
import { type TFunction } from 'i18next';
import { CubesIcon } from '@patternfly/react-icons/dist/js/icons/cubes-icon';

import ListPageBody from '../ListPage/ListPageBody';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { useTranslation } from '../../../hooks/useTranslation';
import RadioField from '../../form/RadioField';
import TextField from '../../form/TextField';
import ListItemField from '../../form/ListItemField';
import { AuthProviderFormValues, OrgAssignmentType } from './types';
import { type AuthProviderFormValues, OrgAssignmentType } from './types';

const OrganizationAssignmentSection = () => {
const { t } = useTranslation();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as React from 'react';
import { Alert, Breadcrumb, BreadcrumbItem, Bullseye, PageSection, Spinner, Title } from '@patternfly/react-core';

import { AuthProvider } from '@flightctl/types';
import { type AuthProvider } from '@flightctl/types';

import { useTranslation } from '../../../hooks/useTranslation';
import { useFetch } from '../../../hooks/useFetch';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import { OutlinedQuestionCircleIcon } from '@patternfly/react-icons/dist/js/icon
import { Formik, useFormikContext } from 'formik';
import * as Yup from 'yup';

import { AuthProvider } from '@flightctl/types';
import { type AuthProvider } from '@flightctl/types';
import { useTranslation } from '../../../hooks/useTranslation';
import { useFetch } from '../../../hooks/useFetch';
import NameField from '../../form/NameField';
Expand All @@ -24,7 +24,7 @@ import SwitchField from '../../form/SwitchField';
import ListItemField from '../../form/ListItemField';
import FlightCtlForm from '../../form/FlightCtlForm';
import { getDnsSubdomainValidations } from '../../form/validations';
import { AuthProviderFormValues, FieldValidationResult } from './types';
import { type AuthProviderFormValues, type FieldValidationResult } from './types';
import { ProviderType } from '../../../types/extraTypes';

import { authProviderSchema, getAuthProvider, getAuthProviderPatches, getInitValues } from './utils';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import { TFunction } from 'react-i18next';
import { type TFunction } from 'react-i18next';
import {
FormGroup,
FormSection,
Expand All @@ -19,7 +19,7 @@ import RadioField from '../../form/RadioField';
import ListItemField from '../../form/ListItemField';
import TextField from '../../form/TextField';
import ErrorHelperText, { DefaultHelperText } from '../../form/FieldHelperText';
import { AuthProviderFormValues, RoleAssignmentType } from './types';
import { type AuthProviderFormValues, RoleAssignmentType } from './types';
import { FormGroupWithHelperText } from '../../common/WithHelperText';
import { RoleClaimHelperText, RoleSeparatorHelperText } from './AuthProviderHelperText';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import {
AuthDynamicOrganizationAssignment,
AuthDynamicRoleAssignment,
AuthOrganizationAssignment,
AuthPerUserOrganizationAssignment,
AuthProviderSpec,
AuthRoleAssignment,
AuthStaticOrganizationAssignment,
AuthStaticRoleAssignment,
OAuth2ProviderSpec,
OIDCProviderSpec,
type AuthDynamicOrganizationAssignment,
type AuthDynamicRoleAssignment,
type AuthOrganizationAssignment,
type AuthPerUserOrganizationAssignment,
type AuthProviderSpec,
type AuthRoleAssignment,
type AuthStaticOrganizationAssignment,
type AuthStaticRoleAssignment,
type OAuth2ProviderSpec,
type OIDCProviderSpec,
} from '@flightctl/types';
import { ProviderType } from '../../../types/extraTypes';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
import * as Yup from 'yup';
import { TFunction } from 'i18next';
import { type TFunction } from 'i18next';
import {
ApiVersion,
AuthDynamicRoleAssignment,
AuthOrganizationAssignment,
AuthProvider,
AuthProviderSpec,
AuthRoleAssignment,
AuthStaticRoleAssignment,
OAuth2ProviderSpec,
PatchRequest,
type AuthDynamicRoleAssignment,
type AuthOrganizationAssignment,
type AuthProvider,
type AuthProviderSpec,
type AuthRoleAssignment,
type AuthStaticRoleAssignment,
type OAuth2ProviderSpec,
type PatchRequest,
} from '@flightctl/types';
import { appendJSONPatch } from '../../../utils/patch';
import {
AuthProviderFormValues,
type AuthProviderFormValues,
DEFAULT_ROLE_SEPARATOR,
OrgAssignmentType,
RoleAssignmentType,
Expand All @@ -25,7 +25,7 @@ import {
isRoleAssignmentStatic,
} from './types';
import { validKubernetesDnsSubdomain } from '../../form/validations';
import { DynamicAuthProviderSpec, ProviderType } from '../../../types/extraTypes';
import { type DynamicAuthProviderSpec, ProviderType } from '../../../types/extraTypes';

export const getAssignmentTypeLabel = (
type: AuthOrganizationAssignment['type'] | AuthRoleAssignment['type'] | undefined,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import { CheckCircleIcon } from '@patternfly/react-icons/dist/js/icons/check-cir
import { ExclamationTriangleIcon } from '@patternfly/react-icons/dist/js/icons/exclamation-triangle-icon';

import { useTranslation } from '../../../hooks/useTranslation';
import { FieldValidationResult } from '../CreateAuthProvider/types';
import { type FieldValidationResult } from '../CreateAuthProvider/types';

type TestConnectionModalProps = {
onClose: VoidFunction;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useFetchPeriodically } from '../../hooks/useFetchPeriodically';
import { AuthProviderList } from '@flightctl/types';
import { type AuthProviderList } from '@flightctl/types';

export const useAuthProviders = () => {
const [data, isLoading, error, refetch, isUpdating] = useFetchPeriodically<AuthProviderList>({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ import {
Title,
Wizard,
WizardStep,
WizardStepType,
type WizardStepType,
} from '@patternfly/react-core';
import { CatalogItem } from '@flightctl/types/alpha';
import { Formik, FormikErrors } from 'formik';
import { type CatalogItem } from '@flightctl/types/alpha';
import { Formik, type FormikErrors } from 'formik';

import { useAppContext } from '../../../hooks/useAppContext';
import { useFetch } from '../../../hooks/useFetch';
Expand All @@ -30,7 +30,7 @@ import {
getValidationSchema,
} from './utils';
import { isWizardStepDisabled } from '../../../utils/wizards';
import { AddCatalogItemFormValues } from './types';
import { type AddCatalogItemFormValues } from './types';
import FlightCtlWizardFooter from '../../common/FlightCtlWizardFooter';
import LeaveFormConfirmation from '../../common/LeaveFormConfirmation';
import ErrorBoundary from '../../common/ErrorBoundary';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import {
import FlightCtlModal from '@flightctl/ui-components/src/components/common/FlightCtlModal';
import { Formik } from 'formik';
import * as Yup from 'yup';
import { Catalog } from '@flightctl/types/alpha';
import { type Catalog } from '@flightctl/types/alpha';

import { useFetch } from '../../../hooks/useFetch';
import { useTranslation } from '../../../hooks/useTranslation';
Expand All @@ -27,7 +27,7 @@ import NameField from '../../form/NameField';
import TextField from '../../form/TextField';
import { getErrorMessage } from '../../../utils/error';
import TextAreaField from '../../form/TextAreaField';
import { CreateCatalogFormValues } from './types';
import { type CreateCatalogFormValues } from './types';
import { getCatalogPatches, getCatalogResource } from './utils';

type CreateCatalogModalProps = {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
import * as React from 'react';
import { Alert, FormGroup, Grid, GridItem, Spinner, Title } from '@patternfly/react-core';
import { FormikErrors, useFormikContext } from 'formik';
import { CatalogList } from '@flightctl/types/alpha';
import { type FormikErrors, useFormikContext } from 'formik';
import { type CatalogList } from '@flightctl/types/alpha';

import { useTranslation } from '../../../../hooks/useTranslation';
import { AddCatalogItemFormValues } from '../types';
import { type AddCatalogItemFormValues } from '../types';
import NameField from '../../../form/NameField';
import { getDnsSubdomainValidations } from '../../../form/validations';
import TextField from '../../../form/TextField';
import TextAreaField from '../../../form/TextAreaField';
import IconUploadField from '../../../form/IconUploadField';
import CheckboxField from '../../../form/CheckboxField';
import FlightCtlForm from '../../../form/FlightCtlForm';
import FormSelect, { SelectItem } from '../../../form/FormSelect';
import FormSelect, { type SelectItem } from '../../../form/FormSelect';
import CreateCatalogModal from '../CreateCatalogModal';
import { useFetchPeriodically } from '../../../../hooks/useFetchPeriodically';
import { getErrorMessage } from '../../../../utils/error';
Expand Down
Loading
Loading