add test and make pr comment changes

bcgov · Nov 12, 2024 · fcb8338 · fcb8338
1 parent c5e8bdd
commit fcb8338
Show file tree

Hide file tree

Showing 11 changed files with 38 additions and 24 deletions.
diff --git a/services/core-api/tests/projects/project/resources/test_project_resource.py b/services/core-api/tests/projects/project/resources/test_project_resource.py
@@ -1,8 +1,7 @@
 import json
-
-from tests.factories import MineFactory, ProjectFactory, ProjectSummaryFactory, PartyFactory
-from flask_restx import marshal
-from app.api.projects.response_models import PROJECT_SUMMARY_MODEL
+from tests.factories import MineFactory, ProjectFactory
+from app.api.projects.project.models.project import Project
+from datetime import datetime
 
 
 def test_get_project_by_project_guid(test_client, db_session, auth_headers):
@@ -28,3 +27,24 @@ def test_get_projects_by_mine_guid(test_client, db_session, auth_headers):
 
     assert get_resp.status_code == 200
     assert len(get_data['records']) == batch_size
+
+def test_get_filtered_projects(test_client, db_session, auth_headers):
+    batch_size = 3
+    mine = MineFactory(minimal=True, project=0)
+    ProjectFactory.create_batch(mine=mine, size=batch_size)
+    mine_guid = mine.mine_guid
+    specific_mine_name = mine.mine_name
+    projects = Project.find_by_mine_guid(str(mine_guid))
+
+    get_resp = test_client.get(
+        f'/projects/dashboard?page=1&per_page=10&sort_field=update_timestamp&sort_dir=desc&search={specific_mine_name}',
+        headers=auth_headers['full_auth_header'])
+    get_data = json.loads(get_resp.data.decode())
+
+    assert get_resp.status_code == 200
+    assert len(get_data['records']) == batch_size
+    assert all(project.mine_guid == mine_guid for project in projects)
+    for i in range(len(get_data['records']) - 1):
+        assert datetime.strptime(get_data['records'][i]['update_timestamp'], '%Y-%m-%d') >= datetime.strptime(
+            get_data['records'][i + 1]['update_timestamp'], '%Y-%m-%d')
+
diff --git a/services/core-web/src/components/Forms/MajorProject/MajorProjectSearchForm.tsx b/services/core-web/src/components/Forms/MajorProject/MajorProjectSearchForm.tsx
@@ -1,9 +1,7 @@
 import React, { FC } from "react";
 import { UpOutlined, DownOutlined } from "@ant-design/icons";
 import { Field, reduxForm } from "redux-form";
-import { Form } from "@ant-design/compatible";
-import "@ant-design/compatible/assets/index.css";
-import { Button, Col, Row } from "antd";
+import { Button, Col, Row, Form } from "antd";
 
 import * as FORM from "@/constants/forms";
 import { renderConfig } from "@/components/common/config";
