From 1f51f74b0de08d326478f7cd393bbf0d0e12cb78 Mon Sep 17 00:00:00 2001 From: Jasper Date: Wed, 3 Apr 2024 07:59:50 -0700 Subject: [PATCH 1/7] Initial commit, added file --- client/src/views/mission-replay-view.tsx | 0 package-lock.json | 221 +++++++++++++++++++++++ package.json | 1 + 3 files changed, 222 insertions(+) create mode 100644 client/src/views/mission-replay-view.tsx diff --git a/client/src/views/mission-replay-view.tsx b/client/src/views/mission-replay-view.tsx new file mode 100644 index 000000000..e69de29bb diff --git a/package-lock.json b/package-lock.json index ee86585e3..92e3fd7cc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,6 +14,7 @@ "concurrently": "^7.5.0", "express": "^4.18.2", "google-map-react": "^2.2.1", + "mongodb": "^6.3.0", "mui-datatables": "^4.3.0", "styled-components": "^6.0.7" }, @@ -2215,6 +2216,14 @@ "react-dom": "^16.8.0 || ^17.0.0" } }, + "node_modules/@mongodb-js/saslprep": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/@mongodb-js/saslprep/-/saslprep-1.1.4.tgz", + "integrity": "sha512-8zJ8N1x51xo9hwPh6AWnKdLGEC5N3lDa6kms1YHmFBoRhTpJR6HG8wWk0td1MVCu9cD4YBrvjZEtd5Obw0Fbnw==", + "dependencies": { + "sparse-bitfield": "^3.0.3" + } + }, "node_modules/@mui/base": { "version": "5.0.0-beta.4", "resolved": "https://registry.npmjs.org/@mui/base/-/base-5.0.0-beta.4.tgz", @@ -2675,6 +2684,19 @@ "resolved": "https://registry.npmjs.org/@types/stylis/-/stylis-4.2.0.tgz", "integrity": "sha512-n4sx2bqL0mW1tvDf/loQ+aMX7GQD3lc3fkCMC55VFNDu/vBOabO+LTIeXKM14xK0ppk5TUGcWRjiSpIlUpghKw==" }, + "node_modules/@types/webidl-conversions": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/@types/webidl-conversions/-/webidl-conversions-7.0.3.tgz", + "integrity": "sha512-CiJJvcRtIgzadHCYXw7dqEnMNRjhGZlYK05Mj9OyktqV8uVT8fD2BFOB7S1uwBE3Kj2Z+4UyPmFw/Ixgw/LAlA==" + }, + "node_modules/@types/whatwg-url": { + "version": "11.0.4", + "resolved": "https://registry.npmjs.org/@types/whatwg-url/-/whatwg-url-11.0.4.tgz", + "integrity": "sha512-lXCmTWSHJvf0TRSO58nm978b8HJ/EdsSsEKLd3ODHFjo+3VGAyyTp4v50nWvwtzBxSMQrVOK7tcuN0zGPLICMw==", + "dependencies": { + "@types/webidl-conversions": "*" + } + }, "node_modules/abbrev": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", @@ -2901,6 +2923,14 @@ "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7" } }, + "node_modules/bson": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/bson/-/bson-6.2.0.tgz", + "integrity": "sha512-ID1cI+7bazPDyL9wYy9GaQ8gEEohWvcUl/Yf0dIdutJxnmInEEyCsb4awy/OiBfall7zBA179Pahi3vCdFze3Q==", + "engines": { + "node": ">=16.20.1" + } + }, "node_modules/bytes": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", @@ -4164,6 +4194,11 @@ "node": ">= 0.6" } }, + "node_modules/memory-pager": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/memory-pager/-/memory-pager-1.5.0.tgz", + "integrity": "sha512-ZS4Bp4r/Zoeq6+NLJpP+0Zzm0pR8whtGPf1XExKLJBAczGMnSi3It14OiNCStjQjM6NU1okjQGSxgEZN8eBYKg==" + }, "node_modules/merge-descriptors": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", @@ -4218,6 +4253,60 @@ "node": "*" } }, + "node_modules/mongodb": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.3.0.tgz", + "integrity": "sha512-tt0KuGjGtLUhLoU263+xvQmPHEGTw5LbcNC73EoFRYgSHwZt5tsoJC110hDyO1kjQzpgNrpdcSza9PknWN4LrA==", + "dependencies": { + "@mongodb-js/saslprep": "^1.1.0", + "bson": "^6.2.0", + "mongodb-connection-string-url": "^3.0.0" + }, + "engines": { + "node": ">=16.20.1" + }, + "peerDependencies": { + "@aws-sdk/credential-providers": "^3.188.0", + "@mongodb-js/zstd": "^1.1.0", + "gcp-metadata": "^5.2.0", + "kerberos": "^2.0.1", + "mongodb-client-encryption": ">=6.0.0 <7", + "snappy": "^7.2.2", + "socks": "^2.7.1" + }, + "peerDependenciesMeta": { + "@aws-sdk/credential-providers": { + "optional": true + }, + "@mongodb-js/zstd": { + "optional": true + }, + "gcp-metadata": { + "optional": true + }, + "kerberos": { + "optional": true + }, + "mongodb-client-encryption": { + "optional": true + }, + "snappy": { + "optional": true + }, + "socks": { + "optional": true + } + } + }, + "node_modules/mongodb-connection-string-url": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/mongodb-connection-string-url/-/mongodb-connection-string-url-3.0.0.tgz", + "integrity": "sha512-t1Vf+m1I5hC2M5RJx/7AtxgABy1cZmIPQRMXw+gEIPn/cZNF3Oiy+l0UIypUwVB5trcWHq3crg2g3uAR9aAwsQ==", + "dependencies": { + "@types/whatwg-url": "^11.0.2", + "whatwg-url": "^13.0.0" + } + }, "node_modules/ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", @@ -4552,6 +4641,14 @@ "integrity": "sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w==", "dev": true }, + "node_modules/punycode": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", + "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", + "engines": { + "node": ">=6" + } + }, "node_modules/qs": { "version": "6.11.0", "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", @@ -5013,6 +5110,14 @@ "node": ">=0.10.0" } }, + "node_modules/sparse-bitfield": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/sparse-bitfield/-/sparse-bitfield-3.0.3.tgz", + "integrity": "sha512-kvzhi7vqKTfkh0PZU+2D2PIllw2ymqJKujUcyPMd9Y75Nv4nPbGJZXNhxsgdQab2BmlDct1YnfQCguEvHr7VsQ==", + "dependencies": { + "memory-pager": "^1.0.2" + } + }, "node_modules/statuses": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", @@ -5141,6 +5246,17 @@ "nodetouch": "bin/nodetouch.js" } }, + "node_modules/tr46": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-4.1.1.tgz", + "integrity": "sha512-2lv/66T7e5yNyhAAC4NaKe5nVavzuGJQVVtRYLyQ2OI8tsJ61PMLlelehb0wi2Hx6+hT/OJUWZcw8MjlSRnxvw==", + "dependencies": { + "punycode": "^2.3.0" + }, + "engines": { + "node": ">=14" + } + }, "node_modules/ts-node": { "version": "10.9.1", "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.1.tgz", @@ -5335,6 +5451,26 @@ "node": ">= 0.8" } }, + "node_modules/webidl-conversions": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz", + "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==", + "engines": { + "node": ">=12" + } + }, + "node_modules/whatwg-url": { + "version": "13.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-13.0.0.tgz", + "integrity": "sha512-9WWbymnqj57+XEuqADHrCJ2eSXzn8WXIW/YSGaZtb2WKAInQ6CHfaUUcTyyver0p8BDg5StLQq8h1vtZuwmOig==", + "dependencies": { + "tr46": "^4.1.1", + "webidl-conversions": "^7.0.0" + }, + "engines": { + "node": ">=16" + } + }, "node_modules/wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", @@ -6835,6 +6971,14 @@ "react-is": "^16.8.0 || ^17.0.0" } }, + "@mongodb-js/saslprep": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/@mongodb-js/saslprep/-/saslprep-1.1.4.tgz", + "integrity": "sha512-8zJ8N1x51xo9hwPh6AWnKdLGEC5N3lDa6kms1YHmFBoRhTpJR6HG8wWk0td1MVCu9cD4YBrvjZEtd5Obw0Fbnw==", + "requires": { + "sparse-bitfield": "^3.0.3" + } + }, "@mui/base": { "version": "5.0.0-beta.4", "resolved": "https://registry.npmjs.org/@mui/base/-/base-5.0.0-beta.4.tgz", @@ -7157,6 +7301,19 @@ "resolved": "https://registry.npmjs.org/@types/stylis/-/stylis-4.2.0.tgz", "integrity": "sha512-n4sx2bqL0mW1tvDf/loQ+aMX7GQD3lc3fkCMC55VFNDu/vBOabO+LTIeXKM14xK0ppk5TUGcWRjiSpIlUpghKw==" }, + "@types/webidl-conversions": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/@types/webidl-conversions/-/webidl-conversions-7.0.3.tgz", + "integrity": "sha512-CiJJvcRtIgzadHCYXw7dqEnMNRjhGZlYK05Mj9OyktqV8uVT8fD2BFOB7S1uwBE3Kj2Z+4UyPmFw/Ixgw/LAlA==" + }, + "@types/whatwg-url": { + "version": "11.0.4", + "resolved": "https://registry.npmjs.org/@types/whatwg-url/-/whatwg-url-11.0.4.tgz", + "integrity": "sha512-lXCmTWSHJvf0TRSO58nm978b8HJ/EdsSsEKLd3ODHFjo+3VGAyyTp4v50nWvwtzBxSMQrVOK7tcuN0zGPLICMw==", + "requires": { + "@types/webidl-conversions": "*" + } + }, "abbrev": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", @@ -7324,6 +7481,11 @@ "update-browserslist-db": "^1.0.11" } }, + "bson": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/bson/-/bson-6.2.0.tgz", + "integrity": "sha512-ID1cI+7bazPDyL9wYy9GaQ8gEEohWvcUl/Yf0dIdutJxnmInEEyCsb4awy/OiBfall7zBA179Pahi3vCdFze3Q==" + }, "bytes": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", @@ -8311,6 +8473,11 @@ "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==" }, + "memory-pager": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/memory-pager/-/memory-pager-1.5.0.tgz", + "integrity": "sha512-ZS4Bp4r/Zoeq6+NLJpP+0Zzm0pR8whtGPf1XExKLJBAczGMnSi3It14OiNCStjQjM6NU1okjQGSxgEZN8eBYKg==" + }, "merge-descriptors": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", @@ -8347,6 +8514,25 @@ "brace-expansion": "^1.1.7" } }, + "mongodb": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.3.0.tgz", + "integrity": "sha512-tt0KuGjGtLUhLoU263+xvQmPHEGTw5LbcNC73EoFRYgSHwZt5tsoJC110hDyO1kjQzpgNrpdcSza9PknWN4LrA==", + "requires": { + "@mongodb-js/saslprep": "^1.1.0", + "bson": "^6.2.0", + "mongodb-connection-string-url": "^3.0.0" + } + }, + "mongodb-connection-string-url": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/mongodb-connection-string-url/-/mongodb-connection-string-url-3.0.0.tgz", + "integrity": "sha512-t1Vf+m1I5hC2M5RJx/7AtxgABy1cZmIPQRMXw+gEIPn/cZNF3Oiy+l0UIypUwVB5trcWHq3crg2g3uAR9aAwsQ==", + "requires": { + "@types/whatwg-url": "^11.0.2", + "whatwg-url": "^13.0.0" + } + }, "ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", @@ -8585,6 +8771,11 @@ "integrity": "sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w==", "dev": true }, + "punycode": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", + "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==" + }, "qs": { "version": "6.11.0", "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", @@ -8945,6 +9136,14 @@ "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz", "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==" }, + "sparse-bitfield": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/sparse-bitfield/-/sparse-bitfield-3.0.3.tgz", + "integrity": "sha512-kvzhi7vqKTfkh0PZU+2D2PIllw2ymqJKujUcyPMd9Y75Nv4nPbGJZXNhxsgdQab2BmlDct1YnfQCguEvHr7VsQ==", + "requires": { + "memory-pager": "^1.0.2" + } + }, "statuses": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", @@ -9034,6 +9233,14 @@ "nopt": "~1.0.10" } }, + "tr46": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-4.1.1.tgz", + "integrity": "sha512-2lv/66T7e5yNyhAAC4NaKe5nVavzuGJQVVtRYLyQ2OI8tsJ61PMLlelehb0wi2Hx6+hT/OJUWZcw8MjlSRnxvw==", + "requires": { + "punycode": "^2.3.0" + } + }, "ts-node": { "version": "10.9.1", "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.1.tgz", @@ -9145,6 +9352,20 @@ "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==" }, + "webidl-conversions": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz", + "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==" + }, + "whatwg-url": { + "version": "13.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-13.0.0.tgz", + "integrity": "sha512-9WWbymnqj57+XEuqADHrCJ2eSXzn8WXIW/YSGaZtb2WKAInQ6CHfaUUcTyyver0p8BDg5StLQq8h1vtZuwmOig==", + "requires": { + "tr46": "^4.1.1", + "webidl-conversions": "^7.0.0" + } + }, "wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", diff --git a/package.json b/package.json index c6281c542..5e89fc6d6 100644 --- a/package.json +++ b/package.json @@ -9,6 +9,7 @@ "concurrently": "^7.5.0", "express": "^4.18.2", "google-map-react": "^2.2.1", + "mongodb": "^6.3.0", "mui-datatables": "^4.3.0", "styled-components": "^6.0.7" }, From f1590d26c858d0c108ad059eb15fa06437bfd2b2 Mon Sep 17 00:00:00 2001 From: Jasper Date: Sun, 7 Apr 2024 04:52:43 -0700 Subject: [PATCH 2/7] Initial commit, added file --- .env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env b/.env index 7347b0674..375613325 100644 --- a/.env +++ b/.env @@ -2,7 +2,7 @@ MONGO_USERNAME = SupportAdmin MONGO_PASSWORD = UVR2015 MONGO_DB_STRING = aiw5o28 -MONGO_LOCAL = true +MONGO_LOCAL = false # Server config SERVER_PORT = 9090 From d378b894f07165700065359bcb1a4e20635a87ad Mon Sep 17 00:00:00 2001 From: Jasper Date: Tue, 9 Apr 2024 06:27:44 -0700 Subject: [PATCH 3/7] Add config --- client/src/utils/view-provider.tsx | 8 +++++++- client/src/views/mission-replay-view.tsx | 10 ++++++++++ client/src/views/tabs/rocket-missions-tab.tsx | 18 ++++++++++++++++-- services/server/src/config/config.ts | 2 +- 4 files changed, 34 insertions(+), 4 deletions(-) diff --git a/client/src/utils/view-provider.tsx b/client/src/utils/view-provider.tsx index 6c031eab5..11f947bbd 100644 --- a/client/src/utils/view-provider.tsx +++ b/client/src/utils/view-provider.tsx @@ -7,12 +7,13 @@ import ComponentDocs from '../views/component-docs-view'; import RocketDetailsView from '../views/rocket-details-view'; import DataConfigView from '../views/data-config-view'; import ActiveMissionView from '../views/active-mission'; +import MissionReplayView from '../views/mission-replay-view'; import { ActiveMissionProvider } from './ActiveMissionContext'; import { SocketGateway } from './socket-context'; const ROCKET_SELECT_KEY = 'ROCKET_SELECT'; const COMPONENT_DOCUMENT_KEY = 'COMPONENT_DOCUMENT'; -// const MISSION_REPLAY_KEY = 'MISSION_REPLAY'; +const MISSION_REPLAY_KEY = 'MISSION_REPLAY'; // Rocket Details const ROCKET_DETAILS_KEY = 'ROCKET_DETAILS'; @@ -103,6 +104,11 @@ export default function ViewProvider(props: ViewProviderProps) { /> } + case MISSION_REPLAY_KEY: + return { + view: MISSION_REPLAY_KEY, + currentView: + } default: throw Error(`Unknown action type: ${action.type}`); } diff --git a/client/src/views/mission-replay-view.tsx b/client/src/views/mission-replay-view.tsx index e69de29bb..6e7258ce1 100644 --- a/client/src/views/mission-replay-view.tsx +++ b/client/src/views/mission-replay-view.tsx @@ -0,0 +1,10 @@ +// mission-replay-view.tsx +import { useState } from 'react'; + +import React from 'react'; + +const MissionReplayView: React.FC = () => { + return
hi
; +}; + +export default MissionReplayView; \ No newline at end of file diff --git a/client/src/views/tabs/rocket-missions-tab.tsx b/client/src/views/tabs/rocket-missions-tab.tsx index b43560e12..335387bd4 100644 --- a/client/src/views/tabs/rocket-missions-tab.tsx +++ b/client/src/views/tabs/rocket-missions-tab.tsx @@ -1,4 +1,4 @@ -import React, { useCallback, useEffect, useState } from 'react'; +import React, { useCallback, useEffect, useState, useContext } from 'react'; import { IMission, IRocketPopulated } from '../../utils/entities'; import MUIDataTable, { MUIDataTableOptions } from 'mui-datatables'; import { useActiveMission } from '../../utils/ActiveMissionContext'; @@ -60,17 +60,31 @@ const RocketDetailsTab: React.FC = (props: Props) => { const activeMissionContext = useActiveMission() + // const options: MUIDataTableOptions = { + // filter: true, + // responsive: 'standard', + // onRowClick: (rowData: any[], rowMeta: { dataIndex: number, rowIndex: number }) => { + // activeMissionContext.updateMission(rocket.Missions[rowMeta.dataIndex]); + // activeMissionContext.updateRocket(rocket); + // console.log(activeMissionContext.activeMission); + // onMissionClick(missions[rowMeta.dataIndex]); + // } + // }; + const options: MUIDataTableOptions = { filter: true, responsive: 'standard', onRowClick: (rowData: any[], rowMeta: { dataIndex: number, rowIndex: number }) => { + console.log('Navigating to mission replay view'); activeMissionContext.updateMission(rocket.Missions[rowMeta.dataIndex]); activeMissionContext.updateRocket(rocket); - console.log(activeMissionContext.activeMission); + // console.log(activeMissionContext.activeMission); onMissionClick(missions[rowMeta.dataIndex]); } }; + + const columns: ITableColumns[] = [ { name: "Name", diff --git a/services/server/src/config/config.ts b/services/server/src/config/config.ts index 4dcf76b92..12637ba01 100644 --- a/services/server/src/config/config.ts +++ b/services/server/src/config/config.ts @@ -18,7 +18,7 @@ const SERVER_PORT = process.env.SERVER_PORT ? Number(process.env.SERVER_PORT) : export const config = { mongo: { - url: MONGO_URL_LOCAL + url: MONGO_URL_REMOTE }, server: { port: SERVER_PORT From dff87ab60bc65b0bd62321131a4f29f85adc5078 Mon Sep 17 00:00:00 2001 From: Jasper Date: Tue, 9 Apr 2024 14:47:46 -0700 Subject: [PATCH 4/7] Small clean up --- client/src/views/mission-replay-view.tsx | 3 --- 1 file changed, 3 deletions(-) diff --git a/client/src/views/mission-replay-view.tsx b/client/src/views/mission-replay-view.tsx index 6e7258ce1..d26a2fa12 100644 --- a/client/src/views/mission-replay-view.tsx +++ b/client/src/views/mission-replay-view.tsx @@ -1,6 +1,3 @@ -// mission-replay-view.tsx -import { useState } from 'react'; - import React from 'react'; const MissionReplayView: React.FC = () => { From 674c31b11ffa69b77657d4ba0e412683a60081f1 Mon Sep 17 00:00:00 2001 From: Jasper Date: Sat, 13 Apr 2024 15:39:28 -0700 Subject: [PATCH 5/7] Add props --- client/src/utils/view-provider.tsx | 5 ++++- client/src/views/mission-replay-view.tsx | 17 +++++++++++++++-- client/src/views/tabs/rocket-missions-tab.tsx | 7 ++++--- 3 files changed, 23 insertions(+), 6 deletions(-) diff --git a/client/src/utils/view-provider.tsx b/client/src/utils/view-provider.tsx index 11f947bbd..92c77d387 100644 --- a/client/src/utils/view-provider.tsx +++ b/client/src/utils/view-provider.tsx @@ -107,7 +107,10 @@ export default function ViewProvider(props: ViewProviderProps) { case MISSION_REPLAY_KEY: return { view: MISSION_REPLAY_KEY, - currentView: + currentView: } default: throw Error(`Unknown action type: ${action.type}`); diff --git a/client/src/views/mission-replay-view.tsx b/client/src/views/mission-replay-view.tsx index d26a2fa12..8c0abf50a 100644 --- a/client/src/views/mission-replay-view.tsx +++ b/client/src/views/mission-replay-view.tsx @@ -1,7 +1,20 @@ import React from 'react'; -const MissionReplayView: React.FC = () => { - return
hi
; +interface MissionReplayViewProps { + toDataConfig: (id: string) => void; + setActiveView: () => void; + openActiveMission: (id: string) => void; +} + +const MissionReplayView: React.FC = ({ + toDataConfig, + setActiveView, + openActiveMission +}) => { + const a = toDataConfig + const b = setActiveView + const c = openActiveMission + return
hi
; }; export default MissionReplayView; \ No newline at end of file diff --git a/client/src/views/tabs/rocket-missions-tab.tsx b/client/src/views/tabs/rocket-missions-tab.tsx index 335387bd4..41e17c5d5 100644 --- a/client/src/views/tabs/rocket-missions-tab.tsx +++ b/client/src/views/tabs/rocket-missions-tab.tsx @@ -78,8 +78,9 @@ const RocketDetailsTab: React.FC = (props: Props) => { console.log('Navigating to mission replay view'); activeMissionContext.updateMission(rocket.Missions[rowMeta.dataIndex]); activeMissionContext.updateRocket(rocket); - // console.log(activeMissionContext.activeMission); - onMissionClick(missions[rowMeta.dataIndex]); + // onMissionClick(missions[rowMeta.dataIndex]); + //What do I put here to get the new view + dataConfigClick(missions[rowMeta.dataIndex]) } }; @@ -163,4 +164,4 @@ const RocketDetailsTab: React.FC = (props: Props) => { ); }; -export default RocketDetailsTab; \ No newline at end of file +export default RocketDetailsTab; From f23bb44e2df87a8497ea8c88995b316df313c3f3 Mon Sep 17 00:00:00 2001 From: Jasper Date: Sat, 13 Apr 2024 15:54:59 -0700 Subject: [PATCH 6/7] Clean up --- .env | 2 +- client/src/views/tabs/rocket-missions-tab.tsx | 17 ++--------------- services/server/src/config/config.ts | 2 +- 3 files changed, 4 insertions(+), 17 deletions(-) diff --git a/.env b/.env index 375613325..7347b0674 100644 --- a/.env +++ b/.env @@ -2,7 +2,7 @@ MONGO_USERNAME = SupportAdmin MONGO_PASSWORD = UVR2015 MONGO_DB_STRING = aiw5o28 -MONGO_LOCAL = false +MONGO_LOCAL = true # Server config SERVER_PORT = 9090 diff --git a/client/src/views/tabs/rocket-missions-tab.tsx b/client/src/views/tabs/rocket-missions-tab.tsx index 41e17c5d5..9cef84acd 100644 --- a/client/src/views/tabs/rocket-missions-tab.tsx +++ b/client/src/views/tabs/rocket-missions-tab.tsx @@ -59,18 +59,6 @@ const RocketDetailsTab: React.FC = (props: Props) => { const activeMissionContext = useActiveMission() - - // const options: MUIDataTableOptions = { - // filter: true, - // responsive: 'standard', - // onRowClick: (rowData: any[], rowMeta: { dataIndex: number, rowIndex: number }) => { - // activeMissionContext.updateMission(rocket.Missions[rowMeta.dataIndex]); - // activeMissionContext.updateRocket(rocket); - // console.log(activeMissionContext.activeMission); - // onMissionClick(missions[rowMeta.dataIndex]); - // } - // }; - const options: MUIDataTableOptions = { filter: true, responsive: 'standard', @@ -78,9 +66,8 @@ const RocketDetailsTab: React.FC = (props: Props) => { console.log('Navigating to mission replay view'); activeMissionContext.updateMission(rocket.Missions[rowMeta.dataIndex]); activeMissionContext.updateRocket(rocket); - // onMissionClick(missions[rowMeta.dataIndex]); - //What do I put here to get the new view - dataConfigClick(missions[rowMeta.dataIndex]) + //What do I put here to get the new view? + dataConfigClick={} } }; diff --git a/services/server/src/config/config.ts b/services/server/src/config/config.ts index 12637ba01..4dcf76b92 100644 --- a/services/server/src/config/config.ts +++ b/services/server/src/config/config.ts @@ -18,7 +18,7 @@ const SERVER_PORT = process.env.SERVER_PORT ? Number(process.env.SERVER_PORT) : export const config = { mongo: { - url: MONGO_URL_REMOTE + url: MONGO_URL_LOCAL }, server: { port: SERVER_PORT From 7663d215ed9bbd1df62672f455e63b2adf9bc1a4 Mon Sep 17 00:00:00 2001 From: Jasper Date: Sun, 14 Apr 2024 11:07:21 -0700 Subject: [PATCH 7/7] Update --- client/src/utils/view-provider.tsx | 1 + client/src/views/mission-replay-view.tsx | 9 ++++++--- client/src/views/rocket-details-view.tsx | 4 ++-- client/src/views/tabs/rocket-missions-tab.tsx | 2 +- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/client/src/utils/view-provider.tsx b/client/src/utils/view-provider.tsx index 92c77d387..61d489c71 100644 --- a/client/src/utils/view-provider.tsx +++ b/client/src/utils/view-provider.tsx @@ -108,6 +108,7 @@ export default function ViewProvider(props: ViewProviderProps) { return { view: MISSION_REPLAY_KEY, currentView: diff --git a/client/src/views/mission-replay-view.tsx b/client/src/views/mission-replay-view.tsx index 8c0abf50a..b60d512e4 100644 --- a/client/src/views/mission-replay-view.tsx +++ b/client/src/views/mission-replay-view.tsx @@ -1,19 +1,22 @@ import React from 'react'; interface MissionReplayViewProps { + rocketID: string; toDataConfig: (id: string) => void; setActiveView: () => void; openActiveMission: (id: string) => void; } const MissionReplayView: React.FC = ({ + rocketID, toDataConfig, setActiveView, openActiveMission }) => { - const a = toDataConfig - const b = setActiveView - const c = openActiveMission + const a = rocketID + const b = toDataConfig + const c = setActiveView + const d = openActiveMission return
hi
; }; diff --git a/client/src/views/rocket-details-view.tsx b/client/src/views/rocket-details-view.tsx index 4e6932b48..95d81f5e3 100644 --- a/client/src/views/rocket-details-view.tsx +++ b/client/src/views/rocket-details-view.tsx @@ -51,9 +51,9 @@ function TabPanel(props: TabPanelProps) { interface RocketDetailsProps { rocketID: string; - openActiveMission: (view: string) => void; - setActiveView: (key: string) => void; toDataConfig: (id: string) => void; + setActiveView: (key: string) => void; + openActiveMission: (view: string) => void; } export default function RocketDetailsView(props: RocketDetailsProps) { diff --git a/client/src/views/tabs/rocket-missions-tab.tsx b/client/src/views/tabs/rocket-missions-tab.tsx index 9cef84acd..801080d46 100644 --- a/client/src/views/tabs/rocket-missions-tab.tsx +++ b/client/src/views/tabs/rocket-missions-tab.tsx @@ -67,7 +67,7 @@ const RocketDetailsTab: React.FC = (props: Props) => { activeMissionContext.updateMission(rocket.Missions[rowMeta.dataIndex]); activeMissionContext.updateRocket(rocket); //What do I put here to get the new view? - dataConfigClick={} + dataConfigClick={ROCKET_DETAILS_KEY} } };