Skip to content

Commit

Permalink
Merge branch 'main' into development
Browse files Browse the repository at this point in the history
  • Loading branch information
@anilsingla
anilsingla authored Jan 10, 2024
2 parents a234594 + 289f2c3 commit d4e22c5
Show file tree
Hide file tree
Showing 7 changed files with 89 additions and 19 deletions.
Binary file added src/assets/images/AIShield-watchtower-final-logo.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/images/aishield_logo.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 17 additions & 17 deletions src/pages/BesVersionHistory/AssessmentReport/index.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ const FetchCS = ({ data }: any) => {
style={{minWidth: "200px"}}>
<Grid key={`GridCS2`}>
<MKTypography variant="body1"
key={`MKTypoCS1`}
key={`MKTypoCS1`}
color="inherit"
style={{fontSize:"calc(0.2rem + 0.5vw)",
justifyContent: "center",
Expand All @@ -130,7 +130,7 @@ const FetchCS = ({ data }: any) => {
</Grid>
<Grid key={`GridCS3`}>
<MKTypography variant="body1"
key={`MKTypoCS3`}
key={`MKTypoCS3`}
color="inherit"
style={{fontSize:"calc(0.2rem + 0.5vw)",
justifyContent: "center",
Expand All @@ -153,7 +153,7 @@ const FetchCS = ({ data }: any) => {
</Grid>
<Grid key={`GridCS5`}>
<MKTypography variant="body1"
key={`MKTypoCS5`}
key={`MKTypoCS5`}
color="inherit"
style={{fontSize:"calc(0.2rem + 0.5vw)",
justifyContent: "center",
Expand Down Expand Up @@ -279,7 +279,7 @@ const FetchSAST = ({ cqData, sqData }: any) => {
color="inherit"
key={`MKTypoSASTSQ1`}
style={{fontSize:"calc(0.6rem + 0.5vw)",
paddingLeft: "calc(0.1rem + 0.3vw)"
paddingLeft: "calc(0.1rem + 0.3vw)"
}}>
<b key="BOLDSQ1"> Critical : </b> {sqblocker}
</MKTypography>
Expand All @@ -304,7 +304,7 @@ const FetchSAST = ({ cqData, sqData }: any) => {
key={`MKTypoSASTSQ3`}
color="inherit"
style={{fontSize:"calc(0.6rem + 0.5vw)",
paddingLeft: "calc(0.1rem + 0.3vw)"
paddingLeft: "calc(0.1rem + 0.3vw)"
}}>
<b key="BOLDSQ3">Medium : </b> {sqmajor}
</MKTypography>
Expand All @@ -315,7 +315,7 @@ const FetchSAST = ({ cqData, sqData }: any) => {
key={`MKTypoSASTSQ4`}
color="inherit"
style={{fontSize:"calc(0.6rem + 0.5vw)",
paddingLeft: "calc(0.1rem + 0.3vw)"
paddingLeft: "calc(0.1rem + 0.3vw)"
}}>
<b key="BOLDSQ4">Low : </b>{sqminor}
</MKTypography>
Expand Down Expand Up @@ -524,10 +524,10 @@ const FetchLicense = ({ data, uniq_lic, itemData }: any) => {
key={`MKTypoL2`}
color="inherit"
style={{fontSize:"calc(0.2rem + 0.5vw)",
justifyContent: "center",
display: "flex",
paddingLeft: "calc(0.1rem + 0.3vw)"
}}>
justifyContent: "center",
display: "flex",
paddingLeft: "calc(0.1rem + 0.3vw)"
}}>
<b key="BOLDL3">No. of Non License Files </b>: {non_lic_files}
</MKTypography>
</Grid>
Expand All @@ -537,10 +537,10 @@ const FetchLicense = ({ data, uniq_lic, itemData }: any) => {
key={`MKTypoL3`}
color="inherit"
style={{fontSize:"calc(0.2rem + 0.5vw)",
justifyContent: "center",
display: "flex",
paddingLeft: "calc(0.1rem + 0.3vw)"
}}>
justifyContent: "center",
display: "flex",
paddingLeft: "calc(0.1rem + 0.3vw)"
}}>
<b key="BOLDL4">Unique Licenses </b>: {license_list}
</MKTypography>
</Grid>
Expand Down Expand Up @@ -601,7 +601,7 @@ const FetchSBOM = ({ data, masterData }: any) => {
return(<>
<Grid key={`GRIDSBOMMAIN`}
style={{minWidth: "200px"}}>
<MKTypography key="MKTypoSBOMMain" variant="body1"
<MKTypography key="MKTypoSBOMMain" variant="body1"
color="inherit"
style={{fontSize:"calc(0.3rem + 0.5vw)",
justifyContent: "center",
Expand Down Expand Up @@ -674,7 +674,7 @@ const GetAssessmentData = ({ version, name, report, itemData, masterData }: any)
{jsonData.criticality_score}
</Typography>
<Grid key={`GridCriticalutyScore`}
style={{height: "100px",
style={{height: "100px",
minWidth: "90%",
borderRadius: "3px"
}}
Expand Down Expand Up @@ -946,7 +946,7 @@ function AssessmentReport({ title, name, version, itemData, masterData, ...other
p={0.3}
justifyContent="center"
style={{width: "100%"}}>
{report.map((value, index) => {
{report.map((value) => {
return (
<>
<Grid item
Expand Down
14 changes: 13 additions & 1 deletion src/pages/FuzzingModel/index.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import MKBox from "../../components/MKBox";
import { useLocation } from "react-router-dom";
import { besecureMlAssessmentDataStore } from "../../dataStore";
import { fetchJsonData } from "../BesVersionHistory/AssessmentReport";

const lineOptions = {
startPlug: "disc",
color: "red",
Expand Down Expand Up @@ -222,6 +221,19 @@ function FuzzingModelPage() {
<DefenseSummary />
<RightFuzzing />
</Grid>

<Grid container style={{ width: "100%", placeContent: "center", alignItems: "center", height: "24px", position: "fixed", bottom: 0 }}>
<Grid item>

<MKTypography style={{ fontSize: "12px" }}>
Powered by
</MKTypography>
</Grid>
<Grid item style={{ paddingLeft: "8px" }}>

<img style={{ width: "60px", height: "75px", paddingTop: "6px" }} src={aishieldLogo} />
</Grid>
</Grid>
</div>
);
}
Expand Down
27 changes: 27 additions & 0 deletions src/pages/ModelVulnerabilitiesDetailed/index.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import routes from "../../routes";
import MKBox from "../../components/MKBox";
import { Card, Grid } from "@mui/material";
import ModelVulnerabilitiesDetailedTable from "./ModelVulnerabilitiesDetailedTable";
import MKTypography from "../../components/MKTypography";
import watchtowerLogo from "../../assets/images/AIShield-watchtower-final-logo.png"


function ModelVulnerabilitiesDetailed() {
Expand All @@ -20,7 +22,32 @@ function ModelVulnerabilitiesDetailed() {
</Card>
</Grid>
</Grid>
<Grid pt={47} container style={{ width: "100%", placeContent: "center", alignItems: "center", height: "fit-content" }}>
<Grid item>

<MKTypography style={{ fontSize: "12px" }}>
Powered by
</MKTypography>
</Grid>
<Grid item style={{ paddingLeft: "8px" }}>

<img style={{ width: "70px", height: "30px" }} src={watchtowerLogo} />
</Grid>
</Grid>
</MKBox>

<Grid pt={47} container style={{ width: "100%", placeContent: "center", alignItems: "center", height: "fit-content", position: "fixed", bottom: 0 }}>
<Grid item>

<MKTypography style={{ fontSize: "12px" }}>
Powered by
</MKTypography>
</Grid>
<Grid item style={{ paddingLeft: "8px" }}>

<img style={{ width: "70px", height: "30px" }} src={watchtowerLogo} />
</Grid>
</Grid>
</>
);
}
Expand Down
17 changes: 16 additions & 1 deletion src/pages/ShowModelDetails/AdversarialAttackSummary.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,22 @@ const AdversarialAttackSummary = () => {
</TableBody>
</Table>
</TableContainer>

<Typography color="black"
pt={2}
pb={1}
style={{ fontSize: "12px", float: "right" }}>
Powered by <a
style={{
color: "grey",
cursor: "pointer"
}}
href={`https://www.boschaishield.com/home.html`}
title={"Click to view boschaishield webpage"}
target="_blank"
>
Bosch AIShield
</a>
</Typography>
{dividerDiv(1)}
{attackGraph(selectedMenu, attackMap)}
</>
Expand Down
16 changes: 16 additions & 0 deletions src/pages/ShowModelDetails/StaticAnalysisSummary.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,22 @@ export default function StaticAnalysisSummary({ data }: any): any {
})}
</Grid>
)}
<MKTypography
pt={1}
style={{ float: "right", fontSize: "12px" }}
>
Powered by <a
style={{
color: "grey",
cursor: "pointer"
}}
href={`https://github.com/bosch-aisecurity-aishield/watchtower`}
title={"Click to view watchtower repo"}
target="_blank"
>
AIShield Watchtower
</a>
</MKTypography>
</>
);
}

0 comments on commit d4e22c5

Please sign in to comment.