Skip to content
Snippets Groups Projects
Unverified Commit 2f164747 authored by Martyn Janes's avatar Martyn Janes Committed by GitHub
Browse files

Improved tooling for analysis and updated conflicts UI (#593)

* Improved tooling for analysis and updated conflicts UI

* :package: Update packr

* :package: Run packr2

* :recycle: Refactor analysis-dashboard FPC

* :rotating_light: Fix linter warnings

* :lipstick: Fix missing logo

* :arrow_up:

 Upgrade yarn dependencies

Co-authored-by: default avatarcapossele <angelocapossele@gmail.com>
parent 0ff0cb11
Branches
Tags
No related merge requests found
declare module "vivagraphjs" {
export namespace Graph {
export interface ILink {
id: string;
}
export interface IGraph {
getLink: (nodeA: string, nodeB: string) => ILink | undefined;
addLink: (nodeA: string, nodeB: string) => void;
removeLink: (link: ILink) => void;
getNode: (node: string) => string | undefined;
addNode: (node: string) => void;
removeNode: (node: string) => void;
beginUpdate: () => void;
endUpdate: () => void;
forEachLink: (callback: (link: ILink) => void) => void;
}
export interface ILocation {
vertexPos: number;
customAttributes: number;
transform: number[];
screenSize: number;
}
export interface IWebGL {
createProgram: (code: string, codeB: string) => WebGLProgram;
getLocations: (program: WebGLProgram, commands: string[]) => ILocation;
extendArray: (arr: Float32Array, numItems: number, itemSize: number) => Float32Array;
copyArrayPart: (arr: Float32Array, from: number, to: number, itemSize: number) => Float32Array;
}
export interface IEvents {
click: (handler: (node: { id: string }) => void) => void;
mouseEnter: (handler: (node: { id: string }) => void) => void;
mouseLeave: (handler: (node: { id: string }) => void) => void;
}
function graph(): IGraph;
function webgl(context: WebGLRenderingContextBase): IWebGL;
function webglInputEvents(graphics: View.IWebGLGraphics, graph: IGraph): IEvents;
export namespace View {
export interface IItem {
}
export interface IWebGLGraphics {
link: (callback: () => IItem) => void;
node: (callback: () => IItem) => void;
getNodeUI: (nodeId: string) => {
color: string;
size: number;
} | undefined;
getLinkUI: (linkId: string) => {
color: number;
} | undefined;
setNodeProgram: (program: WebGLProgram) => void;
}
export interface IRenderer {
run: () => void;
dispose: () => void;
getLayout: () => Layout.ILayout;
rerender: () => void;
}
function webglGraphics(): IWebGLGraphics;
function webglLine(color: string): IItem;
function renderer(graph: IGraph, options: {
container: HTMLElement | null;
graphics: IWebGLGraphics;
layout: Layout.ILayout;
renderLinks: boolean;
}): IRenderer;
}
export namespace Layout {
export interface ISimulator {
springLength: (size: number) => void;
}
export interface ILayout {
simulator: ISimulator;
}
function forceDirected(
graph: IGraph,
options: {
springLength: number;
springCoeff: number;
dragCoeff: number;
stableThreshold: number;
gravity: number;
timeStep: number;
theta: number;
}): ILayout;
}
}
}
...@@ -12,13 +12,22 @@ ...@@ -12,13 +12,22 @@
"noImplicitReturns": false, "noImplicitReturns": false,
"noUnusedLocals": true, "noUnusedLocals": true,
"removeComments": true, "removeComments": true,
"strictNullChecks": false, "allowSyntheticDefaultImports": true,
"strictNullChecks": true,
"outDir": "build", "outDir": "build",
"lib": ["es6", "es7", "dom"], "lib": [
"baseUrl": "src", "es6",
"paths": { "es7",
"app/*": ["./app/*"] "dom"
} ],
"typeRoots": []
}, },
"exclude": ["dist", "build", "node_modules"] "include": [
"src/**/*"
],
"exclude": [
"dist",
"build",
"node_modules"
]
} }
\ No newline at end of file
...@@ -9,7 +9,7 @@ let outPath = path.join(__dirname, './build'); ...@@ -9,7 +9,7 @@ let outPath = path.join(__dirname, './build');
// plugins // plugins
let HtmlWebpackPlugin = require('html-webpack-plugin'); let HtmlWebpackPlugin = require('html-webpack-plugin');
let WebpackCleanupPlugin = require('webpack-cleanup-plugin'); let { CleanWebpackPlugin } = require('clean-webpack-plugin');
module.exports = { module.exports = {
context: sourcePath, context: sourcePath,
...@@ -93,7 +93,7 @@ module.exports = { ...@@ -93,7 +93,7 @@ module.exports = {
NODE_ENV: 'development', // use 'development' unless process.env.NODE_ENV is defined NODE_ENV: 'development', // use 'development' unless process.env.NODE_ENV is defined
DEBUG: false DEBUG: false
}), }),
new WebpackCleanupPlugin(), new CleanWebpackPlugin(),
new HtmlWebpackPlugin({ new HtmlWebpackPlugin({
template: 'assets/index.html' template: 'assets/index.html'
}) })
......
This diff is collapsed.
This diff is collapsed.
...@@ -24,8 +24,8 @@ var ErrNotFound = errors.New("not found") ...@@ -24,8 +24,8 @@ var ErrNotFound = errors.New("not found")
var ErrForbidden = errors.New("forbidden") var ErrForbidden = errors.New("forbidden")
// holds analysis dashboard assets // holds analysis dashboard assets
var appBox = packr.New("AnalysisDashboard_App", "./frontend/build") var appBox = packr.New("AnalysisDashboardApp", "./frontend/build")
var assetsBox = packr.New("AnalysisDashboard_Assets", "./frontend/src/assets") var assetsBox = packr.New("AnalysisDashboardAssets", "./frontend/src/assets")
func indexRoute(e echo.Context) error { func indexRoute(e echo.Context) error {
if config.Node().GetBool(CfgDev) { if config.Node().GetBool(CfgDev) {
......
...@@ -65,6 +65,7 @@ ...@@ -65,6 +65,7 @@
"dateformat": "^3.0.3", "dateformat": "^3.0.3",
"favicons-webpack-plugin": "^2.1.0", "favicons-webpack-plugin": "^2.1.0",
"history": "^4.10.1", "history": "^4.10.1",
"js-yaml": "^3.13.1",
"mobx": "^5.15.0", "mobx": "^5.15.0",
"mobx-react": "^5.4.3", "mobx-react": "^5.4.3",
"mobx-react-router": "^4.0.5", "mobx-react-router": "^4.0.5",
......
This diff is collapsed.
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment