Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding CALM Visualizer to main branch from 'explore-cytoscape' #786

Merged
merged 56 commits into from
Jan 10, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
257477c
WIP Interactive Visualizer (#487)
aidanm3341 Nov 5, 2024
fdd5af7
Merge pull request #563 from finos/main
aidanm3341 Nov 6, 2024
e5a5cb7
Added group and nested group functionality
Adwoa-Konadu-Appiah Nov 6, 2024
4d1d554
Only re-generate graph if uploaded CALM instance json file has change…
oliviajanejohns Nov 11, 2024
6dc64f3
Add arrow labels on graph outputted by calm-visualizer (finos#568)
oliviajanejohns Nov 11, 2024
3cbf2dd
Add arrow labels on graph outputted by calm-visualizer (finos#568)
oliviajanejohns Nov 11, 2024
e055379
#585 remove comments & update group feature
Adwoa-Konadu-Appiah Nov 12, 2024
79fa131
#585 remove whitespaces
Adwoa-Konadu-Appiah Nov 13, 2024
345b09e
Merge pull request #570 from oliviajanejohns/finos-561
oliviajanejohns Nov 14, 2024
e5620d5
Merge pull request #568 from oliviajanejohns/visualizer
oliviajanejohns Nov 14, 2024
db9a35a
merge branch
Adwoa-Konadu-Appiah Nov 14, 2024
3096ebd
styled git containers
Adwoa-Konadu-Appiah Nov 14, 2024
ce1908e
Add prettier to calm-visualizer
oliviajanejohns Nov 15, 2024
cee00bb
Add tailwindcss to calm-visualizer
oliviajanejohns Nov 15, 2024
2483dbd
Open node-detail-preview on node selection
oliviajanejohns Nov 15, 2024
def30cb
Update visualiser branch to bring in latest changes (#598)
oliviajanejohns Nov 18, 2024
789da7e
Enlarge container to view nodes
Adwoa-Konadu-Appiah Nov 19, 2024
4529be9
Merge pull request #564 from Adwoa-Konadu-Appiah/vizualizer
aidanm3341 Nov 21, 2024
d8801c8
Merge branch 'vizualizer' of https://github.com/finos/architecture-as…
oliviajanejohns Nov 21, 2024
1622b3f
Merge pull request #597 from oliviajanejohns/node-detail-preview
oliviajanejohns Nov 22, 2024
862f331
Installed cytoscape
YoofiTT96 Nov 22, 2024
677396e
Initial scafolding
YoofiTT96 Nov 22, 2024
228b4cf
Add data processing
YoofiTT96 Nov 22, 2024
d938fca
Add more scaffolding
YoofiTT96 Nov 22, 2024
2193b84
WIP laypouting
YoofiTT96 Nov 22, 2024
4e38fa7
WIP layouting
YoofiTT96 Nov 22, 2024
6c0cbe4
show sidepanel for details on cytoscapenode on tap
DorothyEwuah Nov 25, 2024
7c62da8
WIP layouting - Add grouping
YoofiTT96 Nov 22, 2024
7a4cf30
Shorten edge labels and add tooltip
aamanrebello Nov 22, 2024
8d275e0
WIP layouting - Move cytoscape rendering to Drawer
YoofiTT96 Nov 22, 2024
8f7ed10
rendering cytoscape graph based on upload
DorothyEwuah Nov 25, 2024
f621e61
Remove unused JSPlump dependency
oliviajanejohns Nov 25, 2024
ad2ca44
Render cytoscape graph based on uploaded file
oliviajanejohns Nov 26, 2024
4674e2e
WIP layouting - Clean up commits. Remove layout file requirements
YoofiTT96 Nov 27, 2024
e1207d4
Display edges in sidebar when clicked on
aamanrebello Nov 27, 2024
514d9a9
Update explore-cytoscape with changes from main (#648)
YoofiTT96 Dec 3, 2024
9ba5a00
Changes
YoofiTT96 Dec 3, 2024
641a2f8
Merge remote-tracking branch 'refs/remotes/upstream/explore-cytoscape…
YoofiTT96 Dec 3, 2024
aeb2e9b
Merge pull request #649 from YoofiTT96/cytoscape-exploration
aidanm3341 Dec 6, 2024
4c31c67
formatting fixes and typescript errors
aidanm3341 Dec 6, 2024
dd1b607
removed unecessary step during file upload and deleted some files
aidanm3341 Dec 6, 2024
127b951
styling improvements
aidanm3341 Dec 6, 2024
1fe0950
Added navbar and menu to calm-visualizer webpage
oliviajanejohns Dec 8, 2024
7af027a
Add 'no file selected' message
oliviajanejohns Dec 8, 2024
fda115a
Delete unused component
oliviajanejohns Dec 8, 2024
3e64308
Merge branch 'explore-cytoscape' of https://github.com/finos/architec…
oliviajanejohns Dec 11, 2024
897441d
Merge pull request #659 from oliviajanejohns/explore-cytoscape
oliviajanejohns Dec 13, 2024
e9eea8a
Add connection descriptions toggle
oliviajanejohns Dec 15, 2024
227ea10
Merge branch 'explore-cytoscape' of https://github.com/finos-labs/arc…
aidanm3341 Dec 18, 2024
e426cb1
Merge branch 'explore-cytoscape' of https://github.com/finos/architec…
oliviajanejohns Dec 18, 2024
3cc9513
Merge pull request #683 from oliviajanejohns/explore-cytoscape
oliviajanejohns Dec 18, 2024
dd93647
Added Toggle to show/hide descriptions on nodes
oliviajanejohns Dec 20, 2024
77057af
Setup Vitest
oliviajanejohns Dec 20, 2024
da26d35
Merge pull request #698 from oliviajanejohns/explore-cytoscape
oliviajanejohns Dec 24, 2024
2d2c3fe
Merge branch 'main' of https://github.com/finos/architecture-as-code …
oliviajanejohns Jan 10, 2025
880cce0
Merge branch 'main' into explore-cytoscape-merge
aidanm3341 Jan 10, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 15 additions & 9 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
{
"testing.openTesting": "neverOpen",
"jest.outputConfig": {
"revealOn": "run",
"revealWithFocus": "none",
"clearOnRun": "none"
},
"java.compile.nullAnalysis.mode": "automatic",
"java.configuration.updateBuildConfiguration": "automatic"
}
"testing.openTesting": "neverOpen",
"jest.outputConfig": {
"revealOn": "run",
"revealWithFocus": "none",
"clearOnRun": "none"
},
"editor.formatOnSave": true,
"editor.codeActionsOnSave": {
"source.fixAll.eslint": "explicit"
},
"java.compile.nullAnalysis.mode": "automatic",
"java.configuration.updateBuildConfiguration": "automatic",
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.formatOnPaste": false
}
24 changes: 24 additions & 0 deletions calm-visualizer/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*
pnpm-debug.log*
lerna-debug.log*

node_modules
dist
dist-ssr
*.local

# Editor directories and files
.vscode/*
!.vscode/extensions.json
.idea
.DS_Store
*.suo
*.ntvs*
*.njsproj
*.sln
*.sw?
9 changes: 9 additions & 0 deletions calm-visualizer/.prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"trailingComma": "es5",
"tabWidth": 4,
"semi": true,
"singleQuote": true,
"bracketSpacing": true,
"endOfLine": "auto",
"printWidth": 100
}
50 changes: 50 additions & 0 deletions calm-visualizer/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
# React + TypeScript + Vite

This template provides a minimal setup to get React working in Vite with HMR and some ESLint rules.

Currently, two official plugins are available:

- [@vitejs/plugin-react](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react/README.md) uses [Babel](https://babeljs.io/) for Fast Refresh
- [@vitejs/plugin-react-swc](https://github.com/vitejs/vite-plugin-react-swc) uses [SWC](https://swc.rs/) for Fast Refresh

## Expanding the ESLint configuration

If you are developing a production application, we recommend updating the configuration to enable type aware lint rules:

- Configure the top-level `parserOptions` property like this:

```js
export default tseslint.config({
languageOptions: {
// other options...
parserOptions: {
project: ['./tsconfig.node.json', './tsconfig.app.json'],
tsconfigRootDir: import.meta.dirname,
},
},
});
```

- Replace `tseslint.configs.recommended` to `tseslint.configs.recommendedTypeChecked` or `tseslint.configs.strictTypeChecked`
- Optionally add `...tseslint.configs.stylisticTypeChecked`
- Install [eslint-plugin-react](https://github.com/jsx-eslint/eslint-plugin-react) and update the config:

```js
// eslint.config.js
import react from 'eslint-plugin-react';

export default tseslint.config({
// Set the react version
settings: { react: { version: '18.3' } },
plugins: {
// Add the react plugin
react,
},
rules: {
// other rules...
// Enable its recommended rules
...react.configs.recommended.rules,
...react.configs['jsx-runtime'].rules,
},
});
```
25 changes: 25 additions & 0 deletions calm-visualizer/eslint.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import js from '@eslint/js';
import globals from 'globals';
import reactHooks from 'eslint-plugin-react-hooks';
import reactRefresh from 'eslint-plugin-react-refresh';
import tseslint from 'typescript-eslint';

export default tseslint.config(
{ ignores: ['dist'] },
{
extends: [js.configs.recommended, ...tseslint.configs.recommended],
files: ['**/*.{ts,tsx}'],
languageOptions: {
ecmaVersion: 2020,
globals: globals.browser,
},
plugins: {
'react-hooks': reactHooks,
'react-refresh': reactRefresh,
},
rules: {
...reactHooks.configs.recommended.rules,
'react-refresh/only-export-components': ['warn', { allowConstantExport: true }],
},
}
);
Loading
Loading