Skip to content

Commit

Permalink
Merge pull request #284 from jadmsaadaot/SUBMIT-task#264
Browse files Browse the repository at this point in the history
Add submission history in UI component
  • Loading branch information
jadmsaadaot authored Feb 7, 2025
2 parents e757515 + e51d440 commit d9d6efa
Show file tree
Hide file tree
Showing 11 changed files with 471 additions and 223 deletions.
1 change: 1 addition & 0 deletions submit-api/src/submit_api/enums/activity_type.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ class ActivityTypeEnum(enum.Enum):

SUBMISSION = 'SUBMISSION'
USER = 'USER'
PACKAGE = 'PACKAGE'


class ActorTypeEnum(enum.Enum):
Expand Down
2 changes: 1 addition & 1 deletion submit-api/src/submit_api/services/activity_log_service.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ def log_activity( # pylint: disable=too-many-arguments
action: str,
actor_id: int = TokenInfo.get_id(),
actor_type: str = ActorTypeEnum.STAFF.value,
entity_type=ActivityTypeEnum.SUBMISSION.value,
entity_type=ActivityTypeEnum.PACKAGE.value,
entity_version: int = 1,
visibility: str = VisibilityTypeEnum.STAFF.value,
session=None,
Expand Down
222 changes: 0 additions & 222 deletions submit-web/src/components/Submission/InfoBox.tsx

This file was deleted.

76 changes: 76 additions & 0 deletions submit-web/src/components/Submission/InfoBox/AdminInfoBox.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
import { SubmissionPackage } from "@/models/Package";
import { Grid, Stack, Typography } from "@mui/material";
import { BCDesignTokens } from "epic.theme";
import { get, isArray } from "lodash";
import { useMemo } from "react";
import VersionGroup from "../VersionGroup";
import { SubmissionHistory } from "./SubmissionHistory";

type InfoBoxProps = {
submissionPackage: SubmissionPackage;
};
export const AdminInfoBox = ({ submissionPackage }: InfoBoxProps) => {
const { version } = submissionPackage;

const condition = useMemo(() => {
if (!submissionPackage.meta) return "";
const condition = get(submissionPackage, "meta.main_condition");

return get(condition, "condition_number", "");
}, [submissionPackage]);

const supportingConditions = useMemo(() => {
if (!submissionPackage.meta) return "";
const conditions = get(submissionPackage, "meta.supporting_conditions");
if (!conditions || !isArray(conditions)) return "";

return conditions
.map((condition) => condition.condition_number)
.filter(Boolean)
.join(", ");
}, [submissionPackage]);

return (
<Grid
container
sx={{
borderRadius: "4px",
border: `1px solid ${BCDesignTokens.surfaceColorBorderDefault}`,
p: BCDesignTokens.layoutPaddingSmall,
}}
rowSpacing={1}
>
<Grid
item
xs={12}
container
alignContent={"flex-end"}
justifyContent={"flex-end"}
>
<Typography color={BCDesignTokens.themeGray70} sx={{ mr: 1 }}>
Version:{" "}
</Typography>
<VersionGroup currentPackageVersion={version} />
</Grid>

<Grid item xs={12} lg={4} container>
<Stack direction={"row"}>
<Typography color={BCDesignTokens.themeGray70}>Condition:</Typography>
<Typography color={"inherit"}>{condition}</Typography>
</Stack>
</Grid>

<Grid item xs={12} lg={4} container>
<Stack direction={"row"}>
<Typography color={BCDesignTokens.themeGray70}>
Supporting Conditions:
</Typography>
<Typography color={"inherit"}>{supportingConditions}</Typography>
</Stack>
</Grid>
<Grid item xs={12} container>
<SubmissionHistory submissionPackageId={String(submissionPackage.id)} />
</Grid>
</Grid>
);
};
Loading

0 comments on commit d9d6efa

Please sign in to comment.