From f1b6890a314c266e85ecc6b0c0555d6ee6dd318a Mon Sep 17 00:00:00 2001 From: Andrew Hopkinson <64254061+toxophilist@users.noreply.github.com> Date: Thu, 29 Aug 2024 13:21:16 +0100 Subject: [PATCH] fix: Resolve SonarCloud warnings --- .../src/components/dialogs/OcdQueryDialog.tsx | 4 +- .../dialogs/OcdReferenceDataQueryDialog.tsx | 37 +++---------------- .../model/src/layout/OcdCommonLayoutEngine.ts | 4 +- .../src/layout/OcdOkitWebLayoutEngine.ts | 12 +++--- 4 files changed, 14 insertions(+), 43 deletions(-) diff --git a/ocd/packages/desktop/src/components/dialogs/OcdQueryDialog.tsx b/ocd/packages/desktop/src/components/dialogs/OcdQueryDialog.tsx index 7fe3db897..04cca2f8b 100644 --- a/ocd/packages/desktop/src/components/dialogs/OcdQueryDialog.tsx +++ b/ocd/packages/desktop/src/components/dialogs/OcdQueryDialog.tsx @@ -5,13 +5,11 @@ import { CompartmentPickerProps, QueryDialogProps } from "../../types/Dialogs" import { OciApiFacade } from "../../facade/OciApiFacade" -import { useContext, useState } from "react" -// import { OciCompartment } from "../../model/provider/oci/resources" +import React, { useContext, useState } from "react" import { OciModelResources } from '@ocd/model' import { OcdDocument } from "../OcdDocument" import { OcdUtils } from '@ocd/core' import { ActiveFileContext, ConsoleConfigContext } from "../../pages/OcdConsole" -import React from "react" export const OcdQueryDialog = ({ocdDocument, setOcdDocument}: QueryDialogProps): JSX.Element => { const {activeFile, setActiveFile} = useContext(ActiveFileContext) diff --git a/ocd/packages/desktop/src/components/dialogs/OcdReferenceDataQueryDialog.tsx b/ocd/packages/desktop/src/components/dialogs/OcdReferenceDataQueryDialog.tsx index d3b480b54..5d621a8f0 100644 --- a/ocd/packages/desktop/src/components/dialogs/OcdReferenceDataQueryDialog.tsx +++ b/ocd/packages/desktop/src/components/dialogs/OcdReferenceDataQueryDialog.tsx @@ -3,39 +3,26 @@ ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl. */ -import { CompartmentPickerProps, QueryDialogProps } from "../../types/Dialogs" +import { QueryDialogProps } from "../../types/Dialogs" import { OciApiFacade } from "../../facade/OciApiFacade" -import { useContext, useState } from "react" -// import { OciCompartment } from "../../model/provider/oci/resources" -import { OciModelResources } from '@ocd/model' -import { OcdDocument } from "../OcdDocument" -import { OcdUtils } from '@ocd/core' -import { ActiveFileContext, CacheContext, ConsoleConfigContext } from "../../pages/OcdConsole" -import React from "react" +import React, { useContext, useState } from "react" +import { CacheContext, ConsoleConfigContext } from "../../pages/OcdConsole" import OcdConsoleConfig from "../OcdConsoleConfiguration" -import { OcdCacheData } from "../OcdCache" export const OcdReferenceDataQueryDialog = ({ocdDocument, setOcdDocument}: QueryDialogProps): JSX.Element => { - const {activeFile, setActiveFile} = useContext(ActiveFileContext) const {ocdConsoleConfig, setOcdConsoleConfig} = useContext(ConsoleConfigContext) const {ocdCache, setOcdCache} = useContext(CacheContext) const loadingState = '......Reading OCI Config' const regionsLoading = {id: 'Select Valid Profile', displayName: 'Select Valid Profile'} - const [className, setClassName] = useState(`ocd-reference-data-query-dialog`) + const className = `ocd-reference-data-query-dialog` const [workingClassName, setWorkingClassName] = useState(`ocd-query-wrapper hidden`) const [cursor, setCursor] = useState('default') const [profiles, setProfiles] = useState([loadingState]) const [profilesLoaded, setProfilesLoaded] = useState(false) const [regions, setRegions] = useState([regionsLoading]) - const [compartments, setCompartments] = useState([] as OciModelResources.OciCompartment[]) const [selectedProfile, setSelectedProfile] = useState('DEFAULT') const [selectedRegion, setSelectedRegion] = useState('') - const [selectedCompartmentIds, setSelectedCompartmentIds] = useState([]) - const [hierarchy, setHierarchy] = useState('') - const refs: Record> = compartments.reduce((acc, value: OciModelResources.OciCompartment) => { - acc[value.hierarchy] = React.createRef(); - return acc; - }, {} as Record>); + if (!profilesLoaded) OciApiFacade.loadOCIConfigProfileNames().then((results) => { setProfilesLoaded(true) setProfiles(results) @@ -82,20 +69,6 @@ export const OcdReferenceDataQueryDialog = ({ocdDocument, setOcdDocument}: Query setCursor('default') console.debug('OcdReferenceDataQueryDialog: Cache', ocdCache) }) - // // setClassName(`${className} ocd-busy-cursor`) - // OciApiFacade.queryDropdown(selectedProfile, selectedRegion).then((results) => { - // // @ts-ignore - // console.debug('OcdReferenceDataQueryDialog: Query Dropdown', JSON.stringify(results, null, 2)) - // const clone = OcdConsoleConfig.clone(ocdConsoleConfig) - // console.debug('OcdReferenceDataQueryDialog: Cache', ocdCache) - // ocdCache.cache.dropdownData[selectedProfile] = {all: results} - // ocdCache.cache.profile = selectedProfile - // console.debug('OcdReferenceDataQueryDialog: Cache', ocdCache) - // clone.queryReferenceData = !ocdConsoleConfig.queryReferenceData - // setOcdConsoleConfig(clone) - // setAndSaveOcdCache(OcdCacheData.clone(ocdCache)) - // setCursor('default') - // }) } return ( diff --git a/ocd/packages/model/src/layout/OcdCommonLayoutEngine.ts b/ocd/packages/model/src/layout/OcdCommonLayoutEngine.ts index 631c21758..ca832b7d0 100644 --- a/ocd/packages/model/src/layout/OcdCommonLayoutEngine.ts +++ b/ocd/packages/model/src/layout/OcdCommonLayoutEngine.ts @@ -40,14 +40,14 @@ export class OcdCommonLayoutEngine { return coords.filter(c => c.pgid === '') // Only Coords Without Parent } - layout(detailed: boolean = true, coords: OcdViewCoords[]): OcdViewCoords[] { + layout(detailed: boolean, coords: OcdViewCoords[]): OcdViewCoords[] { const rootCoords = coords ? this.createCoordsHierarchy(coords) : this.createCoordsHierarchy(this.coords) rootCoords.filter((c) => c.container).forEach((p) => this.layoutChildren(detailed, p)) this.layoutRoot(detailed, rootCoords) return rootCoords } - layoutChildren(detailed: boolean = true, parent: OcdViewCoords): OcdViewCoords { + layoutChildren(detailed: boolean, parent: OcdViewCoords): OcdViewCoords { if (parent.coords) { // Reset Width & Height parent.w = this.spacing diff --git a/ocd/packages/model/src/layout/OcdOkitWebLayoutEngine.ts b/ocd/packages/model/src/layout/OcdOkitWebLayoutEngine.ts index a46b2fcf6..db12b8347 100644 --- a/ocd/packages/model/src/layout/OcdOkitWebLayoutEngine.ts +++ b/ocd/packages/model/src/layout/OcdOkitWebLayoutEngine.ts @@ -5,7 +5,7 @@ import { OcdDesign, OcdViewCoords } from "../OcdDesign" import { OcdCommonLayoutEngine } from "./OcdCommonLayoutEngine" -import { OciResource, OciModelResources } from "../index" +import { OciResource } from "../index" export class OcdOkitWebLayoutEngine extends OcdCommonLayoutEngine { moveToChild: Record = {'oci-subnet': ['oci-dhcp-option', 'oci-route-table', 'oci-security-list']} @@ -78,7 +78,7 @@ export class OcdOkitWebLayoutEngine extends OcdCommonLayoutEngine { return rootCoords } - layoutChildren(detailed: boolean = true, parent: OcdViewCoords): OcdViewCoords { + layoutChildren(detailed: boolean, parent: OcdViewCoords): OcdViewCoords { if (parent.coords) { // Reset Width & Height parent.w = this.spacing @@ -104,7 +104,7 @@ export class OcdOkitWebLayoutEngine extends OcdCommonLayoutEngine { child.x = childX child.y = childY // Add Spacing - childX += (this.spacing + (detailed ? this.detailedWidth : this.simpleWidth) as number) + childX += (this.spacing + (detailed ? this.detailedWidth : this.simpleWidth)) // Size Container parent.w = Math.max(parent.w, (childX + this.spacing)) parent.h = childY + this.spacing + this.simpleHeight @@ -131,7 +131,7 @@ export class OcdOkitWebLayoutEngine extends OcdCommonLayoutEngine { return parent } - layoutTopEdgeChildren(detailed: boolean = true, parent: OcdViewCoords, edge: string[]): OcdViewCoords { + layoutTopEdgeChildren(detailed: boolean, parent: OcdViewCoords, edge: string[]): OcdViewCoords { console.debug('OcdOkitWebLayoutEngine: layoutTopEdgeChildren:', parent.class, edge) let childX = this.spacing + this.detailedWidth let childY = ((this.simpleHeight/2) * -1) - this.edgeAdjustment @@ -140,7 +140,7 @@ export class OcdOkitWebLayoutEngine extends OcdCommonLayoutEngine { child.x = childX child.y = childY // Add Spacing - childX += (this.spacing + (detailed ? this.detailedWidth : this.simpleWidth) as number) + childX += (this.spacing + (detailed ? this.detailedWidth : this.simpleWidth)) // Size Container parent.w = Math.max(parent.w, (childX + this.spacing)) }) @@ -148,7 +148,7 @@ export class OcdOkitWebLayoutEngine extends OcdCommonLayoutEngine { return parent } - layoutRightEdgeChildren(detailed: boolean = true, parent: OcdViewCoords, edge: string[]): OcdViewCoords { + layoutRightEdgeChildren(detailed: boolean, parent: OcdViewCoords, edge: string[]): OcdViewCoords { console.debug('OcdOkitWebLayoutEngine: layoutRightEdgeChildren:', parent.class, edge) let childX = parent.w - this.simpleWidth - this.edgeAdjustment let childY = this.spacing + this.simpleHeight