Skip to content

Commit

Permalink
Merge branch 'develop' into feature/1072-nodedetails-sidepanel
Browse files Browse the repository at this point in the history
  • Loading branch information
faisal7008 committed Oct 31, 2023
2 parents 00d43f6 + 049f9e0 commit 2f0dce3
Show file tree
Hide file tree
Showing 5 changed files with 3,860 additions and 31 deletions.
20 changes: 20 additions & 0 deletions .github/workflows/hacktoberfest-comment.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
on:
pull_request:
types: [closed]

jobs:
comment:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2

- name: Comment on PR
if: ${{ github.event.pull_request.merged == true && contains(github.event.pull_request.labels.*.name, 'hacktoberfest-accepted') }}
uses: peter-evans/create-or-update-comment@v1
with:
token: ${{ secrets.GH_ACTIONS }}
issue-number: ${{ github.event.pull_request.number }}
body: |
A heartfelt thank you, @${{ github.event.pull_request.user.login }}, for your enthusiastic involvement in Hacktoberfest! To express our gratitude, we've crafted a special virtual badge just for you. Don't hesitate to showcase it on your social media profiles and share the love by mentioning Komiser in your posts. Your contribution means the world to us!
![Image](docs/images/hacktoberfest-badge.svg)
29 changes: 2 additions & 27 deletions dashboard/components/explorer/DependencyGraph.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -173,32 +173,6 @@ const DependencyGraph = ({ data }: DependencyGraphProps) => {

return (
<div className="relative h-full flex-1 bg-dependency-graph bg-[length:40px_40px]">
<CytoscapeComponent
className="h-full w-full"
elements={CytoscapeComponent.normalizeElements({
nodes: data.nodes,
edges: data.edges
})}
// forEach={(data.nodes, node => {console.log(node)})}
maxZoom={maxZoom}
minZoom={minZoom}
layout={graphLayoutConfig}
stylesheet={[
{
selector: 'node',
style: nodeStyeConfig
},
{
selector: 'edge',
style: edgeStyleConfig
},
{
selector: '.leaf',
style: leafStyleConfig
}
]}
cy={(cy: Cytoscape.Core) => cyActionHandlers(cy)}
/>
{dataIsEmpty ? (
<>
<div className="translate-y-[201px]">
Expand Down Expand Up @@ -244,7 +218,8 @@ const DependencyGraph = ({ data }: DependencyGraphProps) => {
<div className="relative">
<WarningIcon className="peer" height="16" width="16" />
<Tooltip bottom="xs" align="left" width="lg">
Only AWS resources are currently supported on the explorer.
Only AWS and Civo resources are currently supported on the
explorer.
</Tooltip>
</div>
)}
Expand Down
14 changes: 10 additions & 4 deletions dashboard/components/explorer/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,16 @@ export const nodeStyeConfig = {
'text-opacity': 1,
'font-size': 17,
'background-color': 'white',
'background-image': node =>
node.data('provider') === 'AWS'
? '/assets/img/dependency-graph/aws-node.svg'
: '',
'background-image': node => {
switch (node.data('provider')) {
case 'AWS':
return '/assets/img/dependency-graph/aws-node.svg';
case 'Civo':
return '/assets/img/dependency-graph/civo-node.svg';
default:
return '';
}
},
'background-height': 20,
'background-width': 20,
'border-color': '#EDEBEE',
Expand Down
9 changes: 9 additions & 0 deletions dashboard/public/assets/img/dependency-graph/civo-node.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 2f0dce3

Please sign in to comment.