Skip to content

Commit

Permalink
refactor: SonarCloud suggestions
Browse files Browse the repository at this point in the history
  • Loading branch information
toxophilist committed Dec 2, 2024
1 parent 327df4c commit cdaa37a
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 14 deletions.
3 changes: 1 addition & 2 deletions ocd/packages/desktop/index.html
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
<!DOCTYPE html>
<html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<title>OKIT - Open Cloud Designer</title>
</head>
<body>
<div id="root"></div>
<script type="module" src="/src/main.tsx"></script>
<!-- <script type="module" src="/src/renderer.ts"></script> -->
</body>
</html>
4 changes: 1 addition & 3 deletions ocd/packages/react/src/components/OcdCanvasLayers.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,7 @@ const OcdCanvasLayer = ({ ocdDocument, setOcdDocument, layer } : LayerBarLayerPr
<div className={`ocd-canvas-layer-name ${layer.class}`} onClick={() => onLayerSelectedClick()} aria-hidden>
<input id={layer.id.replace(/\W+/g, "")} type='text' value={title} onChange={onChange} tabIndex={-1}></input>
</div>
{page.layers.length > 1 && <div className={`ocd-layer-visiblity-icon delete-layer`}
onClick={onDeleteClick}
></div>}
{page.layers.length > 1 && <div className={`ocd-layer-visiblity-icon delete-layer`} onClick={onDeleteClick} aria-hidden></div>}
</div>
)
}
Expand Down
2 changes: 1 addition & 1 deletion ocd/packages/react/src/components/OcdCanvasPages.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ const OcdPagesThreeDotMenu = ({ocdDocument, setOcdDocument}: PageBarMenuProps):
<li className='ocd-dropdown-menu-item ocd-mouseover-highlight'><div><label><input id='ocd_console_page_display_grid' type='checkbox' onChange={displayGridOnChange} ref={cbRef} checked={activePage.grid}/>Display Grid</label></div></li>
<li className='ocd-dropdown-menu-item'><div>--------------------------------</div></li>
<li className='ocd-dropdown-menu-item ocd-mouseover-highlight'><div onClick={onDuplicatePageClick} aria-hidden>Duplicate "{activePageName}"</div></li>
{ocdDocument.design.view.pages.length > 1 && <li className='ocd-dropdown-menu-item ocd-mouseover-highlight'><div onClick={onDeletePageClick}>Delete "{activePageName}"</div></li>}
{ocdDocument.design.view.pages.length > 1 && <li className='ocd-dropdown-menu-item ocd-mouseover-highlight'><div onClick={onDeletePageClick} aria-hidden>Delete "{activePageName}"</div></li>}
<li className='ocd-dropdown-menu-item ocd-mouseover-highlight'><div onClick={onAddPageClick} aria-hidden>Add Page</div></li>
</ul>
</li>
Expand Down
4 changes: 2 additions & 2 deletions ocd/packages/react/src/components/OcdPalette.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ const OcdPalette = ({ ocdConsoleConfig, setDragData, ocdDocument }: PaletteProps
return (
<div className='ocd-designer-left-panel'>
<div className={`ocd-designer-tab-bar ocd-designer-tab-bar-theme`}>
<div className={`ocd-designer-tab ocd-designer-tab-theme ${activeTab === 'provider' ? 'ocd-designer-active-tab-theme' : ''}`} onClick={() => onTabClick('Provider')}><span>Provider</span></div>
<div className={`ocd-designer-tab ocd-designer-tab-theme ${activeTab === 'model' ? 'ocd-designer-active-tab-theme' : ''}`} onClick={() => onTabClick('Model')}><span>Model</span></div>
<div className={`ocd-designer-tab ocd-designer-tab-theme ${activeTab === 'provider' ? 'ocd-designer-active-tab-theme' : ''}`} onClick={() => onTabClick('Provider')} aria-hidden><span>Provider</span></div>
<div className={`ocd-designer-tab ocd-designer-tab-theme ${activeTab === 'model' ? 'ocd-designer-active-tab-theme' : ''}`} onClick={() => onTabClick('Model')} aria-hidden><span>Model</span></div>
</div>
<ActiveTab
ocdConsoleConfig={ocdConsoleConfig}
Expand Down
12 changes: 6 additions & 6 deletions ocd/packages/react/src/components/OcdProperties.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ const OcdPropertiesTabbar = ({modelId, coordsId, activeTab, setActiveTab, additi
const OcdPropertiesTabbarTab = ({title, active, setActive, additionalCss}: {title: string, active: boolean, setActive: (title: string) => void, additionalCss: string}): JSX.Element => {
console.debug('OcdPropertiesTabbarTab: Render', title, active ? '- Active' : '')
return(
<div className={`ocd-designer-tab ocd-designer-tab-theme ${active ? 'ocd-designer-active-tab-theme' : ''} ${additionalCss ? additionalCss : ''}`} onClick={() => setActive(title.toLowerCase())}><span>{title}</span></div>
<div className={`ocd-designer-tab ocd-designer-tab-theme ${active ? 'ocd-designer-active-tab-theme' : ''} ${additionalCss ? additionalCss : ''}`} onClick={() => setActive(title.toLowerCase())} aria-hidden><span>{title}</span></div>
)
}

Expand Down Expand Up @@ -218,15 +218,15 @@ const OcdResourceTags = ({ocdDocument, setOcdDocument}: DesignerResourceProperti
const tag = freeformTags.find((t) => t.key === oldKey)
if (tag) {
tag.key = newKey
setFreeformTags(freeformTags)
setFreeformTags([...freeformTags])
updateFreeformTags(freeformTags)
}
})
const onFreeformValueChange = ((key: string, value: string) => {
const tag = freeformTags.find((t) => t.key === key)
if (tag) {
tag.value = value
setFreeformTags(freeformTags)
setFreeformTags([...freeformTags])
updateFreeformTags(freeformTags)
}
})
Expand All @@ -245,23 +245,23 @@ const OcdResourceTags = ({ocdDocument, setOcdDocument}: DesignerResourceProperti
const tag = definedTags.find((t) => t.namespace === oldNamespace && t.key === key)
if (tag) {
tag.namespace = newNamespace
setDefinedTags(definedTags)
setDefinedTags([...definedTags])
updateDefinedTags(definedTags)
}
})
const onDefinedKeyChange = ((namespace: string, oldKey: string, newKey: string) => {
const tag = definedTags.find((t) => t.namespace === namespace && t.key === oldKey)
if (tag) {
tag.key = newKey
setDefinedTags(definedTags)
setDefinedTags([...definedTags])
updateDefinedTags(definedTags)
}
})
const onDefinedValueChange = ((namespace: string, key: string, value: string) => {
const tag = definedTags.find((t) => t.namespace === namespace && t.key === key)
if (tag) {
tag.value = value
setDefinedTags(definedTags)
setDefinedTags([...definedTags])
updateDefinedTags(definedTags)
}
})
Expand Down

0 comments on commit cdaa37a

Please sign in to comment.