Merge pull request #2231 from bluewave-labs/sw-016-sep-25-add-mapping-from-model-inventory-to-projects-and-framework

MuhammadKhalilzadeh · web-flow · commit 713fc6fd6540 · 2025-09-27T20:03:27.000+03:30
added-used-in-projects-dropdown-in-add-new-model
diff --git a/Clients/src/domain/interfaces/i.modelInventory.ts b/Clients/src/domain/interfaces/i.modelInventory.ts
@@ -13,6 +13,7 @@ export interface IModelInventory {
   biases?: string;
   limitations?: string;
   hosting_provider?: string;
+  used_in_projects: string[];
   is_demo?: boolean;
   created_at?: Date;
   updated_at?: Date;
diff --git a/Clients/src/domain/types/Project.ts b/Clients/src/domain/types/Project.ts
@@ -20,6 +20,7 @@ export type Project = {
   framework: {
     project_framework_id: number;
     framework_id: number;
+    name: string;
   }[];
   monitored_regulations_and_standards: string[];
   is_organizational?: boolean;
diff --git a/Clients/src/presentation/components/Modals/NewModelInventory/index.tsx b/Clients/src/presentation/components/Modals/NewModelInventory/index.tsx
@@ -32,6 +32,8 @@ import { KeyboardArrowDown } from "@mui/icons-material";
 import { ReactComponent as GreyDownArrowIcon } from "../../../assets/icons/chevron-down-grey.svg";
 import { useModalKeyHandling } from "../../../../application/hooks/useModalKeyHandling";
 import modelInventoryOptions from "../../../utils/model-inventory.json";
+import {getAllProjects} from "../../../../application/repository/project.repository"
+import { Project } from "../../../../domain/types/Project";
 
 interface NewModelInventoryProps {
   isOpen: boolean;
@@ -51,10 +53,11 @@ interface NewModelInventoryFormValues {
   security_assessment: boolean;
   status: ModelInventoryStatus;
   status_date: string;
-  reference_link: string,
-  biases: string,
-  limitations: string,
-  hosting_provider: string,
+  reference_link: string;
+  biases: string;
+  limitations: string;
+  hosting_provider: string;
+  used_in_projects: string[]
 }
 
 interface NewModelInventoryFormErrors {
@@ -66,6 +69,7 @@ interface NewModelInventoryFormErrors {
   capabilities?: string;
   status?: string;
   status_date?: string;
+  used_in_projects?: string;
 }
 
 const initialState: NewModelInventoryFormValues = {
@@ -82,6 +86,7 @@ const initialState: NewModelInventoryFormValues = {
   biases:  "",
   limitations: "",
   hosting_provider: "",
+  used_in_projects : [],
 };
 
 const statusOptions = [
@@ -170,6 +175,41 @@ const NewModelInventory: FC<NewModelInventoryProps> = ({
     }
   };
 
+  const [projectList, setProjects] = useState<Project[]>([]);
+  const [, setProjectsLoading] = useState(true);
+  
+  useEffect(() => {
+    const fetchProjects = async () => {
+      try {
+        setProjectsLoading(true);
+        const response = await getAllProjects();
+        if (response?.data) {
+          setProjects(response.data);
+        }
+      } catch (error) {
+        console.error("Error fetching projects:", error);
+      } finally {
+        setProjectsLoading(false);
+      }
+    };
+  
+    fetchProjects();
+  }, []);
+
+  const combinedList = useMemo(() => {
+    const targetFrameworks = ["ISO 42001", "ISO 27001"];
+  
+    return projectList.flatMap((project) => {
+      // Get enabled framework names for this project
+      const enabledFrameworks = project.framework?.map((f) => f.name) || [];
+  
+      // Only include target frameworks that are enabled
+      return targetFrameworks
+        .filter((fw) => enabledFrameworks.includes(fw))
+        .map((fw) => `${project.project_title.trim()} - ${fw}`);
+    });
+  }, [projectList]);
+
   // Transform users to the format expected by SelectComponent
   const userOptions = useMemo(() => {
     return users.map((user) => ({
@@ -219,6 +259,14 @@ const NewModelInventory: FC<NewModelInventoryProps> = ({
     []
   );
 
+  const handleSelectUsedInProjectChange = useCallback(
+    (_event: React.SyntheticEvent, newValue: string[]) => {
+      setValues((prev) => ({ ...prev, used_in_projects: newValue }));
+      setErrors((prev) => ({ ...prev, used_in_projects: "" }));
+    },
+    []
+  );
+
   const handleDateChange = useCallback((newDate: Dayjs | null) => {
     if (newDate?.isValid()) {
       setValues((prev) => ({
@@ -664,6 +712,68 @@ const NewModelInventory: FC<NewModelInventoryProps> = ({
                 )}
               </Stack>
 
+              <Stack>
+                <Typography
+                  sx={{
+                    fontSize: 13,
+                    fontWeight: 400,
+                    mb: theme.spacing(2),
+                    color: theme.palette.text.secondary,
+                  }}
+                >
+                  Used in projects
+                </Typography>
+                <Autocomplete
+                  multiple
+                  id="projects-framework"
+                  size="small"
+                  value={values.used_in_projects}
+                  options={combinedList}
+                  onChange={handleSelectUsedInProjectChange}
+                  getOptionLabel={(option) => option}
+                  noOptionsText={
+                    values.used_in_projects.length === combinedList.length
+                      ? "All projects selected"
+                      : "No options"
+                  }
+                  renderOption={(props, option) => (
+                    <Box component="li" {...props}>
+                      <Typography sx={{ fontSize: 13, fontWeight: 400 }}>
+                        {option}
+                      </Typography>
+                    </Box>
+                  )}
+                  filterSelectedOptions
+                  popupIcon={<GreyDownArrowIcon />}
+                  renderInput={(params) => (
+                    <TextField
+                      {...params}
+                      error={!!errors.used_in_projects}
+                      placeholder="Select projects-framework"
+                      sx={capabilitiesRenderInputStyle}
+                    />
+                  )}
+                  sx={{
+                    backgroundColor: theme.palette.background.main,
+                    ...capabilitiesSxStyle,
+                  }}
+                  slotProps={capabilitiesSlotProps}
+                />
+                {errors.used_in_projects && (
+                  <Typography
+                    variant="caption"
+                    sx={{
+                      mt: 1,
+                      color: "#f04438",
+                      fontWeight: 300,
+                      fontSize: 11,
+                    }}
+                  >
+                    {errors.used_in_projects}
+                  </Typography>
+                )}
+          </Stack>
+
               <Stack
                 direction={"row"}
                 gap={theme.spacing(8)}
diff --git a/Clients/src/presentation/pages/ModelInventory/index.tsx b/Clients/src/presentation/pages/ModelInventory/index.tsx
@@ -797,6 +797,7 @@ const ModelInventory: React.FC = () => {
                biases: selectedModelInventory.biases || "",
                limitations: selectedModelInventory.limitations || "",
                hosting_provider: selectedModelInventory.hosting_provider || "",
+               used_in_projects: selectedModelInventory.used_in_projects,
               }
             : undefined
         }
diff --git a/Servers/controllers/modelInventory.ctrl.ts b/Servers/controllers/modelInventory.ctrl.ts
@@ -122,6 +122,7 @@ export async function createNewModelInventory(req: Request, res: Response) {
     biases,
     limitations,
     hosting_provider,
+    used_in_projects,
     is_demo,
   } = req.body;
 
@@ -151,6 +152,7 @@ export async function createNewModelInventory(req: Request, res: Response) {
       biases,
       limitations,
       hosting_provider,
+      used_in_projects,
       is_demo,
     });
 
@@ -210,6 +212,7 @@ export async function updateModelInventoryById(req: Request, res: Response) {
     biases,
     limitations,
     hosting_provider,
+    used_in_projects,
     is_demo,
   } = req.body;
 
@@ -256,6 +259,7 @@ export async function updateModelInventoryById(req: Request, res: Response) {
         status,
         status_date,
         reference_link,
+        used_in_projects,
         biases,
         limitations,
         hosting_provider,
diff --git a/Servers/database/migrations/20250926170942-add-one-column-in-model-inventory-table.js b/Servers/database/migrations/20250926170942-add-one-column-in-model-inventory-table.js
@@ -0,0 +1,57 @@
+'use strict';
+
+const { getTenantHash } = require("../../dist/tools/getTenantHash");
+
+/** @type {import('sequelize-cli').Migration} */
+module.exports = {
+  async up(queryInterface, Sequelize) {
+    const transaction = await queryInterface.sequelize.transaction();
+    try {
+      const organizations = await queryInterface.sequelize.query(
+        `SELECT id FROM organizations;`,
+        { transaction }
+      );
+
+      for (let organization of organizations[0]) {
+        const tenantHash = getTenantHash(organization.id);
+
+        // Add column with TEXT type and default value
+        await queryInterface.sequelize.query(
+          `ALTER TABLE "${tenantHash}".model_inventories
+           ADD COLUMN used_in_projects TEXT NOT NULL DEFAULT '';`,
+          { transaction }
+        );
+      }
+
+      await transaction.commit();
+    } catch (error) {
+      await transaction.rollback();
+      throw error;
+    }
+  },
+
+  async down(queryInterface, Sequelize) {
+    const transaction = await queryInterface.sequelize.transaction();
+    try {
+      const organizations = await queryInterface.sequelize.query(
+        `SELECT id FROM organizations;`,
+        { transaction }
+      );
+
+      for (let organization of organizations[0]) {
+        const tenantHash = getTenantHash(organization.id);
+
+        await queryInterface.sequelize.query(
+          `ALTER TABLE "${tenantHash}".model_inventories
+           DROP COLUMN used_in_projects;`,
+          { transaction }
+        );
+      }
+
+      await transaction.commit();
+    } catch (error) {
+      await transaction.rollback();
+      throw error;
+    }
+  }
+};
diff --git a/Servers/domain.layer/interfaces/i.modelInventory.ts b/Servers/domain.layer/interfaces/i.modelInventory.ts
@@ -15,6 +15,7 @@ export interface IModelInventory {
   biases?: string;
   limitations?: string;
   hosting_provider?: string;
+  used_in_projects: string;
   is_demo?: boolean;
   created_at?: Date;
   updated_at?: Date;
diff --git a/Servers/domain.layer/models/modelInventory/modelInventory.model.ts b/Servers/domain.layer/models/modelInventory/modelInventory.model.ts
@@ -98,6 +98,12 @@ export class ModelInventoryModel
   })
   hosting_provider!: string;
 
+  @Column({
+    type: DataType.TEXT,
+    allowNull: false,
+  })
+  used_in_projects!: string;
+
   @Column({
     type: DataType.BOOLEAN,
     allowNull: false,
@@ -198,6 +204,14 @@ export class ModelInventoryModel
         this.hosting_provider
       );
     }
+
+    if (!this.used_in_projects?.trim()) {
+      throw new ValidationException(
+        "Used in projects is required",
+        "used_in_projects",
+        this.used_in_projects
+      );
+    }
   }
 
   /**
@@ -301,6 +315,7 @@ export class ModelInventoryModel
       biases: this.biases,
       limitations: this.limitations,
       hosting_provider: this.hosting_provider,
+      used_in_projects: this.used_in_projects? this.used_in_projects.split(", ").filter((use) => use.trim()) : [],
       is_demo: this.is_demo,
       created_at: this.created_at?.toISOString(),
       updated_at: this.updated_at?.toISOString(),
@@ -335,6 +350,7 @@ export class ModelInventoryModel
       biases: this.biases,
       limitations: this.limitations,
       hosting_provider: this.hosting_provider,
+      used_in_projects: this.used_in_projects? this.used_in_projects.split(", ").filter((use) => use.trim()) : [],
       is_demo: this.is_demo,
       created_at: this.created_at?.toISOString(),
       updated_at: this.updated_at?.toISOString(),
@@ -408,6 +424,9 @@ export class ModelInventoryModel
       biases: data.biases || "",
       limitations: data.limitations || "",
       hosting_provider: data.hosting_provider || "",
+      used_in_projects: Array.isArray(data.used_in_projects)
+      ? data.used_in_projects.join(", ")
+      : data.used_in_projects || "",
       is_demo: data.is_demo || false,
       created_at: new Date(),
       updated_at: new Date(),
@@ -465,6 +484,11 @@ export class ModelInventoryModel
     if (data.hosting_provider !== undefined) {
       existingModel.hosting_provider = data.hosting_provider;
     }
+    if (data.used_in_projects !== undefined) {
+      existingModel.used_in_projects = Array.isArray(data.used_in_projects)
+        ? data.used_in_projects.join(", ")
+        : data.used_in_projects;
+    }
     if (data.is_demo !== undefined) {
       existingModel.is_demo = data.is_demo;
     }
diff --git a/Servers/scripts/createNewTenant.ts b/Servers/scripts/createNewTenant.ts
@@ -667,6 +667,7 @@ export const createNewTenant = async (organization_id: number, transaction: Tran
         biases VARCHAR(255) NOT NULL,
         limitations VARCHAR(255) NOT NULL,
         hosting_provider VARCHAR(255) NOT NULL,
+        used_in_projects TEXT NOT NULL,
         is_demo BOOLEAN NOT NULL DEFAULT false,
         created_at TIMESTAMP WITH TIME ZONE NOT NULL,
         updated_at TIMESTAMP WITH TIME ZONE NOT NULL,
diff --git a/Servers/utils/modelInventory.utils.ts b/Servers/utils/modelInventory.utils.ts
@@ -40,8 +40,8 @@ export const createNewModelInventoryQuery = async (
 
   try {
     const result = await sequelize.query(
-      `INSERT INTO "${tenant}".model_inventories (provider_model, provider, model, version, approver, capabilities, security_assessment, status, status_date, reference_link, biases, limitations, hosting_provider, is_demo, created_at, updated_at)       
-      VALUES (:provider_model, :provider, :model, :version, :approver, :capabilities, :security_assessment, :status, :status_date, :reference_link, :biases, :limitations, :hosting_provider, :is_demo, :created_at, :updated_at) RETURNING *`,
+      `INSERT INTO "${tenant}".model_inventories (provider_model, provider, model, version, approver, capabilities, security_assessment, status, status_date, reference_link, biases, limitations, hosting_provider, used_in_projects, is_demo, created_at, updated_at)       
+      VALUES (:provider_model, :provider, :model, :version, :approver, :capabilities, :security_assessment, :status, :status_date, :reference_link, :biases, :limitations, :hosting_provider, :used_in_projects, :is_demo, :created_at, :updated_at) RETURNING *`,
       {
         replacements: {
           provider_model: modelInventory.provider_model || '',
@@ -59,6 +59,7 @@ export const createNewModelInventoryQuery = async (
           biases: modelInventory.biases,
           limitations: modelInventory.limitations,
           hosting_provider: modelInventory.hosting_provider,
+          used_in_projects: modelInventory.used_in_projects,
           is_demo: modelInventory.is_demo,
           created_at: created_at,
           updated_at: created_at,
@@ -86,7 +87,7 @@ export const updateModelInventoryByIdQuery = async (
   try {
     // First update the record
     await sequelize.query(
-      `UPDATE "${tenant}".model_inventories SET provider_model = :provider_model, provider = :provider, model = :model, version = :version, approver = :approver, capabilities = :capabilities, security_assessment = :security_assessment, status = :status, status_date = :status_date, reference_link = :reference_link, biases = :biases, limitations = :limitations,  hosting_provider = :hosting_provider, is_demo = :is_demo, updated_at = :updated_at WHERE id = :id`,
+      `UPDATE "${tenant}".model_inventories SET provider_model = :provider_model, provider = :provider, model = :model, version = :version, approver = :approver, capabilities = :capabilities, security_assessment = :security_assessment, status = :status, status_date = :status_date, reference_link = :reference_link, biases = :biases, limitations = :limitations,  hosting_provider = :hosting_provider, used_in_projects = :used_in_projects, is_demo = :is_demo, updated_at = :updated_at WHERE id = :id`,
       {
         replacements: {
           id,
@@ -105,6 +106,7 @@ export const updateModelInventoryByIdQuery = async (
           biases: modelInventory.biases,
           limitations: modelInventory.limitations,
           hosting_provider: modelInventory.hosting_provider,
+          used_in_projects: modelInventory.used_in_projects,
           is_demo: modelInventory.is_demo,
           updated_at,
         },

Original file line number	Diff line number	Diff line change
`@@ -797,6 +797,7 @@ const ModelInventory: React.FC = () => {`
`797`	`797`	`biases: selectedModelInventory.biases \|\| "",`
`798`	`798`	`limitations: selectedModelInventory.limitations \|\| "",`
`799`	`799`	`hosting_provider: selectedModelInventory.hosting_provider \|\| "",`
	`800`	`+ used_in_projects: selectedModelInventory.used_in_projects,`
`800`	`801`	`}`
`801`	`802`	`: undefined`
`802`	`803`	`}`