Merge pull request #229 from bcgov/ticdi-103

Ticdi 103 - create document page layout
bcgov · Aug 29, 2024 · f19d606 · f19d606
2 parents 0be72e2 + ba201eb
commit f19d606
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 17 deletions.
diff --git a/backend/src/report/report.service.ts b/backend/src/report/report.service.ts
@@ -241,7 +241,8 @@ export class ReportService {
     const md2 = JSON.stringify(cdogsData);
     conf.data = md2;
     const response2 = await ax(conf).catch((error) => {
-      console.log(error.response);
+      console.log('cdogs error');
+      console.log(error);
     });
     // response2.data is the docx file after the second insertions
     // (anything nested in a variable or provision should be inserted at this point)

diff --git a/frontend/src/app/components/common/Collapsible.tsx b/frontend/src/app/components/common/Collapsible.tsx
@@ -39,7 +39,6 @@ const Collapsible: FC<CollapsibleProps> = ({ title, children, isOpen }) => {
         </div>
       </div>
 
-      <hr />
       <div style={contentStyle}>{children}</div>
     </div>
   );

diff --git a/frontend/src/app/content/pages/LandingPage.tsx b/frontend/src/app/content/pages/LandingPage.tsx
@@ -130,7 +130,6 @@ const LandingPage: FC = () => {
         );
         if (!displayData.error) {
           setData(displayData.dtr);
-          setIsOpen(true);
         } else {
           setError(displayData.error);
           setShowError(true);
@@ -215,7 +214,6 @@ const LandingPage: FC = () => {
       const displayData: { dtr: DTRDisplayObject | null; error: string | null } = await getDisplayData(dtidValue);
       if (!displayData.error) {
         setData(displayData.dtr);
-        setIsOpen(true);
       } else {
         setError(displayData.error);
         setShowError(true);
@@ -448,19 +446,7 @@ const LandingPage: FC = () => {
         <div className="font-weight-bold inlineDiv mr-1">Primary Contact Name:</div>
         <div className="inlineDiv">{data?.primaryContactName}</div>
       </div>
-      <Collapsible title="Disposition Transaction ID Details" isOpen={isOpen}>
-        {data ? <DtidDetails data={data!} /> : <Skeleton />}
-      </Collapsible>
-      <Collapsible title="Tenure Details" isOpen={isOpen}>
-        {data ? <TenureDetails data={data!} /> : <Skeleton />}
-      </Collapsible>
-      <Collapsible title="Interested Parties" isOpen={isOpen}>
-        {data ? <InterestedParties data={data!} /> : <Skeleton />}
-      </Collapsible>
-
-      <hr />
       <h3>Create Document</h3>
-      <hr />
       <Row className="mb-3">
         <div className="ml-3 mr-3">
           <b>Document Type:</b>
@@ -480,6 +466,16 @@ const LandingPage: FC = () => {
           </select>
         </div>
       </Row>
+      <Collapsible title="Disposition Transaction ID Details" isOpen={isOpen}>
+        {data ? <DtidDetails data={data!} /> : <Skeleton />}
+      </Collapsible>
+      <Collapsible title="Tenure Details" isOpen={isOpen}>
+        {data ? <TenureDetails data={data!} /> : <Skeleton />}
+      </Collapsible>
+      <Collapsible title="Interested Parties" isOpen={isOpen}>
+        {data ? <InterestedParties data={data!} /> : <Skeleton />}
+      </Collapsible>
+
       {provisionGroups && dtid && documentType ? (
         <>
           <Collapsible title="Provisions" isOpen={false}>

diff --git a/frontend/src/app/content/pages/ManageProvisionsPage.tsx b/frontend/src/app/content/pages/ManageProvisionsPage.tsx
@@ -86,7 +86,7 @@ const ManageProvisionsPage: FC<ManageProvisionsPageProps> = () => {
   };
 
   const handleFilterProvisions = (searchTerm: string) => {
-    const searchKeys: string[] = ['provision_name', 'category'];
+    const searchKeys: string[] = ['id', 'provision_name', 'category'];
     setFilterText(searchTerm);
 
     const fp: Provision[] = data.allProvisions