Skip to content

RequirementSet settings MVP #457

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ErikBuer merged 9 commits into from
Jul 1, 2026
Merged

RequirementSet settings MVP #457

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2fd8098
RequirementSet settings MVP
ErikBuer Jun 30, 2026
780d8d6
bugfix wrong field names
ErikBuer Jun 30, 2026
898c490
Requirements: bugfix, allow adding verification references after appr…
ErikBuer Jul 1, 2026
3256307
Show external requirement id in req peek view
ErikBuer Jul 1, 2026
d82f5a3
allow duplicate external req ids, but give warning
ErikBuer Jul 1, 2026
9635ef0
Requirements table UX QoL
ErikBuer Jul 1, 2026
391cd86
DisplayRequirement: UX QoL
ErikBuer Jul 1, 2026
878da80
colorize external requirement id
ErikBuer Jul 1, 2026
4ed4ea5
Requirement ID, add formatting to tooltip also
ErikBuer Jul 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion dokuly/frontend/src/components/dokuly_components/requirementPill/requirementPill.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,21 @@ import React, { useEffect, useState } from "react";
import { useNavigate } from "react-router-dom";
import { OverlayTrigger, Popover } from "react-bootstrap";
import { getRequirement } from "../../requirements/functions/queries";
import { renderExternalId } from "../../requirements/functions/externalIdUtils";