@@ -29,7 +27,7 @@ export const MajorProjectsSearchForm: FC<MajorProjectsSearchFormProps> = ({
   };
 
   return (
-    <Form layout="vertical" onSubmit={handleSubmit} onReset={handleSearchFormReset}>
+    <Form layout="vertical" onReset={handleSearchFormReset}>
       <Row gutter={6}>
         <Col md={24} xs={24}>
           <Field
@@ -72,7 +70,7 @@ export const MajorProjectsSearchForm: FC<MajorProjectsSearchFormProps> = ({
         <Button className="full-mobile" type="secondary" htmlType="reset">
           Clear Filters
         </Button>
-        <Button className="full-mobile" type="primary" htmlType="submit">
+        <Button className="full-mobile" type="primary" htmlType="submit" onClick={handleSubmit}>
           Apply Filters
         </Button>
       </div>

diff --git a/services/core-web/src/components/dashboard/majorProjectHomePage/MajorProjectSearch.tsx b/services/core-web/src/components/dashboard/majorProjectHomePage/MajorProjectSearch.tsx
@@ -40,7 +40,6 @@ export const MajorProjectSearch: FC<MajorProjectSearchProps> = ({
         <Col md={{ span: 12, offset: 6 }} xs={{ span: 20, offset: 2 }}>
           <span className="advanced-search__container">
             <MajorProjectSearchForm
-              // @ts-ignore
               handleReset={handleReset}
               onSubmit={handleSearch}
               toggleAdvancedSearch={toggleIsAdvancedSearch}

diff --git a/services/core-web/src/components/dashboard/majorProjectHomePage/MajorProjectTable.tsx b/services/core-web/src/components/dashboard/majorProjectHomePage/MajorProjectTable.tsx
@@ -8,7 +8,7 @@ import {
   MAJOR_MINE_APPLICATION_AND_IRT_STATUS_CODES,
   PROJECT_DECISION_PACKAGE_STATUS_CODES
 } from "@mds/common/constants/enums";
-import { formatDate, dateSorter } from "@common/utils/helpers";
+import { formatDate, dateSorter } from "@mds/common/redux/utils/helpers";
 import CoreTable from "@mds/common/components/common/CoreTable";
 import * as router from "@/constants/routes";
 import {
@@ -18,7 +18,7 @@ import { useFeatureFlag } from "@mds/common/providers/featureFlags/useFeatureFla
 import { Feature } from "@mds/common";
 import { IProject } from "@mds/common/interfaces";
 
-interface MajorProjectsSearchFormProps {
+interface MajorProjectTableProps {
   projects: IProject[];
   mineCommodityOptionsHash: any;
   handleSearch: (params: any) => void;
@@ -92,7 +92,7 @@ const handleTableChange = (handleSearch, tableFilters) => (pagination, filters,
   handleSearch(params);
 };
 
-export const MajorProjectTable: FC<MajorProjectsSearchFormProps> = ({
+export const MajorProjectTable: FC<MajorProjectTableProps> = ({
   projects,
   mineCommodityOptionsHash,
   handleSearch,
@@ -147,8 +147,7 @@ export const MajorProjectTable: FC<MajorProjectsSearchFormProps> = ({
       key: "project",
       dataIndex: "project",
       render: (text, record) => (
-        // @ts-ignore
-        <div title="" align="right" data-cy="major-projects-table-open-button">
+        <div title="" data-cy="major-projects-table-open-button">
           <Row gutter={1}>
             <Col span={12}>
               <Link to={router.EDIT_PROJECT.dynamicRoute(record.key)}>
@@ -169,8 +168,7 @@ export const MajorProjectTable: FC<MajorProjectsSearchFormProps> = ({
     {
       title: "",
       key: "project_section",
-      dataIndex: "project_section",
-      render: (text, record) => {
+      render: (record) => {
         return (
           // @ts-ignore
           <div title="" align="right">

diff --git a/services/core-web/src/styles/components/DocumentTableWithExpandedRows.scss b/services/core-web/src/styles/components/DocumentTableWithExpandedRows.scss
@@ -88,7 +88,7 @@
     }
 }
 
-expanded-row-button {
+.expanded-row-button {
     color: $primary-btn-color;
     background-color: $pure-white;
     border-color: $primary-btn-color;

diff --git a/...core-web/src/tests/components/dashboard/majorProjectHomePage/MajorProjectHomePage.spec.js b/...core-web/src/tests/components/dashboard/majorProjectHomePage/MajorProjectHomePage.spec.js
@@ -1,7 +1,7 @@
 import React from "react";
 import { render } from "@testing-library/react";
 import { MajorProjectHomePage } from "@/components/dashboard/majorProjectHomePage/MajorProjectHomePage";
-import * as MOCK from "@/tests/mocks/dataMocks";
+import * as MOCK from "@mds/common/tests/mocks/dataMocks";
 import { ReduxWrapper } from "@/tests/utils/ReduxWrapper";
 
 const dispatchProps = {};

diff --git a/...s/core-web/src/tests/components/dashboard/majorProjectHomePage/MajorProjectSearch.spec.js b/...s/core-web/src/tests/components/dashboard/majorProjectHomePage/MajorProjectSearch.spec.js
@@ -1,6 +1,6 @@
 import React from "react";
 import MajorProjectSearch from "@/components/dashboard/majorProjectHomePage/MajorProjectSearch";
-import * as MOCK from "@/tests/mocks/dataMocks";
+import * as MOCK from "@mds/common/tests/mocks/dataMocks";
 import { render } from "@testing-library/react";
 import { ReduxWrapper } from "@/tests/utils/ReduxWrapper";
 

diff --git a/...es/core-web/src/tests/components/dashboard/majorProjectHomePage/MajorProjectTable.spec.js b/...es/core-web/src/tests/components/dashboard/majorProjectHomePage/MajorProjectTable.spec.js
@@ -1,6 +1,6 @@
 import React from "react";
 import MajorProjectTable from "@/components/dashboard/majorProjectHomePage/MajorProjectTable";
-import * as MOCK from "@/tests/mocks/dataMocks";
+import * as MOCK from "@mds/common/tests/mocks/dataMocks";
 import { render } from "@testing-library/react";
 import { ReduxWrapper } from "@/tests/utils/ReduxWrapper";
 import { BrowserRouter } from "react-router-dom";

diff --git a/...components/dashboard/majorProjectHomePage/__snapshots__/MajorProjectHomePage.spec.js.snap b/...components/dashboard/majorProjectHomePage/__snapshots__/MajorProjectHomePage.spec.js.snap
@@ -34,7 +34,7 @@ exports[`MajorProjectHomePage renders properly 1`] = `
               class="advanced-search__container"
             >
               <form
-                class="ant-legacy-form ant-legacy-form-vertical"
+                class="ant-form ant-form-vertical"
               >
                 <div
                   class="ant-row"

diff --git a/...s/components/dashboard/majorProjectHomePage/__snapshots__/MajorProjectSearch.spec.js.snap b/...s/components/dashboard/majorProjectHomePage/__snapshots__/MajorProjectSearch.spec.js.snap
@@ -13,7 +13,7 @@ exports[`Major Project Search Component renders properly 1`] = `
           class="advanced-search__container"
         >
           <form
-            class="ant-legacy-form ant-legacy-form-vertical"
+            class="ant-form ant-form-vertical"
           >
             <div
               class="ant-row"

diff --git a/...ts/components/dashboard/majorProjectHomePage/__snapshots__/MajorProjectTable.spec.js.snap b/...ts/components/dashboard/majorProjectHomePage/__snapshots__/MajorProjectTable.spec.js.snap
@@ -454,7 +454,6 @@ exports[`MajorProjectTable renders properly 1`] = `
                       class="ant-table-cell"
                     >
                       <div
-                        align="right"
                         data-cy="major-projects-table-open-button"
                         title=""
                       >