rename ott-vis packages to have more consistent names

Author: dyc3

.github/workflows/main.yml

@@ -109,7 +109,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        package: [ott-vis, ott-vis-datasource]
+        package: [ott-vis-panel, ott-vis-datasource]
     steps:
       - uses: actions/checkout@v4
       - name: Setup Node.js environment

packages/ott-vis-common/package.json

@@ -65,7 +65,7 @@
 		"@grafana/runtime": "10.0.3",
 		"@grafana/ui": "10.0.3",
 		"@grafana/schema": "10.0.3",
-		"ott-vis-common": "*",
+		"ott-vis": "*",
 		"react": "18.2.0",
 		"react-dom": "18.2.0",
 		"rxjs": "7.8.0",

packages/ott-vis-common/tsconfig.json

@@ -9,7 +9,7 @@ import {
 
 import { MyQuery, MyDataSourceOptions } from "./types";
 import { getBackendSrv } from "@grafana/runtime";
-import type { SystemState } from "ott-vis-common";
+import type { SystemState } from "ott-vis";
 import { lastValueFrom } from "rxjs";
 
 export class DataSource extends DataSourceApi<MyQuery, MyDataSourceOptions> {

packages/ott-vis-datasource/package.json

@@ -1,5 +1,5 @@
 {
-	"extends": "../../.eslintrc.json",
+	"extends": "./.config/.eslintrc",
 	"rules": {
 		"camelcase": ["error", { "properties": "never" }]
 	}

packages/ott-vis-datasource/src/datasource.ts

@@ -0,0 +1,76 @@
+{
+	"name": "ott-vis-panel",
+	"version": "0.10.0",
+	"description": "",
+	"author": "Ott",
+	"license": "AGPL-3.0-or-later",
+	"engines": {
+		"node": ">=18"
+	},
+	"scripts": {
+		"build": "webpack -c ./.config/webpack/webpack.config.ts --env production",
+		"dev": "webpack -w -c ./.config/webpack/webpack.config.ts --env development",
+		"test": "jest --passWithNoTests --maxWorkers 4 --coverage",
+		"typecheck": "tsc --noEmit",
+		"lint": "prettier --write --config ../../.prettierrc . && tsc --noEmit && eslint --cache --ignore-path ./.gitignore --ext .js,.jsx,.ts,.tsx . --fix",
+		"lint-ci": "prettier --check --config ../../.prettierrc . && tsc --noEmit && eslint --cache --ignore-path ./.gitignore --ext .js,.jsx,.ts,.tsx .",
+		"e2e": "npm exec cypress install && npm exec grafana-e2e run",
+		"e2e:update": "npm exec cypress install && npm exec grafana-e2e run --update-screenshots",
+		"server": "docker-compose up --build",
+		"sign": "npx --yes @grafana/sign-plugin@latest"
+	},
+	"devDependencies": {
+		"@babel/core": "^7.21.4",
+		"@grafana/e2e": "10.0.3",
+		"@grafana/e2e-selectors": "10.0.3",
+		"@grafana/eslint-config": "^6.0.0",
+		"@grafana/tsconfig": "^1.2.0-rc1",
+		"@swc/core": "^1.3.90",
+		"@swc/helpers": "^0.5.0",
+		"@swc/jest": "^0.2.26",
+		"@testing-library/jest-dom": "6.1.4",
+		"@testing-library/react": "14.0.0",
+		"@types/jest": "^29.5.0",
+		"@types/lodash": "^4.14.194",
+		"@types/node": "^20.8.7",
+		"@types/testing-library__jest-dom": "5.14.8",
+		"@types/d3": "7.4.3",
+		"copy-webpack-plugin": "^11.0.0",
+		"css-loader": "^6.7.3",
+		"d3": "7.8.5",
+		"eslint": "^8.57.0",
+		"eslint-plugin-deprecation": "^2.0.0",
+		"eslint-plugin-jsdoc": "^48.0.2",
+		"eslint-plugin-react": "^7.33.2",
+		"eslint-plugin-react-hooks": "^4.6.0",
+		"eslint-webpack-plugin": "^4.0.1",
+		"fork-ts-checker-webpack-plugin": "^8.0.0",
+		"glob": "^10.2.7",
+		"identity-obj-proxy": "3.0.0",
+		"jest": "^29.5.0",
+		"jest-environment-jsdom": "^29.5.0",
+		"prettier": "^2.8.7",
+		"replace-in-file-webpack-plugin": "^1.0.6",
+		"sass": "1.63.2",
+		"sass-loader": "13.3.1",
+		"style-loader": "3.3.3",
+		"swc-loader": "^0.2.3",
+		"ts-node": "^10.9.1",
+		"tsconfig-paths": "^4.2.0",
+		"typescript": "4.8.4",
+		"webpack": "^5.86.0",
+		"webpack-cli": "^5.1.4",
+		"webpack-livereload-plugin": "^3.0.2"
+	},
+	"dependencies": {
+		"@emotion/css": "11.10.6",
+		"@grafana/data": "10.0.3",
+		"@grafana/runtime": "10.0.3",
+		"@grafana/ui": "10.0.3",
+		"@grafana/schema": "10.0.3",
+		"ott-vis": "*",
+		"react": "18.2.0",
+		"react-dom": "18.2.0",
+		"tslib": "2.5.3"
+	}
+}

packages/ott-vis/.config/.cprc.json renamed to packages/ott-vis-panel/.config/.cprc.json

@@ -23,8 +23,8 @@
 	"panels": [
 		{
 			"datasource": {
-				"type": "ott-vis-datasource",
-				"uid": "P8AFEECD30EDC727B"
+				"type": "grafana",
+				"uid": "grafana"
 			},
 			"gridPos": {
 				"h": 8,
@@ -42,9 +42,10 @@
 			"targets": [
 				{
 					"datasource": {
-						"type": "ott-vis-datasource",
-						"uid": "P8AFEECD30EDC727B"
+						"type": "datasource",
+						"uid": "grafana"
 					},
+					"queryType": "randomWalk",
 					"refId": "A"
 				}
 			],
@@ -53,8 +54,8 @@
 		},
 		{
 			"datasource": {
-				"type": "ott-vis-datasource",
-				"uid": "P8AFEECD30EDC727B"
+				"type": "grafana",
+				"uid": "grafana"
 			},
 			"gridPos": {
 				"h": 8,
@@ -72,9 +73,10 @@
 			"targets": [
 				{
 					"datasource": {
-						"type": "ott-vis-datasource",
-						"uid": "P8AFEECD30EDC727B"
+						"type": "datasource",
+						"uid": "grafana"
 					},
+					"queryType": "randomWalk",
 					"refId": "A"
 				}
 			],
@@ -354,7 +356,7 @@
 		"list": []
 	},
 	"time": {
-		"from": "now-5m",
+		"from": "now-6h",
 		"to": "now"
 	},
 	"timepicker": {},

packages/ott-vis/.config/.eslintrc renamed to packages/ott-vis-panel/.config/.eslintrc

@@ -1,4 +1,4 @@
-import type { SystemState } from "ott-vis-common";
+import type { SystemState } from "ott-vis";
 import { aggMonolithRooms, countRoomClients, groupMonolithsByRegion } from "./aggregate";
 
 const sampleSystemState: SystemState = [

packages/ott-vis/.config/Dockerfile renamed to packages/ott-vis-panel/.config/Dockerfile

@@ -1,4 +1,4 @@
-import type { SystemState } from "ott-vis-common";
+import type { SystemState } from "ott-vis";
 
 /**
  * Builds a map of room names to the number of clients in each room from the room state.

packages/ott-vis/.config/README.md renamed to packages/ott-vis-panel/.config/README.md

@@ -1,7 +1,7 @@
 import React from "react";
 import { PanelProps } from "@grafana/data";
 import type { CoreOptions } from "types";
-import type { SystemState } from "ott-vis-common";
+import type { SystemState } from "ott-vis";
 import { css, cx } from "@emotion/css";
 import { useStyles2 } from "@grafana/ui";
 import GlobalView from "./views/GlobalView";

packages/ott-vis/.config/jest-setup.js renamed to packages/ott-vis-panel/.config/jest-setup.js

@@ -1,6 +1,6 @@
 import React from "react";
 import ForceGraph, { Link, Node } from "components/ForceGraph";
-import type { SystemState } from "ott-vis-common";
+import type { SystemState } from "ott-vis";
 import { aggMonolithRooms, countRoomClients } from "aggregate";
 
 interface Props {

packages/ott-vis/.config/jest.config.js renamed to packages/ott-vis-panel/.config/jest.config.js

@@ -1,6 +1,6 @@
 import React from "react";
 import ForceGraph, { Link, Node } from "components/ForceGraph";
-import type { SystemState } from "ott-vis-common";
+import type { SystemState } from "ott-vis";
 import { aggMonolithRooms, countRoomClients, groupMonolithsByRegion } from "aggregate";
 import _ from "lodash";
 

packages/ott-vis/.config/jest/mocks/react-inlinesvg.tsx renamed to packages/ott-vis-panel/.config/jest/mocks/react-inlinesvg.tsx

@@ -0,0 +1,9 @@
+{
+	"extends": "./.config/tsconfig.json",
+	"compilerOptions": {
+		"strict": true,
+		"typeRoots": ["../../node_modules/@types"],
+		"esModuleInterop": true,
+		"jsx": "react"
+	}
+}

packages/ott-vis/.config/jest/utils.js renamed to packages/ott-vis-panel/.config/jest/utils.js

@@ -1,5 +1,5 @@
 {
-	"extends": "./.config/.eslintrc",
+	"extends": "../../.eslintrc.json",
 	"rules": {
 		"camelcase": ["error", { "properties": "never" }]
 	}