Merge branch 'release/0.9.0'
This commit is contained in:
@@ -8,3 +8,10 @@ REACT_APP_OTA_SERVICE_URL=https://gw.cec-euprd.fiskerinc.com/ota_update
|
|||||||
REACT_APP_SECURITY_DLL_URL=https://assets.fiskerdps.com/cloud-supplier/fisker_security_32.dll
|
REACT_APP_SECURITY_DLL_URL=https://assets.fiskerdps.com/cloud-supplier/fisker_security_32.dll
|
||||||
REACT_APP_SECURITY_DLL_64_URL=https://assets.fiskerdps.com/cloud-supplier/fisker_security_64.dll
|
REACT_APP_SECURITY_DLL_64_URL=https://assets.fiskerdps.com/cloud-supplier/fisker_security_64.dll
|
||||||
REACT_APP_SUPERSET_URL=https://superset.cec-euprd.fiskerinc.com
|
REACT_APP_SUPERSET_URL=https://superset.cec-euprd.fiskerinc.com
|
||||||
|
REACT_APP_ROLE_CREATE=e92f2b3e-1b80-42e5-9483-8ae648224dc6
|
||||||
|
REACT_APP_ROLE_READ_ONLY=9af2d8c0-c26d-4d6d-bbd1-ac53cbd37ebc
|
||||||
|
REACT_APP_ROLE_DELETE=bfd1cccc-213a-4f31-b3d1-6e685976aec8
|
||||||
|
REACT_APP_ROLE_GENERATE_CERTIFICATE=9af2d8c0-c26d-4d6d-bbd1-ac53cbd37ebc
|
||||||
|
REACT_APP_ROLE_MANUFACTURE=3412e11a-a2d1-4355-be3e-ef9aa5065b69
|
||||||
|
REACT_APP_ROLE_SUPPLIER_APPROVER=a6c9805e-80b2-42b2-bfbb-9df52e5504d8
|
||||||
|
REACT_APP_ECCKEY_ENV=
|
||||||
|
|||||||
@@ -8,3 +8,10 @@ REACT_APP_OTA_SERVICE_URL=https://gw.cec-prd.fiskerinc.com/ota_update
|
|||||||
REACT_APP_SECURITY_DLL_URL=https://assets.fiskerdps.com/cloud-supplier/fisker_security_32.dll
|
REACT_APP_SECURITY_DLL_URL=https://assets.fiskerdps.com/cloud-supplier/fisker_security_32.dll
|
||||||
REACT_APP_SECURITY_DLL_64_URL=https://assets.fiskerdps.com/cloud-supplier/fisker_security_64.dll
|
REACT_APP_SECURITY_DLL_64_URL=https://assets.fiskerdps.com/cloud-supplier/fisker_security_64.dll
|
||||||
REACT_APP_SUPERSET_URL=https://superset.cec-prd.fiskerinc.com
|
REACT_APP_SUPERSET_URL=https://superset.cec-prd.fiskerinc.com
|
||||||
|
REACT_APP_ROLE_CREATE=e92f2b3e-1b80-42e5-9483-8ae648224dc6
|
||||||
|
REACT_APP_ROLE_READ_ONLY=9af2d8c0-c26d-4d6d-bbd1-ac53cbd37ebc
|
||||||
|
REACT_APP_ROLE_DELETE=bfd1cccc-213a-4f31-b3d1-6e685976aec8
|
||||||
|
REACT_APP_ROLE_GENERATE_CERTIFICATE=9af2d8c0-c26d-4d6d-bbd1-ac53cbd37ebc
|
||||||
|
REACT_APP_ROLE_MANUFACTURE=3412e11a-a2d1-4355-be3e-ef9aa5065b69
|
||||||
|
REACT_APP_ROLE_SUPPLIER_APPROVER=a6c9805e-80b2-42b2-bfbb-9df52e5504d8
|
||||||
|
REACT_APP_ECCKEY_ENV=
|
||||||
|
|||||||
7
.env.dev
7
.env.dev
@@ -8,3 +8,10 @@ REACT_APP_OTA_SERVICE_URL=https://dev-gw.cloud.fiskerinc.com/ota_update
|
|||||||
REACT_APP_SECURITY_DLL_URL=https://assets.fiskerdps.com/cloud-supplier/fisker_security_32.dll
|
REACT_APP_SECURITY_DLL_URL=https://assets.fiskerdps.com/cloud-supplier/fisker_security_32.dll
|
||||||
REACT_APP_SECURITY_DLL_64_URL=https://assets.fiskerdps.com/cloud-supplier/fisker_security_64.dll
|
REACT_APP_SECURITY_DLL_64_URL=https://assets.fiskerdps.com/cloud-supplier/fisker_security_64.dll
|
||||||
REACT_APP_SUPERSET_URL=https://dev-superset-new.cloud.fiskerinc.com
|
REACT_APP_SUPERSET_URL=https://dev-superset-new.cloud.fiskerinc.com
|
||||||
|
REACT_APP_ROLE_CREATE=efcc3025-e2d8-4212-8227-805c7be39d2c
|
||||||
|
REACT_APP_ROLE_READ_ONLY=a729bbd4-2038-4649-9127-16782bb1e701
|
||||||
|
REACT_APP_ROLE_DELETE=8f78dce7-f5f9-4033-a10c-c9c7408bfcfe
|
||||||
|
REACT_APP_ROLE_GENERATE_CERTIFICATE=746f34b0-9ba0-4b5d-8d84-0256a9c8e390
|
||||||
|
REACT_APP_ROLE_MANUFACTURE=3412e11a-a2d1-4355-be3e-ef9aa5065b69
|
||||||
|
REACT_APP_ROLE_SUPPLIER_APPROVER=a6c9805e-80b2-42b2-bfbb-9df52e5504d8
|
||||||
|
REACT_APP_ECCKEY_ENV=stage,prod
|
||||||
|
|||||||
@@ -8,4 +8,10 @@ REACT_APP_OTA_SERVICE_URL=http://localhost/ota_update
|
|||||||
REACT_APP_SECURITY_DLL_URL=https://assets.fiskerdps.com/cloud-supplier/fisker_security_32.dll
|
REACT_APP_SECURITY_DLL_URL=https://assets.fiskerdps.com/cloud-supplier/fisker_security_32.dll
|
||||||
REACT_APP_SECURITY_DLL_64_URL=https://assets.fiskerdps.com/cloud-supplier/fisker_security_64.dll
|
REACT_APP_SECURITY_DLL_64_URL=https://assets.fiskerdps.com/cloud-supplier/fisker_security_64.dll
|
||||||
REACT_APP_SUPERSET_URL=https://dev-superset-new.cloud.fiskerinc.com
|
REACT_APP_SUPERSET_URL=https://dev-superset-new.cloud.fiskerinc.com
|
||||||
|
REACT_APP_ROLE_CREATE=efcc3025-e2d8-4212-8227-805c7be39d2c
|
||||||
|
REACT_APP_ROLE_READ_ONLY=a729bbd4-2038-4649-9127-16782bb1e701
|
||||||
|
REACT_APP_ROLE_DELETE=8f78dce7-f5f9-4033-a10c-c9c7408bfcfe
|
||||||
|
REACT_APP_ROLE_GENERATE_CERTIFICATE=746f34b0-9ba0-4b5d-8d84-0256a9c8e390
|
||||||
|
REACT_APP_ROLE_MANUFACTURE=3412e11a-a2d1-4355-be3e-ef9aa5065b69
|
||||||
|
REACT_APP_ROLE_SUPPLIER_APPROVER=a6c9805e-80b2-42b2-bfbb-9df52e5504d8
|
||||||
|
REACT_APP_ECCKEY_ENV=dev,stage,prod
|
||||||
|
|||||||
7
.env.prd
7
.env.prd
@@ -8,3 +8,10 @@ REACT_APP_OTA_SERVICE_URL=https://gw.cloud.fiskerinc.com/ota_update
|
|||||||
REACT_APP_SECURITY_DLL_URL=https://assets.fiskerdps.com/cloud-supplier/fisker_security_32.dll
|
REACT_APP_SECURITY_DLL_URL=https://assets.fiskerdps.com/cloud-supplier/fisker_security_32.dll
|
||||||
REACT_APP_SECURITY_DLL_64_URL=https://assets.fiskerdps.com/cloud-supplier/fisker_security_64.dll
|
REACT_APP_SECURITY_DLL_64_URL=https://assets.fiskerdps.com/cloud-supplier/fisker_security_64.dll
|
||||||
REACT_APP_SUPERSET_URL=https://superset.cloud.fiskerinc.com
|
REACT_APP_SUPERSET_URL=https://superset.cloud.fiskerinc.com
|
||||||
|
REACT_APP_ROLE_CREATE=efcc3025-e2d8-4212-8227-805c7be39d2c
|
||||||
|
REACT_APP_ROLE_READ_ONLY=a729bbd4-2038-4649-9127-16782bb1e701
|
||||||
|
REACT_APP_ROLE_DELETE=8f78dce7-f5f9-4033-a10c-c9c7408bfcfe
|
||||||
|
REACT_APP_ROLE_GENERATE_CERTIFICATE=746f34b0-9ba0-4b5d-8d84-0256a9c8e390
|
||||||
|
REACT_APP_ROLE_MANUFACTURE=3412e11a-a2d1-4355-be3e-ef9aa5065b69
|
||||||
|
REACT_APP_ROLE_SUPPLIER_APPROVER=a6c9805e-80b2-42b2-bfbb-9df52e5504d8
|
||||||
|
REACT_APP_ECCKEY_ENV=stage
|
||||||
|
|||||||
7
.env.stg
7
.env.stg
@@ -8,3 +8,10 @@ REACT_APP_OTA_SERVICE_URL=https://stg-gw.cloud.fiskerinc.com/ota_update
|
|||||||
REACT_APP_SECURITY_DLL_URL=https://assets.fiskerdps.com/cloud-supplier/fisker_security_32.dll
|
REACT_APP_SECURITY_DLL_URL=https://assets.fiskerdps.com/cloud-supplier/fisker_security_32.dll
|
||||||
REACT_APP_SECURITY_DLL_64_URL=https://assets.fiskerdps.com/cloud-supplier/fisker_security_64.dll
|
REACT_APP_SECURITY_DLL_64_URL=https://assets.fiskerdps.com/cloud-supplier/fisker_security_64.dll
|
||||||
REACT_APP_SUPERSET_URL=https://stg-superset.cloud.fiskerinc.com
|
REACT_APP_SUPERSET_URL=https://stg-superset.cloud.fiskerinc.com
|
||||||
|
REACT_APP_ROLE_CREATE=efcc3025-e2d8-4212-8227-805c7be39d2c
|
||||||
|
REACT_APP_ROLE_READ_ONLY=a729bbd4-2038-4649-9127-16782bb1e701
|
||||||
|
REACT_APP_ROLE_DELETE=8f78dce7-f5f9-4033-a10c-c9c7408bfcfe
|
||||||
|
REACT_APP_ROLE_GENERATE_CERTIFICATE=746f34b0-9ba0-4b5d-8d84-0256a9c8e390
|
||||||
|
REACT_APP_ROLE_MANUFACTURE=3412e11a-a2d1-4355-be3e-ef9aa5065b69
|
||||||
|
REACT_APP_ROLE_SUPPLIER_APPROVER=a6c9805e-80b2-42b2-bfbb-9df52e5504d8
|
||||||
|
REACT_APP_ECCKEY_ENV=prod
|
||||||
|
|||||||
@@ -8,3 +8,10 @@ REACT_APP_OTA_SERVICE_URL=http://localhost/ota_update
|
|||||||
REACT_APP_SECURITY_DLL_URL=https://assets.fiskerdps.com/cloud-supplier/fisker_security_32.dll
|
REACT_APP_SECURITY_DLL_URL=https://assets.fiskerdps.com/cloud-supplier/fisker_security_32.dll
|
||||||
REACT_APP_SECURITY_DLL_64_URL=https://assets.fiskerdps.com/cloud-supplier/fisker_security_64.dll
|
REACT_APP_SECURITY_DLL_64_URL=https://assets.fiskerdps.com/cloud-supplier/fisker_security_64.dll
|
||||||
REACT_APP_SUPERSET_URL=https://dev-superset.cloud.fiskerinc.com
|
REACT_APP_SUPERSET_URL=https://dev-superset.cloud.fiskerinc.com
|
||||||
|
REACT_APP_ROLE_CREATE=efcc3025-e2d8-4212-8227-805c7be39d2c
|
||||||
|
REACT_APP_ROLE_READ_ONLY=a729bbd4-2038-4649-9127-16782bb1e701
|
||||||
|
REACT_APP_ROLE_DELETE=8f78dce7-f5f9-4033-a10c-c9c7408bfcfe
|
||||||
|
REACT_APP_ROLE_GENERATE_CERTIFICATE=746f34b0-9ba0-4b5d-8d84-0256a9c8e390
|
||||||
|
REACT_APP_ROLE_MANUFACTURE=3412e11a-a2d1-4355-be3e-ef9aa5065b69
|
||||||
|
REACT_APP_ROLE_SUPPLIER_APPROVER=a6c9805e-80b2-42b2-bfbb-9df52e5504d8
|
||||||
|
REACT_APP_ECCKEY_ENV=dev,stage,prod
|
||||||
|
|||||||
@@ -24,12 +24,7 @@ spec:
|
|||||||
- name: {{ .Chart.Name }}
|
- name: {{ .Chart.Name }}
|
||||||
image: "{{ .Values.image.registry }}/{{ .Values.image.name }}:{{ .Values.image.tag}}"
|
image: "{{ .Values.image.registry }}/{{ .Values.image.name }}:{{ .Values.image.tag}}"
|
||||||
resources:
|
resources:
|
||||||
requests:
|
{{- toYaml .Values.resources | nindent 12 }}
|
||||||
cpu: {{ .Values.resources.requests.cpu }}
|
|
||||||
memory: {{ .Values.resources.requests.memory }}
|
|
||||||
limits:
|
|
||||||
cpu: {{ .Values.resources.limits.cpu }}
|
|
||||||
memory: {{ .Values.resources.limits.memory }}
|
|
||||||
env:
|
env:
|
||||||
# non-secret env vars
|
# non-secret env vars
|
||||||
{{- range $name, $value := $.Values.env }}
|
{{- range $name, $value := $.Values.env }}
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ resources:
|
|||||||
cpu: 100m
|
cpu: 100m
|
||||||
memory: 128Mi
|
memory: 128Mi
|
||||||
limits:
|
limits:
|
||||||
cpu: 250m
|
#cpu: 250m
|
||||||
memory: 256Mi
|
memory: 256Mi
|
||||||
|
|
||||||
replicas: 3
|
replicas: 3
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ resources:
|
|||||||
cpu: 100m
|
cpu: 100m
|
||||||
memory: 128Mi
|
memory: 128Mi
|
||||||
limits:
|
limits:
|
||||||
cpu: 250m
|
#cpu: 250m
|
||||||
memory: 256Mi
|
memory: 256Mi
|
||||||
|
|
||||||
replicas: 3
|
replicas: 3
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ resources:
|
|||||||
cpu: 100m
|
cpu: 100m
|
||||||
memory: 128Mi
|
memory: 128Mi
|
||||||
limits:
|
limits:
|
||||||
cpu: 250m
|
#cpu: 250m
|
||||||
memory: 256Mi
|
memory: 256Mi
|
||||||
|
|
||||||
replicas: 1
|
replicas: 1
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ resources:
|
|||||||
cpu: 100m
|
cpu: 100m
|
||||||
memory: 128Mi
|
memory: 128Mi
|
||||||
limits:
|
limits:
|
||||||
cpu: 250m
|
#cpu: 250m
|
||||||
memory: 256Mi
|
memory: 256Mi
|
||||||
|
|
||||||
replicas: 3
|
replicas: 3
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ resources:
|
|||||||
cpu: 100m
|
cpu: 100m
|
||||||
memory: 128Mi
|
memory: 128Mi
|
||||||
limits:
|
limits:
|
||||||
cpu: 250m
|
#cpu: 250m
|
||||||
memory: 256Mi
|
memory: 256Mi
|
||||||
|
|
||||||
replicas: 1
|
replicas: 1
|
||||||
|
|||||||
@@ -128,7 +128,8 @@ const TRexLogsTable = ({ vin, token, classes }) => {
|
|||||||
const [logs, setLogs] = useState([]);
|
const [logs, setLogs] = useState([]);
|
||||||
const [pageIndex, setPageIndex] = useState(0);
|
const [pageIndex, setPageIndex] = useState(0);
|
||||||
const [pageSize, setPageSize] = useState(DEFAULT_PAGE_SIZE);
|
const [pageSize, setPageSize] = useState(DEFAULT_PAGE_SIZE);
|
||||||
const [selectedDate, setSelectedDate] = useState(new Date());
|
const local_date = new Date()
|
||||||
|
const [selectedDate, setSelectedDate] = useState(new Date(local_date.getUTCFullYear(), local_date.getUTCMonth(), local_date.getUTCDate()));
|
||||||
const [total, setTotal] = useState(0);
|
const [total, setTotal] = useState(0);
|
||||||
const { setMessage } = useStatusContext();
|
const { setMessage } = useStatusContext();
|
||||||
|
|
||||||
@@ -140,7 +141,7 @@ const TRexLogsTable = ({ vin, token, classes }) => {
|
|||||||
return pageSize * pageIndex + pageSize
|
return pageSize * pageIndex + pageSize
|
||||||
}
|
}
|
||||||
const getReadPercentage = () => {
|
const getReadPercentage = () => {
|
||||||
return (currentOffset * 100 / blobSize).toFixed(2);
|
return (currentOffset * 100 / blobSize);
|
||||||
}
|
}
|
||||||
const getFilteredLogs = (logs) => {
|
const getFilteredLogs = (logs) => {
|
||||||
return logs.filter(log => currectLogLevels[log.level] === true)
|
return logs.filter(log => currectLogLevels[log.level] === true)
|
||||||
@@ -182,6 +183,19 @@ const TRexLogsTable = ({ vin, token, classes }) => {
|
|||||||
return fetched
|
return fetched
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const downloadFile = async () => {
|
||||||
|
let day = formatTwoDigit(selectedDate.getDate())
|
||||||
|
let month = formatTwoDigit(selectedDate.getMonth() + 1)// 0 Indexed
|
||||||
|
let year = selectedDate.getFullYear()
|
||||||
|
|
||||||
|
let result = await api.getLogFileLink({ vin, year, month, day }, token)
|
||||||
|
window.open(result['Link'], '_blank')
|
||||||
|
}
|
||||||
|
|
||||||
|
const formatTwoDigit = (num) => {
|
||||||
|
return num < 10 ? '0' + num : '' + num
|
||||||
|
}
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
(async () => {
|
(async () => {
|
||||||
try {
|
try {
|
||||||
@@ -258,7 +272,7 @@ const TRexLogsTable = ({ vin, token, classes }) => {
|
|||||||
format="yyyy/MM/dd"
|
format="yyyy/MM/dd"
|
||||||
margin="normal"
|
margin="normal"
|
||||||
id="date-picker-inline"
|
id="date-picker-inline"
|
||||||
label="Choose date"
|
label="Choose date (UTC)"
|
||||||
value={selectedDate}
|
value={selectedDate}
|
||||||
onChange={handleNewDate}
|
onChange={handleNewDate}
|
||||||
KeyboardButtonProps={{
|
KeyboardButtonProps={{
|
||||||
@@ -267,10 +281,11 @@ const TRexLogsTable = ({ vin, token, classes }) => {
|
|||||||
/>
|
/>
|
||||||
</MuiPickersUtilsProvider>
|
</MuiPickersUtilsProvider>
|
||||||
</TableCell>
|
</TableCell>
|
||||||
|
|
||||||
<TableCell align="center">
|
<TableCell align="center">
|
||||||
{
|
{
|
||||||
blobSize === 0 ? `No logs for ${fromatDateForRequest(selectedDate)}` :
|
blobSize === 0 ? `No logs for ${fromatDateForRequest(selectedDate)}` :
|
||||||
`Read ${getReadPercentage()}% of logs`
|
`Read ${getReadPercentage().toFixed(2)}% of logs`
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
<LinearProgress
|
<LinearProgress
|
||||||
@@ -278,7 +293,10 @@ const TRexLogsTable = ({ vin, token, classes }) => {
|
|||||||
align="center"
|
align="center"
|
||||||
value={getReadPercentage()} />
|
value={getReadPercentage()} />
|
||||||
}
|
}
|
||||||
|
<br></br>
|
||||||
|
<button onClick={downloadFile} disabled={blobSize === 0}>Download Log File</button>
|
||||||
</TableCell>
|
</TableCell>
|
||||||
|
|
||||||
</TableRow>
|
</TableRow>
|
||||||
</Table>
|
</Table>
|
||||||
|
|
||||||
@@ -293,7 +311,7 @@ const TRexLogsTable = ({ vin, token, classes }) => {
|
|||||||
</TableRow>
|
</TableRow>
|
||||||
</TableHead >
|
</TableHead >
|
||||||
<TableBody>
|
<TableBody>
|
||||||
{getFilteredLogs(logs).slice(-getDesiredSize(), (pageIndex === 0 ? undefined : -(pageSize * pageIndex))).map((log, i) => (
|
{getFilteredLogs(logs).slice(-getDesiredSize(), (pageIndex === 0 ? undefined : -(pageSize * pageIndex))).reverse().map((log, i) => (
|
||||||
<TableRow key={log.trex_timestamp + log.cloud_timestamp} >
|
<TableRow key={log.trex_timestamp + log.cloud_timestamp} >
|
||||||
<TableCell align="center">{log.level}</TableCell>
|
<TableCell align="center">{log.level}</TableCell>
|
||||||
<TableCell align="center" style={{ wordBreak: "break-all" }}>{log.trex_timestamp}</TableCell>
|
<TableCell align="center" style={{ wordBreak: "break-all" }}>{log.trex_timestamp}</TableCell>
|
||||||
|
|||||||
@@ -1,15 +1,15 @@
|
|||||||
import DateFnsUtils from '@date-io/date-fns';
|
import DateFnsUtils from '@date-io/date-fns';
|
||||||
import { Button, CircularProgress, Grid, TableFooter, TablePagination, TableCell, Table, TableRow, TableBody} from "@material-ui/core";
|
import { Button, CircularProgress, Grid, Table, TableBody, TableCell, TableFooter, TablePagination, TableRow } from "@material-ui/core";
|
||||||
import { KeyboardDatePicker, MuiPickersUtilsProvider } from '@material-ui/pickers';
|
import { KeyboardDatePicker, MuiPickersUtilsProvider } from '@material-ui/pickers';
|
||||||
|
import clsx from "clsx";
|
||||||
import React, { useEffect, useState } from "react";
|
import React, { useEffect, useState } from "react";
|
||||||
import { logger } from "../../../services/monitoring";
|
import { logger } from "../../../services/monitoring";
|
||||||
import { DTCTimelineProvider, useDTCTimelineContext } from '../../Contexts/DTCTimelineContext';
|
import { DTCTimelineProvider, useDTCTimelineContext } from '../../Contexts/DTCTimelineContext';
|
||||||
import { useStatusContext } from "../../Contexts/StatusContext";
|
import { useStatusContext } from "../../Contexts/StatusContext";
|
||||||
import { useUserContext } from "../../Contexts/UserContext";
|
import { useUserContext } from "../../Contexts/UserContext";
|
||||||
import { useLocalStorage } from "../../useLocalStorage";
|
|
||||||
import clsx from "clsx";
|
|
||||||
import TableHeaderSortable from "../../Table/HeaderSortable";
|
|
||||||
import SearchField from '../../Controls/SearchField';
|
import SearchField from '../../Controls/SearchField';
|
||||||
|
import TableHeaderSortable from "../../Table/HeaderSortable";
|
||||||
|
import { useLocalStorage } from "../../useLocalStorage";
|
||||||
import useStyles from "../../useStyles";
|
import useStyles from "../../useStyles";
|
||||||
|
|
||||||
const MainForm = ({ vin }) => {
|
const MainForm = ({ vin }) => {
|
||||||
@@ -41,8 +41,12 @@ const MainForm = ({ vin }) => {
|
|||||||
label: "ECU",
|
label: "ECU",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
id: "dtc",
|
id: "trouble_code",
|
||||||
label: "DTC",
|
label: "Trouble Code",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: "status_byte",
|
||||||
|
label: "Status Code",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
id: "epoch_usec",
|
id: "epoch_usec",
|
||||||
@@ -190,7 +194,8 @@ const MainForm = ({ vin }) => {
|
|||||||
</TableCell>
|
</TableCell>
|
||||||
<TableCell>{dtc.vin}</TableCell>
|
<TableCell>{dtc.vin}</TableCell>
|
||||||
<TableCell>{dtc.ecu_name}</TableCell>
|
<TableCell>{dtc.ecu_name}</TableCell>
|
||||||
<TableCell>{dtc.dtc}</TableCell>
|
<TableCell>{dtc.trouble_code}</TableCell>
|
||||||
|
<TableCell>{dtc.status_byte}</TableCell>
|
||||||
<TableCell>{formatDate(dtc.epoch_usec)}</TableCell>
|
<TableCell>{formatDate(dtc.epoch_usec)}</TableCell>
|
||||||
</TableRow>
|
</TableRow>
|
||||||
))}
|
))}
|
||||||
|
|||||||
@@ -218,6 +218,122 @@ exports[`Manifest Details Component Render 1`] = `
|
|||||||
</fieldset>
|
</fieldset>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div
|
||||||
|
class="MuiFormControl-root MuiFormControl-marginNormal"
|
||||||
|
>
|
||||||
|
<label
|
||||||
|
class="MuiFormLabel-root MuiInputLabel-root makeStyles-whiteBackground-0 MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-outlined"
|
||||||
|
data-shrink="false"
|
||||||
|
>
|
||||||
|
Rollback
|
||||||
|
</label>
|
||||||
|
<div
|
||||||
|
class="MuiInputBase-root MuiOutlinedInput-root MuiInputBase-formControl"
|
||||||
|
>
|
||||||
|
<select
|
||||||
|
aria-invalid="false"
|
||||||
|
class="MuiSelect-root MuiSelect-select MuiSelect-outlined MuiInputBase-input MuiOutlinedInput-input"
|
||||||
|
>
|
||||||
|
<option
|
||||||
|
value="true"
|
||||||
|
>
|
||||||
|
True
|
||||||
|
</option>
|
||||||
|
<option
|
||||||
|
value="false"
|
||||||
|
>
|
||||||
|
False
|
||||||
|
</option>
|
||||||
|
</select>
|
||||||
|
<svg
|
||||||
|
aria-hidden="true"
|
||||||
|
class="MuiSvgIcon-root MuiSelect-icon MuiSelect-iconOutlined"
|
||||||
|
focusable="false"
|
||||||
|
viewBox="0 0 24 24"
|
||||||
|
>
|
||||||
|
<path
|
||||||
|
d="M7 10l5 5 5-5z"
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
|
<fieldset
|
||||||
|
aria-hidden="true"
|
||||||
|
class="PrivateNotchedOutline-root-0 MuiOutlinedInput-notchedOutline"
|
||||||
|
style="padding-left: 8px;"
|
||||||
|
>
|
||||||
|
<legend
|
||||||
|
class="PrivateNotchedOutline-legend-0"
|
||||||
|
style="width: 0.01px;"
|
||||||
|
>
|
||||||
|
<span>
|
||||||
|
|
||||||
|
</span>
|
||||||
|
</legend>
|
||||||
|
</fieldset>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div
|
||||||
|
class="MuiFormControl-root MuiFormControl-marginNormal"
|
||||||
|
>
|
||||||
|
<label
|
||||||
|
class="MuiFormLabel-root MuiInputLabel-root makeStyles-whiteBackground-0 MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-shrink MuiInputLabel-outlined MuiFormLabel-filled"
|
||||||
|
data-shrink="true"
|
||||||
|
>
|
||||||
|
ECC Keys
|
||||||
|
</label>
|
||||||
|
<div
|
||||||
|
class="MuiInputBase-root MuiOutlinedInput-root MuiInputBase-formControl"
|
||||||
|
>
|
||||||
|
<select
|
||||||
|
aria-invalid="false"
|
||||||
|
class="MuiSelect-root MuiSelect-select MuiSelect-outlined MuiInputBase-input MuiOutlinedInput-input"
|
||||||
|
>
|
||||||
|
<option
|
||||||
|
value="current"
|
||||||
|
>
|
||||||
|
local
|
||||||
|
</option>
|
||||||
|
<option
|
||||||
|
value="dev"
|
||||||
|
>
|
||||||
|
dev
|
||||||
|
</option>
|
||||||
|
<option
|
||||||
|
value="stage"
|
||||||
|
>
|
||||||
|
stage
|
||||||
|
</option>
|
||||||
|
<option
|
||||||
|
value="prod"
|
||||||
|
>
|
||||||
|
prod
|
||||||
|
</option>
|
||||||
|
</select>
|
||||||
|
<svg
|
||||||
|
aria-hidden="true"
|
||||||
|
class="MuiSvgIcon-root MuiSelect-icon MuiSelect-iconOutlined"
|
||||||
|
focusable="false"
|
||||||
|
viewBox="0 0 24 24"
|
||||||
|
>
|
||||||
|
<path
|
||||||
|
d="M7 10l5 5 5-5z"
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
|
<fieldset
|
||||||
|
aria-hidden="true"
|
||||||
|
class="PrivateNotchedOutline-root-0 MuiOutlinedInput-notchedOutline"
|
||||||
|
style="padding-left: 8px;"
|
||||||
|
>
|
||||||
|
<legend
|
||||||
|
class="PrivateNotchedOutline-legend-0"
|
||||||
|
style="width: 0.01px;"
|
||||||
|
>
|
||||||
|
<span>
|
||||||
|
|
||||||
|
</span>
|
||||||
|
</legend>
|
||||||
|
</fieldset>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
<button
|
<button
|
||||||
aria-label="send command"
|
aria-label="send command"
|
||||||
class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-0 MuiButton-containedPrimary MuiButton-fullWidth"
|
class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-0 MuiButton-containedPrimary MuiButton-fullWidth"
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ import { Button, FormControl, TextField } from "@material-ui/core";
|
|||||||
import React, { useEffect, useState } from "react";
|
import React, { useEffect, useState } from "react";
|
||||||
import { Redirect } from "react-router";
|
import { Redirect } from "react-router";
|
||||||
import { useParams } from "react-router-dom";
|
import { useParams } from "react-router-dom";
|
||||||
|
import { ENVS } from "../../../utils/key-envs";
|
||||||
import { ManifestsProvider, useManifestsContext } from "../../Contexts/ManifestsContext";
|
import { ManifestsProvider, useManifestsContext } from "../../Contexts/ManifestsContext";
|
||||||
import { useStatusContext } from "../../Contexts/StatusContext";
|
import { useStatusContext } from "../../Contexts/StatusContext";
|
||||||
import { useUserContext } from "../../Contexts/UserContext";
|
import { useUserContext } from "../../Contexts/UserContext";
|
||||||
@@ -18,6 +19,11 @@ const activeStates = [
|
|||||||
{value: false, label: "Archived" },
|
{value: false, label: "Archived" },
|
||||||
];
|
];
|
||||||
|
|
||||||
|
const booleanStates = [
|
||||||
|
{value: true, label: "True" },
|
||||||
|
{value: false, label: "False" },
|
||||||
|
];
|
||||||
|
|
||||||
const emptyManifest = {
|
const emptyManifest = {
|
||||||
name: "",
|
name: "",
|
||||||
version: "",
|
version: "",
|
||||||
@@ -43,7 +49,8 @@ const MainForm = () => {
|
|||||||
const [name, setName] = useState("");
|
const [name, setName] = useState("");
|
||||||
const [type, setType] = useState("");
|
const [type, setType] = useState("");
|
||||||
const [active, setActive] = useState(true); // So !active = archived
|
const [active, setActive] = useState(true); // So !active = archived
|
||||||
|
const [rollback, setRollback] = useState(true);
|
||||||
|
const [env, setEnv] = useState("current");
|
||||||
|
|
||||||
const changeName = (e) => {
|
const changeName = (e) => {
|
||||||
setName(e.target.value);
|
setName(e.target.value);
|
||||||
@@ -57,10 +64,18 @@ const MainForm = () => {
|
|||||||
setActive(e.target.value === 'true')
|
setActive(e.target.value === 'true')
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const changeRollback = (e) => {
|
||||||
|
setRollback(e.target.value === 'true')
|
||||||
|
}
|
||||||
|
|
||||||
|
const changeEnv = (e) => {
|
||||||
|
setEnv(e.target.value)
|
||||||
|
}
|
||||||
|
|
||||||
const onSubmit = async (e) => {
|
const onSubmit = async (e) => {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
try {
|
try {
|
||||||
const result = await updateManifest(manifest_id, { name, type, active }, token);
|
const result = await updateManifest(manifest_id, { name, type, active, rollback, env }, token);
|
||||||
if (!result || result.error) return;
|
if (!result || result.error) return;
|
||||||
|
|
||||||
setMessage(`Updated manifest ${manifest_id}`);
|
setMessage(`Updated manifest ${manifest_id}`);
|
||||||
@@ -81,7 +96,9 @@ const MainForm = () => {
|
|||||||
setManifest(result);
|
setManifest(result);
|
||||||
setName(result.name);
|
setName(result.name);
|
||||||
setType(result.type);
|
setType(result.type);
|
||||||
setActive(result.active)
|
setActive(result.active);
|
||||||
|
setRollback(result.rollback);
|
||||||
|
setEnv(result.env ?? "current");
|
||||||
}
|
}
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
setMessage(e.message);
|
setMessage(e.message);
|
||||||
@@ -146,6 +163,10 @@ const MainForm = () => {
|
|||||||
/>
|
/>
|
||||||
<DropDownList label="Type" data={manifestTypes} classes={classes} onChange={changeType} value={type} />
|
<DropDownList label="Type" data={manifestTypes} classes={classes} onChange={changeType} value={type} />
|
||||||
<DropDownList label="Active" data={activeStates} classes={classes} onChange={changeActive} value={active}/>
|
<DropDownList label="Active" data={activeStates} classes={classes} onChange={changeActive} value={active}/>
|
||||||
|
<DropDownList label="Rollback" data={booleanStates} classes={classes} onChange={changeRollback} value={rollback}/>
|
||||||
|
{
|
||||||
|
ENVS.length > 1 && <DropDownList label="ECC Keys" data={ENVS} classes={classes} onChange={changeEnv} value={env}/>
|
||||||
|
}
|
||||||
<Button
|
<Button
|
||||||
type="submit"
|
type="submit"
|
||||||
aria-label="send command"
|
aria-label="send command"
|
||||||
|
|||||||
@@ -197,6 +197,18 @@ const vehiclesAPI = {
|
|||||||
.then(fetchRespHandler)
|
.then(fetchRespHandler)
|
||||||
.catch(errorHandler)
|
.catch(errorHandler)
|
||||||
},
|
},
|
||||||
|
|
||||||
|
getLogFileLink: async ({vin, year, month, day}, token) => {
|
||||||
|
const u = `${API_ENDPOINT}/vehicle/${vin}/trex-logs-link?year=${year}&month=${month}&day=${day}`
|
||||||
|
return fetch(u, {
|
||||||
|
method: "GET",
|
||||||
|
headers: Object.assign(
|
||||||
|
{ "Content-Type": "application/json" },
|
||||||
|
getAuthHeaderOptions(token)
|
||||||
|
),
|
||||||
|
}).then(fetchRespHandler)
|
||||||
|
.catch(errorHandler)
|
||||||
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
export default vehiclesAPI;
|
export default vehiclesAPI;
|
||||||
|
|||||||
35
src/utils/key-envs.js
Normal file
35
src/utils/key-envs.js
Normal file
@@ -0,0 +1,35 @@
|
|||||||
|
const KEY_ENVS = process.env.REACT_APP_ECCKEY_ENV;
|
||||||
|
const ENV = process.env.REACT_APP_ENV;
|
||||||
|
|
||||||
|
export const CURRENT_ENV = "current";
|
||||||
|
|
||||||
|
const GetEnvName = (value) => {
|
||||||
|
if (value === "cec-prd" || value === "cec-euprd") return "prd";
|
||||||
|
return value;
|
||||||
|
}
|
||||||
|
|
||||||
|
const MakeList = () => {
|
||||||
|
const result = [];
|
||||||
|
const list = KEY_ENVS.split(",");
|
||||||
|
|
||||||
|
list.forEach((env) => {
|
||||||
|
if (env.length > 0) result.push({
|
||||||
|
value: env,
|
||||||
|
label: env,
|
||||||
|
})
|
||||||
|
})
|
||||||
|
result.unshift({
|
||||||
|
value: CURRENT_ENV,
|
||||||
|
label: GetEnvName(ENV),
|
||||||
|
});
|
||||||
|
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
export const GetEnvValue = (value) => {
|
||||||
|
if (value === ENV) return CURRENT_ENV;
|
||||||
|
return value;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
export const ENVS = MakeList();
|
||||||
@@ -1,12 +1,12 @@
|
|||||||
import { parsePayload } from "./jwt";
|
import { parsePayload } from "./jwt";
|
||||||
|
|
||||||
export const Roles = {
|
export const Roles = {
|
||||||
READ: "a729bbd4-2038-4649-9127-16782bb1e701",
|
READ: process.env.REACT_APP_ROLE_READ_ONLY,
|
||||||
CREATE: "efcc3025-e2d8-4212-8227-805c7be39d2c",
|
CREATE: process.env.REACT_APP_ROLE_CREATE,
|
||||||
DELETE: "8f78dce7-f5f9-4033-a10c-c9c7408bfcfe",
|
DELETE: process.env.REACT_APP_ROLE_DELETE,
|
||||||
CERTIFICATES: "746f34b0-9ba0-4b5d-8d84-0256a9c8e390",
|
CERTIFICATES: process.env.REACT_APP_ROLE_GENERATE_CERTIFICATE,
|
||||||
APPROVESUPPLIERS: "a6c9805e-80b2-42b2-bfbb-9df52e5504d8",
|
APPROVESUPPLIERS: process.env.REACT_APP_ROLE_SUPPLIER_APPROVER,
|
||||||
MANUFACTURE: "3412e11a-a2d1-4355-be3e-ef9aa5065b69",
|
MANUFACTURE: process.env.REACT_APP_ROLE_MANUFACTURE,
|
||||||
MAGNAGROUP: process.env.REACT_APP_MAGNA_GROUP_ID,
|
MAGNAGROUP: process.env.REACT_APP_MAGNA_GROUP_ID,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user