diff --git a/web-app/package.json b/web-app/package.json index 923e6cf7fe9..aae88c7363a 100644 --- a/web-app/package.json +++ b/web-app/package.json @@ -74,7 +74,7 @@ "@types/superagent": "^4.1.18", "@types/webpack-env": "^1.18.1", "@types/websocket": "^1.0.0", - "prettier": "^2.8.8", + "prettier": "3.0.0", "react-scripts": "5.0.1", "testcafe": "2.6.2", "typescript": "^4.4.3" diff --git a/web-app/public/index.html b/web-app/public/index.html index a16ca3d5f80..806d86d3fea 100644 --- a/web-app/public/index.html +++ b/web-app/public/index.html @@ -1,4 +1,4 @@ - + diff --git a/web-app/src/MainRouter.tsx b/web-app/src/MainRouter.tsx index 5ab82f077bb..2a07c8de61e 100644 --- a/web-app/src/MainRouter.tsx +++ b/web-app/src/MainRouter.tsx @@ -24,7 +24,7 @@ import { baseUrl } from "./history"; const Login = React.lazy(() => import("./screens/LoginPage/LoginPage")); const Logout = React.lazy(() => import("./screens/LogoutPage/LogoutPage")); const LoginCallback = React.lazy( - () => import("./screens/LoginPage/LoginCallback") + () => import("./screens/LoginPage/LoginCallback"), ); const MainRouter = () => { diff --git a/web-app/src/ProtectedRoutes.tsx b/web-app/src/ProtectedRoutes.tsx index 169285a84ee..a1325ce28f7 100644 --- a/web-app/src/ProtectedRoutes.tsx +++ b/web-app/src/ProtectedRoutes.tsx @@ -66,7 +66,7 @@ const ProtectedRoute = ({ Component }: ProtectedRouteProps) => { if (res.customStyles && res.customStyles !== "") { const overrideColorVariants = getOverrideColorVariants( - res.customStyles + res.customStyles, ); if (overrideColorVariants !== false) { @@ -91,7 +91,7 @@ const ProtectedRoute = ({ Component }: ProtectedRouteProps) => { undefined, { "X-Anonymous": "1", - } + }, ) .then((value) => { dispatch(setAnonymousMode()); diff --git a/web-app/src/StyleHandler.tsx b/web-app/src/StyleHandler.tsx index 99762be4ec2..c6ad1274ab3 100644 --- a/web-app/src/StyleHandler.tsx +++ b/web-app/src/StyleHandler.tsx @@ -43,7 +43,7 @@ interface IStyleHandler { const StyleHandler = ({ children }: IStyleHandler) => { const colorVariants = useSelector( - (state: AppState) => state.system.overrideStyles + (state: AppState) => state.system.overrideStyles, ); let thm = theme; diff --git a/web-app/src/api/index.ts b/web-app/src/api/index.ts index 9222cb21530..b8e5c3ce96e 100644 --- a/web-app/src/api/index.ts +++ b/web-app/src/api/index.ts @@ -29,7 +29,7 @@ api.request = async ({ }; export function CommonAPIValidation( - res: HttpResponse + res: HttpResponse, ): HttpResponse { const err = res.error as Error; if (err && err.code === 403 && err.message === "invalid session") { diff --git a/web-app/src/api/operatorApi.ts b/web-app/src/api/operatorApi.ts index 4d3d3f90249..ef470f61fc4 100644 --- a/web-app/src/api/operatorApi.ts +++ b/web-app/src/api/operatorApi.ts @@ -971,7 +971,7 @@ export interface ApiConfig { baseUrl?: string; baseApiParams?: Omit; securityWorker?: ( - securityData: SecurityDataType | null + securityData: SecurityDataType | null, ) => Promise | RequestParams | void; customFetch?: typeof fetch; } @@ -1017,7 +1017,7 @@ export class HttpClient { protected encodeQueryParam(key: string, value: any) { const encodedKey = encodeURIComponent(key); return `${encodedKey}=${encodeURIComponent( - typeof value === "number" ? value : `${value}` + typeof value === "number" ? value : `${value}`, )}`; } @@ -1033,13 +1033,13 @@ export class HttpClient { protected toQueryString(rawQuery?: QueryParamsType): string { const query = rawQuery || {}; const keys = Object.keys(query).filter( - (key) => "undefined" !== typeof query[key] + (key) => "undefined" !== typeof query[key], ); return keys .map((key) => Array.isArray(query[key]) ? this.addArrayQueryParam(query, key) - : this.addQueryParam(query, key) + : this.addQueryParam(query, key), ) .join("&"); } @@ -1067,7 +1067,7 @@ export class HttpClient { ? property : typeof property === "object" && property !== null ? JSON.stringify(property) - : `${property}` + : `${property}`, ); return formData; }, new FormData()), @@ -1076,7 +1076,7 @@ export class HttpClient { protected mergeRequestParams( params1: RequestParams, - params2?: RequestParams + params2?: RequestParams, ): RequestParams { return { ...this.baseApiParams, @@ -1091,7 +1091,7 @@ export class HttpClient { } protected createAbortSignal = ( - cancelToken: CancelToken + cancelToken: CancelToken, ): AbortSignal | undefined => { if (this.abortControllers.has(cancelToken)) { const abortController = this.abortControllers.get(cancelToken); @@ -1155,7 +1155,7 @@ export class HttpClient { typeof body === "undefined" || body === null ? null : payloadFormatter(body), - } + }, ).then(async (response) => { const r = response as HttpResponse; r.data = null as unknown as T; @@ -1193,7 +1193,7 @@ export class HttpClient { * @baseUrl /api/v1 */ export class Api< - SecurityDataType extends unknown + SecurityDataType extends unknown, > extends HttpClient { login = { /** @@ -1239,7 +1239,7 @@ export class Api< */ loginOauth2Auth: ( body: LoginOauth2AuthRequest, - params: RequestParams = {} + params: RequestParams = {}, ) => this.request({ path: `/login/oauth2/auth`, @@ -1333,7 +1333,7 @@ export class Api< */ subscriptionValidate: ( body: SubscriptionValidateRequest, - params: RequestParams = {} + params: RequestParams = {}, ) => this.request({ path: `/subscription/validate`, @@ -1375,7 +1375,7 @@ export class Api< subscriptionActivate: ( namespace: string, tenant: string, - params: RequestParams = {} + params: RequestParams = {}, ) => this.request({ path: `/subscription/namespaces/${namespace}/tenants/${tenant}/activate`, @@ -1402,7 +1402,7 @@ export class Api< /** @format int32 */ limit?: number; }, - params: RequestParams = {} + params: RequestParams = {}, ) => this.request({ path: `/tenants`, @@ -1472,7 +1472,7 @@ export class Api< /** @format int32 */ limit?: number; }, - params: RequestParams = {} + params: RequestParams = {}, ) => this.request({ path: `/namespaces/${namespace}/tenants`, @@ -1495,7 +1495,7 @@ export class Api< listTenantCertificateSigningRequest: ( namespace: string, tenant: string, - params: RequestParams = {} + params: RequestParams = {}, ) => this.request({ path: `/namespaces/${namespace}/tenants/${tenant}/csr`, @@ -1517,7 +1517,7 @@ export class Api< tenantIdentityProvider: ( namespace: string, tenant: string, - params: RequestParams = {} + params: RequestParams = {}, ) => this.request({ path: `/namespaces/${namespace}/tenants/${tenant}/identity-provider`, @@ -1540,7 +1540,7 @@ export class Api< namespace: string, tenant: string, body: IdpConfiguration, - params: RequestParams = {} + params: RequestParams = {}, ) => this.request({ path: `/namespaces/${namespace}/tenants/${tenant}/identity-provider`, @@ -1564,7 +1564,7 @@ export class Api< namespace: string, tenant: string, body: SetAdministratorsRequest, - params: RequestParams = {} + params: RequestParams = {}, ) => this.request({ path: `/namespaces/${namespace}/tenants/${tenant}/set-administrators`, @@ -1587,7 +1587,7 @@ export class Api< tenantConfiguration: ( namespace: string, tenant: string, - params: RequestParams = {} + params: RequestParams = {}, ) => this.request({ path: `/namespaces/${namespace}/tenants/${tenant}/configuration`, @@ -1610,7 +1610,7 @@ export class Api< namespace: string, tenant: string, body: UpdateTenantConfigurationRequest, - params: RequestParams = {} + params: RequestParams = {}, ) => this.request({ path: `/namespaces/${namespace}/tenants/${tenant}/configuration`, @@ -1633,7 +1633,7 @@ export class Api< tenantSecurity: ( namespace: string, tenant: string, - params: RequestParams = {} + params: RequestParams = {}, ) => this.request({ path: `/namespaces/${namespace}/tenants/${tenant}/security`, @@ -1656,7 +1656,7 @@ export class Api< namespace: string, tenant: string, body: UpdateTenantSecurityRequest, - params: RequestParams = {} + params: RequestParams = {}, ) => this.request({ path: `/namespaces/${namespace}/tenants/${tenant}/security`, @@ -1679,7 +1679,7 @@ export class Api< tenantDetails: ( namespace: string, tenant: string, - params: RequestParams = {} + params: RequestParams = {}, ) => this.request({ path: `/namespaces/${namespace}/tenants/${tenant}`, @@ -1702,7 +1702,7 @@ export class Api< namespace: string, tenant: string, body: DeleteTenantRequest, - params: RequestParams = {} + params: RequestParams = {}, ) => this.request({ path: `/namespaces/${namespace}/tenants/${tenant}`, @@ -1726,7 +1726,7 @@ export class Api< namespace: string, tenant: string, body: UpdateTenantRequest, - params: RequestParams = {} + params: RequestParams = {}, ) => this.request({ path: `/namespaces/${namespace}/tenants/${tenant}`, @@ -1750,7 +1750,7 @@ export class Api< namespace: string, tenant: string, body: Pool, - params: RequestParams = {} + params: RequestParams = {}, ) => this.request({ path: `/namespaces/${namespace}/tenants/${tenant}/pools`, @@ -1774,7 +1774,7 @@ export class Api< namespace: string, tenant: string, body: PoolUpdateRequest, - params: RequestParams = {} + params: RequestParams = {}, ) => this.request({ path: `/namespaces/${namespace}/tenants/${tenant}/pools`, @@ -1798,7 +1798,7 @@ export class Api< listPvCsForTenant: ( namespace: string, tenant: string, - params: RequestParams = {} + params: RequestParams = {}, ) => this.request({ path: `/namespaces/${namespace}/tenants/${tenant}/pvcs`, @@ -1820,7 +1820,7 @@ export class Api< getTenantUsage: ( namespace: string, tenant: string, - params: RequestParams = {} + params: RequestParams = {}, ) => this.request({ path: `/namespaces/${namespace}/tenants/${tenant}/usage`, @@ -1842,7 +1842,7 @@ export class Api< getTenantPods: ( namespace: string, tenant: string, - params: RequestParams = {} + params: RequestParams = {}, ) => this.request({ path: `/namespaces/${namespace}/tenants/${tenant}/pods`, @@ -1864,7 +1864,7 @@ export class Api< getTenantEvents: ( namespace: string, tenant: string, - params: RequestParams = {} + params: RequestParams = {}, ) => this.request({ path: `/namespaces/${namespace}/tenants/${tenant}/events`, @@ -1886,7 +1886,7 @@ export class Api< getTenantLogReport: ( namespace: string, tenant: string, - params: RequestParams = {} + params: RequestParams = {}, ) => this.request({ path: `/namespaces/${namespace}/tenants/${tenant}/log-report`, @@ -1909,7 +1909,7 @@ export class Api< namespace: string, tenant: string, podName: string, - params: RequestParams = {} + params: RequestParams = {}, ) => this.request({ path: `/namespaces/${namespace}/tenants/${tenant}/pods/${podName}`, @@ -1932,7 +1932,7 @@ export class Api< namespace: string, tenant: string, podName: string, - params: RequestParams = {} + params: RequestParams = {}, ) => this.request({ path: `/namespaces/${namespace}/tenants/${tenant}/pods/${podName}`, @@ -1954,7 +1954,7 @@ export class Api< namespace: string, tenant: string, podName: string, - params: RequestParams = {} + params: RequestParams = {}, ) => this.request({ path: `/namespaces/${namespace}/tenants/${tenant}/pods/${podName}/events`, @@ -1977,7 +1977,7 @@ export class Api< namespace: string, tenant: string, podName: string, - params: RequestParams = {} + params: RequestParams = {}, ) => this.request({ path: `/namespaces/${namespace}/tenants/${tenant}/pods/${podName}/describe`, @@ -2000,7 +2000,7 @@ export class Api< namespace: string, tenant: string, body: TlsConfiguration, - params: RequestParams = {} + params: RequestParams = {}, ) => this.request({ path: `/namespaces/${namespace}/tenants/${tenant}/certificates`, @@ -2023,7 +2023,7 @@ export class Api< tenantDeleteEncryption: ( namespace: string, tenant: string, - params: RequestParams = {} + params: RequestParams = {}, ) => this.request({ path: `/namespaces/${namespace}/tenants/${tenant}/encryption`, @@ -2045,7 +2045,7 @@ export class Api< namespace: string, tenant: string, body: EncryptionConfiguration, - params: RequestParams = {} + params: RequestParams = {}, ) => this.request({ path: `/namespaces/${namespace}/tenants/${tenant}/encryption`, @@ -2068,7 +2068,7 @@ export class Api< tenantEncryptionInfo: ( namespace: string, tenant: string, - params: RequestParams = {} + params: RequestParams = {}, ) => this.request({ path: `/namespaces/${namespace}/tenants/${tenant}/encryption`, @@ -2090,7 +2090,7 @@ export class Api< getTenantYaml: ( namespace: string, tenant: string, - params: RequestParams = {} + params: RequestParams = {}, ) => this.request({ path: `/namespaces/${namespace}/tenants/${tenant}/yaml`, @@ -2113,7 +2113,7 @@ export class Api< namespace: string, tenant: string, body: TenantYAML, - params: RequestParams = {} + params: RequestParams = {}, ) => this.request({ path: `/namespaces/${namespace}/tenants/${tenant}/yaml`, @@ -2137,7 +2137,7 @@ export class Api< namespace: string, tenant: string, body: UpdateDomainsRequest, - params: RequestParams = {} + params: RequestParams = {}, ) => this.request({ path: `/namespaces/${namespace}/tenants/${tenant}/domains`, @@ -2160,7 +2160,7 @@ export class Api< getResourceQuota: ( namespace: string, resourceQuotaName: string, - params: RequestParams = {} + params: RequestParams = {}, ) => this.request({ path: `/namespaces/${namespace}/resourcequotas/${resourceQuotaName}`, @@ -2183,7 +2183,7 @@ export class Api< namespace: string, tenant: string, pvcName: string, - params: RequestParams = {} + params: RequestParams = {}, ) => this.request({ path: `/namespaces/${namespace}/tenants/${tenant}/pvc/${pvcName}`, @@ -2205,7 +2205,7 @@ export class Api< namespace: string, tenant: string, pvcName: string, - params: RequestParams = {} + params: RequestParams = {}, ) => this.request({ path: `/namespaces/${namespace}/tenants/${tenant}/pvcs/${pvcName}/events`, @@ -2228,7 +2228,7 @@ export class Api< namespace: string, tenant: string, pvcName: string, - params: RequestParams = {} + params: RequestParams = {}, ) => this.request({ path: `/namespaces/${namespace}/tenants/${tenant}/pvcs/${pvcName}/describe`, @@ -2256,7 +2256,7 @@ export class Api< */ num_nodes: number; }, - params: RequestParams = {} + params: RequestParams = {}, ) => this.request({ path: `/cluster/max-allocatable-memory`, @@ -2284,7 +2284,7 @@ export class Api< */ num_nodes: number; }, - params: RequestParams = {} + params: RequestParams = {}, ) => this.request({ path: `/cluster/allocatable-resources`, @@ -2308,7 +2308,7 @@ export class Api< getParity: ( nodes: number, disksPerNode: number, - params: RequestParams = {} + params: RequestParams = {}, ) => this.request({ path: `/get-parity/${nodes}/${disksPerNode}`, @@ -2411,7 +2411,7 @@ export class Api< */ operatorSubnetLogin: ( body: OperatorSubnetLoginRequest, - params: RequestParams = {} + params: RequestParams = {}, ) => this.request({ path: `/subnet/login`, @@ -2434,7 +2434,7 @@ export class Api< */ operatorSubnetLoginMfa: ( body: OperatorSubnetLoginMFARequest, - params: RequestParams = {} + params: RequestParams = {}, ) => this.request({ path: `/subnet/login/mfa`, @@ -2459,7 +2459,7 @@ export class Api< query: { token: string; }, - params: RequestParams = {} + params: RequestParams = {}, ) => this.request({ path: `/subnet/apikey`, @@ -2481,7 +2481,7 @@ export class Api< */ operatorSubnetRegisterApiKey: ( body: OperatorSubnetAPIKey, - params: RequestParams = {} + params: RequestParams = {}, ) => this.request({ path: `/subnet/apikey/register`, diff --git a/web-app/src/common/SecureComponent/SecureComponent.tsx b/web-app/src/common/SecureComponent/SecureComponent.tsx index d8cca677509..647d14ef570 100644 --- a/web-app/src/common/SecureComponent/SecureComponent.tsx +++ b/web-app/src/common/SecureComponent/SecureComponent.tsx @@ -40,7 +40,7 @@ const SecureComponent = ({ resource, scopes, matchAll, - containsResource + containsResource, ); if (!permissionGranted && !errorProps) return ; if (!permissionGranted && errorProps) { diff --git a/web-app/src/common/SecureComponent/__tests__/accessControl.test.ts b/web-app/src/common/SecureComponent/__tests__/accessControl.test.ts index 1c3d26ef826..689d35c70ec 100644 --- a/web-app/src/common/SecureComponent/__tests__/accessControl.test.ts +++ b/web-app/src/common/SecureComponent/__tests__/accessControl.test.ts @@ -49,7 +49,7 @@ const setPolicy1 = () => { }, operator: false, status: "ok", - }) + }), ); }; const setPolicy2 = () => { @@ -91,7 +91,7 @@ const setPolicy2 = () => { "console-ui": ["admin:CreateServiceAccount", "admin:CreateUser"], }, status: "ok", - }) + }), ); }; const setPolicy3 = () => { @@ -109,7 +109,7 @@ const setPolicy3 = () => { }, status: "ok", operator: false, - }) + }), ); }; @@ -125,7 +125,7 @@ const setPolicy4 = () => { }, status: "ok", operator: false, - }) + }), ); }; @@ -137,7 +137,7 @@ test("Upload button disabled", () => { test("Upload button enabled valid prefix", () => { setPolicy1(); expect(hasPermission("testcafe/write", ["s3:PutObject"], false, true)).toBe( - true + true, ); }); @@ -146,8 +146,8 @@ test("Can Browse Bucket", () => { expect( hasPermission( "bucket-svc", - IAM_PAGES_PERMISSIONS[IAM_PAGES.OBJECT_BROWSER_VIEW] - ) + IAM_PAGES_PERMISSIONS[IAM_PAGES.OBJECT_BROWSER_VIEW], + ), ).toBe(true); }); @@ -166,8 +166,8 @@ test("Can browse a bucket for a policy with a wildcard", () => { expect( hasPermission( "testbucket-0", - IAM_PAGES_PERMISSIONS[IAM_PAGES.OBJECT_BROWSER_VIEW] - ) + IAM_PAGES_PERMISSIONS[IAM_PAGES.OBJECT_BROWSER_VIEW], + ), ).toBe(true); }); @@ -179,8 +179,8 @@ test("Can delete an object inside a bucket prefix", () => { "xref_cust_guid_actd-v1.jpg", "test/digitalinsights/xref_cust_guid_actd-v1.jpg", ], - [IAM_SCOPES.S3_DELETE_OBJECT] - ) + [IAM_SCOPES.S3_DELETE_OBJECT], + ), ).toBe(true); }); @@ -189,7 +189,7 @@ test("Can't delete an object inside a bucket prefix", () => { expect( hasPermission( ["xref_cust_guid_actd-v1.jpg", "test/xref_cust_guid_actd-v1.jpg"], - [IAM_SCOPES.S3_DELETE_OBJECT] - ) + [IAM_SCOPES.S3_DELETE_OBJECT], + ), ).toBe(false); }); diff --git a/web-app/src/common/SecureComponent/accessControl.ts b/web-app/src/common/SecureComponent/accessControl.ts index 0d1f9c7554b..ea26ef5b9d4 100644 --- a/web-app/src/common/SecureComponent/accessControl.ts +++ b/web-app/src/common/SecureComponent/accessControl.ts @@ -22,7 +22,7 @@ const hasPermission = ( resource: string | string[] | undefined, scopes: string[], matchAll?: boolean, - containsResource?: boolean + containsResource?: boolean, ) => { if (!resource) { return false; @@ -46,7 +46,7 @@ const hasPermission = ( // Filter wildcard items const wildcards = Object.keys(sessionGrants).filter( - (item) => item.includes("*") && item !== "arn:aws:s3:::*" + (item) => item.includes("*") && item !== "arn:aws:s3:::*", ); const getMatchingWildcards = (path: string) => { @@ -130,7 +130,7 @@ const hasPermission = ( ...anyResourceGrant, ], scopes, - matchAll + matchAll, ); }; @@ -140,7 +140,7 @@ const hasPermission = ( const hasAccessToResource = ( userPermissionsOnBucket: string[] | null | undefined, requiredPermissions: string[] = [], - matchAll?: boolean + matchAll?: boolean, ) => { if (!userPermissionsOnBucket) { return false; @@ -148,7 +148,7 @@ const hasAccessToResource = ( const s3All = userPermissionsOnBucket.includes(IAM_SCOPES.S3_ALL_ACTIONS); const AdminAll = userPermissionsOnBucket.includes( - IAM_SCOPES.ADMIN_ALL_ACTIONS + IAM_SCOPES.ADMIN_ALL_ACTIONS, ); const permissions = requiredPermissions.filter(function (n) { diff --git a/web-app/src/common/utils.ts b/web-app/src/common/utils.ts index 100ccd2b126..bfebe8b27a3 100644 --- a/web-app/src/common/utils.ts +++ b/web-app/src/common/utils.ts @@ -123,7 +123,7 @@ export const k8sScalarUnitsExcluding = (exclude?: string[]) => { export const getBytes = ( value: string, unit: string, - fromk8s: boolean = false + fromk8s: boolean = false, ): string => { return getBytesNumber(value, unit, fromk8s).toString(10); }; @@ -132,7 +132,7 @@ export const getBytes = ( export const getBytesNumber = ( value: string, unit: string, - fromk8s: boolean = false + fromk8s: boolean = false, ): number => { const vl: number = parseFloat(value); @@ -158,7 +158,7 @@ export const getTotalSize = (value: string, unit: string) => { export const setMemoryResource = ( memorySize: number, capacitySize: string, - maxMemorySize: number + maxMemorySize: number, ) => { // value always comes as Gi const requestedSizeBytes = getBytes(memorySize.toString(10), "Gi", true); @@ -202,22 +202,22 @@ export const setMemoryResource = ( if (capSize >= parseInt(getBytes("1", "Pi", true), 10)) { memLimitSize = Math.max( memReqSize, - parseInt(getBytes("64", "Gi", true), 10) + parseInt(getBytes("64", "Gi", true), 10), ); } else if (capSize >= parseInt(getBytes("100", "Ti"), 10)) { memLimitSize = Math.max( memReqSize, - parseInt(getBytes("32", "Gi", true), 10) + parseInt(getBytes("32", "Gi", true), 10), ); } else if (capSize >= parseInt(getBytes("10", "Ti"), 10)) { memLimitSize = Math.max( memReqSize, - parseInt(getBytes("16", "Gi", true), 10) + parseInt(getBytes("16", "Gi", true), 10), ); } else if (capSize >= parseInt(getBytes("1", "Ti"), 10)) { memLimitSize = Math.max( memReqSize, - parseInt(getBytes("8", "Gi", true), 10) + parseInt(getBytes("8", "Gi", true), 10), ); } @@ -234,12 +234,12 @@ export const calculateDistribution = ( limitSize: number = 0, drivesPerServer: number = 0, marketplaceIntegration?: IMkEnvs, - selectedStorageType?: string + selectedStorageType?: string, ): IStorageDistribution => { const requestedSizeBytes = getBytes( capacityToUse.value, capacityToUse.unit, - true + true, ); if (parseInt(requestedSizeBytes, 10) < minStReq) { @@ -268,7 +268,7 @@ export const calculateDistribution = ( limitSize, drivesPerServer, marketplaceIntegration, - selectedStorageType + selectedStorageType, ); return numberOfNodes; @@ -280,7 +280,7 @@ const calculateStorage = ( limitSize: number, drivesPerServer: number, marketplaceIntegration?: IMkEnvs, - selectedStorageType?: string + selectedStorageType?: string, ): IStorageDistribution => { // Size validation const intReqBytes = parseInt(requestedBytes, 10); @@ -294,7 +294,7 @@ const calculateStorage = ( limitSize, drivesPerServer, marketplaceIntegration, - selectedStorageType + selectedStorageType, ); }; @@ -305,7 +305,7 @@ const structureCalc = ( maxClusterSize: number, disksPerNode: number = 0, marketplaceIntegration?: IMkEnvs, - selectedStorageType?: string + selectedStorageType?: string, ): IStorageDistribution => { if ( isNaN(nodes) || @@ -328,7 +328,7 @@ const structureCalc = ( if (disksPerNode === 0) { persistentVolumeSize = Math.floor( - Math.min(desiredCapacity / Math.max(4, nodes), maxDiskSize) + Math.min(desiredCapacity / Math.max(4, nodes), maxDiskSize), ); // pVS = min((desiredCapacity / max(4 | nodes)) | maxDiskSize) numberPersistentVolumes = desiredCapacity / persistentVolumeSize; // nPV = dC / pVS @@ -339,7 +339,7 @@ const structureCalc = ( volumesPerServer = disksPerNode; numberPersistentVolumes = volumesPerServer * nodes; persistentVolumeSize = Math.floor( - desiredCapacity / numberPersistentVolumes + desiredCapacity / numberPersistentVolumes, ); } @@ -348,7 +348,7 @@ const structureCalc = ( volumesPerServer = Math.ceil(volumesPerServer); // Increment of volumes per server numberPersistentVolumes = volumesPerServer * nodes; // nPV = vPS * n persistentVolumeSize = Math.floor( - desiredCapacity / numberPersistentVolumes + desiredCapacity / numberPersistentVolumes, ); // pVS = dC / nPV const limitSize = persistentVolumeSize * volumesPerServer * nodes; // lS = pVS * vPS * n @@ -384,20 +384,20 @@ const structureCalc = ( const configs: IntegrationConfiguration[] = get( setConfigs, "configurations", - [] + [], ); const mainSelection = configs.find( - (item) => item.typeSelection === selectedStorageType + (item) => item.typeSelection === selectedStorageType, ); if (mainSelection !== undefined && mainSelection.minimumVolumeSize) { const minimumPvSize = getBytesNumber( mainSelection.minimumVolumeSize?.driveSize, mainSelection.minimumVolumeSize?.sizeUnit, - true + true, ); const storageTypeLabel = setConfigs.variantSelectorValues!.find( - (item) => item.value === selectedStorageType + (item) => item.value === selectedStorageType, ); if (persistentVolumeSize < minimumPvSize) { @@ -431,7 +431,7 @@ export const erasureCodeCalc = ( parityValidValues: string[], totalDisks: number, pvSize: number, - totalNodes: number + totalNodes: number, ): IErasureCodeCalc => { // Parity Values is empty if (parityValidValues.length < 1) { @@ -466,7 +466,7 @@ export const erasureCodeCalc = ( maxCapacity: maxCapacity.toString(10), maxFailureTolerations: maxTolerations, }; - } + }, ); let defaultEC = maxEC; @@ -561,7 +561,7 @@ const twoDigitsNumberString = (value: number) => { export const getTimeFromTimestamp = ( timestamp: string, fullDate: boolean = false, - simplifiedDate: boolean = false + simplifiedDate: boolean = false, ) => { const timestampToInt = parseInt(timestamp); if (isNaN(timestampToInt)) { @@ -572,9 +572,9 @@ export const getTimeFromTimestamp = ( if (fullDate) { if (simplifiedDate) { return `${twoDigitsNumberString( - dateObject.getMonth() + 1 + dateObject.getMonth() + 1, )}/${twoDigitsNumberString(dateObject.getDate())} ${twoDigitsNumberString( - dateObject.getHours() + dateObject.getHours(), )}:${twoDigitsNumberString(dateObject.getMinutes())}`; } else { return dateObject.toLocaleString(); @@ -582,7 +582,7 @@ export const getTimeFromTimestamp = ( } return `${dateObject.getHours()}:${String(dateObject.getMinutes()).padStart( 2, - "0" + "0", )}`; }; @@ -590,7 +590,7 @@ export const calculateBytes = ( x: string | number, showDecimals = false, roundFloor = true, - k8sUnit = false + k8sUnit = false, ): IBytesCalc => { let bytes; diff --git a/web-app/src/config.ts b/web-app/src/config.ts index 545f08574bc..730d89c9c3c 100644 --- a/web-app/src/config.ts +++ b/web-app/src/config.ts @@ -17,7 +17,7 @@ export const MinIOPlan = ( document.head.querySelector( - "[name~=minio-license][content]" + "[name~=minio-license][content]", ) as HTMLMetaElement )?.content || "AGPL"; diff --git a/web-app/src/index.tsx b/web-app/src/index.tsx index 604d7ff7041..1e74a5011cd 100644 --- a/web-app/src/index.tsx +++ b/web-app/src/index.tsx @@ -23,7 +23,7 @@ import MainRouter from "./MainRouter"; import StyleHandler from "./StyleHandler"; const root = ReactDOM.createRoot( - document.getElementById("root") as HTMLElement + document.getElementById("root") as HTMLElement, ); root.render( @@ -33,7 +33,7 @@ root.render( - + , ); // If you want your app to work offline and load faster, you can change diff --git a/web-app/src/screens/Console/CommandBar.tsx b/web-app/src/screens/Console/CommandBar.tsx index ed99de858ac..726337de8c2 100644 --- a/web-app/src/screens/Console/CommandBar.tsx +++ b/web-app/src/screens/Console/CommandBar.tsx @@ -132,7 +132,7 @@ const CommandBar = () => { const initialActions: Action[] = routesAsKbarActions( features, operatorMode, - navigate + navigate, ); useRegisterActions(initialActions, [operatorMode, features]); @@ -190,13 +190,13 @@ const ResultItem = React.forwardRef( active: boolean; currentRootActionId: ActionId; }, - ref: React.Ref + ref: React.Ref, ) => { const classes = useStyles(); const ancestors = React.useMemo(() => { if (!currentRootActionId) return action.ancestors; const index = action.ancestors.findIndex( - (ancestor) => ancestor.id === currentRootActionId + (ancestor) => ancestor.id === currentRootActionId, ); // +1 removes the currentRootAction; e.g. // if we are on the "Set theme" parent action, @@ -295,7 +295,7 @@ const ResultItem = React.forwardRef( ) : null} ); - } + }, ); export default CommandBar; diff --git a/web-app/src/screens/Console/Common/Components/withSuspense.tsx b/web-app/src/screens/Console/Common/Components/withSuspense.tsx index 445ddd12d2e..3cce7464f8c 100644 --- a/web-app/src/screens/Console/Common/Components/withSuspense.tsx +++ b/web-app/src/screens/Console/Common/Components/withSuspense.tsx @@ -18,7 +18,7 @@ import React, { ComponentType, Suspense, SuspenseProps } from "react"; function withSuspense

( WrappedComponent: ComponentType

, - fallback: SuspenseProps["fallback"] = null + fallback: SuspenseProps["fallback"] = null, ) { function ComponentWithSuspense(props: P) { return ( diff --git a/web-app/src/screens/Console/Common/CredentialsPrompt/CredentialsPrompt.tsx b/web-app/src/screens/Console/Common/CredentialsPrompt/CredentialsPrompt.tsx index 2cdbce75347..d7b27fa9556 100644 --- a/web-app/src/screens/Console/Common/CredentialsPrompt/CredentialsPrompt.tsx +++ b/web-app/src/screens/Console/Common/CredentialsPrompt/CredentialsPrompt.tsx @@ -139,7 +139,7 @@ const CredentialsPrompt = ({ "credentials.json", JSON.stringify({ ...consoleExtras, - }) + }), ); }; @@ -162,7 +162,7 @@ const CredentialsPrompt = ({ "all_credentials.json", JSON.stringify({ ...allCredentials, - }) + }), ); }; diff --git a/web-app/src/screens/Console/Common/FormComponents/AutocompleteWrapper/AutocompleteWrapper.tsx b/web-app/src/screens/Console/Common/FormComponents/AutocompleteWrapper/AutocompleteWrapper.tsx index cef8320a1a9..5b191efc9c3 100644 --- a/web-app/src/screens/Console/Common/FormComponents/AutocompleteWrapper/AutocompleteWrapper.tsx +++ b/web-app/src/screens/Console/Common/FormComponents/AutocompleteWrapper/AutocompleteWrapper.tsx @@ -61,7 +61,7 @@ const styles = (theme: Theme) => const inputStyles = makeStyles((theme: Theme) => createStyles({ ...inputFieldStyles, - }) + }), ); function InputField(props: TextFieldProps) { diff --git a/web-app/src/screens/Console/Common/FormComponents/CSVMultiSelector/CSVMultiSelector.tsx b/web-app/src/screens/Console/Common/FormComponents/CSVMultiSelector/CSVMultiSelector.tsx index 24280fab3ce..a9e4c9188ea 100644 --- a/web-app/src/screens/Console/Common/FormComponents/CSVMultiSelector/CSVMultiSelector.tsx +++ b/web-app/src/screens/Console/Common/FormComponents/CSVMultiSelector/CSVMultiSelector.tsx @@ -112,7 +112,7 @@ const CSVMultiSelector = ({ (newString: string) => { onChange(newString); }, - [onChange] + [onChange], ); // We avoid multiple re-renders / hang issue typing too fast diff --git a/web-app/src/screens/Console/Common/FormComponents/DateSelector/DateSelector.tsx b/web-app/src/screens/Console/Common/FormComponents/DateSelector/DateSelector.tsx index be2e7b61012..ef43c1c7e93 100644 --- a/web-app/src/screens/Console/Common/FormComponents/DateSelector/DateSelector.tsx +++ b/web-app/src/screens/Console/Common/FormComponents/DateSelector/DateSelector.tsx @@ -78,7 +78,7 @@ const SelectStyled = withStyles((theme: Theme) => borderBottom: 0, fontSize: 12, }, - }) + }), )(InputBase); interface IDateSelectorProps { @@ -106,7 +106,7 @@ const DateSelector = forwardRef( onDateChange, value = "", }: IDateSelectorProps, - ref: any + ref: any, ) => { useImperativeHandle(ref, () => ({ resetDate })); @@ -276,7 +276,7 @@ const DateSelector = forwardRef( ); - } + }, ); export default withStyles(styles)(DateSelector); diff --git a/web-app/src/screens/Console/Common/FormComponents/DateSelector/utils.ts b/web-app/src/screens/Console/Common/FormComponents/DateSelector/utils.ts index 38a7dd5ab05..a9b661cc1d9 100644 --- a/web-app/src/screens/Console/Common/FormComponents/DateSelector/utils.ts +++ b/web-app/src/screens/Console/Common/FormComponents/DateSelector/utils.ts @@ -35,7 +35,7 @@ const currentYear = new Date().getFullYear(); export const years = Array.from( Array(25), - (_, numYear) => numYear + currentYear + (_, numYear) => numYear + currentYear, ); export const validDate = (year: string, month: string, day: string): any[] => { diff --git a/web-app/src/screens/Console/Common/FormComponents/DaysSelector/DaysSelector.tsx b/web-app/src/screens/Console/Common/FormComponents/DaysSelector/DaysSelector.tsx index 12f481b4b7c..41234d172a1 100644 --- a/web-app/src/screens/Console/Common/FormComponents/DaysSelector/DaysSelector.tsx +++ b/web-app/src/screens/Console/Common/FormComponents/DaysSelector/DaysSelector.tsx @@ -109,7 +109,7 @@ const calculateNewTime = ( initialDate: Date, days: number, hours: number, - minutes: number + minutes: number, ) => { return DateTime.fromJSDate(initialDate).plus({ days, hours, minutes }); }; @@ -140,8 +140,8 @@ const DaysSelector = ({ initialDate, selectedDays, selectedHours, - selectedMinutes - ) + selectedMinutes, + ), ); } }, [initialDate, selectedDays, selectedHours, selectedMinutes]); diff --git a/web-app/src/screens/Console/Common/FormComponents/InputBoxWrapper/InputBoxWrapper.tsx b/web-app/src/screens/Console/Common/FormComponents/InputBoxWrapper/InputBoxWrapper.tsx index 3daf8cfb4c1..3cc067d671e 100644 --- a/web-app/src/screens/Console/Common/FormComponents/InputBoxWrapper/InputBoxWrapper.tsx +++ b/web-app/src/screens/Console/Common/FormComponents/InputBoxWrapper/InputBoxWrapper.tsx @@ -95,7 +95,7 @@ const styles = (theme: Theme) => const inputStyles = makeStyles((theme: Theme) => createStyles({ ...inputFieldStyles, - }) + }), ); function InputField(props: TextFieldProps) { @@ -173,7 +173,7 @@ const InputBoxWrapper = ({ container className={clsx( className !== "" ? className : "", - error !== "" ? classes.errorInField : classes.inputBoxContainer + error !== "" ? classes.errorInField : classes.inputBoxContainer, )} > {label !== "" && ( diff --git a/web-app/src/screens/Console/Common/FormComponents/SelectWrapper/SelectWrapper.tsx b/web-app/src/screens/Console/Common/FormComponents/SelectWrapper/SelectWrapper.tsx index e89dd74dd13..f7e35437115 100644 --- a/web-app/src/screens/Console/Common/FormComponents/SelectWrapper/SelectWrapper.tsx +++ b/web-app/src/screens/Console/Common/FormComponents/SelectWrapper/SelectWrapper.tsx @@ -86,7 +86,7 @@ const SelectStyled = withStyles((theme: Theme) => backgroundColor: "#fff", }, }, - }) + }), )(InputBase); const SelectWrapper = ({ diff --git a/web-app/src/screens/Console/Common/Hooks/useApi.tsx b/web-app/src/screens/Console/Common/Hooks/useApi.tsx index 7d4fbcb341c..3dd97776279 100644 --- a/web-app/src/screens/Console/Common/Hooks/useApi.tsx +++ b/web-app/src/screens/Console/Common/Hooks/useApi.tsx @@ -8,7 +8,7 @@ type IsApiInProgress = boolean; const useApi = ( onSuccess: NoReturnFunction, - onError: NoReturnFunction + onError: NoReturnFunction, ): [IsApiInProgress, ApiMethodToInvoke] => { const [isLoading, setIsLoading] = useState(false); diff --git a/web-app/src/screens/Console/Common/ModalWrapper/ModalWrapper.tsx b/web-app/src/screens/Console/Common/ModalWrapper/ModalWrapper.tsx index 54e09cbcf8c..16c65dc531e 100644 --- a/web-app/src/screens/Console/Common/ModalWrapper/ModalWrapper.tsx +++ b/web-app/src/screens/Console/Common/ModalWrapper/ModalWrapper.tsx @@ -69,7 +69,7 @@ const ModalWrapper = ({ const [openSnackbar, setOpenSnackbar] = useState(false); const modalSnackMessage = useSelector( - (state: AppState) => state.system.modalSnackBar + (state: AppState) => state.system.modalSnackBar, ); useEffect(() => { diff --git a/web-app/src/screens/Console/Common/ProgressBarWrapper/ProgressBarWrapper.tsx b/web-app/src/screens/Console/Common/ProgressBarWrapper/ProgressBarWrapper.tsx index a89d4401e58..de1e9ded5da 100644 --- a/web-app/src/screens/Console/Common/ProgressBarWrapper/ProgressBarWrapper.tsx +++ b/web-app/src/screens/Console/Common/ProgressBarWrapper/ProgressBarWrapper.tsx @@ -51,7 +51,7 @@ const SmallBorderLinearProgress = styled(BorderLinearProgress)(() => ({ })); function LinearProgressWithLabel( - props: { error: boolean; cancelled: boolean } & LinearProgressProps + props: { error: boolean; cancelled: boolean } & LinearProgressProps, ) { let color = "#000"; let size = 18; diff --git a/web-app/src/screens/Console/Common/TableWrapper/TableWrapper.tsx b/web-app/src/screens/Console/Common/TableWrapper/TableWrapper.tsx index 8355d262cc0..5d3792c427f 100644 --- a/web-app/src/screens/Console/Common/TableWrapper/TableWrapper.tsx +++ b/web-app/src/screens/Console/Common/TableWrapper/TableWrapper.tsx @@ -255,7 +255,7 @@ const selectWidth = 45; const subRenderFunction = ( rowData: any, column: IColumns, - isSelected: boolean + isSelected: boolean, ) => { const itemElement = isString(rowData) ? rowData @@ -281,13 +281,13 @@ const calculateColumnRest = ( hasSelect: boolean, hasActions: boolean, columnsSelector: boolean, - columnsShown: string[] + columnsShown: string[], ) => { let colsItems = [...columns]; if (columnsSelector) { colsItems = columns.filter((column) => - columnsShown.includes(column.elementKey!) + columnsShown.includes(column.elementKey!), ); } @@ -320,7 +320,7 @@ const generateColumnsMap = ( columnsSelector: boolean, columnsShown: string[], sortColumn: string, - sortDirection: "ASC" | "DESC" | undefined + sortDirection: "ASC" | "DESC" | undefined, ) => { const commonRestWidth = calculateColumnRest( columns, @@ -329,7 +329,7 @@ const generateColumnsMap = ( hasSelect, hasActions, columnsSelector, - columnsShown + columnsShown, ); return columns.map((column: IColumns, index: number) => { if (columnsSelector && !columnsShown.includes(column.elementKey!)) { @@ -366,7 +366,7 @@ const generateColumnsMap = ( cellRenderer={({ rowData }) => { const isSelected = selectedItems ? selectedItems.includes( - isString(rowData) ? rowData : rowData[idField] + isString(rowData) ? rowData : rowData[idField], ) : false; return subRenderFunction(rowData, column, isSelected); @@ -384,7 +384,7 @@ const elementActions = ( actions: ItemActions[], valueToSend: any, selected: boolean, - idField: string + idField: string, ) => { return actions.map((action: ItemActions, index: number) => { if (action.type === "view") { @@ -620,7 +620,7 @@ const TableWrapper = ({ width, itemActions ? itemActions.filter((el) => el.type !== "view").length - : 0 + : 0, ); const hasSelect: boolean = !!(onSelect && selectedItems); const hasOptions: boolean = !!( @@ -674,7 +674,7 @@ const TableWrapper = ({ return get( TableRowPredefStyles, returnElement, - {} + {}, ); } @@ -715,7 +715,7 @@ const TableWrapper = ({ ? selectedItems.includes( isString(rowData) ? rowData - : rowData[idField] + : rowData[idField], ) : false; @@ -770,7 +770,7 @@ const TableWrapper = ({ columnsSelector, columnsShown, sortConfig ? sortConfig.currentSort : "", - sortConfig ? sortConfig.currentDirection : undefined + sortConfig ? sortConfig.currentDirection : undefined, )} {hasOptions && ( // @ts-ignore @@ -784,14 +784,14 @@ const TableWrapper = ({ ? selectedItems.includes( isString(rowData) ? rowData - : rowData[idField] + : rowData[idField], ) : false; return elementActions( itemActions || [], rowData, isSelected, - idField + idField, ); }} /> diff --git a/web-app/src/screens/Console/Common/TolerationSelector/TolerationSelector.tsx b/web-app/src/screens/Console/Common/TolerationSelector/TolerationSelector.tsx index 9c1c025fb54..8ed7d77a1ef 100644 --- a/web-app/src/screens/Console/Common/TolerationSelector/TolerationSelector.tsx +++ b/web-app/src/screens/Console/Common/TolerationSelector/TolerationSelector.tsx @@ -137,7 +137,7 @@ const TolerationSelector = ({ ) => { onOperatorChange( - ITolerationOperator[e.target.value as ITolerationOperator] + ITolerationOperator[e.target.value as ITolerationOperator], ); }} id={`operator-${index}`} @@ -176,7 +176,7 @@ const TolerationSelector = ({ ) => { onEffectChange( - ITolerationEffect[e.target.value as ITolerationEffect] + ITolerationEffect[e.target.value as ITolerationEffect], ); }} id={`effects-${index}`} diff --git a/web-app/src/screens/Console/Common/VerticalTabs/VerticalTabs.tsx b/web-app/src/screens/Console/Common/VerticalTabs/VerticalTabs.tsx index 0c34f62e30d..aa5c63524b7 100644 --- a/web-app/src/screens/Console/Common/VerticalTabs/VerticalTabs.tsx +++ b/web-app/src/screens/Console/Common/VerticalTabs/VerticalTabs.tsx @@ -105,7 +105,7 @@ const VerticalTabs = ({ useEffect(() => { if (isRouteTabs) { const tabConfigElement = children.find( - (item) => item.tabConfig.to === pathname + (item) => item.tabConfig.to === pathname, ); if (tabConfigElement) { diff --git a/web-app/src/screens/Console/Console.tsx b/web-app/src/screens/Console/Console.tsx index b6505e1d785..83bb036ba80 100644 --- a/web-app/src/screens/Console/Console.tsx +++ b/web-app/src/screens/Console/Console.tsx @@ -54,18 +54,18 @@ const RegisterOperator = React.lazy(() => import("./Support/RegisterOperator")); const AddTenant = React.lazy(() => import("./Tenants/AddTenant/AddTenant")); const ListTenants = React.lazy( - () => import("./Tenants/ListTenants/ListTenants") + () => import("./Tenants/ListTenants/ListTenants"), ); const IconsScreen = React.lazy(() => import("./Common/IconsScreen")); const TenantDetails = React.lazy( - () => import("./Tenants/TenantDetails/TenantDetails") + () => import("./Tenants/TenantDetails/TenantDetails"), ); const License = React.lazy(() => import("./License/License")); const Marketplace = React.lazy(() => import("./Marketplace/Marketplace")); const AddPool = React.lazy( - () => import("./Tenants/TenantDetails/Pools/AddPool/AddPool") + () => import("./Tenants/TenantDetails/Pools/AddPool/AddPool"), ); const styles = (theme: Theme) => @@ -114,10 +114,10 @@ const Console = ({ classes }: IConsoleProps) => { const session = useSelector(selSession); const features = useSelector(selFeatures); const snackBarMessage = useSelector( - (state: AppState) => state.system.snackBar + (state: AppState) => state.system.snackBar, ); const loadingProgress = useSelector( - (state: AppState) => state.system.loadingProgress + (state: AppState) => state.system.loadingProgress, ); const [openSnackbar, setOpenSnackbar] = useState(false); @@ -198,9 +198,9 @@ const Console = ({ classes }: IConsoleProps) => { ? route.customPermissionFnc() : hasPermission( CONSOLE_UI_RESOURCE, - IAM_PAGES_PERMISSIONS[route.path] + IAM_PAGES_PERMISSIONS[route.path], ))) && - !route.fsHidden + !route.fsHidden, ); const closeSnackBar = () => { diff --git a/web-app/src/screens/Console/License/License.tsx b/web-app/src/screens/Console/License/License.tsx index 89acb89235a..ba01438c0f1 100644 --- a/web-app/src/screens/Console/License/License.tsx +++ b/web-app/src/screens/Console/License/License.tsx @@ -32,7 +32,7 @@ import { getLicenseConsent } from "./utils"; import PageHeaderWrapper from "../Common/PageHeaderWrapper/PageHeaderWrapper"; const LicenseConsentModal = withSuspense( - React.lazy(() => import("./LicenseConsentModal")) + React.lazy(() => import("./LicenseConsentModal")), ); const License = () => { diff --git a/web-app/src/screens/Console/License/LicensePlans.tsx b/web-app/src/screens/Console/License/LicensePlans.tsx index f16ad56af56..50c7eac9e7c 100644 --- a/web-app/src/screens/Console/License/LicensePlans.tsx +++ b/web-app/src/screens/Console/License/LicensePlans.tsx @@ -289,7 +289,7 @@ const LicensePlans = ({ licenseInfo, operatorMode }: IRegisterStatus) => { link: string, btnText: string, variant: any, - plan: string + plan: string, ) => { let linkToNav = currentPlan !== "community" ? "https://subnet.min.io" : link; @@ -309,7 +309,7 @@ const LicensePlans = ({ licenseInfo, operatorMode }: IRegisterStatus) => { window.open( `${linkToNav}?ref=${operatorMode ? "op" : "con"}`, - "_blank" + "_blank", ); }} label={btnText} @@ -616,7 +616,7 @@ const LicensePlans = ({ licenseInfo, operatorMode }: IRegisterStatus) => { `https://slack.min.io${linkTracker}`, "Join Slack", "regular", - LICENSE_PLANS.COMMUNITY + LICENSE_PLANS.COMMUNITY, )} @@ -662,7 +662,7 @@ const LicensePlans = ({ licenseInfo, operatorMode }: IRegisterStatus) => { ? "Subscribe" : "Login to SUBNET", "callAction", - LICENSE_PLANS.STANDARD + LICENSE_PLANS.STANDARD, )} @@ -717,7 +717,7 @@ const LicensePlans = ({ licenseInfo, operatorMode }: IRegisterStatus) => { ? "Subscribe" : "Login to SUBNET", "callAction", - LICENSE_PLANS.ENTERPRISE + LICENSE_PLANS.ENTERPRISE, )} diff --git a/web-app/src/screens/Console/Menu/AppMenu.tsx b/web-app/src/screens/Console/Menu/AppMenu.tsx index 7f1e46d67f4..1ace7631bf6 100644 --- a/web-app/src/screens/Console/Menu/AppMenu.tsx +++ b/web-app/src/screens/Console/Menu/AppMenu.tsx @@ -30,7 +30,7 @@ const AppMenu = () => { let logoPlan = getLogoVar(); const sidebarOpen = useSelector( - (state: AppState) => state.system.sidebarOpen + (state: AppState) => state.system.sidebarOpen, ); const routes = validRoutes(); diff --git a/web-app/src/screens/Console/Menu/LicenseBadge.tsx b/web-app/src/screens/Console/Menu/LicenseBadge.tsx index 1fb9dd9747b..39534a77bbd 100644 --- a/web-app/src/screens/Console/Menu/LicenseBadge.tsx +++ b/web-app/src/screens/Console/Menu/LicenseBadge.tsx @@ -24,7 +24,7 @@ import { registeredCluster } from "../../../config"; const LicenseBadge = () => { const licenseInfo = useSelector( - (state: AppState) => state?.system?.licenseInfo + (state: AppState) => state?.system?.licenseInfo, ); const isAgplAckDone = getLicenseConsent(); diff --git a/web-app/src/screens/Console/Menu/MenuItem.tsx b/web-app/src/screens/Console/Menu/MenuItem.tsx index 5ccd63417db..d3d5d7be92e 100644 --- a/web-app/src/screens/Console/Menu/MenuItem.tsx +++ b/web-app/src/screens/Console/Menu/MenuItem.tsx @@ -66,7 +66,7 @@ const MenuItem = ({ ? item.customPermissionFnc() : hasPermission(CONSOLE_UI_RESOURCE, IAM_PAGES_PERMISSIONS[item.to])) || item.forceDisplay) && - !item.fsHidden + !item.fsHidden, ); let hasChildren = childrenMenuList?.length; @@ -89,7 +89,7 @@ const MenuItem = ({ } }, // eslint-disable-next-line react-hooks/exhaustive-deps - [page, selectedMenuItem, previewMenuGroup, expandedGroup] + [page, selectedMenuItem, previewMenuGroup, expandedGroup], ); const selectMenuHandler = useCallback( @@ -99,7 +99,7 @@ const MenuItem = ({ page.onClick && page.onClick(e); }, // eslint-disable-next-line react-hooks/exhaustive-deps - [page] + [page], ); const onClickHandler = hasChildren diff --git a/web-app/src/screens/Console/Storage/StoragePVCs.tsx b/web-app/src/screens/Console/Storage/StoragePVCs.tsx index b504e8b4886..f79ac1b0b3a 100644 --- a/web-app/src/screens/Console/Storage/StoragePVCs.tsx +++ b/web-app/src/screens/Console/Storage/StoragePVCs.tsx @@ -76,7 +76,7 @@ const StorageVolumes = ({ classes }: IStorageVolumesProps) => { }, [loading, dispatch]); const filteredRecords: IStoragePVCs[] = records.filter((elementItem) => - elementItem.name.toLowerCase().includes(filter.toLowerCase()) + elementItem.name.toLowerCase().includes(filter.toLowerCase()), ); const confirmDeletePVC = (pvcItem: IStoragePVCs) => { diff --git a/web-app/src/screens/Console/Support/registerSlice.ts b/web-app/src/screens/Console/Support/registerSlice.ts index bdafdc7e9ee..4a2ad4731d7 100644 --- a/web-app/src/screens/Console/Support/registerSlice.ts +++ b/web-app/src/screens/Console/Support/registerSlice.ts @@ -83,7 +83,7 @@ export const registerSlice = createSlice({ }, setSubnetOrganizations: ( state, - action: PayloadAction + action: PayloadAction, ) => { state.subnetOrganizations = action.payload; }, diff --git a/web-app/src/screens/Console/Tenants/AddTenant/AddTenant.tsx b/web-app/src/screens/Console/Tenants/AddTenant/AddTenant.tsx index dd5b5cb380b..d3634b33e6b 100644 --- a/web-app/src/screens/Console/Tenants/AddTenant/AddTenant.tsx +++ b/web-app/src/screens/Console/Tenants/AddTenant/AddTenant.tsx @@ -63,7 +63,7 @@ const useStyles = makeStyles((theme: Theme) => ...modalBasic, ...wizardCommon, ...settingsCommon, - }) + }), ); const AddTenant = () => { @@ -75,7 +75,7 @@ const AddTenant = () => { // Fields const addSending = useSelector( - (state: AppState) => state.createTenant.addingTenant + (state: AppState) => state.createTenant.addingTenant, ); const [formRender, setFormRender] = useState(null); @@ -90,7 +90,7 @@ const AddTenant = () => { setConfiguration = get( resourcesConfigurations, element, - IMkEnvs.default + IMkEnvs.default, ); } }); diff --git a/web-app/src/screens/Console/Tenants/AddTenant/CreateTenantButton.tsx b/web-app/src/screens/Console/Tenants/AddTenant/CreateTenantButton.tsx index 01a8166fee4..15abe0d7dbe 100644 --- a/web-app/src/screens/Console/Tenants/AddTenant/CreateTenantButton.tsx +++ b/web-app/src/screens/Console/Tenants/AddTenant/CreateTenantButton.tsx @@ -25,16 +25,16 @@ const CreateTenantButton = () => { const dispatch = useAppDispatch(); const addSending = useSelector( - (state: AppState) => state.createTenant.addingTenant + (state: AppState) => state.createTenant.addingTenant, ); const validPages = useSelector( - (state: AppState) => state.createTenant.validPages + (state: AppState) => state.createTenant.validPages, ); const selectedStorageClass = useSelector( (state: AppState) => - state.createTenant.fields.nameTenant.selectedStorageClass + state.createTenant.fields.nameTenant.selectedStorageClass, ); const enabled = diff --git a/web-app/src/screens/Console/Tenants/AddTenant/NewTenantCredentials.tsx b/web-app/src/screens/Console/Tenants/AddTenant/NewTenantCredentials.tsx index 189a9c7e93c..cb700365780 100644 --- a/web-app/src/screens/Console/Tenants/AddTenant/NewTenantCredentials.tsx +++ b/web-app/src/screens/Console/Tenants/AddTenant/NewTenantCredentials.tsx @@ -26,10 +26,10 @@ const NewTenantCredentials = () => { const navigate = useNavigate(); const showNewCredentials = useSelector( - (state: AppState) => state.createTenant.showNewCredentials + (state: AppState) => state.createTenant.showNewCredentials, ); const createdAccount = useSelector( - (state: AppState) => state.createTenant.createdAccount + (state: AppState) => state.createTenant.createdAccount, ); return ( diff --git a/web-app/src/screens/Console/Tenants/AddTenant/Steps/Affinity.tsx b/web-app/src/screens/Console/Tenants/AddTenant/Steps/Affinity.tsx index e6d21863bde..b8a7b009617 100644 --- a/web-app/src/screens/Console/Tenants/AddTenant/Steps/Affinity.tsx +++ b/web-app/src/screens/Console/Tenants/AddTenant/Steps/Affinity.tsx @@ -119,25 +119,25 @@ const Affinity = ({ classes }: IAffinityProps) => { const dispatch = useAppDispatch(); const podAffinity = useSelector( - (state: AppState) => state.createTenant.fields.affinity.podAffinity + (state: AppState) => state.createTenant.fields.affinity.podAffinity, ); const nodeSelectorLabels = useSelector( - (state: AppState) => state.createTenant.fields.affinity.nodeSelectorLabels + (state: AppState) => state.createTenant.fields.affinity.nodeSelectorLabels, ); const withPodAntiAffinity = useSelector( - (state: AppState) => state.createTenant.fields.affinity.withPodAntiAffinity + (state: AppState) => state.createTenant.fields.affinity.withPodAntiAffinity, ); const keyValuePairs = useSelector( - (state: AppState) => state.createTenant.nodeSelectorPairs + (state: AppState) => state.createTenant.nodeSelectorPairs, ); const tolerations = useSelector( - (state: AppState) => state.createTenant.tolerations + (state: AppState) => state.createTenant.tolerations, ); const [validationErrors, setValidationErrors] = useState({}); const [loading, setLoading] = useState(true); const [keyValueMap, setKeyValueMap] = useState<{ [key: string]: string[] }>( - {} + {}, ); const [keyOptions, setKeyOptions] = useState([]); @@ -149,10 +149,10 @@ const Affinity = ({ classes }: IAffinityProps) => { pageName: "affinity", field: field, value: value, - }) + }), ); }, - [dispatch] + [dispatch], ); useEffect(() => { @@ -236,7 +236,7 @@ const Affinity = ({ classes }: IAffinityProps) => { isPageValid({ pageName: "affinity", valid: Object.keys(commonVal).length === 0, - }) + }), ); setValidationErrors(commonVal); @@ -249,7 +249,7 @@ const Affinity = ({ classes }: IAffinityProps) => { setTolerationInfo({ index: index, tolerationValue: alterToleration, - }) + }), ); }; @@ -427,7 +427,7 @@ const Affinity = ({ classes }: IAffinityProps) => { size={"small"} onClick={() => { const arrCp = keyValuePairs.filter( - (item, index) => index !== i + (item, index) => index !== i, ); dispatch(setKeyValuePairs(arrCp)); }} diff --git a/web-app/src/screens/Console/Tenants/AddTenant/Steps/Configure.tsx b/web-app/src/screens/Console/Tenants/AddTenant/Steps/Configure.tsx index efb6610cefc..a0bcd9a5e88 100644 --- a/web-app/src/screens/Console/Tenants/AddTenant/Steps/Configure.tsx +++ b/web-app/src/screens/Console/Tenants/AddTenant/Steps/Configure.tsx @@ -147,35 +147,35 @@ const Configure = ({ classes }: IConfigureProps) => { const dispatch = useAppDispatch(); const exposeMinIO = useSelector( - (state: AppState) => state.createTenant.fields.configure.exposeMinIO + (state: AppState) => state.createTenant.fields.configure.exposeMinIO, ); const exposeConsole = useSelector( - (state: AppState) => state.createTenant.fields.configure.exposeConsole + (state: AppState) => state.createTenant.fields.configure.exposeConsole, ); const setDomains = useSelector( - (state: AppState) => state.createTenant.fields.configure.setDomains + (state: AppState) => state.createTenant.fields.configure.setDomains, ); const consoleDomain = useSelector( - (state: AppState) => state.createTenant.fields.configure.consoleDomain + (state: AppState) => state.createTenant.fields.configure.consoleDomain, ); const minioDomains = useSelector( - (state: AppState) => state.createTenant.fields.configure.minioDomains + (state: AppState) => state.createTenant.fields.configure.minioDomains, ); const tenantCustom = useSelector( - (state: AppState) => state.createTenant.fields.configure.tenantCustom + (state: AppState) => state.createTenant.fields.configure.tenantCustom, ); const tenantEnvVars = useSelector( - (state: AppState) => state.createTenant.fields.configure.envVars + (state: AppState) => state.createTenant.fields.configure.envVars, ); const tenantSecurityContext = useSelector( (state: AppState) => - state.createTenant.fields.configure.tenantSecurityContext + state.createTenant.fields.configure.tenantSecurityContext, ); const customRuntime = useSelector( - (state: AppState) => state.createTenant.fields.configure.customRuntime + (state: AppState) => state.createTenant.fields.configure.customRuntime, ); const runtimeClassName = useSelector( - (state: AppState) => state.createTenant.fields.configure.runtimeClassName + (state: AppState) => state.createTenant.fields.configure.runtimeClassName, ); const [validationErrors, setValidationErrors] = useState({}); @@ -184,10 +184,10 @@ const Configure = ({ classes }: IConfigureProps) => { const updateField = useCallback( (field: string, value: any) => { dispatch( - updateAddField({ pageName: "configure", field: field, value: value }) + updateAddField({ pageName: "configure", field: field, value: value }), ); }, - [dispatch] + [dispatch], ); // Validation @@ -258,7 +258,7 @@ const Configure = ({ classes }: IConfigureProps) => { isPageValid({ pageName: "configure", valid: Object.keys(commonVal).length === 0, - }) + }), ); setValidationErrors(commonVal); @@ -378,7 +378,7 @@ const Configure = ({ classes }: IConfigureProps) => { id={`minio-domain-${index.toString()}`} name={`minio-domain-${index.toString()}`} onChange={( - e: React.ChangeEvent + e: React.ChangeEvent, ) => { updateMinIODomain(e.target.value, index); }} @@ -637,9 +637,9 @@ const Configure = ({ classes }: IConfigureProps) => { existingEnvVars.map((keyPair, i) => i === index ? { key: e.target.value, value: keyPair.value } - : keyPair - ) - ) + : keyPair, + ), + ), ); }} index={index} @@ -659,9 +659,9 @@ const Configure = ({ classes }: IConfigureProps) => { existingEnvVars.map((keyPair, i) => i === index ? { key: keyPair.key, value: e.target.value } - : keyPair - ) - ) + : keyPair, + ), + ), ); }} index={index} @@ -688,7 +688,7 @@ const Configure = ({ classes }: IConfigureProps) => { size={"small"} onClick={() => { const existingEnvVars = tenantEnvVars.filter( - (item, fIndex) => fIndex !== index + (item, fIndex) => fIndex !== index, ); dispatch(setEnvVars(existingEnvVars)); }} diff --git a/web-app/src/screens/Console/Tenants/AddTenant/Steps/Encryption.tsx b/web-app/src/screens/Console/Tenants/AddTenant/Steps/Encryption.tsx index 951a237a9e7..a6a864b47c6 100644 --- a/web-app/src/screens/Console/Tenants/AddTenant/Steps/Encryption.tsx +++ b/web-app/src/screens/Console/Tenants/AddTenant/Steps/Encryption.tsx @@ -92,69 +92,71 @@ const Encryption = ({ classes }: IEncryptionProps) => { const dispatch = useAppDispatch(); const replicas = useSelector( - (state: AppState) => state.createTenant.fields.encryption.replicas + (state: AppState) => state.createTenant.fields.encryption.replicas, ); const rawConfiguration = useSelector( - (state: AppState) => state.createTenant.fields.encryption.rawConfiguration + (state: AppState) => state.createTenant.fields.encryption.rawConfiguration, ); const encryptionTab = useSelector( - (state: AppState) => state.createTenant.fields.encryption.encryptionTab + (state: AppState) => state.createTenant.fields.encryption.encryptionTab, ); const enableEncryption = useSelector( - (state: AppState) => state.createTenant.fields.encryption.enableEncryption + (state: AppState) => state.createTenant.fields.encryption.enableEncryption, ); const encryptionType = useSelector( - (state: AppState) => state.createTenant.fields.encryption.encryptionType + (state: AppState) => state.createTenant.fields.encryption.encryptionType, ); const gcpProjectID = useSelector( - (state: AppState) => state.createTenant.fields.encryption.gcpProjectID + (state: AppState) => state.createTenant.fields.encryption.gcpProjectID, ); const gcpEndpoint = useSelector( - (state: AppState) => state.createTenant.fields.encryption.gcpEndpoint + (state: AppState) => state.createTenant.fields.encryption.gcpEndpoint, ); const gcpClientEmail = useSelector( - (state: AppState) => state.createTenant.fields.encryption.gcpClientEmail + (state: AppState) => state.createTenant.fields.encryption.gcpClientEmail, ); const gcpClientID = useSelector( - (state: AppState) => state.createTenant.fields.encryption.gcpClientID + (state: AppState) => state.createTenant.fields.encryption.gcpClientID, ); const gcpPrivateKeyID = useSelector( - (state: AppState) => state.createTenant.fields.encryption.gcpPrivateKeyID + (state: AppState) => state.createTenant.fields.encryption.gcpPrivateKeyID, ); const gcpPrivateKey = useSelector( - (state: AppState) => state.createTenant.fields.encryption.gcpPrivateKey + (state: AppState) => state.createTenant.fields.encryption.gcpPrivateKey, ); const enableCustomCertsForKES = useSelector( (state: AppState) => - state.createTenant.fields.encryption.enableCustomCertsForKES + state.createTenant.fields.encryption.enableCustomCertsForKES, ); const enableAutoCert = useSelector( - (state: AppState) => state.createTenant.fields.security.enableAutoCert + (state: AppState) => state.createTenant.fields.security.enableAutoCert, ); const enableTLS = useSelector( - (state: AppState) => state.createTenant.fields.security.enableTLS + (state: AppState) => state.createTenant.fields.security.enableTLS, ); const minioServerCertificates = useSelector( - (state: AppState) => state.createTenant.certificates.minioServerCertificates + (state: AppState) => + state.createTenant.certificates.minioServerCertificates, ); const kesServerCertificate = useSelector( - (state: AppState) => state.createTenant.certificates.kesServerCertificate + (state: AppState) => state.createTenant.certificates.kesServerCertificate, ); const minioMTLSCertificate = useSelector( - (state: AppState) => state.createTenant.certificates.minioMTLSCertificate + (state: AppState) => state.createTenant.certificates.minioMTLSCertificate, ); const kmsMTLSCertificate = useSelector( - (state: AppState) => state.createTenant.certificates.kmsMTLSCertificate + (state: AppState) => state.createTenant.certificates.kmsMTLSCertificate, ); const kmsCA = useSelector( - (state: AppState) => state.createTenant.certificates.kmsCA + (state: AppState) => state.createTenant.certificates.kmsCA, ); const enableCustomCerts = useSelector( - (state: AppState) => state.createTenant.fields.security.enableCustomCerts + (state: AppState) => state.createTenant.fields.security.enableCustomCerts, ); const kesSecurityContext = useSelector( - (state: AppState) => state.createTenant.fields.encryption.kesSecurityContext + (state: AppState) => + state.createTenant.fields.encryption.kesSecurityContext, ); const [validationErrors, setValidationErrors] = useState({}); @@ -165,7 +167,7 @@ const Encryption = ({ classes }: IEncryptionProps) => { (enableAutoCert || (minioServerCertificates && minioServerCertificates.filter( - (item) => item.encoded_key && item.encoded_cert + (item) => item.encoded_key && item.encoded_cert, ).length > 0)) ) { encryptionAvailable = true; @@ -175,10 +177,10 @@ const Encryption = ({ classes }: IEncryptionProps) => { const updateField = useCallback( (field: string, value: any) => { dispatch( - updateAddField({ pageName: "encryption", field: field, value: value }) + updateAddField({ pageName: "encryption", field: field, value: value }), ); }, - [dispatch] + [dispatch], ); const cleanValidation = (fieldName: string) => { @@ -264,7 +266,7 @@ const Encryption = ({ classes }: IEncryptionProps) => { isPageValid({ pageName: "encryption", valid: Object.keys(commonVal).length === 0, - }) + }), ); setValidationErrors(commonVal); @@ -423,7 +425,7 @@ const Encryption = ({ classes }: IEncryptionProps) => { key: "key", fileName: fileName, value: encodedValue, - }) + }), ); cleanValidation("serverKey"); }} @@ -442,7 +444,7 @@ const Encryption = ({ classes }: IEncryptionProps) => { key: "cert", fileName: fileName, value: encodedValue, - }) + }), ); cleanValidation("serverCert"); }} @@ -471,7 +473,7 @@ const Encryption = ({ classes }: IEncryptionProps) => { key: "key", fileName: fileName, value: encodedValue, - }) + }), ); cleanValidation("clientKey"); }} @@ -490,7 +492,7 @@ const Encryption = ({ classes }: IEncryptionProps) => { key: "cert", fileName: fileName, value: encodedValue, - }) + }), ); cleanValidation("clientCert"); }} @@ -518,7 +520,7 @@ const Encryption = ({ classes }: IEncryptionProps) => { key: "key", fileName: fileName, value: encodedValue, - }) + }), ); cleanValidation("vault_key"); }} @@ -535,7 +537,7 @@ const Encryption = ({ classes }: IEncryptionProps) => { key: "cert", fileName: fileName, value: encodedValue, - }) + }), ); cleanValidation("vault_cert"); }} @@ -551,7 +553,7 @@ const Encryption = ({ classes }: IEncryptionProps) => { addFileKMSCa({ fileName: fileName, value: encodedValue, - }) + }), ); cleanValidation("vault_ca"); }} diff --git a/web-app/src/screens/Console/Tenants/AddTenant/Steps/Encryption/AWSKMSAdd.tsx b/web-app/src/screens/Console/Tenants/AddTenant/Steps/Encryption/AWSKMSAdd.tsx index b69788c4105..5528f30429c 100644 --- a/web-app/src/screens/Console/Tenants/AddTenant/Steps/Encryption/AWSKMSAdd.tsx +++ b/web-app/src/screens/Console/Tenants/AddTenant/Steps/Encryption/AWSKMSAdd.tsx @@ -41,7 +41,7 @@ const useStyles = makeStyles((theme: Theme) => ...formFieldStyles, ...modalBasic, ...wizardCommon, - }) + }), ); const AWSKMSAdd = () => { @@ -49,25 +49,25 @@ const AWSKMSAdd = () => { const classes = useStyles(); const encryptionTab = useSelector( - (state: AppState) => state.createTenant.fields.encryption.encryptionTab + (state: AppState) => state.createTenant.fields.encryption.encryptionTab, ); const awsEndpoint = useSelector( - (state: AppState) => state.createTenant.fields.encryption.awsEndpoint + (state: AppState) => state.createTenant.fields.encryption.awsEndpoint, ); const awsRegion = useSelector( - (state: AppState) => state.createTenant.fields.encryption.awsRegion + (state: AppState) => state.createTenant.fields.encryption.awsRegion, ); const awsKMSKey = useSelector( - (state: AppState) => state.createTenant.fields.encryption.awsKMSKey + (state: AppState) => state.createTenant.fields.encryption.awsKMSKey, ); const awsAccessKey = useSelector( - (state: AppState) => state.createTenant.fields.encryption.awsAccessKey + (state: AppState) => state.createTenant.fields.encryption.awsAccessKey, ); const awsSecretKey = useSelector( - (state: AppState) => state.createTenant.fields.encryption.awsSecretKey + (state: AppState) => state.createTenant.fields.encryption.awsSecretKey, ); const awsToken = useSelector( - (state: AppState) => state.createTenant.fields.encryption.awsToken + (state: AppState) => state.createTenant.fields.encryption.awsToken, ); const [validationErrors, setValidationErrors] = useState({}); @@ -107,7 +107,7 @@ const AWSKMSAdd = () => { isPageValid({ pageName: "encryption", valid: Object.keys(commonVal).length === 0, - }) + }), ); setValidationErrors(commonVal); @@ -124,10 +124,10 @@ const AWSKMSAdd = () => { const updateField = useCallback( (field: string, value: any) => { dispatch( - updateAddField({ pageName: "encryption", field: field, value: value }) + updateAddField({ pageName: "encryption", field: field, value: value }), ); }, - [dispatch] + [dispatch], ); const cleanValidation = (fieldName: string) => { diff --git a/web-app/src/screens/Console/Tenants/AddTenant/Steps/Encryption/AzureKMSAdd.tsx b/web-app/src/screens/Console/Tenants/AddTenant/Steps/Encryption/AzureKMSAdd.tsx index 1df92193517..a969eb12e38 100644 --- a/web-app/src/screens/Console/Tenants/AddTenant/Steps/Encryption/AzureKMSAdd.tsx +++ b/web-app/src/screens/Console/Tenants/AddTenant/Steps/Encryption/AzureKMSAdd.tsx @@ -41,7 +41,7 @@ const useStyles = makeStyles((theme: Theme) => ...formFieldStyles, ...modalBasic, ...wizardCommon, - }) + }), ); const AzureKMSAdd = () => { @@ -49,19 +49,19 @@ const AzureKMSAdd = () => { const classes = useStyles(); const encryptionTab = useSelector( - (state: AppState) => state.createTenant.fields.encryption.encryptionTab + (state: AppState) => state.createTenant.fields.encryption.encryptionTab, ); const azureEndpoint = useSelector( - (state: AppState) => state.createTenant.fields.encryption.azureEndpoint + (state: AppState) => state.createTenant.fields.encryption.azureEndpoint, ); const azureTenantID = useSelector( - (state: AppState) => state.createTenant.fields.encryption.azureTenantID + (state: AppState) => state.createTenant.fields.encryption.azureTenantID, ); const azureClientID = useSelector( - (state: AppState) => state.createTenant.fields.encryption.azureClientID + (state: AppState) => state.createTenant.fields.encryption.azureClientID, ); const azureClientSecret = useSelector( - (state: AppState) => state.createTenant.fields.encryption.azureClientSecret + (state: AppState) => state.createTenant.fields.encryption.azureClientSecret, ); const [validationErrors, setValidationErrors] = useState({}); @@ -102,7 +102,7 @@ const AzureKMSAdd = () => { isPageValid({ pageName: "encryption", valid: Object.keys(commonVal).length === 0, - }) + }), ); setValidationErrors(commonVal); @@ -119,10 +119,10 @@ const AzureKMSAdd = () => { const updateField = useCallback( (field: string, value: any) => { dispatch( - updateAddField({ pageName: "encryption", field: field, value: value }) + updateAddField({ pageName: "encryption", field: field, value: value }), ); }, - [dispatch] + [dispatch], ); const cleanValidation = (fieldName: string) => { diff --git a/web-app/src/screens/Console/Tenants/AddTenant/Steps/Encryption/GCPKMSAdd.tsx b/web-app/src/screens/Console/Tenants/AddTenant/Steps/Encryption/GCPKMSAdd.tsx index ced79dc837e..58877ac5297 100644 --- a/web-app/src/screens/Console/Tenants/AddTenant/Steps/Encryption/GCPKMSAdd.tsx +++ b/web-app/src/screens/Console/Tenants/AddTenant/Steps/Encryption/GCPKMSAdd.tsx @@ -36,7 +36,7 @@ const useStyles = makeStyles((theme: Theme) => ...formFieldStyles, ...modalBasic, ...wizardCommon, - }) + }), ); const GCPKMSAdd = () => { @@ -44,32 +44,32 @@ const GCPKMSAdd = () => { const dispatch = useAppDispatch(); const gcpProjectID = useSelector( - (state: AppState) => state.createTenant.fields.encryption.gcpProjectID + (state: AppState) => state.createTenant.fields.encryption.gcpProjectID, ); const gcpEndpoint = useSelector( - (state: AppState) => state.createTenant.fields.encryption.gcpEndpoint + (state: AppState) => state.createTenant.fields.encryption.gcpEndpoint, ); const gcpClientEmail = useSelector( - (state: AppState) => state.createTenant.fields.encryption.gcpClientEmail + (state: AppState) => state.createTenant.fields.encryption.gcpClientEmail, ); const gcpClientID = useSelector( - (state: AppState) => state.createTenant.fields.encryption.gcpClientID + (state: AppState) => state.createTenant.fields.encryption.gcpClientID, ); const gcpPrivateKeyID = useSelector( - (state: AppState) => state.createTenant.fields.encryption.gcpPrivateKeyID + (state: AppState) => state.createTenant.fields.encryption.gcpPrivateKeyID, ); const gcpPrivateKey = useSelector( - (state: AppState) => state.createTenant.fields.encryption.gcpPrivateKey + (state: AppState) => state.createTenant.fields.encryption.gcpPrivateKey, ); // Common const updateField = useCallback( (field: string, value: any) => { dispatch( - updateAddField({ pageName: "encryption", field: field, value: value }) + updateAddField({ pageName: "encryption", field: field, value: value }), ); }, - [dispatch] + [dispatch], ); return ( diff --git a/web-app/src/screens/Console/Tenants/AddTenant/Steps/Encryption/GemaltoKMSAdd.tsx b/web-app/src/screens/Console/Tenants/AddTenant/Steps/Encryption/GemaltoKMSAdd.tsx index 24b0f1e09e0..0457fc78fd9 100644 --- a/web-app/src/screens/Console/Tenants/AddTenant/Steps/Encryption/GemaltoKMSAdd.tsx +++ b/web-app/src/screens/Console/Tenants/AddTenant/Steps/Encryption/GemaltoKMSAdd.tsx @@ -41,7 +41,7 @@ const useStyles = makeStyles((theme: Theme) => ...formFieldStyles, ...modalBasic, ...wizardCommon, - }) + }), ); const GemaltoKMSAdd = () => { @@ -49,19 +49,19 @@ const GemaltoKMSAdd = () => { const classes = useStyles(); const encryptionTab = useSelector( - (state: AppState) => state.createTenant.fields.encryption.encryptionTab + (state: AppState) => state.createTenant.fields.encryption.encryptionTab, ); const gemaltoEndpoint = useSelector( - (state: AppState) => state.createTenant.fields.encryption.gemaltoEndpoint + (state: AppState) => state.createTenant.fields.encryption.gemaltoEndpoint, ); const gemaltoToken = useSelector( - (state: AppState) => state.createTenant.fields.encryption.gemaltoToken + (state: AppState) => state.createTenant.fields.encryption.gemaltoToken, ); const gemaltoDomain = useSelector( - (state: AppState) => state.createTenant.fields.encryption.gemaltoDomain + (state: AppState) => state.createTenant.fields.encryption.gemaltoDomain, ); const gemaltoRetry = useSelector( - (state: AppState) => state.createTenant.fields.encryption.gemaltoRetry + (state: AppState) => state.createTenant.fields.encryption.gemaltoRetry, ); const [validationErrors, setValidationErrors] = useState({}); @@ -104,7 +104,7 @@ const GemaltoKMSAdd = () => { isPageValid({ pageName: "encryption", valid: Object.keys(commonVal).length === 0, - }) + }), ); setValidationErrors(commonVal); @@ -121,10 +121,10 @@ const GemaltoKMSAdd = () => { const updateField = useCallback( (field: string, value: any) => { dispatch( - updateAddField({ pageName: "encryption", field: field, value: value }) + updateAddField({ pageName: "encryption", field: field, value: value }), ); }, - [dispatch] + [dispatch], ); const cleanValidation = (fieldName: string) => { diff --git a/web-app/src/screens/Console/Tenants/AddTenant/Steps/Encryption/VaultKMSAdd.tsx b/web-app/src/screens/Console/Tenants/AddTenant/Steps/Encryption/VaultKMSAdd.tsx index 4955856accb..948009f872b 100644 --- a/web-app/src/screens/Console/Tenants/AddTenant/Steps/Encryption/VaultKMSAdd.tsx +++ b/web-app/src/screens/Console/Tenants/AddTenant/Steps/Encryption/VaultKMSAdd.tsx @@ -42,7 +42,7 @@ const useStyles = makeStyles((theme: Theme) => ...formFieldStyles, ...modalBasic, ...wizardCommon, - }) + }), ); const VaultKMSAdd = () => { @@ -50,34 +50,35 @@ const VaultKMSAdd = () => { const classes = useStyles(); const encryptionTab = useSelector( - (state: AppState) => state.createTenant.fields.encryption.encryptionTab + (state: AppState) => state.createTenant.fields.encryption.encryptionTab, ); const vaultEndpoint = useSelector( - (state: AppState) => state.createTenant.fields.encryption.vaultEndpoint + (state: AppState) => state.createTenant.fields.encryption.vaultEndpoint, ); const vaultEngine = useSelector( - (state: AppState) => state.createTenant.fields.encryption.vaultEngine + (state: AppState) => state.createTenant.fields.encryption.vaultEngine, ); const vaultNamespace = useSelector( - (state: AppState) => state.createTenant.fields.encryption.vaultNamespace + (state: AppState) => state.createTenant.fields.encryption.vaultNamespace, ); const vaultPrefix = useSelector( - (state: AppState) => state.createTenant.fields.encryption.vaultPrefix + (state: AppState) => state.createTenant.fields.encryption.vaultPrefix, ); const vaultAppRoleEngine = useSelector( - (state: AppState) => state.createTenant.fields.encryption.vaultAppRoleEngine + (state: AppState) => + state.createTenant.fields.encryption.vaultAppRoleEngine, ); const vaultId = useSelector( - (state: AppState) => state.createTenant.fields.encryption.vaultId + (state: AppState) => state.createTenant.fields.encryption.vaultId, ); const vaultSecret = useSelector( - (state: AppState) => state.createTenant.fields.encryption.vaultSecret + (state: AppState) => state.createTenant.fields.encryption.vaultSecret, ); const vaultRetry = useSelector( - (state: AppState) => state.createTenant.fields.encryption.vaultRetry + (state: AppState) => state.createTenant.fields.encryption.vaultRetry, ); const vaultPing = useSelector( - (state: AppState) => state.createTenant.fields.encryption.vaultPing + (state: AppState) => state.createTenant.fields.encryption.vaultPing, ); const [validationErrors, setValidationErrors] = useState({}); @@ -127,7 +128,7 @@ const VaultKMSAdd = () => { isPageValid({ pageName: "encryption", valid: Object.keys(commonVal).length === 0, - }) + }), ); setValidationErrors(commonVal); @@ -146,10 +147,10 @@ const VaultKMSAdd = () => { const updateField = useCallback( (field: string, value: any) => { dispatch( - updateAddField({ pageName: "encryption", field: field, value: value }) + updateAddField({ pageName: "encryption", field: field, value: value }), ); }, - [dispatch] + [dispatch], ); const cleanValidation = (fieldName: string) => { diff --git a/web-app/src/screens/Console/Tenants/AddTenant/Steps/IdentityProvider.tsx b/web-app/src/screens/Console/Tenants/AddTenant/Steps/IdentityProvider.tsx index e644977a83f..94d7dd3bdd7 100644 --- a/web-app/src/screens/Console/Tenants/AddTenant/Steps/IdentityProvider.tsx +++ b/web-app/src/screens/Console/Tenants/AddTenant/Steps/IdentityProvider.tsx @@ -58,7 +58,7 @@ const useStyles = makeStyles((theme: Theme) => ...createTenantCommon, ...modalBasic, ...wizardCommon, - }) + }), ); const IdentityProvider = () => { @@ -66,7 +66,8 @@ const IdentityProvider = () => { const classes = useStyles(); const idpSelection = useSelector( - (state: AppState) => state.createTenant.fields.identityProvider.idpSelection + (state: AppState) => + state.createTenant.fields.identityProvider.idpSelection, ); return ( diff --git a/web-app/src/screens/Console/Tenants/AddTenant/Steps/IdentityProvider/IDPActiveDirectory.tsx b/web-app/src/screens/Console/Tenants/AddTenant/Steps/IdentityProvider/IDPActiveDirectory.tsx index ab6114b2235..6a88dc2d0c4 100644 --- a/web-app/src/screens/Console/Tenants/AddTenant/Steps/IdentityProvider/IDPActiveDirectory.tsx +++ b/web-app/src/screens/Console/Tenants/AddTenant/Steps/IdentityProvider/IDPActiveDirectory.tsx @@ -75,7 +75,7 @@ const useStyles = makeStyles((theme: Theme) => ...formFieldStyles, ...modalBasic, ...wizardCommon, - }) + }), ); const IDPActiveDirectory = () => { @@ -83,51 +83,52 @@ const IDPActiveDirectory = () => { const classes = useStyles(); const idpSelection = useSelector( - (state: AppState) => state.createTenant.fields.identityProvider.idpSelection + (state: AppState) => + state.createTenant.fields.identityProvider.idpSelection, ); const ADURL = useSelector( - (state: AppState) => state.createTenant.fields.identityProvider.ADURL + (state: AppState) => state.createTenant.fields.identityProvider.ADURL, ); const ADSkipTLS = useSelector( - (state: AppState) => state.createTenant.fields.identityProvider.ADSkipTLS + (state: AppState) => state.createTenant.fields.identityProvider.ADSkipTLS, ); const ADServerInsecure = useSelector( (state: AppState) => - state.createTenant.fields.identityProvider.ADServerInsecure + state.createTenant.fields.identityProvider.ADServerInsecure, ); const ADGroupSearchBaseDN = useSelector( (state: AppState) => - state.createTenant.fields.identityProvider.ADGroupSearchBaseDN + state.createTenant.fields.identityProvider.ADGroupSearchBaseDN, ); const ADGroupSearchFilter = useSelector( (state: AppState) => - state.createTenant.fields.identityProvider.ADGroupSearchFilter + state.createTenant.fields.identityProvider.ADGroupSearchFilter, ); const ADUserDNs = useSelector( - (state: AppState) => state.createTenant.fields.identityProvider.ADUserDNs + (state: AppState) => state.createTenant.fields.identityProvider.ADUserDNs, ); const ADGroupDNs = useSelector( - (state: AppState) => state.createTenant.fields.identityProvider.ADGroupDNs + (state: AppState) => state.createTenant.fields.identityProvider.ADGroupDNs, ); const ADLookupBindDN = useSelector( (state: AppState) => - state.createTenant.fields.identityProvider.ADLookupBindDN + state.createTenant.fields.identityProvider.ADLookupBindDN, ); const ADLookupBindPassword = useSelector( (state: AppState) => - state.createTenant.fields.identityProvider.ADLookupBindPassword + state.createTenant.fields.identityProvider.ADLookupBindPassword, ); const ADUserDNSearchBaseDN = useSelector( (state: AppState) => - state.createTenant.fields.identityProvider.ADUserDNSearchBaseDN + state.createTenant.fields.identityProvider.ADUserDNSearchBaseDN, ); const ADUserDNSearchFilter = useSelector( (state: AppState) => - state.createTenant.fields.identityProvider.ADUserDNSearchFilter + state.createTenant.fields.identityProvider.ADUserDNSearchFilter, ); const ADServerStartTLS = useSelector( (state: AppState) => - state.createTenant.fields.identityProvider.ADServerStartTLS + state.createTenant.fields.identityProvider.ADServerStartTLS, ); const [validationErrors, setValidationErrors] = useState({}); @@ -139,10 +140,10 @@ const IDPActiveDirectory = () => { pageName: "identityProvider", field: field, value: value, - }) + }), ); }, - [dispatch] + [dispatch], ); const cleanValidation = (fieldName: string) => { @@ -175,7 +176,7 @@ const IDPActiveDirectory = () => { isPageValid({ pageName: "identityProvider", valid: Object.keys(commonVal).length === 0, - }) + }), ); setValidationErrors(commonVal); @@ -357,7 +358,7 @@ const IDPActiveDirectory = () => { setIDPADUsrAtIndex({ index: index, userDN: e.target.value, - }) + }), ); cleanValidation(`ad-userdn-${index.toString()}`); }} @@ -418,7 +419,7 @@ const IDPActiveDirectory = () => { setIDPADGroupAtIndex({ index: index, userDN: e.target.value, - }) + }), ); cleanValidation(`ad-groupdn-${index.toString()}`); }} diff --git a/web-app/src/screens/Console/Tenants/AddTenant/Steps/IdentityProvider/IDPBuiltIn.tsx b/web-app/src/screens/Console/Tenants/AddTenant/Steps/IdentityProvider/IDPBuiltIn.tsx index 6c5e4d5b35a..dd57ee5f84e 100644 --- a/web-app/src/screens/Console/Tenants/AddTenant/Steps/IdentityProvider/IDPBuiltIn.tsx +++ b/web-app/src/screens/Console/Tenants/AddTenant/Steps/IdentityProvider/IDPBuiltIn.tsx @@ -77,7 +77,7 @@ const useStyles = makeStyles((theme: Theme) => ...formFieldStyles, ...modalBasic, ...wizardCommon, - }) + }), ); const IDPBuiltIn = () => { @@ -85,13 +85,14 @@ const IDPBuiltIn = () => { const classes = useStyles(); const idpSelection = useSelector( - (state: AppState) => state.createTenant.fields.identityProvider.idpSelection + (state: AppState) => + state.createTenant.fields.identityProvider.idpSelection, ); const accessKeys = useSelector( - (state: AppState) => state.createTenant.fields.identityProvider.accessKeys + (state: AppState) => state.createTenant.fields.identityProvider.accessKeys, ); const secretKeys = useSelector( - (state: AppState) => state.createTenant.fields.identityProvider.secretKeys + (state: AppState) => state.createTenant.fields.identityProvider.secretKeys, ); const [validationErrors, setValidationErrors] = useState({}); @@ -130,7 +131,7 @@ const IDPBuiltIn = () => { isPageValid({ pageName: "identityProvider", valid: Object.keys(commonVal).length === 0, - }) + }), ); setValidationErrors(commonVal); @@ -154,7 +155,7 @@ const IDPBuiltIn = () => { setIDPUsrAtIndex({ index, accessKey: e.target.value, - }) + }), ); cleanValidation(`accesskey-${index.toString()}`); }} @@ -173,7 +174,7 @@ const IDPBuiltIn = () => { setIDPPwdAtIndex({ index, secretKey: e.target.value, - }) + }), ); cleanValidation(`secretkey-${index.toString()}`); }} @@ -212,13 +213,13 @@ const IDPBuiltIn = () => { setIDPUsrAtIndex({ index, accessKey: getRandomString(16), - }) + }), ); dispatch( setIDPPwdAtIndex({ index, secretKey: getRandomString(16), - }) + }), ); }} size={"small"} diff --git a/web-app/src/screens/Console/Tenants/AddTenant/Steps/IdentityProvider/IDPOpenID.tsx b/web-app/src/screens/Console/Tenants/AddTenant/Steps/IdentityProvider/IDPOpenID.tsx index f2a87c9bd9b..6def355610b 100644 --- a/web-app/src/screens/Console/Tenants/AddTenant/Steps/IdentityProvider/IDPOpenID.tsx +++ b/web-app/src/screens/Console/Tenants/AddTenant/Steps/IdentityProvider/IDPOpenID.tsx @@ -59,7 +59,7 @@ const useStyles = makeStyles((theme: Theme) => ...formFieldStyles, ...modalBasic, ...wizardCommon, - }) + }), ); const IDPOpenID = () => { @@ -67,30 +67,32 @@ const IDPOpenID = () => { const classes = useStyles(); const idpSelection = useSelector( - (state: AppState) => state.createTenant.fields.identityProvider.idpSelection + (state: AppState) => + state.createTenant.fields.identityProvider.idpSelection, ); const openIDConfigurationURL = useSelector( (state: AppState) => - state.createTenant.fields.identityProvider.openIDConfigurationURL + state.createTenant.fields.identityProvider.openIDConfigurationURL, ); const openIDClientID = useSelector( (state: AppState) => - state.createTenant.fields.identityProvider.openIDClientID + state.createTenant.fields.identityProvider.openIDClientID, ); const openIDSecretID = useSelector( (state: AppState) => - state.createTenant.fields.identityProvider.openIDSecretID + state.createTenant.fields.identityProvider.openIDSecretID, ); const openIDCallbackURL = useSelector( (state: AppState) => - state.createTenant.fields.identityProvider.openIDCallbackURL + state.createTenant.fields.identityProvider.openIDCallbackURL, ); const openIDClaimName = useSelector( (state: AppState) => - state.createTenant.fields.identityProvider.openIDClaimName + state.createTenant.fields.identityProvider.openIDClaimName, ); const openIDScopes = useSelector( - (state: AppState) => state.createTenant.fields.identityProvider.openIDScopes + (state: AppState) => + state.createTenant.fields.identityProvider.openIDScopes, ); const [validationErrors, setValidationErrors] = useState({}); @@ -102,10 +104,10 @@ const IDPOpenID = () => { pageName: "identityProvider", field: field, value: value, - }) + }), ); }, - [dispatch] + [dispatch], ); const cleanValidation = (fieldName: string) => { @@ -148,7 +150,7 @@ const IDPOpenID = () => { isPageValid({ pageName: "identityProvider", valid: Object.keys(commonVal).length === 0, - }) + }), ); setValidationErrors(commonVal); diff --git a/web-app/src/screens/Console/Tenants/AddTenant/Steps/Images.tsx b/web-app/src/screens/Console/Tenants/AddTenant/Steps/Images.tsx index 9559cd95559..b263fe7f74c 100644 --- a/web-app/src/screens/Console/Tenants/AddTenant/Steps/Images.tsx +++ b/web-app/src/screens/Console/Tenants/AddTenant/Steps/Images.tsx @@ -49,32 +49,32 @@ const Images = ({ classes }: IImagesProps) => { const dispatch = useAppDispatch(); const customImage = useSelector( - (state: AppState) => state.createTenant.fields.configure.customImage + (state: AppState) => state.createTenant.fields.configure.customImage, ); const imageName = useSelector( - (state: AppState) => state.createTenant.fields.configure.imageName + (state: AppState) => state.createTenant.fields.configure.imageName, ); const customDockerhub = useSelector( - (state: AppState) => state.createTenant.fields.configure.customDockerhub + (state: AppState) => state.createTenant.fields.configure.customDockerhub, ); const imageRegistry = useSelector( - (state: AppState) => state.createTenant.fields.configure.imageRegistry + (state: AppState) => state.createTenant.fields.configure.imageRegistry, ); const imageRegistryUsername = useSelector( (state: AppState) => - state.createTenant.fields.configure.imageRegistryUsername + state.createTenant.fields.configure.imageRegistryUsername, ); const imageRegistryPassword = useSelector( (state: AppState) => - state.createTenant.fields.configure.imageRegistryPassword + state.createTenant.fields.configure.imageRegistryPassword, ); const tenantCustom = useSelector( - (state: AppState) => state.createTenant.fields.configure.tenantCustom + (state: AppState) => state.createTenant.fields.configure.tenantCustom, ); const kesImage = useSelector( - (state: AppState) => state.createTenant.fields.configure.kesImage + (state: AppState) => state.createTenant.fields.configure.kesImage, ); const [validationErrors, setValidationErrors] = useState({}); @@ -83,10 +83,10 @@ const Images = ({ classes }: IImagesProps) => { const updateField = useCallback( (field: string, value: any) => { dispatch( - updateAddField({ pageName: "configure", field: field, value: value }) + updateAddField({ pageName: "configure", field: field, value: value }), ); }, - [dispatch] + [dispatch], ); // Validation @@ -139,7 +139,7 @@ const Images = ({ classes }: IImagesProps) => { isPageValid({ pageName: "configure", valid: Object.keys(commonVal).length === 0, - }) + }), ); setValidationErrors(commonVal); diff --git a/web-app/src/screens/Console/Tenants/AddTenant/Steps/Security.tsx b/web-app/src/screens/Console/Tenants/AddTenant/Steps/Security.tsx index 142b670684d..d593fbe2fe2 100644 --- a/web-app/src/screens/Console/Tenants/AddTenant/Steps/Security.tsx +++ b/web-app/src/screens/Console/Tenants/AddTenant/Steps/Security.tsx @@ -124,32 +124,34 @@ const Security = ({ classes }: ISecurityProps) => { const dispatch = useAppDispatch(); const enableTLS = useSelector( - (state: AppState) => state.createTenant.fields.security.enableTLS + (state: AppState) => state.createTenant.fields.security.enableTLS, ); const enableAutoCert = useSelector( - (state: AppState) => state.createTenant.fields.security.enableAutoCert + (state: AppState) => state.createTenant.fields.security.enableAutoCert, ); const enableCustomCerts = useSelector( - (state: AppState) => state.createTenant.fields.security.enableCustomCerts + (state: AppState) => state.createTenant.fields.security.enableCustomCerts, ); const minioCertificates = useSelector( - (state: AppState) => state.createTenant.certificates.minioServerCertificates + (state: AppState) => + state.createTenant.certificates.minioServerCertificates, ); const minioClientCertificates = useSelector( - (state: AppState) => state.createTenant.certificates.minioClientCertificates + (state: AppState) => + state.createTenant.certificates.minioClientCertificates, ); const caCertificates = useSelector( - (state: AppState) => state.createTenant.certificates.minioCAsCertificates + (state: AppState) => state.createTenant.certificates.minioCAsCertificates, ); // Common const updateField = useCallback( (field: string, value: any) => { dispatch( - updateAddField({ pageName: "security", field: field, value: value }) + updateAddField({ pageName: "security", field: field, value: value }), ); }, - [dispatch] + [dispatch], ); // Validation @@ -253,7 +255,7 @@ const Security = ({ classes }: ISecurityProps) => { key: "cert", fileName: fileName, value: encodedValue, - }) + }), ); }} accept=".cer,.crt,.cert,.pem" @@ -270,7 +272,7 @@ const Security = ({ classes }: ISecurityProps) => { key: "key", fileName: fileName, value: encodedValue, - }) + }), ); }} accept=".key,.pem" @@ -326,7 +328,7 @@ const Security = ({ classes }: ISecurityProps) => { key: "cert", fileName: fileName, value: encodedValue, - }) + }), ); }} accept=".cer,.crt,.cert,.pem" @@ -343,7 +345,7 @@ const Security = ({ classes }: ISecurityProps) => { key: "key", fileName: fileName, value: encodedValue, - }) + }), ); }} accept=".key,.pem" @@ -401,7 +403,7 @@ const Security = ({ classes }: ISecurityProps) => { key: "cert", fileName: fileName, value: encodedValue, - }) + }), ); }} accept=".cer,.crt,.cert,.pem" diff --git a/web-app/src/screens/Console/Tenants/AddTenant/Steps/SizePreview.tsx b/web-app/src/screens/Console/Tenants/AddTenant/Steps/SizePreview.tsx index fe65066e8bd..7c80365a97a 100644 --- a/web-app/src/screens/Console/Tenants/AddTenant/Steps/SizePreview.tsx +++ b/web-app/src/screens/Console/Tenants/AddTenant/Steps/SizePreview.tsx @@ -52,34 +52,34 @@ const styles = (theme: Theme) => const SizePreview = ({ classes }: ISizePreviewProps) => { const nodes = useSelector( - (state: AppState) => state.createTenant.fields.tenantSize.nodes + (state: AppState) => state.createTenant.fields.tenantSize.nodes, ); const memoryNode = useSelector( (state: AppState) => - state.createTenant.fields.tenantSize.resourcesMemoryRequest + state.createTenant.fields.tenantSize.resourcesMemoryRequest, ); const ecParity = useSelector( - (state: AppState) => state.createTenant.fields.tenantSize.ecParity + (state: AppState) => state.createTenant.fields.tenantSize.ecParity, ); const distribution = useSelector( - (state: AppState) => state.createTenant.fields.tenantSize.distribution + (state: AppState) => state.createTenant.fields.tenantSize.distribution, ); const ecParityCalc = useSelector( - (state: AppState) => state.createTenant.fields.tenantSize.ecParityCalc + (state: AppState) => state.createTenant.fields.tenantSize.ecParityCalc, ); const cpuToUse = useSelector( (state: AppState) => - state.createTenant.fields.tenantSize.resourcesCPURequest + state.createTenant.fields.tenantSize.resourcesCPURequest, ); const integrationSelection = useSelector( (state: AppState) => - state.createTenant.fields.tenantSize.integrationSelection + state.createTenant.fields.tenantSize.integrationSelection, ); const usableInformation = ecParityCalc.storageFactors.find( - (element) => element.erasureCode === ecParity + (element) => element.erasureCode === ecParity, ); return ( @@ -173,7 +173,7 @@ const SizePreview = ({ classes }: ISizePreviewProps) => { {distribution ? Math.floor( usableInformation.maxFailureTolerations / - distribution.disks + distribution.disks, ) : "-"} diff --git a/web-app/src/screens/Console/Tenants/AddTenant/Steps/TenantResources/NameTenantMain.tsx b/web-app/src/screens/Console/Tenants/AddTenant/Steps/TenantResources/NameTenantMain.tsx index f1184b515fb..d0e5d1e761a 100644 --- a/web-app/src/screens/Console/Tenants/AddTenant/Steps/TenantResources/NameTenantMain.tsx +++ b/web-app/src/screens/Console/Tenants/AddTenant/Steps/TenantResources/NameTenantMain.tsx @@ -60,11 +60,11 @@ const styles = (theme: Theme) => const NameTenantField = () => { const dispatch = useAppDispatch(); const tenantName = useSelector( - (state: AppState) => state.createTenant.fields.nameTenant.tenantName + (state: AppState) => state.createTenant.fields.nameTenant.tenantName, ); const tenantNameError = useSelector( - (state: AppState) => state.createTenant.validationErrors["tenant-name"] + (state: AppState) => state.createTenant.validationErrors["tenant-name"], ); return ( @@ -92,14 +92,14 @@ const NameTenantMain = ({ classes, formToRender }: INameTenantMainScreen) => { const selectedStorageClass = useSelector( (state: AppState) => - state.createTenant.fields.nameTenant.selectedStorageClass + state.createTenant.fields.nameTenant.selectedStorageClass, ); const selectedStorageType = useSelector( (state: AppState) => - state.createTenant.fields.nameTenant.selectedStorageType + state.createTenant.fields.nameTenant.selectedStorageType, ); const storageClasses = useSelector( - (state: AppState) => state.createTenant.storageClasses + (state: AppState) => state.createTenant.storageClasses, ); const features = useSelector(selFeatures); @@ -107,10 +107,10 @@ const NameTenantMain = ({ classes, formToRender }: INameTenantMainScreen) => { const updateField = useCallback( (field: string, value: string) => { dispatch( - updateAddField({ pageName: "nameTenant", field: field, value: value }) + updateAddField({ pageName: "nameTenant", field: field, value: value }), ); }, - [dispatch] + [dispatch], ); // Validation @@ -150,7 +150,7 @@ const NameTenantMain = ({ classes, formToRender }: INameTenantMainScreen) => { onChange={(e: SelectChangeEvent) => { updateField( "selectedStorageClass", - e.target.value as string + e.target.value as string, ); }} label="Storage Class" @@ -169,19 +169,19 @@ const NameTenantMain = ({ classes, formToRender }: INameTenantMainScreen) => { setStorageType({ storageType: e.target.value as string, features: features, - }) + }), ); }} label={get( mkPanelConfigurations, `${formToRender}.variantSelectorLabel`, - "Storage Type" + "Storage Type", )} value={selectedStorageType} options={get( mkPanelConfigurations, `${formToRender}.variantSelectorValues`, - [] + [], )} /> @@ -192,7 +192,7 @@ const NameTenantMain = ({ classes, formToRender }: INameTenantMainScreen) => { get( mkPanelConfigurations, `${formToRender}.sizingComponent`, - null + null, ) )} diff --git a/web-app/src/screens/Console/Tenants/AddTenant/Steps/TenantResources/NamespaceSelector.tsx b/web-app/src/screens/Console/Tenants/AddTenant/Steps/TenantResources/NamespaceSelector.tsx index d94b06df781..8b55e5b2a07 100644 --- a/web-app/src/screens/Console/Tenants/AddTenant/Steps/TenantResources/NamespaceSelector.tsx +++ b/web-app/src/screens/Console/Tenants/AddTenant/Steps/TenantResources/NamespaceSelector.tsx @@ -29,18 +29,18 @@ const NamespaceSelector = ({ formToRender }: { formToRender?: IMkEnvs }) => { const dispatch = useAppDispatch(); const namespace = useSelector( - (state: AppState) => state.createTenant.fields.nameTenant.namespace + (state: AppState) => state.createTenant.fields.nameTenant.namespace, ); const showNSCreateButton = useSelector( - (state: AppState) => state.createTenant.showNSCreateButton + (state: AppState) => state.createTenant.showNSCreateButton, ); const namespaceError = useSelector( - (state: AppState) => state.createTenant.validationErrors["namespace"] + (state: AppState) => state.createTenant.validationErrors["namespace"], ); const openAddNSConfirm = useSelector( - (state: AppState) => state.createTenant.addNSOpen + (state: AppState) => state.createTenant.addNSOpen, ); const debounceNamespace = useMemo( @@ -48,7 +48,7 @@ const NamespaceSelector = ({ formToRender }: { formToRender?: IMkEnvs }) => { debounce(() => { dispatch(validateNamespaceAsync()); }, 500), - [dispatch] + [dispatch], ); useEffect(() => { diff --git a/web-app/src/screens/Console/Tenants/AddTenant/Steps/TenantResources/TenantResources.tsx b/web-app/src/screens/Console/Tenants/AddTenant/Steps/TenantResources/TenantResources.tsx index 223978a8908..94f628c9e1e 100644 --- a/web-app/src/screens/Console/Tenants/AddTenant/Steps/TenantResources/TenantResources.tsx +++ b/web-app/src/screens/Console/Tenants/AddTenant/Steps/TenantResources/TenantResources.tsx @@ -36,7 +36,7 @@ const TenantResources = () => { setConfiguration = get( resourcesConfigurations, element, - IMkEnvs.default + IMkEnvs.default, ); } }); diff --git a/web-app/src/screens/Console/Tenants/AddTenant/Steps/TenantResources/TenantSize.tsx b/web-app/src/screens/Console/Tenants/AddTenant/Steps/TenantResources/TenantSize.tsx index 2787b2268e6..1471342e1d5 100644 --- a/web-app/src/screens/Console/Tenants/AddTenant/Steps/TenantResources/TenantSize.tsx +++ b/web-app/src/screens/Console/Tenants/AddTenant/Steps/TenantResources/TenantSize.tsx @@ -63,51 +63,51 @@ const TenantSize = ({ classes, formToRender }: ITenantSizeProps) => { const dispatch = useAppDispatch(); const volumeSize = useSelector( - (state: AppState) => state.createTenant.fields.tenantSize.volumeSize + (state: AppState) => state.createTenant.fields.tenantSize.volumeSize, ); const sizeFactor = useSelector( - (state: AppState) => state.createTenant.fields.tenantSize.sizeFactor + (state: AppState) => state.createTenant.fields.tenantSize.sizeFactor, ); const drivesPerServer = useSelector( - (state: AppState) => state.createTenant.fields.tenantSize.drivesPerServer + (state: AppState) => state.createTenant.fields.tenantSize.drivesPerServer, ); const nodes = useSelector( - (state: AppState) => state.createTenant.fields.tenantSize.nodes + (state: AppState) => state.createTenant.fields.tenantSize.nodes, ); const memoryNode = useSelector( - (state: AppState) => state.createTenant.fields.tenantSize.memoryNode + (state: AppState) => state.createTenant.fields.tenantSize.memoryNode, ); const ecParity = useSelector( - (state: AppState) => state.createTenant.fields.tenantSize.ecParity + (state: AppState) => state.createTenant.fields.tenantSize.ecParity, ); const ecParityChoices = useSelector( - (state: AppState) => state.createTenant.fields.tenantSize.ecParityChoices + (state: AppState) => state.createTenant.fields.tenantSize.ecParityChoices, ); const cleanECChoices = useSelector( - (state: AppState) => state.createTenant.fields.tenantSize.cleanECChoices + (state: AppState) => state.createTenant.fields.tenantSize.cleanECChoices, ); const resourcesSize = useSelector( - (state: AppState) => state.createTenant.fields.tenantSize.resourcesSize + (state: AppState) => state.createTenant.fields.tenantSize.resourcesSize, ); const distribution = useSelector( - (state: AppState) => state.createTenant.fields.tenantSize.distribution + (state: AppState) => state.createTenant.fields.tenantSize.distribution, ); const ecParityCalc = useSelector( - (state: AppState) => state.createTenant.fields.tenantSize.ecParityCalc + (state: AppState) => state.createTenant.fields.tenantSize.ecParityCalc, ); const untouchedECField = useSelector( - (state: AppState) => state.createTenant.fields.tenantSize.untouchedECField + (state: AppState) => state.createTenant.fields.tenantSize.untouchedECField, ); const limitSize = useSelector( - (state: AppState) => state.createTenant.limitSize + (state: AppState) => state.createTenant.limitSize, ); const selectedStorageClass = useSelector( (state: AppState) => - state.createTenant.fields.nameTenant.selectedStorageClass + state.createTenant.fields.nameTenant.selectedStorageClass, ); const selectedStorageType = useSelector( (state: AppState) => - state.createTenant.fields.nameTenant.selectedStorageType + state.createTenant.fields.nameTenant.selectedStorageType, ); const [validationErrors, setValidationErrors] = useState({}); @@ -122,10 +122,10 @@ const TenantSize = ({ classes, formToRender }: ITenantSizeProps) => { pageName: "tenantSize", field: field, value: value, - }) + }), ); }, - [dispatch] + [dispatch], ); const cleanValidation = (fieldName: string) => { @@ -139,7 +139,7 @@ const TenantSize = ({ classes, formToRender }: ITenantSizeProps) => { if (cleanECChoices.length > 0 && ecParityCalc.defaultEC !== "") { updateField( "ecParityChoices", - ecListTransform(cleanECChoices, ecParityCalc.defaultEC) + ecListTransform(cleanECChoices, ecParityCalc.defaultEC), ); } }, [ecParityCalc, cleanECChoices, updateField]); @@ -159,7 +159,7 @@ const TenantSize = ({ classes, formToRender }: ITenantSizeProps) => { cleanECChoices, distribution.persistentVolumes, distribution.pvSize, - distribution.nodes + distribution.nodes, ); updateField("ecParityCalc", ecCodeValidated); @@ -196,7 +196,7 @@ const TenantSize = ({ classes, formToRender }: ITenantSizeProps) => { parseInt(limitSize), parseInt(drivesPerServer), formToRender, - selectedStorageType + selectedStorageType, ); updateField("distribution", distrCalculate); @@ -236,7 +236,7 @@ const TenantSize = ({ classes, formToRender }: ITenantSizeProps) => { parseInt(parsedSize) > limitSize[selectedStorageClass], customValidationMessage: `Volume size must be greater than 1Gi and less than ${niceBytes( limitSize[selectedStorageClass], - true + true, )}`, }, { @@ -258,7 +258,7 @@ const TenantSize = ({ classes, formToRender }: ITenantSizeProps) => { distribution.error === "" && ecParityCalc.error === 0 && ecParity !== "", - }) + }), ); setValidationErrors(commonValidation); @@ -298,7 +298,7 @@ const TenantSize = ({ classes, formToRender }: ITenantSizeProps) => { isPageValid({ pageName: "tenantSize", valid: false, - }) + }), ); updateField("ecParity", ""); }); diff --git a/web-app/src/screens/Console/Tenants/AddTenant/Steps/TenantResources/TenantSizeMK.tsx b/web-app/src/screens/Console/Tenants/AddTenant/Steps/TenantResources/TenantSizeMK.tsx index 3a135259f4c..50c156f99d7 100644 --- a/web-app/src/screens/Console/Tenants/AddTenant/Steps/TenantResources/TenantSizeMK.tsx +++ b/web-app/src/screens/Console/Tenants/AddTenant/Steps/TenantResources/TenantSizeMK.tsx @@ -64,54 +64,54 @@ const TenantSizeMK = ({ const dispatch = useAppDispatch(); const volumeSize = useSelector( - (state: AppState) => state.createTenant.fields.tenantSize.volumeSize + (state: AppState) => state.createTenant.fields.tenantSize.volumeSize, ); const sizeFactor = useSelector( - (state: AppState) => state.createTenant.fields.tenantSize.sizeFactor + (state: AppState) => state.createTenant.fields.tenantSize.sizeFactor, ); const drivesPerServer = useSelector( - (state: AppState) => state.createTenant.fields.tenantSize.drivesPerServer + (state: AppState) => state.createTenant.fields.tenantSize.drivesPerServer, ); const nodes = useSelector( - (state: AppState) => state.createTenant.fields.tenantSize.nodes + (state: AppState) => state.createTenant.fields.tenantSize.nodes, ); const memoryNode = useSelector( - (state: AppState) => state.createTenant.fields.tenantSize.memoryNode + (state: AppState) => state.createTenant.fields.tenantSize.memoryNode, ); const ecParity = useSelector( - (state: AppState) => state.createTenant.fields.tenantSize.ecParity + (state: AppState) => state.createTenant.fields.tenantSize.ecParity, ); const ecParityChoices = useSelector( - (state: AppState) => state.createTenant.fields.tenantSize.ecParityChoices + (state: AppState) => state.createTenant.fields.tenantSize.ecParityChoices, ); const cleanECChoices = useSelector( - (state: AppState) => state.createTenant.fields.tenantSize.cleanECChoices + (state: AppState) => state.createTenant.fields.tenantSize.cleanECChoices, ); const resourcesSize = useSelector( - (state: AppState) => state.createTenant.fields.tenantSize.resourcesSize + (state: AppState) => state.createTenant.fields.tenantSize.resourcesSize, ); const distribution = useSelector( - (state: AppState) => state.createTenant.fields.tenantSize.distribution + (state: AppState) => state.createTenant.fields.tenantSize.distribution, ); const ecParityCalc = useSelector( - (state: AppState) => state.createTenant.fields.tenantSize.ecParityCalc + (state: AppState) => state.createTenant.fields.tenantSize.ecParityCalc, ); const cpuToUse = useSelector( - (state: AppState) => state.createTenant.fields.tenantSize.cpuToUse + (state: AppState) => state.createTenant.fields.tenantSize.cpuToUse, ); const maxCPUsUse = useSelector( - (state: AppState) => state.createTenant.fields.tenantSize.maxCPUsUse + (state: AppState) => state.createTenant.fields.tenantSize.maxCPUsUse, ); const integrationSelection = useSelector( (state: AppState) => - state.createTenant.fields.tenantSize.integrationSelection + state.createTenant.fields.tenantSize.integrationSelection, ); const limitSize = useSelector( - (state: AppState) => state.createTenant.limitSize + (state: AppState) => state.createTenant.limitSize, ); const selectedStorageType = useSelector( (state: AppState) => - state.createTenant.fields.nameTenant.selectedStorageType + state.createTenant.fields.nameTenant.selectedStorageType, ); const [validationErrors, setValidationErrors] = useState({}); @@ -124,10 +124,10 @@ const TenantSizeMK = ({ pageName: "tenantSize", field: field, value: value, - }) + }), ); }, - [dispatch] + [dispatch], ); const updateMainField = useCallback( @@ -137,10 +137,10 @@ const TenantSizeMK = ({ pageName: "nameTenant", field: field, value: value, - }) + }), ); }, - [dispatch] + [dispatch], ); const cleanValidation = (fieldName: string) => { @@ -156,7 +156,7 @@ const TenantSizeMK = ({ cleanECChoices, distribution.persistentVolumes, distribution.pvSize, - distribution.nodes + distribution.nodes, ); updateField("ecParityCalc", ecCodeValidated); @@ -179,11 +179,11 @@ const TenantSizeMK = ({ const configs: IntegrationConfiguration[] = get( setConfigs, "configurations", - [] + [], ); const mainSelection = configs.find( - (item) => item.typeSelection === selectedStorageType + (item) => item.typeSelection === selectedStorageType, ); if (mainSelection) { @@ -194,9 +194,9 @@ const TenantSizeMK = ({ getBytes( mainSelection.driveSize.driveSize, mainSelection.driveSize.sizeUnit, - true + true, ), - 10 + 10, ); const distrCalculate: IStorageDistribution = { @@ -211,11 +211,11 @@ const TenantSizeMK = ({ // apply requests, half of the available resources updateField( "resourcesCPURequest", - Math.max(1, mainSelection.CPU / 2) + Math.max(1, mainSelection.CPU / 2), ); updateField( "resourcesMemoryRequest", - Math.max(2, mainSelection.memory / 2) + Math.max(2, mainSelection.memory / 2), ); } } @@ -247,7 +247,7 @@ const TenantSizeMK = ({ resourcesSize.error === "" && ecParity !== "" && parseInt(nodes) >= 4, - }) + }), ); setValidationErrors(commonValidation); @@ -275,7 +275,7 @@ const TenantSizeMK = ({ api .invoke( "GET", - `api/v1/get-parity/${nodes}/${integrationSelection.drivesPerServer}` + `api/v1/get-parity/${nodes}/${integrationSelection.drivesPerServer}`, ) .then((ecList: string[]) => { updateField("ecParityChoices", ecListTransform(ecList)); @@ -287,7 +287,7 @@ const TenantSizeMK = ({ isPageValid({ pageName: "tenantSize", valid: false, - }) + }), ); updateField("ecParity", ""); }); diff --git a/web-app/src/screens/Console/Tenants/AddTenant/Steps/TenantResources/TenantSizeResources.tsx b/web-app/src/screens/Console/Tenants/AddTenant/Steps/TenantResources/TenantSizeResources.tsx index 093b7a32563..e1be5da6222 100644 --- a/web-app/src/screens/Console/Tenants/AddTenant/Steps/TenantResources/TenantSizeResources.tsx +++ b/web-app/src/screens/Console/Tenants/AddTenant/Steps/TenantResources/TenantSizeResources.tsx @@ -56,59 +56,59 @@ ITenantSizeResourcesProps) => { const dispatch = useAppDispatch(); const nodes = useSelector( - (state: AppState) => state.createTenant.fields.tenantSize.nodes + (state: AppState) => state.createTenant.fields.tenantSize.nodes, ); const resourcesSize = useSelector( - (state: AppState) => state.createTenant.fields.tenantSize.resourcesSize + (state: AppState) => state.createTenant.fields.tenantSize.resourcesSize, ); const selectedStorageClass = useSelector( (state: AppState) => - state.createTenant.fields.nameTenant.selectedStorageClass + state.createTenant.fields.nameTenant.selectedStorageClass, ); const maxCPUsUse = useSelector( - (state: AppState) => state.createTenant.fields.tenantSize.maxCPUsUse + (state: AppState) => state.createTenant.fields.tenantSize.maxCPUsUse, ); const maxMemorySize = useSelector( - (state: AppState) => state.createTenant.fields.tenantSize.maxMemorySize + (state: AppState) => state.createTenant.fields.tenantSize.maxMemorySize, ); const resourcesSpecifyLimit = useSelector( (state: AppState) => - state.createTenant.fields.tenantSize.resourcesSpecifyLimit + state.createTenant.fields.tenantSize.resourcesSpecifyLimit, ); const resourcesCPURequestError = useSelector( (state: AppState) => - state.createTenant.fields.tenantSize.resourcesCPURequestError + state.createTenant.fields.tenantSize.resourcesCPURequestError, ); const resourcesCPURequest = useSelector( (state: AppState) => - state.createTenant.fields.tenantSize.resourcesCPURequest + state.createTenant.fields.tenantSize.resourcesCPURequest, ); const resourcesCPULimitError = useSelector( (state: AppState) => - state.createTenant.fields.tenantSize.resourcesCPULimitError + state.createTenant.fields.tenantSize.resourcesCPULimitError, ); const resourcesCPULimit = useSelector( - (state: AppState) => state.createTenant.fields.tenantSize.resourcesCPULimit + (state: AppState) => state.createTenant.fields.tenantSize.resourcesCPULimit, ); const resourcesMemoryRequestError = useSelector( (state: AppState) => - state.createTenant.fields.tenantSize.resourcesMemoryRequestError + state.createTenant.fields.tenantSize.resourcesMemoryRequestError, ); const resourcesMemoryRequest = useSelector( (state: AppState) => - state.createTenant.fields.tenantSize.resourcesMemoryRequest + state.createTenant.fields.tenantSize.resourcesMemoryRequest, ); const resourcesMemoryLimitError = useSelector( (state: AppState) => - state.createTenant.fields.tenantSize.resourcesMemoryLimitError + state.createTenant.fields.tenantSize.resourcesMemoryLimitError, ); const resourcesMemoryLimit = useSelector( (state: AppState) => - state.createTenant.fields.tenantSize.resourcesMemoryLimit + state.createTenant.fields.tenantSize.resourcesMemoryLimit, ); // Common @@ -119,10 +119,10 @@ ITenantSizeResourcesProps) => { pageName: "tenantSize", field: field, value: value, - }) + }), ); }, - [dispatch] + [dispatch], ); /*Debounce functions*/ @@ -136,7 +136,7 @@ ITenantSizeResourcesProps) => { resourcesMemoryLimitError === "" && resourcesCPURequestError === "" && resourcesCPULimitError === "", - }) + }), ); }, [ dispatch, @@ -161,13 +161,13 @@ ITenantSizeResourcesProps) => { const memoryExists = get( maxAllocatableResources, "min_allocatable_mem", - false + false, ); const cpuExists = get( maxAllocatableResources, "min_allocatable_cpu", - false + false, ); if (memoryExists === false || cpuExists === false) { @@ -180,19 +180,19 @@ ITenantSizeResourcesProps) => { } const maxMemory = floor( - res.mem_priority.max_allocatable_mem / 1024 / 1024 / 1024 + res.mem_priority.max_allocatable_mem / 1024 / 1024 / 1024, ); // We default to Best CPU Configuration updateField("maxMemorySize", maxMemory.toString()); updateField( "maxCPUsUse", - res.cpu_priority.max_allocatable_cpu.toString() + res.cpu_priority.max_allocatable_cpu.toString(), ); const maxAllocatableCPU = get( maxAllocatableResources, "cpu_priority.max_allocatable_cpu", - 0 + 0, ); const baseCpuUse = Math.max(1, floor(maxAllocatableCPU / 2)); @@ -248,7 +248,7 @@ ITenantSizeResourcesProps) => { } else if (value > parseInt(maxCPUsUse)) { updateField( "resourcesCPURequestError", - `Request exceeds available cores (${maxCPUsUse})` + `Request exceeds available cores (${maxCPUsUse})`, ); } else if (e.target.validity.valid) { updateField("resourcesCPURequestError", ""); @@ -278,19 +278,19 @@ ITenantSizeResourcesProps) => { } else if (value > parseInt(maxMemorySize)) { updateField( "resourcesMemoryRequestError", - `Request exceeds available memory across ${nodes} nodes (${maxMemorySize}Gi)` + `Request exceeds available memory across ${nodes} nodes (${maxMemorySize}Gi)`, ); } else if (value < 2) { updateField( "resourcesMemoryRequestError", - "At least 2Gi must be requested" + "At least 2Gi must be requested", ); } else if (e.target.validity.valid) { updateField("resourcesMemoryRequestError", ""); } else { updateField( "resourcesMemoryRequestError", - "Invalid configuration" + "Invalid configuration", ); } updateField("resourcesMemoryRequest", e.target.value); @@ -346,7 +346,7 @@ ITenantSizeResourcesProps) => { } else { updateField( "resourcesCPULimitError", - "Invalid configuration" + "Invalid configuration", ); } updateField("resourcesCPULimit", e.target.value); @@ -374,7 +374,7 @@ ITenantSizeResourcesProps) => { } else { updateField( "resourcesMemoryLimitError", - "Invalid configuration" + "Invalid configuration", ); } updateField("resourcesMemoryLimit", e.target.value); diff --git a/web-app/src/screens/Console/Tenants/AddTenant/Steps/helpers/AddNamespaceModal.tsx b/web-app/src/screens/Console/Tenants/AddTenant/Steps/helpers/AddNamespaceModal.tsx index 3eed9ee564c..ecf768591e2 100644 --- a/web-app/src/screens/Console/Tenants/AddTenant/Steps/helpers/AddNamespaceModal.tsx +++ b/web-app/src/screens/Console/Tenants/AddTenant/Steps/helpers/AddNamespaceModal.tsx @@ -39,7 +39,7 @@ const useStyles = makeStyles((theme: Theme) => }, ...modalBasic, ...deleteDialogStyles, - }) + }), ); const AddNamespaceModal = () => { @@ -47,13 +47,13 @@ const AddNamespaceModal = () => { const classes = useStyles(); const namespace = useSelector( - (state: AppState) => state.createTenant.fields.nameTenant.namespace + (state: AppState) => state.createTenant.fields.nameTenant.namespace, ); const addNamespaceLoading = useSelector( - (state: AppState) => state.createTenant.addNSLoading + (state: AppState) => state.createTenant.addNSLoading, ); const addNamespaceOpen = useSelector( - (state: AppState) => state.createTenant.addNSOpen + (state: AppState) => state.createTenant.addNSOpen, ); return ( diff --git a/web-app/src/screens/Console/Tenants/AddTenant/createTenantSlice.ts b/web-app/src/screens/Console/Tenants/AddTenant/createTenantSlice.ts index 62b838db8a5..0b32182ca7d 100644 --- a/web-app/src/screens/Console/Tenants/AddTenant/createTenantSlice.ts +++ b/web-app/src/screens/Console/Tenants/AddTenant/createTenantSlice.ts @@ -351,7 +351,7 @@ export const createTenantSlice = createSlice({ pageName: keyof IFieldStore; field: string; value: any; - }> + }>, ) => { if ( has(state.fields, `${action.payload.pageName}.${action.payload.field}`) @@ -359,7 +359,7 @@ export const createTenantSlice = createSlice({ const originPageNameItems = get( state.fields, `${action.payload.pageName}`, - {} + {}, ); let newValue: any = {}; @@ -375,7 +375,7 @@ export const createTenantSlice = createSlice({ action: PayloadAction<{ pageName: keyof IFieldStore; valid: boolean; - }> + }>, ) => { let originValidPages = state.validPages; if (action.payload.valid) { @@ -386,7 +386,7 @@ export const createTenantSlice = createSlice({ } } else { const newSetOfPages = originValidPages.filter( - (elm) => elm !== action.payload.pageName + (elm) => elm !== action.payload.pageName, ); state.validPages = [...newSetOfPages]; } @@ -399,7 +399,7 @@ export const createTenantSlice = createSlice({ action: PayloadAction<{ storageType: string; features?: string[]; - }> + }>, ) => { let size = state.fields.tenantSize.volumeSize; let sizeFactor = state.fields.tenantSize.sizeFactor; @@ -423,7 +423,7 @@ export const createTenantSlice = createSlice({ formToRender = get( resourcesConfigurations, element, - IMkEnvs.default + IMkEnvs.default, ); } }); @@ -439,10 +439,10 @@ export const createTenantSlice = createSlice({ const configs: IntegrationConfiguration[] = get( setConfigs, "configurations", - [] + [], ); const mainSelection = configs.find( - (item) => item.typeSelection === action.payload.storageType + (item) => item.typeSelection === action.payload.storageType, ); if (mainSelection !== undefined) { // store the selected storage class @@ -451,7 +451,7 @@ export const createTenantSlice = createSlice({ const minimumSize = getBytesNumber( mainSelection.minimumVolumeSize?.driveSize, mainSelection.minimumVolumeSize?.sizeUnit, - true + true, ); const drivesPerServer = state.fields.tenantSize.drivesPerServer; @@ -460,7 +460,7 @@ export const createTenantSlice = createSlice({ const currentSize = getBytesNumber( size.toString(), sizeFactor, - true + true, ); if (currentSize < minimumSize) { // size = minimumSize.toString(10); @@ -522,7 +522,7 @@ export const createTenantSlice = createSlice({ if (minioCertsList.length > 1) { state.certificates.minioServerCertificates = minioCertsList.filter( - (item: KeyPair) => item.id !== action.payload + (item: KeyPair) => item.id !== action.payload, ); } }, @@ -561,7 +561,7 @@ export const createTenantSlice = createSlice({ if (minioClientCertsList.length > 1) { state.certificates.minioClientCertificates = minioClientCertsList.filter( - (item: KeyPair) => item.id !== action.payload + (item: KeyPair) => item.id !== action.payload, ); } }, @@ -576,7 +576,7 @@ export const createTenantSlice = createSlice({ }, addFileToCaCertificates: ( state, - action: PayloadAction + action: PayloadAction, ) => { const caCertificates = state.certificates.minioCAsCertificates; @@ -596,7 +596,7 @@ export const createTenantSlice = createSlice({ const CACertsList = state.certificates.minioCAsCertificates; if (CACertsList.length > 1) { state.certificates.minioCAsCertificates = CACertsList.filter( - (item: KeyPair) => item.id !== action.payload + (item: KeyPair) => item.id !== action.payload, ); } }, @@ -648,7 +648,7 @@ export const createTenantSlice = createSlice({ action: PayloadAction<{ index: number; tolerationValue: ITolerationModel; - }> + }>, ) => { state.tolerations[action.payload.index] = action.payload.tolerationValue; }, @@ -667,7 +667,7 @@ export const createTenantSlice = createSlice({ }, removeToleration: (state, action: PayloadAction) => { state.tolerations = state.tolerations.filter( - (_, index) => index !== action.payload + (_, index) => index !== action.payload, ); }, addNewMinIODomain: (state) => { @@ -676,7 +676,7 @@ export const createTenantSlice = createSlice({ removeMinIODomain: (state, action: PayloadAction) => { state.fields.configure.minioDomains = state.fields.configure.minioDomains.filter( - (_, index) => index !== action.payload + (_, index) => index !== action.payload, ); }, addIDPNewKeyPair: (state) => { @@ -694,7 +694,7 @@ export const createTenantSlice = createSlice({ action: PayloadAction<{ index: number; accessKey: string; - }> + }>, ) => { if ( state.fields.identityProvider.accessKeys.length > action.payload.index @@ -708,7 +708,7 @@ export const createTenantSlice = createSlice({ action: PayloadAction<{ index: number; secretKey: string; - }> + }>, ) => { if ( state.fields.identityProvider.secretKeys.length > action.payload.index @@ -730,7 +730,7 @@ export const createTenantSlice = createSlice({ action: PayloadAction<{ index: number; userDN: string; - }> + }>, ) => { if ( state.fields.identityProvider.ADUserDNs.length > action.payload.index @@ -752,7 +752,7 @@ export const createTenantSlice = createSlice({ action: PayloadAction<{ index: number; userDN: string; - }> + }>, ) => { if ( state.fields.identityProvider.ADGroupDNs.length > action.payload.index @@ -886,7 +886,7 @@ export const createTenantSlice = createSlice({ } const newStorage = elements.map((storageClass: any) => { const name = get(storageClass, "name", "").split( - ".storageclass.storage.k8s.io/requests.storage" + ".storageclass.storage.k8s.io/requests.storage", )[0]; return { label: name, value: name }; @@ -895,7 +895,7 @@ export const createTenantSlice = createSlice({ state.storageClasses = newStorage; const stExists = newStorage.findIndex( (storageClass) => - storageClass.value === state.fields.nameTenant.selectedStorageClass + storageClass.value === state.fields.nameTenant.selectedStorageClass, ); if (newStorage.length > 0 && stExists === -1) { diff --git a/web-app/src/screens/Console/Tenants/AddTenant/sliceUtils.ts b/web-app/src/screens/Console/Tenants/AddTenant/sliceUtils.ts index 744c5e226f0..c169403f861 100644 --- a/web-app/src/screens/Console/Tenants/AddTenant/sliceUtils.ts +++ b/web-app/src/screens/Console/Tenants/AddTenant/sliceUtils.ts @@ -20,7 +20,7 @@ import { Draft } from "@reduxjs/toolkit"; export const flipValidPageInState = ( state: Draft, pageName: string, - valid: boolean + valid: boolean, ) => { let originValidPages = state.validPages; if (valid) { diff --git a/web-app/src/screens/Console/Tenants/AddTenant/thunks/createTenantThunk.ts b/web-app/src/screens/Console/Tenants/AddTenant/thunks/createTenantThunk.ts index 4acbceca502..739340b315b 100644 --- a/web-app/src/screens/Console/Tenants/AddTenant/thunks/createTenantThunk.ts +++ b/web-app/src/screens/Console/Tenants/AddTenant/thunks/createTenantThunk.ts @@ -126,7 +126,7 @@ export const createTenantAsync = createAsyncThunk( let namespace = state.createTenant.fields.nameTenant.namespace; const tolerationValues = tolerations.filter( - (toleration) => toleration.key.trim() !== "" + (toleration) => toleration.key.trim() !== "", ); const poolName = generatePoolName([]); @@ -145,7 +145,7 @@ export const createTenantAsync = createAsyncThunk( nodeSelectorLabels, withPodAntiAffinity, tenantName, - poolName + poolName, ), }; break; @@ -205,12 +205,12 @@ export const createTenantAsync = createAsyncThunk( dataSend.pools[0].resources.requests = {}; if (fields.tenantSize.resourcesCPURequest !== "") { dataSend.pools[0].resources.requests.cpu = parseInt( - fields.tenantSize.resourcesCPURequest + fields.tenantSize.resourcesCPURequest, ); } if (fields.tenantSize.resourcesMemoryRequest !== "") { dataSend.pools[0].resources.requests.memory = parseInt( - getBytes(fields.tenantSize.resourcesMemoryRequest, "Gi", true) + getBytes(fields.tenantSize.resourcesMemoryRequest, "Gi", true), ); } } @@ -222,12 +222,12 @@ export const createTenantAsync = createAsyncThunk( dataSend.pools[0].resources.limits = {}; if (fields.tenantSize.resourcesCPULimit !== "") { dataSend.pools[0].resources.limits.cpu = parseInt( - fields.tenantSize.resourcesCPULimit + fields.tenantSize.resourcesCPULimit, ); } if (fields.tenantSize.resourcesMemoryLimit !== "") { dataSend.pools[0].resources.limits.memory = parseInt( - getBytes(fields.tenantSize.resourcesMemoryLimit, "Gi", true) + getBytes(fields.tenantSize.resourcesMemoryLimit, "Gi", true), ); } } @@ -536,5 +536,5 @@ export const createTenantAsync = createAsyncThunk( dispatch(setErrorSnackMessage(err)); return rejectWithValue(err); }); - } + }, ); diff --git a/web-app/src/screens/Console/Tenants/AddTenant/thunks/namespaceThunks.ts b/web-app/src/screens/Console/Tenants/AddTenant/thunks/namespaceThunks.ts index 93dc3c695af..79772bd0d1b 100644 --- a/web-app/src/screens/Console/Tenants/AddTenant/thunks/namespaceThunks.ts +++ b/web-app/src/screens/Console/Tenants/AddTenant/thunks/namespaceThunks.ts @@ -50,11 +50,11 @@ export const validateNamespaceAsync = createAsyncThunk( setModalErrorSnackMessage({ errorMessage: "Error validating if namespace already has tenants", detailedError: err.detailedError, - }) + }), ); return rejectWithValue(false); }); - } + }, ); export const namespaceResourcesAsync = createAsyncThunk( @@ -67,7 +67,7 @@ export const namespaceResourcesAsync = createAsyncThunk( return api .invoke( "GET", - `/api/v1/namespaces/${namespace}/resourcequotas/${namespace}-storagequota` + `/api/v1/namespaces/${namespace}/resourcequotas/${namespace}-storagequota`, ) .then((res: IQuotas): IQuotas => { return res; @@ -76,7 +76,7 @@ export const namespaceResourcesAsync = createAsyncThunk( console.error("Namespace quota error: ", err); return rejectWithValue(null); }); - } + }, ); export const createNamespaceAsync = createAsyncThunk( @@ -98,5 +98,5 @@ export const createNamespaceAsync = createAsyncThunk( dispatch(setErrorSnackMessage(err)); rejectWithValue(false); }); - } + }, ); diff --git a/web-app/src/screens/Console/Tenants/ListTenants/DeleteTenant.tsx b/web-app/src/screens/Console/Tenants/ListTenants/DeleteTenant.tsx index 2cae84e2b7f..e45369e5de6 100644 --- a/web-app/src/screens/Console/Tenants/ListTenants/DeleteTenant.tsx +++ b/web-app/src/screens/Console/Tenants/ListTenants/DeleteTenant.tsx @@ -63,7 +63,7 @@ const DeleteTenant = ({ invokeDeleteApi( "DELETE", `/api/v1/namespaces/${selectedTenant.namespace}/tenants/${selectedTenant.name}`, - { delete_pvcs: deleteVolumes } + { delete_pvcs: deleteVolumes }, ); }; diff --git a/web-app/src/screens/Console/Tenants/ListTenants/ListTenants.tsx b/web-app/src/screens/Console/Tenants/ListTenants/ListTenants.tsx index f4108438647..f1d685f7351 100644 --- a/web-app/src/screens/Console/Tenants/ListTenants/ListTenants.tsx +++ b/web-app/src/screens/Console/Tenants/ListTenants/ListTenants.tsx @@ -48,7 +48,7 @@ import { } from "../../../../api/operatorApi"; const CredentialsPrompt = withSuspense( - React.lazy(() => import("../../Common/CredentialsPrompt/CredentialsPrompt")) + React.lazy(() => import("../../Common/CredentialsPrompt/CredentialsPrompt")), ); const useStyles = makeStyles((theme: Theme) => ({ diff --git a/web-app/src/screens/Console/Tenants/ListTenants/TenantCapacity.tsx b/web-app/src/screens/Console/Tenants/ListTenants/TenantCapacity.tsx index acd2450f572..00dfe609ac4 100644 --- a/web-app/src/screens/Console/Tenants/ListTenants/TenantCapacity.tsx +++ b/web-app/src/screens/Console/Tenants/ListTenants/TenantCapacity.tsx @@ -58,7 +58,7 @@ const TenantCapacity = ({ let tiersList: CapacityValue[] = []; const standardTier = usedSpaceVariants.find( - (tier) => tier.variant === "STANDARD" + (tier) => tier.variant === "STANDARD", ) || { value: 0, variant: "empty", diff --git a/web-app/src/screens/Console/Tenants/ListTenants/TenantListItem.tsx b/web-app/src/screens/Console/Tenants/ListTenants/TenantListItem.tsx index 28a46bfafc2..5a5538523ae 100644 --- a/web-app/src/screens/Console/Tenants/ListTenants/TenantListItem.tsx +++ b/web-app/src/screens/Console/Tenants/ListTenants/TenantListItem.tsx @@ -178,7 +178,7 @@ const TenantListItem = ({ tenant }: { tenant: TenantList }) => { setTenantName({ name: tenant.name!, namespace: tenant.namespace!, - }) + }), ); dispatch(getTenantAsync()); navigate(`/namespaces/${tenant.namespace}/tenants/${tenant.name}/summary`); diff --git a/web-app/src/screens/Console/Tenants/ListTenants/utils.ts b/web-app/src/screens/Console/Tenants/ListTenants/utils.ts index 71e40eab6c7..2df2772760a 100644 --- a/web-app/src/screens/Console/Tenants/ListTenants/utils.ts +++ b/web-app/src/screens/Console/Tenants/ListTenants/utils.ts @@ -43,7 +43,7 @@ export interface KeyPair { export const ecListTransform = ( ecList: string[], - defaultEC: string = "" + defaultEC: string = "", ): Opts[] => { return ecList.map((value) => { let defLabel = value; @@ -68,7 +68,7 @@ export const getLimitSizes = (resourceQuotas: IQuotas) => { quotas.forEach((rsQuota) => { const stCName = rsQuota.name.split( - ".storageclass.storage.k8s.io/requests.storage" + ".storageclass.storage.k8s.io/requests.storage", )[0]; const hard = get(rsQuota, "hard", 0); const used = get(rsQuota, "used", 0); diff --git a/web-app/src/screens/Console/Tenants/TenantDetails/DeletePVC.tsx b/web-app/src/screens/Console/Tenants/TenantDetails/DeletePVC.tsx index bf6d41b0ee6..2287849bfab 100644 --- a/web-app/src/screens/Console/Tenants/TenantDetails/DeletePVC.tsx +++ b/web-app/src/screens/Console/Tenants/TenantDetails/DeletePVC.tsx @@ -54,13 +54,13 @@ const DeletePVC = ({ setErrorSnackMessage({ errorMessage: "PVC name is incorrect", detailedError: "", - }) + }), ); return; } invokeDeleteApi( "DELETE", - `/api/v1/namespaces/${selectedPVC.namespace}/tenants/${selectedPVC.tenant}/pvc/${selectedPVC.name}` + `/api/v1/namespaces/${selectedPVC.namespace}/tenants/${selectedPVC.tenant}/pvc/${selectedPVC.name}`, ); }; diff --git a/web-app/src/screens/Console/Tenants/TenantDetails/DeletePod.tsx b/web-app/src/screens/Console/Tenants/TenantDetails/DeletePod.tsx index dd48b4faf9f..486510925fa 100644 --- a/web-app/src/screens/Console/Tenants/TenantDetails/DeletePod.tsx +++ b/web-app/src/screens/Console/Tenants/TenantDetails/DeletePod.tsx @@ -58,7 +58,7 @@ const DeletePod = ({ } invokeDeleteApi( "DELETE", - `/api/v1/namespaces/${selectedPod.namespace}/tenants/${selectedPod.tenant}/pods/${selectedPod.name}` + `/api/v1/namespaces/${selectedPod.namespace}/tenants/${selectedPod.tenant}/pods/${selectedPod.name}`, ); }; diff --git a/web-app/src/screens/Console/Tenants/TenantDetails/EditDomains.tsx b/web-app/src/screens/Console/Tenants/TenantDetails/EditDomains.tsx index 5a7d5dd1442..0468fdf5af8 100644 --- a/web-app/src/screens/Console/Tenants/TenantDetails/EditDomains.tsx +++ b/web-app/src/screens/Console/Tenants/TenantDetails/EditDomains.tsx @@ -92,7 +92,7 @@ const EditDomains = ({ if (consoleDomainSet !== "") { // We Validate console domain const consoleRegExp = new RegExp( - /^(https?):\/\/([a-zA-Z0-9\-.]+)(:[0-9]+)?(\/[a-zA-Z0-9\-./]*)?$/ + /^(https?):\/\/([a-zA-Z0-9\-.]+)(:[0-9]+)?(\/[a-zA-Z0-9\-./]*)?$/, ); setConsoleDomainValid(consoleRegExp.test(consoleDomainSet)); @@ -104,7 +104,7 @@ const EditDomains = ({ setMinioDomains(domains.minio); const minioRegExp = new RegExp( - /^(https?):\/\/([a-zA-Z0-9\-.]+)(:[0-9]+)?$/ + /^(https?):\/\/([a-zA-Z0-9\-.]+)(:[0-9]+)?$/, ); const initialValidations = domains.minio.map((domain) => { @@ -144,7 +144,7 @@ const EditDomains = ({ .invoke( "PUT", `/api/v1/namespaces/${namespace}/tenants/${idTenant}/domains`, - payload + payload, ) .then(() => { setIsSending(false); @@ -177,11 +177,11 @@ const EditDomains = ({ const removeMinIODomain = (removeIndex: number) => { const filteredDomains = minioDomains.filter( - (_, index) => index !== removeIndex + (_, index) => index !== removeIndex, ); const filterValidations = minioDomainValid.filter( - (_, index) => index !== removeIndex + (_, index) => index !== removeIndex, ); setMinioDomains(filteredDomains); @@ -243,7 +243,7 @@ const EditDomains = ({ updateMinIODomain(e.target.value, index); setMinioDomainValidation( e.target.validity.valid, - index + index, ); }} label={`MinIO Domain ${index + 1}`} diff --git a/web-app/src/screens/Console/Tenants/TenantDetails/PodsSummary.tsx b/web-app/src/screens/Console/Tenants/TenantDetails/PodsSummary.tsx index a78af7fa603..67fbc6cd08d 100644 --- a/web-app/src/screens/Console/Tenants/TenantDetails/PodsSummary.tsx +++ b/web-app/src/screens/Console/Tenants/TenantDetails/PodsSummary.tsx @@ -55,7 +55,7 @@ const PodsSummary = ({ classes }: IPodsSummary) => { const { tenantName, tenantNamespace } = useParams(); const loadingTenant = useSelector( - (state: AppState) => state.tenants.loadingTenant + (state: AppState) => state.tenants.loadingTenant, ); const [pods, setPods] = useState([]); @@ -74,7 +74,7 @@ const PodsSummary = ({ classes }: IPodsSummary) => { navigate( `/namespaces/${tenantNamespace || ""}/tenants/${tenantName || ""}/pods/${ pod.name - }` + }`, ); return; }; @@ -84,7 +84,7 @@ const PodsSummary = ({ classes }: IPodsSummary) => { let element = document.createElement("a"); element.setAttribute( "href", - `data:application/gzip;base64,${logReportFileContent}` + `data:application/gzip;base64,${logReportFileContent}`, ); element.setAttribute("download", filename); @@ -112,7 +112,7 @@ const PodsSummary = ({ classes }: IPodsSummary) => { }; const filteredRecords: IPodListElement[] = pods.filter((elementItem) => - elementItem.name.toLowerCase().includes(filter.toLowerCase()) + elementItem.name.toLowerCase().includes(filter.toLowerCase()), ); const podTableActions = [ @@ -133,13 +133,13 @@ const PodsSummary = ({ classes }: IPodsSummary) => { "GET", `/api/v1/namespaces/${tenantNamespace || ""}/tenants/${ tenantName || "" - }/pods` + }/pods`, ) .then((result: IPodListElement[]) => { for (let i = 0; i < result.length; i++) { let currentTime = (Date.now() / 1000) | 0; result[i].time = niceDays( - (currentTime - parseInt(result[i].timeCreated)).toString() + (currentTime - parseInt(result[i].timeCreated)).toString(), ); } setPods(result); @@ -150,7 +150,7 @@ const PodsSummary = ({ classes }: IPodsSummary) => { setErrorSnackMessage({ errorMessage: "Error loading pods", detailedError: err.detailedError, - }) + }), ); }); } @@ -163,7 +163,7 @@ const PodsSummary = ({ classes }: IPodsSummary) => { api .invoke( "GET", - `/api/v1/namespaces/${tenantNamespace}/tenants/${tenantName}/log-report` + `/api/v1/namespaces/${tenantNamespace}/tenants/${tenantName}/log-report`, ) .then(async (res: any) => { setLogReportFileContent(decodeURIComponent(res.blob)); diff --git a/web-app/src/screens/Console/Tenants/TenantDetails/Pools/AddPool/AddPool.tsx b/web-app/src/screens/Console/Tenants/TenantDetails/Pools/AddPool/AddPool.tsx index f3468a212af..70edd118f5a 100644 --- a/web-app/src/screens/Console/Tenants/TenantDetails/Pools/AddPool/AddPool.tsx +++ b/web-app/src/screens/Console/Tenants/TenantDetails/Pools/AddPool/AddPool.tsx @@ -67,7 +67,7 @@ const useStyles = makeStyles((theme: Theme) => }, ...formFieldStyles, ...modalStyleUtils, - }) + }), ); const AddPool = () => { diff --git a/web-app/src/screens/Console/Tenants/TenantDetails/Pools/AddPool/AddPoolCreateButton.tsx b/web-app/src/screens/Console/Tenants/TenantDetails/Pools/AddPool/AddPoolCreateButton.tsx index 77b534412ff..0e0b1db3150 100644 --- a/web-app/src/screens/Console/Tenants/TenantDetails/Pools/AddPool/AddPoolCreateButton.tsx +++ b/web-app/src/screens/Console/Tenants/TenantDetails/Pools/AddPool/AddPoolCreateButton.tsx @@ -24,7 +24,7 @@ const AddPoolCreateButton = () => { const dispatch = useAppDispatch(); const selectedStorageClass = useSelector( - (state: AppState) => state.addPool.setup.storageClass + (state: AppState) => state.addPool.setup.storageClass, ); const validPages = useSelector((state: AppState) => state.addPool.validPages); diff --git a/web-app/src/screens/Console/Tenants/TenantDetails/Pools/AddPool/PoolConfiguration.tsx b/web-app/src/screens/Console/Tenants/TenantDetails/Pools/AddPool/PoolConfiguration.tsx index 8334323c5a6..ad30609b847 100644 --- a/web-app/src/screens/Console/Tenants/TenantDetails/Pools/AddPool/PoolConfiguration.tsx +++ b/web-app/src/screens/Console/Tenants/TenantDetails/Pools/AddPool/PoolConfiguration.tsx @@ -82,16 +82,16 @@ const PoolConfiguration = ({ classes }: IConfigureProps) => { const dispatch = useAppDispatch(); const securityContextEnabled = useSelector( - (state: AppState) => state.addPool.configuration.securityContextEnabled + (state: AppState) => state.addPool.configuration.securityContextEnabled, ); const securityContext = useSelector( - (state: AppState) => state.addPool.configuration.securityContext + (state: AppState) => state.addPool.configuration.securityContext, ); const customRuntime = useSelector( - (state: AppState) => state.addPool.configuration.customRuntime + (state: AppState) => state.addPool.configuration.customRuntime, ); const runtimeClassName = useSelector( - (state: AppState) => state.addPool.configuration.runtimeClassName + (state: AppState) => state.addPool.configuration.runtimeClassName, ); const [validationErrors, setValidationErrors] = useState({}); @@ -104,10 +104,10 @@ const PoolConfiguration = ({ classes }: IConfigureProps) => { page: "configuration", field: field, value: value, - }) + }), ); }, - [dispatch] + [dispatch], ); // Validation @@ -151,7 +151,7 @@ const PoolConfiguration = ({ classes }: IConfigureProps) => { isPoolPageValid({ page: "configure", status: Object.keys(commonVal).length === 0, - }) + }), ); setValidationErrors(commonVal); diff --git a/web-app/src/screens/Console/Tenants/TenantDetails/Pools/AddPool/PoolPodPlacement.tsx b/web-app/src/screens/Console/Tenants/TenantDetails/Pools/AddPool/PoolPodPlacement.tsx index a0c12cca053..cf98c10d714 100644 --- a/web-app/src/screens/Console/Tenants/TenantDetails/Pools/AddPool/PoolPodPlacement.tsx +++ b/web-app/src/screens/Console/Tenants/TenantDetails/Pools/AddPool/PoolPodPlacement.tsx @@ -119,25 +119,25 @@ const Affinity = ({ classes }: IAffinityProps) => { const dispatch = useAppDispatch(); const podAffinity = useSelector( - (state: AppState) => state.addPool.affinity.podAffinity + (state: AppState) => state.addPool.affinity.podAffinity, ); const nodeSelectorLabels = useSelector( - (state: AppState) => state.addPool.affinity.nodeSelectorLabels + (state: AppState) => state.addPool.affinity.nodeSelectorLabels, ); const withPodAntiAffinity = useSelector( - (state: AppState) => state.addPool.affinity.withPodAntiAffinity + (state: AppState) => state.addPool.affinity.withPodAntiAffinity, ); const keyValuePairs = useSelector( - (state: AppState) => state.addPool.nodeSelectorPairs + (state: AppState) => state.addPool.nodeSelectorPairs, ); const tolerations = useSelector( - (state: AppState) => state.addPool.tolerations + (state: AppState) => state.addPool.tolerations, ); const [validationErrors, setValidationErrors] = useState({}); const [loading, setLoading] = useState(true); const [keyValueMap, setKeyValueMap] = useState<{ [key: string]: string[] }>( - {} + {}, ); const [keyOptions, setKeyOptions] = useState([]); @@ -149,10 +149,10 @@ const Affinity = ({ classes }: IAffinityProps) => { page: "affinity", field: field, value: value, - }) + }), ); }, - [dispatch] + [dispatch], ); useEffect(() => { @@ -236,7 +236,7 @@ const Affinity = ({ classes }: IAffinityProps) => { isPoolPageValid({ page: "affinity", status: Object.keys(commonVal).length === 0, - }) + }), ); setValidationErrors(commonVal); @@ -249,7 +249,7 @@ const Affinity = ({ classes }: IAffinityProps) => { setPoolTolerationInfo({ index: index, tolerationValue: alterToleration, - }) + }), ); }; @@ -427,7 +427,7 @@ const Affinity = ({ classes }: IAffinityProps) => { size={"small"} onClick={() => { const arrCp = keyValuePairs.filter( - (item, index) => index !== i + (item, index) => index !== i, ); dispatch(setPoolKeyValuePairs(arrCp)); }} diff --git a/web-app/src/screens/Console/Tenants/TenantDetails/Pools/AddPool/PoolResources.tsx b/web-app/src/screens/Console/Tenants/TenantDetails/Pools/AddPool/PoolResources.tsx index 50d529c2d9a..280b49ab866 100644 --- a/web-app/src/screens/Console/Tenants/TenantDetails/Pools/AddPool/PoolResources.tsx +++ b/web-app/src/screens/Console/Tenants/TenantDetails/Pools/AddPool/PoolResources.tsx @@ -89,19 +89,19 @@ const PoolResources = ({ classes }: IPoolResourcesProps) => { const tenant = useSelector((state: AppState) => state.tenants.tenantInfo); const storageClasses = useSelector( - (state: AppState) => state.addPool.storageClasses + (state: AppState) => state.addPool.storageClasses, ); const numberOfNodes = useSelector((state: AppState) => - state.addPool.setup.numberOfNodes.toString() + state.addPool.setup.numberOfNodes.toString(), ); const storageClass = useSelector( - (state: AppState) => state.addPool.setup.storageClass + (state: AppState) => state.addPool.setup.storageClass, ); const volumeSize = useSelector((state: AppState) => - state.addPool.setup.volumeSize.toString() + state.addPool.setup.volumeSize.toString(), ); const volumesPerServer = useSelector((state: AppState) => - state.addPool.setup.volumesPerServer.toString() + state.addPool.setup.volumesPerServer.toString(), ); const [validationErrors, setValidationErrors] = useState({}); @@ -145,7 +145,7 @@ const PoolResources = ({ classes }: IPoolResourcesProps) => { isPoolPageValid({ page: "setup", status: Object.keys(commonVal).length === 0, - }) + }), ); setValidationErrors(commonVal); @@ -156,14 +156,14 @@ const PoolResources = ({ classes }: IPoolResourcesProps) => { api .invoke( "GET", - `/api/v1/namespaces/${tenant.namespace}/resourcequotas/${tenant.namespace}-storagequota` + `/api/v1/namespaces/${tenant.namespace}/resourcequotas/${tenant.namespace}-storagequota`, ) .then((res: IQuotas) => { const elements: IQuotaElement[] = get(res, "elements", []); const newStorage = elements.map((storageClass: any) => { const name = get(storageClass, "name", "").split( - ".storageclass.storage.k8s.io/requests.storage" + ".storageclass.storage.k8s.io/requests.storage", )[0]; return { label: name, value: name }; @@ -174,7 +174,7 @@ const PoolResources = ({ classes }: IPoolResourcesProps) => { page: "setup", field: "storageClass", value: newStorage[0].value, - }) + }), ); dispatch(setPoolStorageClasses(newStorage)); @@ -191,7 +191,7 @@ const PoolResources = ({ classes }: IPoolResourcesProps) => { page: "setup", field: fieldName, value: value, - }) + }), ); }; diff --git a/web-app/src/screens/Console/Tenants/TenantDetails/Pools/AddPool/addPoolSlice.ts b/web-app/src/screens/Console/Tenants/TenantDetails/Pools/AddPool/addPoolSlice.ts index 1bc7f47feef..ecb125638d7 100644 --- a/web-app/src/screens/Console/Tenants/TenantDetails/Pools/AddPool/addPoolSlice.ts +++ b/web-app/src/screens/Console/Tenants/TenantDetails/Pools/AddPool/addPoolSlice.ts @@ -104,7 +104,7 @@ export const addPoolSlice = createSlice({ | "nodeSelectorPairs"; field: string; value: any; - }> + }>, ) => { if (has(state, `${action.payload.page}.${action.payload.field}`)) { const originPageNameItems = get(state, `${action.payload.page}`, {}); @@ -123,7 +123,7 @@ export const addPoolSlice = createSlice({ action: PayloadAction<{ page: string; status: boolean; - }> + }>, ) => { if (action.payload.status) { if (!state.validPages.includes(action.payload.page)) { @@ -131,7 +131,7 @@ export const addPoolSlice = createSlice({ } } else { state.validPages = state.validPages.filter( - (elm) => elm !== action.payload.page + (elm) => elm !== action.payload.page, ); } }, @@ -143,7 +143,7 @@ export const addPoolSlice = createSlice({ action: PayloadAction<{ index: number; tolerationValue: ITolerationModel; - }> + }>, ) => { state.tolerations[action.payload.index] = action.payload.tolerationValue; }, @@ -158,7 +158,7 @@ export const addPoolSlice = createSlice({ }, removePoolToleration: (state, action: PayloadAction) => { state.tolerations = state.tolerations.filter( - (_, index) => index !== action.payload + (_, index) => index !== action.payload, ); }, setPoolKeyValuePairs: (state, action: PayloadAction) => { diff --git a/web-app/src/screens/Console/Tenants/TenantDetails/Pools/AddPool/addPoolThunks.ts b/web-app/src/screens/Console/Tenants/TenantDetails/Pools/AddPool/addPoolThunks.ts index 4373fc9bcea..4c1070641c9 100644 --- a/web-app/src/screens/Console/Tenants/TenantDetails/Pools/AddPool/addPoolThunks.ts +++ b/web-app/src/screens/Console/Tenants/TenantDetails/Pools/AddPool/addPoolThunks.ts @@ -65,14 +65,14 @@ export const addPoolAsync = createAsyncThunk( nodeSelectorLabels, withPodAntiAffinity, tenant.name!, - poolName + poolName, ), }; break; } const tolerationValues = tolerations.filter( - (toleration) => toleration.key.trim() !== "" + (toleration) => toleration.key.trim() !== "", ); let runtimeClass = {}; @@ -104,7 +104,7 @@ export const addPoolAsync = createAsyncThunk( .invoke( "POST", `/api/v1/namespaces/${tenant.namespace}/tenants/${tenant.name}/pools`, - data + data, ) .then(() => { dispatch(resetPoolForm()); @@ -114,5 +114,5 @@ export const addPoolAsync = createAsyncThunk( .catch((err: ErrorResponseHandler) => { dispatch(setErrorSnackMessage(err)); }); - } + }, ); diff --git a/web-app/src/screens/Console/Tenants/TenantDetails/Pools/Details/PoolDetails.tsx b/web-app/src/screens/Console/Tenants/TenantDetails/Pools/Details/PoolDetails.tsx index 7911cbe82d0..54de643c8ce 100644 --- a/web-app/src/screens/Console/Tenants/TenantDetails/Pools/Details/PoolDetails.tsx +++ b/web-app/src/screens/Console/Tenants/TenantDetails/Pools/Details/PoolDetails.tsx @@ -46,7 +46,7 @@ const PoolDetails = () => { const tenant = useSelector((state: AppState) => state.tenants.tenantInfo); const selectedPool = useSelector( - (state: AppState) => state.tenants.selectedPool + (state: AppState) => state.tenants.selectedPool, ); if (tenant === null) { return ; @@ -93,7 +93,7 @@ const PoolDetails = () => { navigate( `/namespaces/${tenant?.namespace || ""}/tenants/${ tenant?.name || "" - }/edit-pool` + }/edit-pool`, ); }} label={"Edit Pool"} @@ -116,7 +116,7 @@ const PoolDetails = () => { value={niceBytesInt( poolInformation.volumes_per_server * poolInformation.servers * - poolInformation.volume_configuration.size + poolInformation.volume_configuration.size, )} /> { @@ -225,7 +225,7 @@ const PoolDetails = () => { ); }); - } + }, )} diff --git a/web-app/src/screens/Console/Tenants/TenantDetails/Pools/Details/PoolsListing.tsx b/web-app/src/screens/Console/Tenants/TenantDetails/Pools/Details/PoolsListing.tsx index b6541808800..ced7edbaa8b 100644 --- a/web-app/src/screens/Console/Tenants/TenantDetails/Pools/Details/PoolsListing.tsx +++ b/web-app/src/screens/Console/Tenants/TenantDetails/Pools/Details/PoolsListing.tsx @@ -47,7 +47,7 @@ const useStyles = makeStyles((theme: Theme) => ...actionsTray, ...tableStyles, ...containerForHeader, - }) + }), ); const PoolsListing = ({ setPoolDetailsView }: IPoolsSummary) => { @@ -56,7 +56,7 @@ const PoolsListing = ({ setPoolDetailsView }: IPoolsSummary) => { const classes = useStyles(); const loadingTenant = useSelector( - (state: AppState) => state.tenants.loadingTenant + (state: AppState) => state.tenants.loadingTenant, ); const tenant = useSelector((state: AppState) => state.tenants.tenantInfo); @@ -118,7 +118,7 @@ const PoolsListing = ({ setPoolDetailsView }: IPoolsSummary) => { navigate( `/namespaces/${tenant?.namespace || ""}/tenants/${ tenant?.name || "" - }/add-pool` + }/add-pool`, ); }} icon={} @@ -137,7 +137,9 @@ const PoolsListing = ({ setPoolDetailsView }: IPoolsSummary) => { renderFullObject: true, renderFunction: (x: Pool) => niceBytesInt( - x.volumes_per_server * x.servers * x.volume_configuration.size + x.volumes_per_server * + x.servers * + x.volume_configuration.size, ), }, { label: "Servers", elementKey: "servers" }, diff --git a/web-app/src/screens/Console/Tenants/TenantDetails/Pools/EditPool/EditPool.tsx b/web-app/src/screens/Console/Tenants/TenantDetails/Pools/EditPool/EditPool.tsx index 8c7ee0f5904..506f129dcb4 100644 --- a/web-app/src/screens/Console/Tenants/TenantDetails/Pools/EditPool/EditPool.tsx +++ b/web-app/src/screens/Console/Tenants/TenantDetails/Pools/EditPool/EditPool.tsx @@ -66,7 +66,7 @@ const useStyles = makeStyles((theme: Theme) => }, ...formFieldStyles, ...modalStyleUtils, - }) + }), ); const EditPool = () => { @@ -77,14 +77,14 @@ const EditPool = () => { const tenant = useSelector((state: AppState) => state.tenants.tenantInfo); const selectedPool = useSelector( - (state: AppState) => state.tenants.selectedPool + (state: AppState) => state.tenants.selectedPool, ); const editSending = useSelector( - (state: AppState) => state.editPool.editSending + (state: AppState) => state.editPool.editSending, ); const navigateTo = useSelector( - (state: AppState) => state.editPool.navigateTo + (state: AppState) => state.editPool.navigateTo, ); const poolsURL = `/namespaces/${tenant?.namespace || ""}/tenants/${ @@ -94,7 +94,7 @@ const EditPool = () => { useEffect(() => { if (selectedPool) { const poolDetails = tenant?.pools?.find( - (pool) => pool.name === selectedPool + (pool) => pool.name === selectedPool, ); if (poolDetails) { diff --git a/web-app/src/screens/Console/Tenants/TenantDetails/Pools/EditPool/EditPoolButton.tsx b/web-app/src/screens/Console/Tenants/TenantDetails/Pools/EditPool/EditPoolButton.tsx index ad03cee7f55..7a9aedc1a59 100644 --- a/web-app/src/screens/Console/Tenants/TenantDetails/Pools/EditPool/EditPoolButton.tsx +++ b/web-app/src/screens/Console/Tenants/TenantDetails/Pools/EditPool/EditPoolButton.tsx @@ -25,14 +25,14 @@ const EditPoolButton = () => { const requiredPages = ["setup", "affinity", "configure"]; const selectedStorageClass = useSelector( - (state: AppState) => state.editPool.fields.setup.storageClass + (state: AppState) => state.editPool.fields.setup.storageClass, ); const validPages = useSelector( - (state: AppState) => state.editPool.validPages + (state: AppState) => state.editPool.validPages, ); const editSending = useSelector( - (state: AppState) => state.editPool.editSending + (state: AppState) => state.editPool.editSending, ); const enabled = diff --git a/web-app/src/screens/Console/Tenants/TenantDetails/Pools/EditPool/EditPoolConfiguration.tsx b/web-app/src/screens/Console/Tenants/TenantDetails/Pools/EditPool/EditPoolConfiguration.tsx index 680f0751826..5ffc1106b78 100644 --- a/web-app/src/screens/Console/Tenants/TenantDetails/Pools/EditPool/EditPoolConfiguration.tsx +++ b/web-app/src/screens/Console/Tenants/TenantDetails/Pools/EditPool/EditPoolConfiguration.tsx @@ -84,16 +84,16 @@ const PoolConfiguration = ({ classes }: IConfigureProps) => { const securityContextEnabled = useSelector( (state: AppState) => - state.editPool.fields.configuration.securityContextEnabled + state.editPool.fields.configuration.securityContextEnabled, ); const securityContext = useSelector( - (state: AppState) => state.editPool.fields.configuration.securityContext + (state: AppState) => state.editPool.fields.configuration.securityContext, ); const customRuntime = useSelector( - (state: AppState) => state.editPool.fields.configuration.customRuntime + (state: AppState) => state.editPool.fields.configuration.customRuntime, ); const runtimeClassName = useSelector( - (state: AppState) => state.editPool.fields.configuration.runtimeClassName + (state: AppState) => state.editPool.fields.configuration.runtimeClassName, ); const [validationErrors, setValidationErrors] = useState({}); @@ -106,10 +106,10 @@ const PoolConfiguration = ({ classes }: IConfigureProps) => { page: "configuration", field: field, value: value, - }) + }), ); }, - [dispatch] + [dispatch], ); // Validation @@ -153,7 +153,7 @@ const PoolConfiguration = ({ classes }: IConfigureProps) => { isEditPoolPageValid({ page: "configure", status: Object.keys(commonVal).length === 0, - }) + }), ); setValidationErrors(commonVal); diff --git a/web-app/src/screens/Console/Tenants/TenantDetails/Pools/EditPool/EditPoolPlacement.tsx b/web-app/src/screens/Console/Tenants/TenantDetails/Pools/EditPool/EditPoolPlacement.tsx index cc56111cec1..f06ec8d123a 100644 --- a/web-app/src/screens/Console/Tenants/TenantDetails/Pools/EditPool/EditPoolPlacement.tsx +++ b/web-app/src/screens/Console/Tenants/TenantDetails/Pools/EditPool/EditPoolPlacement.tsx @@ -119,25 +119,25 @@ const Affinity = ({ classes }: IAffinityProps) => { const dispatch = useAppDispatch(); const podAffinity = useSelector( - (state: AppState) => state.editPool.fields.affinity.podAffinity + (state: AppState) => state.editPool.fields.affinity.podAffinity, ); const nodeSelectorLabels = useSelector( - (state: AppState) => state.editPool.fields.affinity.nodeSelectorLabels + (state: AppState) => state.editPool.fields.affinity.nodeSelectorLabels, ); const withPodAntiAffinity = useSelector( - (state: AppState) => state.editPool.fields.affinity.withPodAntiAffinity + (state: AppState) => state.editPool.fields.affinity.withPodAntiAffinity, ); const keyValuePairs = useSelector( - (state: AppState) => state.editPool.fields.nodeSelectorPairs + (state: AppState) => state.editPool.fields.nodeSelectorPairs, ); const tolerations = useSelector( - (state: AppState) => state.editPool.fields.tolerations + (state: AppState) => state.editPool.fields.tolerations, ); const [validationErrors, setValidationErrors] = useState({}); const [loading, setLoading] = useState(true); const [keyValueMap, setKeyValueMap] = useState<{ [key: string]: string[] }>( - {} + {}, ); const [keyOptions, setKeyOptions] = useState([]); @@ -149,10 +149,10 @@ const Affinity = ({ classes }: IAffinityProps) => { page: "affinity", field: field, value: value, - }) + }), ); }, - [dispatch] + [dispatch], ); useEffect(() => { @@ -236,7 +236,7 @@ const Affinity = ({ classes }: IAffinityProps) => { isEditPoolPageValid({ page: "affinity", status: Object.keys(commonVal).length === 0, - }) + }), ); setValidationErrors(commonVal); @@ -249,7 +249,7 @@ const Affinity = ({ classes }: IAffinityProps) => { setEditPoolTolerationInfo({ index: index, tolerationValue: alterToleration, - }) + }), ); }; @@ -424,7 +424,7 @@ const Affinity = ({ classes }: IAffinityProps) => { size={"small"} onClick={() => { const arrCp = keyValuePairs.filter( - (item, index) => index !== i + (item, index) => index !== i, ); dispatch(setEditPoolKeyValuePairs(arrCp)); }} diff --git a/web-app/src/screens/Console/Tenants/TenantDetails/Pools/EditPool/EditPoolResources.tsx b/web-app/src/screens/Console/Tenants/TenantDetails/Pools/EditPool/EditPoolResources.tsx index b8d3cc5ac7a..c7849d52bd1 100644 --- a/web-app/src/screens/Console/Tenants/TenantDetails/Pools/EditPool/EditPoolResources.tsx +++ b/web-app/src/screens/Console/Tenants/TenantDetails/Pools/EditPool/EditPoolResources.tsx @@ -89,19 +89,19 @@ const PoolResources = ({ classes }: IPoolResourcesProps) => { const tenant = useSelector((state: AppState) => state.tenants.tenantInfo); const storageClasses = useSelector( - (state: AppState) => state.editPool.storageClasses + (state: AppState) => state.editPool.storageClasses, ); const numberOfNodes = useSelector((state: AppState) => - state.editPool.fields.setup.numberOfNodes.toString() + state.editPool.fields.setup.numberOfNodes.toString(), ); const storageClass = useSelector( - (state: AppState) => state.editPool.fields.setup.storageClass + (state: AppState) => state.editPool.fields.setup.storageClass, ); const volumeSize = useSelector((state: AppState) => - state.editPool.fields.setup.volumeSize.toString() + state.editPool.fields.setup.volumeSize.toString(), ); const volumesPerServer = useSelector((state: AppState) => - state.editPool.fields.setup.volumesPerServer.toString() + state.editPool.fields.setup.volumesPerServer.toString(), ); const [validationErrors, setValidationErrors] = useState({}); @@ -145,7 +145,7 @@ const PoolResources = ({ classes }: IPoolResourcesProps) => { isEditPoolPageValid({ page: "setup", status: Object.keys(commonVal).length === 0, - }) + }), ); setValidationErrors(commonVal); @@ -156,14 +156,14 @@ const PoolResources = ({ classes }: IPoolResourcesProps) => { api .invoke( "GET", - `/api/v1/namespaces/${tenant.namespace}/resourcequotas/${tenant.namespace}-storagequota` + `/api/v1/namespaces/${tenant.namespace}/resourcequotas/${tenant.namespace}-storagequota`, ) .then((res: IQuotas) => { const elements: IQuotaElement[] = get(res, "elements", []); const newStorage = elements.map((storageClass: any) => { const name = get(storageClass, "name", "").split( - ".storageclass.storage.k8s.io/requests.storage" + ".storageclass.storage.k8s.io/requests.storage", )[0]; return { label: name, value: name }; @@ -174,7 +174,7 @@ const PoolResources = ({ classes }: IPoolResourcesProps) => { page: "setup", field: "storageClass", value: newStorage[0].value, - }) + }), ); dispatch(setEditPoolStorageClasses(newStorage)); @@ -191,7 +191,7 @@ const PoolResources = ({ classes }: IPoolResourcesProps) => { page: "setup", field: fieldName, value: value, - }) + }), ); }; diff --git a/web-app/src/screens/Console/Tenants/TenantDetails/Pools/EditPool/editPoolSlice.ts b/web-app/src/screens/Console/Tenants/TenantDetails/Pools/EditPool/editPoolSlice.ts index 3be628d1385..98b602290cd 100644 --- a/web-app/src/screens/Console/Tenants/TenantDetails/Pools/EditPool/editPoolSlice.ts +++ b/web-app/src/screens/Console/Tenants/TenantDetails/Pools/EditPool/editPoolSlice.ts @@ -112,7 +112,7 @@ export const editPoolSlice = createSlice({ value: exp.values?.join(", ")!, }); }); - } + }, ); nodeSelectorLabels = labelItems.join("&"); } @@ -184,7 +184,7 @@ export const editPoolSlice = createSlice({ const originPageNameItems = get( state.fields, `${action.payload.page}`, - {} + {}, ); let newValue: any = {}; @@ -200,7 +200,7 @@ export const editPoolSlice = createSlice({ action: PayloadAction<{ page: string; status: boolean; - }> + }>, ) => { const edPoolPV = [...state.validPages]; @@ -212,7 +212,7 @@ export const editPoolSlice = createSlice({ } } else { const newSetOfPages = edPoolPV.filter( - (elm) => elm !== action.payload.page + (elm) => elm !== action.payload.page, ); state.validPages = [...newSetOfPages]; @@ -226,7 +226,7 @@ export const editPoolSlice = createSlice({ action: PayloadAction<{ index: number; tolerationValue: ITolerationModel; - }> + }>, ) => { const editPoolTolerationValue = [...state.fields.tolerations]; @@ -245,12 +245,12 @@ export const editPoolSlice = createSlice({ }, removeEditPoolToleration: (state, action: PayloadAction) => { state.fields.tolerations = state.fields.tolerations.filter( - (_, index) => index !== action.payload + (_, index) => index !== action.payload, ); }, setEditPoolKeyValuePairs: ( state, - action: PayloadAction + action: PayloadAction, ) => { state.fields.nodeSelectorPairs = action.payload; }, diff --git a/web-app/src/screens/Console/Tenants/TenantDetails/Pools/EditPool/thunks/editPoolAsync.ts b/web-app/src/screens/Console/Tenants/TenantDetails/Pools/EditPool/thunks/editPoolAsync.ts index 3dd78fa9eb3..3c9dfb64fea 100644 --- a/web-app/src/screens/Console/Tenants/TenantDetails/Pools/EditPool/thunks/editPoolAsync.ts +++ b/web-app/src/screens/Console/Tenants/TenantDetails/Pools/EditPool/thunks/editPoolAsync.ts @@ -73,14 +73,14 @@ export const editPoolAsync = createAsyncThunk( nodeSelectorLabels, withPodAntiAffinity, tenant.name!, - poolName + poolName, ), }; break; } const tolerationValues = tolerations.filter( - (toleration) => toleration.key.trim() !== "" + (toleration) => toleration.key.trim() !== "", ); const cleanPools = tenant?.pools @@ -147,5 +147,5 @@ export const editPoolAsync = createAsyncThunk( .catch((err: ErrorResponseHandler) => { dispatch(setErrorSnackMessage(err)); }); - } + }, ); diff --git a/web-app/src/screens/Console/Tenants/TenantDetails/PoolsSummary.tsx b/web-app/src/screens/Console/Tenants/TenantDetails/PoolsSummary.tsx index 3be62675d05..dfd7b37ebb3 100644 --- a/web-app/src/screens/Console/Tenants/TenantDetails/PoolsSummary.tsx +++ b/web-app/src/screens/Console/Tenants/TenantDetails/PoolsSummary.tsx @@ -55,10 +55,10 @@ const PoolsSummary = ({ classes }: IPoolsSummary) => { const { pathname = "" } = useLocation(); const selectedPool = useSelector( - (state: AppState) => state.tenants.selectedPool + (state: AppState) => state.tenants.selectedPool, ); const poolDetailsOpen = useSelector( - (state: AppState) => state.tenants.poolDetailsOpen + (state: AppState) => state.tenants.poolDetailsOpen, ); return ( diff --git a/web-app/src/screens/Console/Tenants/TenantDetails/SubnetLicenseTenant.tsx b/web-app/src/screens/Console/Tenants/TenantDetails/SubnetLicenseTenant.tsx index 25450738eb7..71e47421f33 100644 --- a/web-app/src/screens/Console/Tenants/TenantDetails/SubnetLicenseTenant.tsx +++ b/web-app/src/screens/Console/Tenants/TenantDetails/SubnetLicenseTenant.tsx @@ -164,7 +164,7 @@ const SubnetLicenseTenant = ({ (tenant.subnet_license?.storage_capacity || 0) * 1099511627776 ) // 1 Terabyte = 1099511627776 Bytes - .toString(10) + .toString(10), )} { const { tenantName, tenantNamespace } = useParams(); const loadingTenant = useSelector( - (state: AppState) => state.tenants.loadingTenant + (state: AppState) => state.tenants.loadingTenant, ); const [loading, setLoading] = useState(true); @@ -76,7 +76,7 @@ const TenantCSR = ({ classes }: ITenantCSRProps) => { "GET", `/api/v1/namespaces/${tenantNamespace || ""}/tenants/${ tenantName || "" - }/csr` + }/csr`, ) .then((res) => { for (var _i = 0; _i < res.csrElement.length; _i++) { diff --git a/web-app/src/screens/Console/Tenants/TenantDetails/TenantConfiguration.tsx b/web-app/src/screens/Console/Tenants/TenantDetails/TenantConfiguration.tsx index 0d570032885..e957a45a23d 100644 --- a/web-app/src/screens/Console/Tenants/TenantDetails/TenantConfiguration.tsx +++ b/web-app/src/screens/Console/Tenants/TenantDetails/TenantConfiguration.tsx @@ -114,7 +114,7 @@ const TenantConfiguration = ({ classes }: ITenantConfiguration) => { const tenant = useSelector((state: AppState) => state.tenants.tenantInfo); const loadingTenant = useSelector( - (state: AppState) => state.tenants.loadingTenant + (state: AppState) => state.tenants.loadingTenant, ); const [isSending, setIsSending] = useState(false); @@ -126,7 +126,7 @@ const TenantConfiguration = ({ classes }: ITenantConfiguration) => { api .invoke( "GET", - `/api/v1/namespaces/${tenant?.namespace}/tenants/${tenant?.name}/configuration` + `/api/v1/namespaces/${tenant?.namespace}/tenants/${tenant?.name}/configuration`, ) .then((res: ITenantConfigurationResponse) => { if (res.environmentVariables) { @@ -154,7 +154,7 @@ const TenantConfiguration = ({ classes }: ITenantConfiguration) => { .invoke( "PATCH", `/api/v1/namespaces/${tenant?.namespace}/tenants/${tenant?.name}/configuration`, - payload + payload, ) .then(() => { setIsSending(false); @@ -215,8 +215,8 @@ const TenantConfiguration = ({ classes }: ITenantConfiguration) => { existingEnvVars.map((keyPair, i) => i === index ? { key: e.target.value, value: keyPair.value } - : keyPair - ) + : keyPair, + ), ); }} index={index} @@ -235,8 +235,8 @@ const TenantConfiguration = ({ classes }: ITenantConfiguration) => { existingEnvVars.map((keyPair, i) => i === index ? { key: keyPair.key, value: e.target.value } - : keyPair - ) + : keyPair, + ), ); }} index={index} @@ -269,7 +269,7 @@ const TenantConfiguration = ({ classes }: ITenantConfiguration) => { size={"small"} onClick={() => { const existingEnvVars = envVars.filter( - (item, fIndex) => fIndex !== index + (item, fIndex) => fIndex !== index, ); setEnvVars(existingEnvVars); setEnvVarsToBeDeleted([ diff --git a/web-app/src/screens/Console/Tenants/TenantDetails/TenantDetails.tsx b/web-app/src/screens/Console/Tenants/TenantDetails/TenantDetails.tsx index 52b8b9b2938..cadc45fb7bf 100644 --- a/web-app/src/screens/Console/Tenants/TenantDetails/TenantDetails.tsx +++ b/web-app/src/screens/Console/Tenants/TenantDetails/TenantDetails.tsx @@ -69,29 +69,29 @@ const PodsSummary = withSuspense(React.lazy(() => import("./PodsSummary"))); const TenantEvents = withSuspense(React.lazy(() => import("./TenantEvents"))); const TenantCSR = withSuspense(React.lazy(() => import("./TenantCSR"))); const VolumesSummary = withSuspense( - React.lazy(() => import("./VolumesSummary")) + React.lazy(() => import("./VolumesSummary")), ); const TenantMetrics = withSuspense(React.lazy(() => import("./TenantMetrics"))); const TenantTrace = withSuspense(React.lazy(() => import("./TenantTrace"))); const TenantVolumes = withSuspense( - React.lazy(() => import("./pvcs/TenantVolumes")) + React.lazy(() => import("./pvcs/TenantVolumes")), ); const TenantIdentityProvider = withSuspense( - React.lazy(() => import("./TenantIdentityProvider")) + React.lazy(() => import("./TenantIdentityProvider")), ); const TenantSecurity = withSuspense( - React.lazy(() => import("./TenantSecurity")) + React.lazy(() => import("./TenantSecurity")), ); const TenantEncryption = withSuspense( - React.lazy(() => import("./TenantEncryption")) + React.lazy(() => import("./TenantEncryption")), ); const DeleteTenant = withSuspense( - React.lazy(() => import("../ListTenants/DeleteTenant")) + React.lazy(() => import("../ListTenants/DeleteTenant")), ); const PodDetails = withSuspense(React.lazy(() => import("./pods/PodDetails"))); const TenantConfiguration = withSuspense( - React.lazy(() => import("./TenantConfiguration")) + React.lazy(() => import("./TenantConfiguration")), ); interface ITenantDetailsProps { @@ -155,13 +155,13 @@ const TenantDetails = ({ classes }: ITenantDetailsProps) => { const { pathname = "" } = useLocation(); const loadingTenant = useSelector( - (state: AppState) => state.tenants.loadingTenant + (state: AppState) => state.tenants.loadingTenant, ); const selectedTenant = useSelector( - (state: AppState) => state.tenants.currentTenant + (state: AppState) => state.tenants.currentTenant, ); const selectedNamespace = useSelector( - (state: AppState) => state.tenants.currentNamespace + (state: AppState) => state.tenants.currentNamespace, ); const tenantInfo = useSelector((state: AppState) => state.tenants.tenantInfo); @@ -179,7 +179,7 @@ const TenantDetails = ({ classes }: ITenantDetailsProps) => { setTenantName({ name: tenantName, namespace: tenantNamespace, - }) + }), ); dispatch(getTenantAsync()); } @@ -271,7 +271,7 @@ const TenantDetails = ({ classes }: ITenantDetailsProps) => { {tenantInfo && tenantInfo.status && ( @@ -317,7 +317,7 @@ const TenantDetails = ({ classes }: ITenantDetailsProps) => { id={"tenant-hop"} onClick={() => { navigate( - `/namespaces/${tenantNamespace}/tenants/${tenantName}/hop` + `/namespaces/${tenantNamespace}/tenants/${tenantName}/hop`, ); }} disabled={!tenantInfo || !tenantIsOnline(tenantInfo)} diff --git a/web-app/src/screens/Console/Tenants/TenantDetails/TenantEncryption.tsx b/web-app/src/screens/Console/Tenants/TenantDetails/TenantEncryption.tsx index eb6519cabee..5dd51480524 100644 --- a/web-app/src/screens/Console/Tenants/TenantDetails/TenantEncryption.tsx +++ b/web-app/src/screens/Console/Tenants/TenantDetails/TenantEncryption.tsx @@ -132,12 +132,12 @@ const TenantEncryption = ({ classes }: ITenantEncryption) => { const [kmsCACertificateSecret, setKMSCACertificateSecret] = useState(null); const [kmsMTLSCertificate, setKmsMTLSCertificate] = useState( - null + null, ); const [kesServerCertificate, setKESServerCertificate] = useState(null); const [kmsCACertificate, setKmsCACertificate] = useState( - null + null, ); const [validationErrors, setValidationErrors] = useState({}); const cleanValidation = (fieldName: string) => { @@ -362,7 +362,7 @@ const TenantEncryption = ({ classes }: ITenantEncryption) => { api .invoke( "GET", - `/api/v1/namespaces/${tenant?.namespace}/tenants/${tenant?.name}/encryption` + `/api/v1/namespaces/${tenant?.namespace}/tenants/${tenant?.name}/encryption`, ) .then((resp: ITenantEncryptionResponse) => { setEncryptionRawConfiguration(resp.raw); @@ -453,7 +453,7 @@ const TenantEncryption = ({ classes }: ITenantEncryption) => { domain: gemaltoConfiguration?.keysecure?.credentials?.domain || "", retry: parseInt( - gemaltoConfiguration?.keysecure?.credentials?.retry + gemaltoConfiguration?.keysecure?.credentials?.retry, ), }, }, @@ -614,7 +614,7 @@ const TenantEncryption = ({ classes }: ITenantEncryption) => { .invoke( "PUT", `/api/v1/namespaces/${tenant?.namespace}/tenants/${tenant?.name}/encryption`, - dataSend + dataSend, ) .then(() => { setConfirmOpen(false); @@ -633,7 +633,7 @@ const TenantEncryption = ({ classes }: ITenantEncryption) => { .invoke( "DELETE", `/api/v1/namespaces/${tenant?.namespace}/tenants/${tenant?.name}/encryption`, - {} + {}, ) .then(() => { setConfirmOpen(false); @@ -831,7 +831,7 @@ const TenantEncryption = ({ classes }: ITenantEncryption) => { id="vault_approle_engine" name="vault_approle_engine" onChange={( - e: React.ChangeEvent + e: React.ChangeEvent, ) => setVaultConfiguration({ ...vaultConfiguration, @@ -852,7 +852,7 @@ const TenantEncryption = ({ classes }: ITenantEncryption) => { id="vault_id" name="vault_id" onChange={( - e: React.ChangeEvent + e: React.ChangeEvent, ) => setVaultConfiguration({ ...vaultConfiguration, @@ -885,7 +885,7 @@ const TenantEncryption = ({ classes }: ITenantEncryption) => { id="vault_secret" name="vault_secret" onChange={( - e: React.ChangeEvent + e: React.ChangeEvent, ) => setVaultConfiguration({ ...vaultConfiguration, @@ -919,7 +919,7 @@ const TenantEncryption = ({ classes }: ITenantEncryption) => { id="vault_retry" name="vault_retry" onChange={( - e: React.ChangeEvent + e: React.ChangeEvent, ) => setVaultConfiguration({ ...vaultConfiguration, @@ -1000,7 +1000,7 @@ const TenantEncryption = ({ classes }: ITenantEncryption) => { id="azure_tenant_id" name="azure_tenant_id" onChange={( - e: React.ChangeEvent + e: React.ChangeEvent, ) => setAzureConfiguration({ ...azureConfiguration, @@ -1028,7 +1028,7 @@ const TenantEncryption = ({ classes }: ITenantEncryption) => { id="azure_client_id" name="azure_client_id" onChange={( - e: React.ChangeEvent + e: React.ChangeEvent, ) => setAzureConfiguration({ ...azureConfiguration, @@ -1056,7 +1056,7 @@ const TenantEncryption = ({ classes }: ITenantEncryption) => { id="azure_client_secret" name="azure_client_secret" onChange={( - e: React.ChangeEvent + e: React.ChangeEvent, ) => setAzureConfiguration({ ...azureConfiguration, @@ -1133,7 +1133,7 @@ const TenantEncryption = ({ classes }: ITenantEncryption) => { id="gcp_client_email" name="gcp_client_email" onChange={( - e: React.ChangeEvent + e: React.ChangeEvent, ) => setGCPConfiguration({ ...gcpConfiguration, @@ -1160,7 +1160,7 @@ const TenantEncryption = ({ classes }: ITenantEncryption) => { id="gcp_client_id" name="gcp_client_id" onChange={( - e: React.ChangeEvent + e: React.ChangeEvent, ) => setGCPConfiguration({ ...gcpConfiguration, @@ -1187,7 +1187,7 @@ const TenantEncryption = ({ classes }: ITenantEncryption) => { id="gcp_private_key_id" name="gcp_private_key_id" onChange={( - e: React.ChangeEvent + e: React.ChangeEvent, ) => setGCPConfiguration({ ...gcpConfiguration, @@ -1214,7 +1214,7 @@ const TenantEncryption = ({ classes }: ITenantEncryption) => { id="gcp_private_key" name="gcp_private_key" onChange={( - e: React.ChangeEvent + e: React.ChangeEvent, ) => setGCPConfiguration({ ...gcpConfiguration, @@ -1310,7 +1310,7 @@ const TenantEncryption = ({ classes }: ITenantEncryption) => { id="aws_accessKey" name="aws_accessKey" onChange={( - e: React.ChangeEvent + e: React.ChangeEvent, ) => setAWSConfiguration({ ...awsConfiguration, @@ -1339,7 +1339,7 @@ const TenantEncryption = ({ classes }: ITenantEncryption) => { id="aws_secretKey" name="aws_secretKey" onChange={( - e: React.ChangeEvent + e: React.ChangeEvent, ) => setAWSConfiguration({ ...awsConfiguration, @@ -1368,7 +1368,7 @@ const TenantEncryption = ({ classes }: ITenantEncryption) => { id="aws_token" name="aws_token" onChange={( - e: React.ChangeEvent + e: React.ChangeEvent, ) => setAWSConfiguration({ ...awsConfiguration, @@ -1432,7 +1432,7 @@ const TenantEncryption = ({ classes }: ITenantEncryption) => { id="gemalto_token" name="gemalto_token" onChange={( - e: React.ChangeEvent + e: React.ChangeEvent, ) => setGemaltoConfiguration({ ...gemaltoConfiguration, @@ -1461,7 +1461,7 @@ const TenantEncryption = ({ classes }: ITenantEncryption) => { id="gemalto_domain" name="gemalto_domain" onChange={( - e: React.ChangeEvent + e: React.ChangeEvent, ) => setGemaltoConfiguration({ ...gemaltoConfiguration, @@ -1492,7 +1492,7 @@ const TenantEncryption = ({ classes }: ITenantEncryption) => { id="gemalto_retry" name="gemalto_retry" onChange={( - e: React.ChangeEvent + e: React.ChangeEvent, ) => setGemaltoConfiguration({ ...gemaltoConfiguration, diff --git a/web-app/src/screens/Console/Tenants/TenantDetails/TenantEvents.tsx b/web-app/src/screens/Console/Tenants/TenantDetails/TenantEvents.tsx index 6e7459433c0..438f126682b 100644 --- a/web-app/src/screens/Console/Tenants/TenantDetails/TenantEvents.tsx +++ b/web-app/src/screens/Console/Tenants/TenantDetails/TenantEvents.tsx @@ -52,7 +52,7 @@ const TenantEvents = ({ classes }: ITenantEventsProps) => { const params = useParams(); const loadingTenant = useSelector( - (state: AppState) => state.tenants.loadingTenant + (state: AppState) => state.tenants.loadingTenant, ); const [events, setEvents] = useState([]); @@ -71,7 +71,7 @@ const TenantEvents = ({ classes }: ITenantEventsProps) => { api .invoke( "GET", - `/api/v1/namespaces/${tenantNamespace}/tenants/${tenantName}/events` + `/api/v1/namespaces/${tenantNamespace}/tenants/${tenantName}/events`, ) .then((res: IEvent[]) => { for (let i = 0; i < res.length; i++) { diff --git a/web-app/src/screens/Console/Tenants/TenantDetails/TenantIdentityProvider.tsx b/web-app/src/screens/Console/Tenants/TenantDetails/TenantIdentityProvider.tsx index 0a3d841d524..d626dd10d8a 100644 --- a/web-app/src/screens/Console/Tenants/TenantDetails/TenantIdentityProvider.tsx +++ b/web-app/src/screens/Console/Tenants/TenantDetails/TenantIdentityProvider.tsx @@ -106,7 +106,7 @@ const TenantIdentityProvider = ({ classes }: ITenantIdentityProvider) => { const tenant = useSelector((state: AppState) => state.tenants.tenantInfo); const loadingTenant = useSelector( - (state: AppState) => state.tenants.loadingTenant + (state: AppState) => state.tenants.loadingTenant, ); const [isSending, setIsSending] = useState(false); @@ -205,7 +205,7 @@ const TenantIdentityProvider = ({ classes }: ITenantIdentityProvider) => { api .invoke( "GET", - `/api/v1/namespaces/${tenant?.namespace}/tenants/${tenant?.name}/identity-provider` + `/api/v1/namespaces/${tenant?.namespace}/tenants/${tenant?.name}/identity-provider`, ) .then((res: ITenantIdentityProviderResponse) => { if (res) { @@ -223,7 +223,7 @@ const TenantIdentityProvider = ({ classes }: ITenantIdentityProvider) => { setADLookupBindDN(res.active_directory.lookup_bind_dn); setADLookupBindPassword(res.active_directory.lookup_bind_password); setADUserDNSearchBaseDN( - res.active_directory.user_dn_search_base_dn + res.active_directory.user_dn_search_base_dn, ); setADUserDNSearchFilter(res.active_directory.user_dn_search_filter); setADGroupSearchBaseDN(res.active_directory.group_search_base_dn); @@ -281,7 +281,7 @@ const TenantIdentityProvider = ({ classes }: ITenantIdentityProvider) => { .invoke( "POST", `/api/v1/namespaces/${tenant?.namespace}/tenants/${tenant?.name}/identity-provider`, - payload + payload, ) .then(() => { setIsSending(false); @@ -313,7 +313,7 @@ const TenantIdentityProvider = ({ classes }: ITenantIdentityProvider) => { .invoke( "POST", `/api/v1/namespaces/${tenant?.namespace}/tenants/${tenant?.name}/set-administrators`, - payload + payload, ) .then(() => { setIsSending(false); @@ -669,12 +669,12 @@ const TenantIdentityProvider = ({ classes }: ITenantIdentityProvider) => { name={`ad-userdn-${index.toString()}`} value={ADUserDNs[index]} onChange={( - e: React.ChangeEvent + e: React.ChangeEvent, ) => { setADUserDNs( ADUserDNs.map((group, i) => - i === index ? e.target.value : group - ) + i === index ? e.target.value : group, + ), ); }} index={index} @@ -703,7 +703,7 @@ const TenantIdentityProvider = ({ classes }: ITenantIdentityProvider) => { onClick={() => { if (ADUserDNs.length > 1) { setADUserDNs( - ADUserDNs.filter((_, i) => i !== index) + ADUserDNs.filter((_, i) => i !== index), ); } }} @@ -735,12 +735,12 @@ const TenantIdentityProvider = ({ classes }: ITenantIdentityProvider) => { name={`ad-groupdn-${index.toString()}`} value={ADGroupDNs[index]} onChange={( - e: React.ChangeEvent + e: React.ChangeEvent, ) => { setADGroupDNs( ADGroupDNs.map((group, i) => - i === index ? e.target.value : group - ) + i === index ? e.target.value : group, + ), ); }} index={index} @@ -769,7 +769,7 @@ const TenantIdentityProvider = ({ classes }: ITenantIdentityProvider) => { onClick={() => { if (ADGroupDNs.length > 1) { setADGroupDNs( - ADGroupDNs.filter((_, i) => i !== index) + ADGroupDNs.filter((_, i) => i !== index), ); } }} diff --git a/web-app/src/screens/Console/Tenants/TenantDetails/TenantLicense.tsx b/web-app/src/screens/Console/Tenants/TenantDetails/TenantLicense.tsx index 27fc0a54f4a..a824eb51d02 100644 --- a/web-app/src/screens/Console/Tenants/TenantDetails/TenantLicense.tsx +++ b/web-app/src/screens/Console/Tenants/TenantDetails/TenantLicense.tsx @@ -50,7 +50,7 @@ const TenantLicense = ({ classes }: ITenantLicense) => { const dispatch = useAppDispatch(); const loadingTenant = useSelector( - (state: AppState) => state.tenants.loadingTenant + (state: AppState) => state.tenants.loadingTenant, ); const tenant = useSelector((state: AppState) => state.tenants.tenantInfo); @@ -68,7 +68,7 @@ const TenantLicense = ({ classes }: ITenantLicense) => { .invoke( "POST", `/api/v1/subscription/namespaces/${namespace}/tenants/${tenant}/activate`, - {} + {}, ) .then(() => { setLoadingActivateProduct(false); diff --git a/web-app/src/screens/Console/Tenants/TenantDetails/TenantSecurity.tsx b/web-app/src/screens/Console/Tenants/TenantDetails/TenantSecurity.tsx index f6fe43873d6..e65355e6eca 100644 --- a/web-app/src/screens/Console/Tenants/TenantDetails/TenantSecurity.tsx +++ b/web-app/src/screens/Console/Tenants/TenantDetails/TenantSecurity.tsx @@ -137,7 +137,7 @@ const TenantSecurity = ({ classes }: ITenantSecurity) => { const tenant = useSelector((state: AppState) => state.tenants.tenantInfo); const loadingTenant = useSelector( - (state: AppState) => state.tenants.loadingTenant + (state: AppState) => state.tenants.loadingTenant, ); const [isSending, setIsSending] = useState(false); @@ -188,26 +188,26 @@ const TenantSecurity = ({ classes }: ITenantSecurity) => { useState([]); const runAsGroup = useSelector( - (state: AppState) => state.editTenantSecurityContext.runAsGroup + (state: AppState) => state.editTenantSecurityContext.runAsGroup, ); const runAsUser = useSelector( - (state: AppState) => state.editTenantSecurityContext.runAsUser + (state: AppState) => state.editTenantSecurityContext.runAsUser, ); const fsGroup = useSelector( - (state: AppState) => state.editTenantSecurityContext.fsGroup + (state: AppState) => state.editTenantSecurityContext.fsGroup, ); const runAsNonRoot = useSelector( - (state: AppState) => state.editTenantSecurityContext.runAsNonRoot + (state: AppState) => state.editTenantSecurityContext.runAsNonRoot, ); const fsGroupChangePolicy = useSelector( - (state: AppState) => state.editTenantSecurityContext.fsGroupChangePolicy + (state: AppState) => state.editTenantSecurityContext.fsGroupChangePolicy, ); const getTenantSecurityInfo = useCallback(() => { api .invoke( "GET", - `/api/v1/namespaces/${tenant?.namespace}/tenants/${tenant?.name}/security` + `/api/v1/namespaces/${tenant?.namespace}/tenants/${tenant?.name}/security`, ) .then((res: ITenantSecurityResponse) => { setEnableAutoCert(res.autoCert); @@ -229,8 +229,8 @@ const TenantSecurity = ({ classes }: ITenantSecurity) => { dispatch(setRunAsNonRoot(res.securityContext.runAsNonRoot)); dispatch( setFSGroupChangePolicy( - res.securityContext.fsGroupChangePolicy as fsGroupChangePolicyType - ) + res.securityContext.fsGroupChangePolicy as fsGroupChangePolicyType, + ), ); }) .catch((err: ErrorResponseHandler) => { @@ -292,7 +292,7 @@ const TenantSecurity = ({ classes }: ITenantSecurity) => { .invoke( "POST", `/api/v1/namespaces/${tenant?.namespace}/tenants/${tenant?.name}/security`, - payload + payload, ) .then(() => { setIsSending(false); @@ -346,16 +346,16 @@ const TenantSecurity = ({ classes }: ITenantSecurity) => { // Update MinIO server TLS certificate secrets const updatedMinioServerCertificateSecrets = minioServerCertificateSecrets.filter( - (certificateSecret) => certificateSecret.name !== certificateInfo.name + (certificateSecret) => certificateSecret.name !== certificateInfo.name, ); // Update MinIO client TLS certificate secrets const updatedMinioClientCertificateSecrets = minioClientCertificateSecrets.filter( - (certificateSecret) => certificateSecret.name !== certificateInfo.name + (certificateSecret) => certificateSecret.name !== certificateInfo.name, ); const updatedMinIOTLSCaCertificateSecrets = minioTLSCaCertificateSecrets.filter( - (certificateSecret) => certificateSecret.name !== certificateInfo.name + (certificateSecret) => certificateSecret.name !== certificateInfo.name, ); setMinioServerCertificateSecrets(updatedMinioServerCertificateSecrets); setMinioClientCertificateSecrets(updatedMinioClientCertificateSecrets); @@ -367,7 +367,7 @@ const TenantSecurity = ({ classes }: ITenantSecurity) => { id: string, key: string, fileName: string, - value: string + value: string, ) => { let certificates = minioServerCertificates; let updateCertificates: any = () => {}; @@ -429,7 +429,7 @@ const TenantSecurity = ({ classes }: ITenantSecurity) => { if (certificates.length > 1) { const cleanCertsList = certificates.filter( - (item: KeyPair) => item.id !== id + (item: KeyPair) => item.id !== id, ); updateCertificates(cleanCertsList); } @@ -567,7 +567,7 @@ const TenantSecurity = ({ classes }: ITenantSecurity) => { certificateInfo={certificateInfo} onDelete={() => removeCertificate(certificateInfo)} /> - ) + ), )} @@ -586,7 +586,7 @@ const TenantSecurity = ({ classes }: ITenantSecurity) => { keyPair.id, "cert", fileName, - encodedValue + encodedValue, ) } accept=".cer,.crt,.cert,.pem" @@ -602,7 +602,7 @@ const TenantSecurity = ({ classes }: ITenantSecurity) => { keyPair.id, "key", fileName, - encodedValue + encodedValue, ) } accept=".key,.pem" @@ -650,7 +650,7 @@ const TenantSecurity = ({ classes }: ITenantSecurity) => { certificateInfo={certificateInfo} onDelete={() => removeCertificate(certificateInfo)} /> - ) + ), )} @@ -669,7 +669,7 @@ const TenantSecurity = ({ classes }: ITenantSecurity) => { keyPair.id, "cert", fileName, - encodedValue + encodedValue, ) } accept=".cer,.crt,.cert,.pem" @@ -685,7 +685,7 @@ const TenantSecurity = ({ classes }: ITenantSecurity) => { keyPair.id, "key", fileName, - encodedValue + encodedValue, ) } accept=".key,.pem" @@ -733,7 +733,7 @@ const TenantSecurity = ({ classes }: ITenantSecurity) => { certificateInfo={certificateInfo} onDelete={() => removeCertificate(certificateInfo)} /> - ) + ), )} @@ -752,7 +752,7 @@ const TenantSecurity = ({ classes }: ITenantSecurity) => { keyPair.id, "cert", fileName, - encodedValue + encodedValue, ) } accept=".cer,.crt,.cert,.pem" diff --git a/web-app/src/screens/Console/Tenants/TenantDetails/TenantSummary.tsx b/web-app/src/screens/Console/Tenants/TenantDetails/TenantSummary.tsx index 4ff61303b7b..42847f41fd6 100644 --- a/web-app/src/screens/Console/Tenants/TenantDetails/TenantSummary.tsx +++ b/web-app/src/screens/Console/Tenants/TenantDetails/TenantSummary.tsx @@ -159,16 +159,16 @@ const TenantSummary = ({ classes }: ITenantsSummary) => { const tenant = useSelector((state: AppState) => state.tenants.tenantInfo); const encryptionEnabled = useSelector((state: AppState) => - get(state.tenants.tenantInfo, "encryptionEnabled", false) + get(state.tenants.tenantInfo, "encryptionEnabled", false), ); const minioTLS = useSelector((state: AppState) => - get(state.tenants.tenantInfo, "minioTLS", false) + get(state.tenants.tenantInfo, "minioTLS", false), ); const adEnabled = useSelector((state: AppState) => - get(state.tenants.tenantInfo, "idpAdEnabled", false) + get(state.tenants.tenantInfo, "idpAdEnabled", false), ); const oidcEnabled = useSelector((state: AppState) => - get(state.tenants.tenantInfo, "idpOidcEnabled", false) + get(state.tenants.tenantInfo, "idpOidcEnabled", false), ); const [poolCount, setPoolCount] = useState(0); @@ -183,8 +183,8 @@ const TenantSummary = ({ classes }: ITenantsSummary) => { setVolumes( tenant.pools?.reduce( (sum, p) => sum + p.volumes_per_server * p.servers, - 0 - ) || 0 + 0, + ) || 0, ); setInstances(tenant.pools?.reduce((sum, p) => sum + p.servers, 0) || 0); } diff --git a/web-app/src/screens/Console/Tenants/TenantDetails/TenantYAML.tsx b/web-app/src/screens/Console/Tenants/TenantDetails/TenantYAML.tsx index e910ea0f1db..7c317d0645f 100644 --- a/web-app/src/screens/Console/Tenants/TenantDetails/TenantYAML.tsx +++ b/web-app/src/screens/Console/Tenants/TenantDetails/TenantYAML.tsx @@ -60,7 +60,7 @@ const TenantYAML = ({ classes }: ITenantYAMLProps) => { const tenant = useSelector((state: AppState) => state.tenants.currentTenant); const namespace = useSelector( - (state: AppState) => state.tenants.currentNamespace + (state: AppState) => state.tenants.currentNamespace, ); const [addLoading, setAddLoading] = useState(false); @@ -178,7 +178,7 @@ const TenantYAML = ({ classes }: ITenantYAMLProps) => { disabled={addLoading} onClick={() => { navigate( - `/namespaces/${namespace}/tenants/${tenant}/summary` + `/namespaces/${namespace}/tenants/${tenant}/summary`, ); }} label={"Cancel"} diff --git a/web-app/src/screens/Console/Tenants/TenantDetails/UpdateTenantModal.tsx b/web-app/src/screens/Console/Tenants/TenantDetails/UpdateTenantModal.tsx index 7d0604cfcc8..c67627ae7b9 100644 --- a/web-app/src/screens/Console/Tenants/TenantDetails/UpdateTenantModal.tsx +++ b/web-app/src/screens/Console/Tenants/TenantDetails/UpdateTenantModal.tsx @@ -81,7 +81,7 @@ const UpdateTenantModal = ({ break; } }, - [minioImage] + [minioImage], ); useEffect(() => { @@ -125,7 +125,7 @@ const UpdateTenantModal = ({ .invoke( "PUT", `/api/v1/namespaces/${namespace}/tenants/${idTenant}`, - payload + payload, ) .then(() => { setIsSending(false); diff --git a/web-app/src/screens/Console/Tenants/TenantDetails/VolumesSummary.tsx b/web-app/src/screens/Console/Tenants/TenantDetails/VolumesSummary.tsx index 4a0370bef72..af6ce631dfd 100644 --- a/web-app/src/screens/Console/Tenants/TenantDetails/VolumesSummary.tsx +++ b/web-app/src/screens/Console/Tenants/TenantDetails/VolumesSummary.tsx @@ -56,7 +56,7 @@ const TenantVolumes = ({ classes }: ITenantVolumesProps) => { const { tenantName, tenantNamespace } = useParams(); const loadingTenant = useSelector( - (state: AppState) => state.tenants.loadingTenant + (state: AppState) => state.tenants.loadingTenant, ); const [records, setRecords] = useState([]); @@ -70,7 +70,7 @@ const TenantVolumes = ({ classes }: ITenantVolumesProps) => { api .invoke( "GET", - `/api/v1/namespaces/${tenantNamespace}/tenants/${tenantName}/pvcs` + `/api/v1/namespaces/${tenantNamespace}/tenants/${tenantName}/pvcs`, ) .then((res: IStoragePVCs) => { let volumes = get(res, "pvcs", []); @@ -95,14 +95,14 @@ const TenantVolumes = ({ classes }: ITenantVolumesProps) => { }; const filteredRecords: IStoragePVCs[] = records.filter((elementItem) => - elementItem.name.toLowerCase().includes(filter.toLowerCase()) + elementItem.name.toLowerCase().includes(filter.toLowerCase()), ); const PVCViewAction = (PVC: IPodListElement) => { navigate( `/namespaces/${tenantNamespace || ""}/tenants/${tenantName || ""}/pvcs/${ PVC.name - }` + }`, ); return; }; diff --git a/web-app/src/screens/Console/Tenants/TenantDetails/hop/Hop.tsx b/web-app/src/screens/Console/Tenants/TenantDetails/hop/Hop.tsx index f0b0904affb..16243ff24ef 100644 --- a/web-app/src/screens/Console/Tenants/TenantDetails/hop/Hop.tsx +++ b/web-app/src/screens/Console/Tenants/TenantDetails/hop/Hop.tsx @@ -111,7 +111,7 @@ const Hop = ({ classes }: IHopSimple) => { if (loc.indexOf("cp=y") < 0) { const next = `${loc}${add}cp=y`; consoleFrame.current.contentDocument.location.replace( - next + next, ); } else { consoleFrame.current.contentDocument.location.reload(); @@ -128,7 +128,7 @@ const Hop = ({ classes }: IHopSimple) => { component="span" onClick={() => { navigate( - `/namespaces/${tenantNamespace}/tenants/${tenantName}` + `/namespaces/${tenantNamespace}/tenants/${tenantName}`, ); }} size="large" diff --git a/web-app/src/screens/Console/Tenants/TenantDetails/pods/PodDescribe.tsx b/web-app/src/screens/Console/Tenants/TenantDetails/pods/PodDescribe.tsx index df982bfe2a2..70bd9867d32 100644 --- a/web-app/src/screens/Console/Tenants/TenantDetails/pods/PodDescribe.tsx +++ b/web-app/src/screens/Console/Tenants/TenantDetails/pods/PodDescribe.tsx @@ -402,7 +402,7 @@ const PodDescribe = ({ }: IPodEventsProps) => { const dispatch = useAppDispatch(); const loadingTenant = useSelector( - (state: AppState) => state.tenants.loadingTenant + (state: AppState) => state.tenants.loadingTenant, ); const [describeInfo, setDescribeInfo] = useState(); @@ -426,7 +426,7 @@ const PodDescribe = ({ api .invoke( "GET", - `/api/v1/namespaces/${namespace}/tenants/${tenant}/pods/${podName}/describe` + `/api/v1/namespaces/${namespace}/tenants/${tenant}/pods/${podName}/describe`, ) .then((res: DescribeResponse) => { const cleanRes = cleanDescribeResponseEnvVariables(res); @@ -441,11 +441,11 @@ const PodDescribe = ({ }, [loading, podName, namespace, tenant, dispatch]); const cleanDescribeResponseEnvVariables = ( - res: DescribeResponse + res: DescribeResponse, ): DescribeResponse => { res.containers = res.containers.map((c) => { c.environmentVariables = c.environmentVariables.filter( - (item) => item !== null + (item) => item !== null, ); return c; }); diff --git a/web-app/src/screens/Console/Tenants/TenantDetails/pods/PodEvents.tsx b/web-app/src/screens/Console/Tenants/TenantDetails/pods/PodEvents.tsx index b70a2313837..8889229ee69 100644 --- a/web-app/src/screens/Console/Tenants/TenantDetails/pods/PodEvents.tsx +++ b/web-app/src/screens/Console/Tenants/TenantDetails/pods/PodEvents.tsx @@ -40,7 +40,7 @@ const PodEvents = ({ }: IPodEventsProps) => { const dispatch = useAppDispatch(); const loadingTenant = useSelector( - (state: AppState) => state.tenants.loadingTenant + (state: AppState) => state.tenants.loadingTenant, ); const [events, setEvents] = useState([]); const [loading, setLoading] = useState(true); @@ -62,7 +62,7 @@ const PodEvents = ({ api .invoke( "GET", - `/api/v1/namespaces/${namespace}/tenants/${tenant}/pods/${podName}/events` + `/api/v1/namespaces/${namespace}/tenants/${tenant}/pods/${podName}/events`, ) .then((res: IEvent[]) => { for (let i = 0; i < res.length; i++) { diff --git a/web-app/src/screens/Console/Tenants/TenantDetails/pods/PodLogs.tsx b/web-app/src/screens/Console/Tenants/TenantDetails/pods/PodLogs.tsx index f84969ee7ec..c29f8ec8c72 100644 --- a/web-app/src/screens/Console/Tenants/TenantDetails/pods/PodLogs.tsx +++ b/web-app/src/screens/Console/Tenants/TenantDetails/pods/PodLogs.tsx @@ -91,7 +91,7 @@ const PodLogs = ({ }: IPodLogsProps) => { const dispatch = useAppDispatch(); const loadingTenant = useSelector( - (state: AppState) => state.tenants.loadingTenant + (state: AppState) => state.tenants.loadingTenant, ); const [highlight, setHighlight] = useState(""); const [logLines, setLogLines] = useState([]); @@ -163,7 +163,7 @@ const PodLogs = ({ api .invoke( "GET", - `/api/v1/namespaces/${namespace}/tenants/${tenant}/pods/${podName}` + `/api/v1/namespaces/${namespace}/tenants/${tenant}/pods/${podName}`, ) .then((res: string) => { setLogLines(res.split("\n")); diff --git a/web-app/src/screens/Console/Tenants/TenantDetails/pvcs/PVCDescribe.tsx b/web-app/src/screens/Console/Tenants/TenantDetails/pvcs/PVCDescribe.tsx index 54598ab9ff0..4ff26925caa 100644 --- a/web-app/src/screens/Console/Tenants/TenantDetails/pvcs/PVCDescribe.tsx +++ b/web-app/src/screens/Console/Tenants/TenantDetails/pvcs/PVCDescribe.tsx @@ -166,7 +166,7 @@ const PVCDescribe = ({ api .invoke( "GET", - `/api/v1/namespaces/${namespace}/tenants/${tenant}/pvcs/${pvcName}/describe` + `/api/v1/namespaces/${namespace}/tenants/${tenant}/pvcs/${pvcName}/describe`, ) .then((res: DescribeResponse) => { setDescribeInfo(res); diff --git a/web-app/src/screens/Console/Tenants/TenantDetails/pvcs/TenantVolumes.tsx b/web-app/src/screens/Console/Tenants/TenantDetails/pvcs/TenantVolumes.tsx index c9cd97977da..d5cd862f038 100644 --- a/web-app/src/screens/Console/Tenants/TenantDetails/pvcs/TenantVolumes.tsx +++ b/web-app/src/screens/Console/Tenants/TenantDetails/pvcs/TenantVolumes.tsx @@ -60,7 +60,7 @@ const TenantVolumes = ({ classes }: IPVCDetailsProps) => { api .invoke( "GET", - `/api/v1/namespaces/${tenantNamespace}/tenants/${tenantName}/pvcs/${PVCName}/events` + `/api/v1/namespaces/${tenantNamespace}/tenants/${tenantName}/pvcs/${PVCName}/events`, ) .then((res: IEvent[]) => { for (let i = 0; i < res.length; i++) { diff --git a/web-app/src/screens/Console/Tenants/TenantDetails/utils.ts b/web-app/src/screens/Console/Tenants/TenantDetails/utils.ts index 4c7d4ddd198..945851348bf 100644 --- a/web-app/src/screens/Console/Tenants/TenantDetails/utils.ts +++ b/web-app/src/screens/Console/Tenants/TenantDetails/utils.ts @@ -47,7 +47,7 @@ export const getNodeSelector = ( labels: string, withPodAntiAffinity: boolean, tenantName: string, - poolName: string + poolName: string, ) => { // Labels in the form of key1=value1&key2=value2&key3=value3... const splittedLabels = labels.split("&"); diff --git a/web-app/src/screens/Console/Tenants/tenantSecurityContextSlice.ts b/web-app/src/screens/Console/Tenants/tenantSecurityContextSlice.ts index 9121a5504e9..d331747a654 100644 --- a/web-app/src/screens/Console/Tenants/tenantSecurityContextSlice.ts +++ b/web-app/src/screens/Console/Tenants/tenantSecurityContextSlice.ts @@ -46,7 +46,7 @@ export const editTenantSecurityContextSlice = createSlice({ }, setFSGroupChangePolicy: ( state, - action: PayloadAction + action: PayloadAction, ) => { state.fsGroupChangePolicy = action.payload; }, diff --git a/web-app/src/screens/Console/Tenants/tenantsSlice.ts b/web-app/src/screens/Console/Tenants/tenantsSlice.ts index 868899b3c20..10810129d27 100644 --- a/web-app/src/screens/Console/Tenants/tenantsSlice.ts +++ b/web-app/src/screens/Console/Tenants/tenantsSlice.ts @@ -68,7 +68,7 @@ export const tenantSlice = createSlice({ action: PayloadAction<{ name: string; namespace: string; - }> + }>, ) => { state.currentTenant = action.payload.name; state.currentNamespace = action.payload.namespace; diff --git a/web-app/src/screens/Console/Tenants/thunks/tenantDetailsAsync.ts b/web-app/src/screens/Console/Tenants/thunks/tenantDetailsAsync.ts index 3d1833511c4..a1a5e61082e 100644 --- a/web-app/src/screens/Console/Tenants/thunks/tenantDetailsAsync.ts +++ b/web-app/src/screens/Console/Tenants/thunks/tenantDetailsAsync.ts @@ -37,5 +37,5 @@ export const getTenantAsync = createAsyncThunk( dispatch(setErrorSnackMessage(err)); return rejectWithValue(err); }); - } + }, ); diff --git a/web-app/src/screens/Console/Tenants/utils.ts b/web-app/src/screens/Console/Tenants/utils.ts index 734b32a2ba3..77d4a9cd30c 100644 --- a/web-app/src/screens/Console/Tenants/utils.ts +++ b/web-app/src/screens/Console/Tenants/utils.ts @@ -16,7 +16,7 @@ export const clearValidationError = ( validationErrors: any, - fieldKey: string + fieldKey: string, ) => { const newValidationElement = { ...validationErrors }; delete newValidationElement[fieldKey]; diff --git a/web-app/src/screens/Console/kbar-actions.tsx b/web-app/src/screens/Console/kbar-actions.tsx index 51f5506aee8..2c352939131 100644 --- a/web-app/src/screens/Console/kbar-actions.tsx +++ b/web-app/src/screens/Console/kbar-actions.tsx @@ -22,7 +22,7 @@ import { IAM_PAGES } from "../../common/SecureComponent/permissions"; export const routesAsKbarActions = ( features: string[] | null, operatorMode: boolean, - navigate: (url: string) => void + navigate: (url: string) => void, ) => { const initialActions: Action[] = []; const allowedMenuItems = validRoutes(); diff --git a/web-app/src/screens/Console/valid-routes.tsx b/web-app/src/screens/Console/valid-routes.tsx index 8c94c521b2b..c27a9ac9cbb 100644 --- a/web-app/src/screens/Console/valid-routes.tsx +++ b/web-app/src/screens/Console/valid-routes.tsx @@ -56,7 +56,7 @@ export const validRoutes = () => { onClick: (path) => { window.open( "https://min.io/docs/minio/linux/index.html?ref=op", - "_blank" + "_blank", ); }, }, diff --git a/web-app/src/screens/LoginPage/LoginPage.tsx b/web-app/src/screens/LoginPage/LoginPage.tsx index 3ef9d8d4134..3b1fc3f0531 100644 --- a/web-app/src/screens/LoginPage/LoginPage.tsx +++ b/web-app/src/screens/LoginPage/LoginPage.tsx @@ -242,7 +242,7 @@ const useStyles = makeStyles((theme: Theme) => }, }, ...spacingUtils, - }) + }), ); export interface LoginStrategyRoutes { @@ -277,16 +277,16 @@ const Login = () => { const jwt = useSelector((state: AppState) => state.login.jwt); const loginStrategy = useSelector( - (state: AppState) => state.login.loginStrategy + (state: AppState) => state.login.loginStrategy, ); const loginSending = useSelector( - (state: AppState) => state.login.loginSending + (state: AppState) => state.login.loginSending, ); const loadingFetchConfiguration = useSelector( - (state: AppState) => state.login.loadingFetchConfiguration + (state: AppState) => state.login.loadingFetchConfiguration, ); const loadingVersion = useSelector( - (state: AppState) => state.login.loadingVersion + (state: AppState) => state.login.loadingVersion, ); const navigateTo = useSelector((state: AppState) => state.login.navigateTo); diff --git a/web-app/src/screens/LoginPage/StrategyForm.tsx b/web-app/src/screens/LoginPage/StrategyForm.tsx index 0f2153ab4b0..f0d8f38f4a5 100644 --- a/web-app/src/screens/LoginPage/StrategyForm.tsx +++ b/web-app/src/screens/LoginPage/StrategyForm.tsx @@ -61,7 +61,7 @@ const useStyles = makeStyles((theme: Theme) => height: 10, }, ...spacingUtils, - }) + }), ); const StrategyForm = () => { @@ -75,7 +75,7 @@ const StrategyForm = () => { const useSTS = useSelector((state: AppState) => state.login.useSTS); const loginSending = useSelector( - (state: AppState) => state.login.loginSending + (state: AppState) => state.login.loginSending, ); const formSubmit = (e: React.FormEvent) => { diff --git a/web-app/src/screens/LoginPage/loginThunks.ts b/web-app/src/screens/LoginPage/loginThunks.ts index edb7ffde64b..33562f4ca85 100644 --- a/web-app/src/screens/LoginPage/loginThunks.ts +++ b/web-app/src/screens/LoginPage/loginThunks.ts @@ -60,7 +60,7 @@ export const doLoginAsync = createAsyncThunk( .invoke( "POST", loginStrategyEndpoints[loginStrategy.loginStrategy] || "/api/v1/login", - loginStrategyPayload[loginStrategy.loginStrategy] + loginStrategyPayload[loginStrategy.loginStrategy], ) .then((res) => { // We set the state in redux @@ -91,7 +91,7 @@ export const doLoginAsync = createAsyncThunk( .catch((err) => { dispatch(setErrorSnackMessage(err)); }); - } + }, ); export const getFetchConfigurationAsync = createAsyncThunk( "login/getFetchConfigurationAsync", @@ -104,7 +104,7 @@ export const getFetchConfigurationAsync = createAsyncThunk( .catch((err: ErrorResponseHandler) => { dispatch(setErrorSnackMessage(err)); }); - } + }, ); export const getVersionAsync = createAsyncThunk( @@ -121,7 +121,7 @@ export const getVersionAsync = createAsyncThunk( latest_version: string; }) => { return latest_version; - } + }, ) .catch((err: ErrorResponseHandler) => { // try the operator version @@ -136,11 +136,11 @@ export const getVersionAsync = createAsyncThunk( latest_version: string; }) => { return latest_version; - } + }, ) .catch((err: ErrorResponseHandler) => { return err; }); }); - } + }, ); diff --git a/web-app/src/serviceWorker.ts b/web-app/src/serviceWorker.ts index 84bc0684012..16eaf8af975 100644 --- a/web-app/src/serviceWorker.ts +++ b/web-app/src/serviceWorker.ts @@ -16,8 +16,8 @@ const isLocalhost = Boolean( window.location.hostname === "[::1]" || // 127.0.0.1/8 is considered localhost for IPv4. window.location.hostname.match( - /^127(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}$/ - ) + /^127(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}$/, + ), ); type Config = { @@ -30,7 +30,7 @@ export function register(config?: Config) { // The URL constructor is available in all browsers that support SW. const publicUrl = new URL( (process as { env: { [key: string]: string } }).env.PUBLIC_URL, - window.location.href + window.location.href, ); if (publicUrl.origin !== window.location.origin) { // Our service worker won't work if PUBLIC_URL is on a different origin @@ -51,7 +51,7 @@ export function register(config?: Config) { navigator.serviceWorker.ready.then(() => { console.log( "This web app is being served cache-first by a service " + - "worker. To learn more, visit https://bit.ly/CRA-PWA" + "worker. To learn more, visit https://bit.ly/CRA-PWA", ); }); } else { @@ -79,7 +79,7 @@ function registerValidSW(swUrl: string, config?: Config) { // content until all client tabs are closed. console.log( "New content is available and will be used when all " + - "tabs for this page are closed. See https://bit.ly/CRA-PWA." + "tabs for this page are closed. See https://bit.ly/CRA-PWA.", ); // Execute callback @@ -129,7 +129,7 @@ function checkValidServiceWorker(swUrl: string, config?: Config) { }) .catch(() => { console.log( - "No internet connection found. App is running in offline mode." + "No internet connection found. App is running in offline mode.", ); }); } diff --git a/web-app/src/systemSlice.ts b/web-app/src/systemSlice.ts index 54327e6240a..291e09f12f0 100644 --- a/web-app/src/systemSlice.ts +++ b/web-app/src/systemSlice.ts @@ -93,7 +93,7 @@ export const systemSlice = createSlice({ // persist preference to local storage localStorage.setItem( "sidebarOpen", - JSON.stringify({ open: action.payload }) + JSON.stringify({ open: action.payload }), ); state.sidebarOpen = action.payload; }, @@ -118,7 +118,7 @@ export const systemSlice = createSlice({ }, setErrorSnackMessage: ( state, - action: PayloadAction + action: PayloadAction, ) => { state.snackBar = { message: action.payload.errorMessage, @@ -135,7 +135,7 @@ export const systemSlice = createSlice({ }, setModalErrorSnackMessage: ( state, - action: PayloadAction<{ errorMessage: string; detailedError: string }> + action: PayloadAction<{ errorMessage: string; detailedError: string }>, ) => { state.modalSnackBar = { message: action.payload.errorMessage, @@ -157,7 +157,7 @@ export const systemSlice = createSlice({ }, setOverrideStyles: ( state, - action: PayloadAction + action: PayloadAction, ) => { state.overrideStyles = action.payload; }, diff --git a/web-app/src/utils/sortFunctions.ts b/web-app/src/utils/sortFunctions.ts index 19ff3f944ac..e9c7f47c2a2 100644 --- a/web-app/src/utils/sortFunctions.ts +++ b/web-app/src/utils/sortFunctions.ts @@ -63,7 +63,7 @@ export const stringSort = (a: string, b: string) => { export const policyDetailsSort = ( a: policyDetailsInterface, - b: policyDetailsInterface + b: policyDetailsInterface, ) => { if (a.policy > b.policy) { return 1; diff --git a/web-app/src/utils/stylesUtils.ts b/web-app/src/utils/stylesUtils.ts index 01208148b98..fbb63fed5d7 100644 --- a/web-app/src/utils/stylesUtils.ts +++ b/web-app/src/utils/stylesUtils.ts @@ -18,7 +18,7 @@ import { IEmbeddedCustomStyles } from "../common/types"; import { createTheme } from "@mui/material"; export const getOverrideColorVariants: ( - customStyles: string + customStyles: string, ) => false | IEmbeddedCustomStyles = (customStyles) => { try { return JSON.parse(atob(customStyles)) as IEmbeddedCustomStyles; diff --git a/web-app/tests/utils/elements-menu.ts b/web-app/tests/utils/elements-menu.ts index 70e0bf11e77..4404e8eecde 100644 --- a/web-app/tests/utils/elements-menu.ts +++ b/web-app/tests/utils/elements-menu.ts @@ -50,7 +50,7 @@ export const bucketsElement = sidebarItem.withAttribute("href", "/buckets"); export const serviceAcctsElement = sidebarItem.withAttribute( "href", - IAM_PAGES.ACCOUNT + IAM_PAGES.ACCOUNT, ); export const identityElement = Selector(".MuiPaper-root") @@ -67,7 +67,7 @@ export const groupsElement = identityChildren export const iamPoliciesElement = sidebarItem.withAttribute( "href", - IAM_PAGES.POLICIES + IAM_PAGES.POLICIES, ); export const configurationsElement = Selector(".MuiPaper-root") @@ -93,7 +93,7 @@ export const profileElement = Selector(".MuiPaper-root") .child("#profile"); export const inspectElement = sidebarItem.withAttribute( "href", - "/support/inspect" + "/support/inspect", ); export const licenseElement = sidebarItem.withAttribute("href", "/license"); diff --git a/web-app/tests/utils/elements.ts b/web-app/tests/utils/elements.ts index 4455605a4f3..c179c7bfc7a 100644 --- a/web-app/tests/utils/elements.ts +++ b/web-app/tests/utils/elements.ts @@ -21,7 +21,7 @@ import { Selector } from "testcafe"; //---------------------------------------------------- export const loginSubmitButton = Selector("form button"); export const closeAlertButton = Selector( - 'button[class*="ModalError-closeButton"]' + 'button[class*="ModalError-closeButton"]', ); export const uploadButton = Selector("span") @@ -33,7 +33,7 @@ export const saveButton = Selector("button:enabled").withText("Save"); export const deleteButton = Selector("button:enabled").withExactText("Delete"); export const addEventDestination = Selector("button:enabled").withText( - "Add Event Destination" + "Add Event Destination", ); export const createTierButton = Selector("button:enabled").withText("Create Tier"); @@ -62,16 +62,16 @@ export const switchInput = Selector(".MuiSwitch-input"); export const bucketNameInput = Selector("#bucket-name"); export const bucketsPrefixInput = Selector("#prefix"); export const bucketsAccessInput = Selector( - 'input[class*="MuiSelect-nativeInput"]' + 'input[class*="MuiSelect-nativeInput"]', ); export const bucketsAccessReadOnlyInput = Selector( - 'li[class*="MuiMenuItem-root"]' + 'li[class*="MuiMenuItem-root"]', ).withText("readonly"); export const bucketsAccessWriteOnlyInput = Selector( - 'li[class*="MuiMenuItem-root"]' + 'li[class*="MuiMenuItem-root"]', ).withText("writeonly"); export const bucketsAccessReadWriteInput = Selector( - 'li[class*="MuiMenuItem-root"]' + 'li[class*="MuiMenuItem-root"]', ).withText("readwrite"); export const uploadInput = Selector("input").withAttribute("type", "file"); export const createPolicyName = Selector("#policy-name"); @@ -82,7 +82,7 @@ export const groupNameInput = Selector("#group-name"); export const searchResourceInput = Selector("#search-resource"); export const filterUserInput = searchResourceInput.withAttribute( "placeholder", - "Filter Users" + "Filter Users", ); export const groupUserCheckbox = Selector(".ReactVirtualized__Table__row span") .withText(constants.TEST_USER_NAME) @@ -96,7 +96,7 @@ export const groupUserCheckbox = Selector(".ReactVirtualized__Table__row span") export const bucketDropdownOptionFor = (modifier) => { return Selector("li").withAttribute( "data-value", - `${constants.TEST_BUCKET_NAME}-${modifier}` + `${constants.TEST_BUCKET_NAME}-${modifier}`, ); }; @@ -112,10 +112,10 @@ export const table = Selector(".ReactVirtualized__Table"); export const bucketsTableDisabled = Selector("#object-list-wrapper") .find(".MuiPaper-root") .withText( - "You require additional permissions in order to view Objects in this bucket. Please ask your MinIO administrator to grant you" + "You require additional permissions in order to view Objects in this bucket. Please ask your MinIO administrator to grant you", ); export const createGroupUserTable = Selector( - ".MuiDialog-container .ReactVirtualized__Table" + ".MuiDialog-container .ReactVirtualized__Table", ); //---------------------------------------------------- @@ -134,43 +134,43 @@ export const settingsWindow = Selector("#settings-container"); //---------------------------------------------------- export const settingsRegionTab = Selector(".MuiTab-root").withAttribute( "href", - "/settings/configurations/region" + "/settings/configurations/region", ); export const settingsCompressionTab = Selector(".MuiTab-root").withAttribute( "href", - "/settings/configurations/compression" + "/settings/configurations/compression", ); export const settingsApiTab = Selector(".MuiTab-root").withAttribute( "href", - "/settings/configurations/api" + "/settings/configurations/api", ); export const settingsHealTab = Selector(".MuiTab-root").withAttribute( "href", - "/settings/configurations/heal" + "/settings/configurations/heal", ); export const settingsScannerTab = Selector(".MuiTab-root").withAttribute( "href", - "/settings/configurations/scanner" + "/settings/configurations/scanner", ); export const settingsEtcdTab = Selector(".MuiTab-root").withAttribute( "href", - "/settings/configurations/etcd" + "/settings/configurations/etcd", ); export const settingsOpenIdTab = Selector(".MuiTab-root").withAttribute( "href", - "/settings/configurations/identity_openid" + "/settings/configurations/identity_openid", ); export const settingsLdapTab = Selector(".MuiTab-root").withAttribute( "href", - "/settings/configurations/identity_ldap" + "/settings/configurations/identity_ldap", ); export const settingsLoggerWebhookTab = Selector(".MuiTab-root").withAttribute( "href", - "/settings/configurations/logger_webhook" + "/settings/configurations/logger_webhook", ); export const settingsAuditWebhookTab = Selector(".MuiTab-root").withAttribute( "href", - "/settings/configurations/audit_webhook" + "/settings/configurations/audit_webhook", ); //---------------------------------------------------- @@ -188,17 +188,17 @@ export const userPolicies = Selector(".MuiTab-root").withText("Policies"); //---------------------------------------------------- export const rewindButton = Selector("button").withAttribute( "id", - "rewind-objects-list" + "rewind-objects-list", ); export const rewindToInput = Selector("input").withAttribute( "id", - "rewind-selector" + "rewind-selector", ); export const rewindDataButton = Selector("button").withAttribute( "id", - "rewind-apply-button" + "rewind-apply-button", ); export const locationEmpty = Selector("div").withAttribute( "id", - "empty-results" + "empty-results", ); diff --git a/web-app/tests/utils/functions.ts b/web-app/tests/utils/functions.ts index 7f9b5cc413a..14abf25f2e6 100644 --- a/web-app/tests/utils/functions.ts +++ b/web-app/tests/utils/functions.ts @@ -52,7 +52,7 @@ export const uploadNamedObjectToBucket = ( t, modifier, objectName, - objectPath + objectPath, ) => { const bucketName = modifier; const minioClient = new Minio.Client({ @@ -123,7 +123,7 @@ export const namedTestBucketBrowseButtonFor = (name) => { export const testBucketBrowseButtonFor = (modifier) => { return namedTestBucketBrowseButtonFor( - `${constants.TEST_BUCKET_NAME}-${modifier}` + `${constants.TEST_BUCKET_NAME}-${modifier}`, ); }; @@ -172,7 +172,7 @@ export const createUser = (t) => { export const cleanUpUser = (t) => { const userListItem = Selector(".ReactVirtualized__Table__rowColumn").withText( - constants.TEST_USER_NAME + constants.TEST_USER_NAME, ); const userDeleteIconButton = userListItem diff --git a/web-app/tests/utils/roles.ts b/web-app/tests/utils/roles.ts index 01d7c84a798..954cca1c420 100644 --- a/web-app/tests/utils/roles.ts +++ b/web-app/tests/utils/roles.ts @@ -17,7 +17,7 @@ export const admin = Role( .typeText("#secretKey", "minioadmin") .click(submitButton); }, - { preserveUrl: true } + { preserveUrl: true }, ); export const bucketAssignPolicy = Role( @@ -28,7 +28,7 @@ export const bucketAssignPolicy = Role( .typeText("#secretKey", "bucketassignpolicy") .click(submitButton); }, - { preserveUrl: true } + { preserveUrl: true }, ); export const bucketRead = Role( @@ -39,7 +39,7 @@ export const bucketRead = Role( .typeText("#secretKey", "bucketread") .click(submitButton); }, - { preserveUrl: true } + { preserveUrl: true }, ); export const bucketWrite = Role( @@ -50,7 +50,7 @@ export const bucketWrite = Role( .typeText("#secretKey", "bucketwrite") .click(submitButton); }, - { preserveUrl: true } + { preserveUrl: true }, ); export const bucketReadWrite = Role( @@ -61,7 +61,7 @@ export const bucketReadWrite = Role( .typeText("#secretKey", "bucketreadwrite") .click(submitButton); }, - { preserveUrl: true } + { preserveUrl: true }, ); export const bucketObjectTags = Role( @@ -72,7 +72,7 @@ export const bucketObjectTags = Role( .typeText("#secretKey", "bucketobjecttags") .click(submitButton); }, - { preserveUrl: true } + { preserveUrl: true }, ); export const bucketCannotTag = Role( @@ -83,7 +83,7 @@ export const bucketCannotTag = Role( .typeText("#secretKey", "bucketcannottag") .click(submitButton); }, - { preserveUrl: true } + { preserveUrl: true }, ); export const bucketSpecific = Role( @@ -94,7 +94,7 @@ export const bucketSpecific = Role( .typeText("#secretKey", "bucketspecific") .click(submitButton); }, - { preserveUrl: true } + { preserveUrl: true }, ); export const bucketWritePrefixOnly = Role( @@ -105,7 +105,7 @@ export const bucketWritePrefixOnly = Role( .typeText("#secretKey", "bucketwriteprefixonlypolicy") .click(submitButton); }, - { preserveUrl: true } + { preserveUrl: true }, ); export const dashboard = Role( @@ -116,7 +116,7 @@ export const dashboard = Role( .typeText("#secretKey", "dashboard") .click(submitButton); }, - { preserveUrl: true } + { preserveUrl: true }, ); export const diagnostics = Role( @@ -127,7 +127,7 @@ export const diagnostics = Role( .typeText("#secretKey", "diagnostics") .click(submitButton); }, - { preserveUrl: true } + { preserveUrl: true }, ); export const groups = Role( @@ -138,7 +138,7 @@ export const groups = Role( .typeText("#secretKey", "groups1234") .click(submitButton); }, - { preserveUrl: true } + { preserveUrl: true }, ); export const heal = Role( @@ -149,7 +149,7 @@ export const heal = Role( .typeText("#secretKey", "heal1234") .click(submitButton); }, - { preserveUrl: true } + { preserveUrl: true }, ); export const iamPolicies = Role( @@ -160,7 +160,7 @@ export const iamPolicies = Role( .typeText("#secretKey", "iampolicies") .click(submitButton); }, - { preserveUrl: true } + { preserveUrl: true }, ); export const logs = Role( @@ -171,7 +171,7 @@ export const logs = Role( .typeText("#secretKey", "logs1234") .click(submitButton); }, - { preserveUrl: true } + { preserveUrl: true }, ); export const notificationEndpoints = Role( @@ -182,7 +182,7 @@ export const notificationEndpoints = Role( .typeText("#secretKey", "notificationendpoints") .click(submitButton); }, - { preserveUrl: true } + { preserveUrl: true }, ); export const settings = Role( @@ -193,7 +193,7 @@ export const settings = Role( .typeText("#secretKey", "settings") .click(submitButton); }, - { preserveUrl: true } + { preserveUrl: true }, ); export const tiers = Role( @@ -204,7 +204,7 @@ export const tiers = Role( .typeText("#secretKey", "tiers1234") .click(submitButton); }, - { preserveUrl: true } + { preserveUrl: true }, ); export const trace = Role( @@ -215,7 +215,7 @@ export const trace = Role( .typeText("#secretKey", "trace1234") .click(submitButton); }, - { preserveUrl: true } + { preserveUrl: true }, ); export const users = Role( @@ -226,7 +226,7 @@ export const users = Role( .typeText("#secretKey", "users1234") .click(submitButton); }, - { preserveUrl: true } + { preserveUrl: true }, ); export const watch = Role( @@ -237,7 +237,7 @@ export const watch = Role( .typeText("#secretKey", "watch1234") .click(submitButton); }, - { preserveUrl: true } + { preserveUrl: true }, ); export const deleteObjectWithPrefixOnly = Role( @@ -248,7 +248,7 @@ export const deleteObjectWithPrefixOnly = Role( .typeText("#secretKey", "deleteobjectwithprefix1234") .click(submitButton); }, - { preserveUrl: true } + { preserveUrl: true }, ); export const conditions1 = Role( @@ -259,7 +259,7 @@ export const conditions1 = Role( .typeText("#secretKey", "conditions1234") .click(submitButton); }, - { preserveUrl: true } + { preserveUrl: true }, ); export const conditions2 = Role( @@ -270,5 +270,5 @@ export const conditions2 = Role( .typeText("#secretKey", "conditions1234") .click(submitButton); }, - { preserveUrl: true } + { preserveUrl: true }, ); diff --git a/web-app/yarn.lock b/web-app/yarn.lock index 7505b388a7e..44097d54ea7 100644 --- a/web-app/yarn.lock +++ b/web-app/yarn.lock @@ -9043,10 +9043,10 @@ prelude-ls@~1.1.2: resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" integrity sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w== -prettier@^2.8.8: - version "2.8.8" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da" - integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q== +prettier@3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.0.0.tgz#e7b19f691245a21d618c68bc54dc06122f6105ae" + integrity sha512-zBf5eHpwHOGPC47h0zrPyNn+eAEIdEzfywMoYn2XPi0P44Zp0tSq64rq0xAREh4auw2cJZHo9QUob+NqCQky4g== pretty-bytes@^5.3.0, pretty-bytes@^5.4.1: version "5.6.0"