const RequirementPeek = ({ requirement }) => {
if (!requirement) return null;

return (
<div style={{ minWidth: "250px", maxWidth: "350px" }}>
<div style={{ fontWeight: "bold", marginBottom: "8px" }}>
<div style={{ fontWeight: "bold", marginBottom: requirement.external_requirement_id ? "4px" : "8px" }}>
Requirement {requirement.id}
</div>
{requirement.external_requirement_id && (
<div style={{ fontSize: "0.8rem", marginBottom: "8px", fontFamily: "monospace" }}>
{renderExternalId(requirement.external_requirement_id)}
</div>
)}
<div
style={{
fontSize: "0.9rem",
Expand Down
5 changes: 2 additions & 3 deletions ...y/frontend/src/components/requirements/components/requirementDocumentReferenceSelector.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ const RequirementDocumentReferenceSelector = ({
referenceField = "statement_references",
referenceType = "statement",
}) => {
const isStateLocked = ["Approved", "Rejected"].includes(requirement?.state);
const [options, setOptions] = useState([]);
const [selectedReferences, setSelectedReferences] = useState([]);
const [searchInput, setSearchInput] = useState("");
Expand Down Expand Up @@ -172,7 +171,7 @@ const RequirementDocumentReferenceSelector = ({

return (
<div>
{!isStateLocked && (
{!readOnly && (
<DokulySelect
value={null}
options={options}
Expand Down Expand Up @@ -202,7 +201,7 @@ const RequirementDocumentReferenceSelector = ({

<div style={{ marginTop: "12px" }}>
{selectedReferences.length === 0 ? (
<small className="text-muted">No statement references added.</small>
<small className="text-muted">No references added.</small>
) : (
<div
style={{
Expand Down
45 changes: 17 additions & 28 deletions dokuly/frontend/src/components/requirements/components/requirementInfoCard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import DeleteButton from "../../dokuly_components/deleteButton";
import NavigateButton from "../../dokuly_components/dokulyTable/components/navigateButton";
import GenericMultiSelector from "../../dokuly_components/genericMultiSelector";
import TextFieldEditor from "../../dokuly_components/dokulyTable/components/textFieldEditor";
import { DEFAULT_REQUIREMENT_SET_SETTINGS } from "../modelConstants";

const renderAdditionalFields = (additionalFields, keyColumnMaxWidth) => {
return Object.entries(additionalFields)
Expand Down Expand Up @@ -54,6 +55,7 @@ const RequirementInfoCard = ({
rowPadding = "10px",
readOnly = false,
project = { id: -1 },
requirementSetSettings = DEFAULT_REQUIREMENT_SET_SETTINGS,
}) => {
const navigate = useNavigate();

Expand All @@ -63,6 +65,10 @@ const RequirementInfoCard = ({
const [parentRequirement, setParentRequirement] = useState(null);
const [superseedingRequirement, setSuperseedingRequirement] = useState(null);
const [isTopLevelRequirement, setIsTopLevelRequiremnt] = useState(false);
const settings = {
...DEFAULT_REQUIREMENT_SET_SETTINGS,
...(requirementSetSettings || {}),
};

useEffect(() => {
setIsTopLevelRequiremnt(item?.parent_requirement === null);
Expand Down Expand Up @@ -279,7 +285,7 @@ const RequirementInfoCard = ({
<CardTitle titleText={"Information"} />

<Container fluid>
{(!item?.derived_from || item?.derived_from.length === 0) && (
{settings.hierarchical_requirements_is_enabled && (!item?.derived_from || item?.derived_from.length === 0) && (
<Row className="align-items-center">
<Col
className="col-lg-6 col-xl-6"
Expand Down Expand Up @@ -320,7 +326,8 @@ const RequirementInfoCard = ({
</Row>
)}

{!item?.parentRequirement &&
{settings.derived_from_enabled &&
!item?.parentRequirement &&
!(
(item?.derived_from.length === 0 && item?.state === "Approved") ||
(item?.derived_from.length === 0 && item?.state === "Rejected")
Expand Down Expand Up @@ -348,7 +355,7 @@ const RequirementInfoCard = ({
)}

{/* Cant be superseded with subrequirements. Cant be superseded if it is verified.*/}
{((item?.superseded_by !== null) ||
{settings.superseded_by_is_enabled && ((item?.superseded_by !== null) ||
(number_of_subrequirements !== -1 && !item?.is_verified && item?.state !== "Approved" && item?.state !== "Rejected")) && (
<Row className="align-items-center">
<Col
Expand Down Expand Up @@ -386,30 +393,7 @@ const RequirementInfoCard = ({
</Row>
)}

<Row className="align-items-center">
<Col
className="col-lg-6 col-xl-6"
style={{ maxWidth: keyColumnMaxWidth, paddingTop: rowPadding }}
>
<b>Obligation level:</b>
</Col>
<Col>
<GenericDropdownSelector
state={item?.obligation_level || ""}
setState={(newObligationLevel) =>
changeField("obligation_level", newObligationLevel)
}
dropdownValues={OBLIGATION_LEVEL_OPTIONS}
placeholder="Select Obligation Level"
borderIfPlaceholder={true}
readOnly={readOnly ||
((item?.derived_from.length === 0 && item?.state === "Approved") || (item?.derived_from.length === 0 && item?.state === "Rejected"))
}
textSize="16px"
/>
</Col>
</Row>

{settings.external_requirement_id_is_enabled && (
<Row className="align-items-center">
<Col
className="col-lg-6 col-xl-6"
Expand All @@ -431,7 +415,9 @@ const RequirementInfoCard = ({
/>
</Col>
</Row>
)}

{settings.requirement_type_is_enabled && (
<Row className="align-items-center">
<Col
className="col-lg-6 col-xl-6"
Expand All @@ -453,7 +439,9 @@ const RequirementInfoCard = ({
/>
</Col>
</Row>
)}

{settings.verification_class_is_enabled && (
<Row className="align-items-center">
<Col
className="col-lg-6 col-xl-6"
Expand All @@ -475,6 +463,7 @@ const RequirementInfoCard = ({
/>
</Col>
</Row>
)}

<Row className="align-items-center">
<Col
Expand All @@ -496,7 +485,7 @@ const RequirementInfoCard = ({
</Col>
</Row>

{created_by !== null && created_by !== undefined && (
{settings.created_by_is_visible && created_by !== null && created_by !== undefined && (
<Row className="align-items-center">
<Col
className="col-lg-6 col-xl-6"
Expand Down
Loading