fix: redeploy + empty state checks

Kiroves · Kiroves · commit dc7048bc55f7 · 2024-11-23T21:41:00.000-08:00
diff --git a/cdk/OpenAPI_Swagger_Definition.yaml b/cdk/OpenAPI_Swagger_Definition.yaml
@@ -1298,9 +1298,9 @@ paths:
         - adminAuthorizer: []
       x-amazon-apigateway-integration:
         uri:
-          Fn::Sub: "arn:aws:apigateway:${AWS::Region}:lambda:path/2015-03-31/functions/${GetMessagesFunction.Arn}/invocations"
+          Fn::Sub: "arn:aws:apigateway:${AWS::Region}:lambda:path/2015-03-31/functions/${adminFunction.Arn}/invocations"
         passthroughBehavior: "when_no_match"
-        httpMethod: "GET"
+        httpMethod: "POST"
         type: "aws_proxy"
   /admin/get_feedback:
       options:
diff --git a/cdk/lib/amplify-stack.ts b/cdk/lib/amplify-stack.ts
@@ -139,9 +139,6 @@ import {
       });
   
       amplifyApp.addBranch("main");
-      amplifyApp.addBranch("dev");
-
       amplifyAppAdmin.addBranch("main");
-      amplifyAppAdmin.addBranch("dev");
     }
   }
diff --git a/cdk/lib/database-stack.ts b/cdk/lib/database-stack.ts
@@ -25,7 +25,7 @@ export class DatabaseStack extends Stack {
         /**
          * Create the RDS service-linked role if it doesn't exist
          */
-        new iam.CfnServiceLinkedRole(this, 'RDSServiceLinkedRoleAWS', {
+        new iam.CfnServiceLinkedRole(this, 'DSARDSServiceLinkedRole', {
             awsServiceName: 'rds.amazonaws.com',
         });
         
diff --git a/docs/deploymentGuide.md b/docs/deploymentGuide.md
@@ -123,7 +123,7 @@ cdk bootstrap aws://<YOUR_AWS_ACCOUNT_ID>/<YOUR_ACCOUNT_REGION> --profile <your-
 **Deploy CDK stack**
 You may run the following command to deploy the stacks all at once. Again, replace `<your-profile-name>` with the appropriate AWS profile used earlier.
 ```
-cdk deploy --all --parameters AmplifyStack:githubRepoName=Digital-Strategy-Assistant --context VpcStackName=DigitalStrategyAssistantVpcStack --context DatabaseStackName=DigitalStrategyAssistantDatabaseStack --context ApiStackName=DigitalStrategyAssistantApiStack --context DbFlowStackName=DigitalStrategyAssistantDBFlowStack --context AmplifyStackName=DigitalStrategyAssistantAmplifyStack --context prefix="Digital-Strategy-Assistant-production" --profile <your-profile-name>
+cdk deploy --all --parameters DigitalStrategyAssistantAmplifyStack:githubRepoName=Digital-Strategy-Assistant --context VpcStackName=DigitalStrategyAssistantVpcStack --context DatabaseStackName=DigitalStrategyAssistantDatabaseStack --context ApiStackName=DigitalStrategyAssistantApiStack --context DbFlowStackName=DigitalStrategyAssistantDBFlowStack --context AmplifyStackName=DigitalStrategyAssistantAmplifyStack --context prefix="Digital-Strategy-Assistant-production" --profile <your-profile-name>
 ```
 If you have trouble running the above command, try removing all the \ and run it in one line.
 
diff --git a/frontendAdmin/src/components/feedback/Feedback.jsx b/frontendAdmin/src/components/feedback/Feedback.jsx
@@ -7,6 +7,7 @@ import {
   ShieldCheck,
   ChevronDown,
   ChevronUp,
+  MessageSquare,
 } from "lucide-react";
 import {
   Collapsible,
@@ -18,6 +19,51 @@ import LoadingScreen from "../Loading/LoadingScreen";
 import { fetchAuthSession } from "aws-amplify/auth";
 import Session from "../history/Session";
 
+const EmptyFeedbackView = ({ role }) => {
+  const getRoleIcon = (role) => {
+    switch (role) {
+      case "public":
+        return <Users className="mr-2" />;
+      case "educator":
+        return <GraduationCap className="mr-2" />;
+      case "admin":
+        return <ShieldCheck className="mr-2" />;
+      default:
+        return null;
+    }
+  };
+
+  const getRoleLabel = (role) => {
+    switch (role) {
+      case "public":
+        return "Student/General Public";
+      case "educator":
+        return "Educator/Educational Designer";
+      case "admin":
+        return "Post-Secondary Institution Admin/Leader";
+      default:
+        return role;
+    }
+  };
+
+  return (
+    <div className="w-full">
+      <div className="flex items-center space-x-4 px-4 py-3 bg-gray-50 rounded-t-lg">
+        <div className="flex items-center">
+          {getRoleIcon(role)}
+          <h2 className="text-lg font-semibold capitalize">
+            {getRoleLabel(role)} Feedback
+          </h2>
+          <span className="ml-2 text-gray-500">(Avg Rating: 0, Total: 0)</span>
+        </div>
+      </div>
+      <div className="p-8 text-center border-b border-x rounded-b-lg bg-white">
+        <p className="text-gray-500">No feedback available for this role yet</p>
+      </div>
+    </div>
+  );
+};
+
 const FeedbackView = ({ role, feedbackData, onFeedbackClick }) => {
   const [isOpen, setIsOpen] = useState(true);
 
@@ -51,6 +97,13 @@ const FeedbackView = ({ role, feedbackData, onFeedbackClick }) => {
     return new Date(dateString).toLocaleString();
   };
 
+  if (
+    !feedbackData.feedback_details ||
+    feedbackData.feedback_details.length === 0
+  ) {
+    return <EmptyFeedbackView role={role} />;
+  }
+
   return (
     <Collapsible open={isOpen} onOpenChange={setIsOpen} className="w-full">
       <CollapsibleTrigger asChild className="hover:cursor-pointer">
@@ -133,21 +186,15 @@ const Feedback = () => {
 
   function sortFeedbackByTimestamp(data) {
     return data.map((roleData) => {
-      // Create a new object to avoid mutating the original
       const sortedData = { ...roleData };
-
-      // Sort feedback_details in descending order (recent first)
       if (
         sortedData.feedback_details &&
         Array.isArray(sortedData.feedback_details)
       ) {
         sortedData.feedback_details = sortedData.feedback_details.sort(
-          (a, b) => {
-            return new Date(b.feedback_time) - new Date(a.feedback_time);
-          }
+          (a, b) => new Date(b.feedback_time) - new Date(a.feedback_time)
         );
       }
-
       return sortedData;
     });
   }
@@ -173,7 +220,6 @@ const Feedback = () => {
         }
 
         const data = await response.json();
-        console.log(data);
         const sortedData = sortFeedbackByTimestamp(data);
         setFeedbackData(sortedData);
       } catch (error) {
@@ -187,7 +233,6 @@ const Feedback = () => {
   }, []);
 
   const handleSessionClick = (sessionId) => {
-    // Find the session object with the matching session_id
     for (const roleData of feedbackData) {
       const session = roleData.feedback_details.find(
         (feedback) => feedback.session_id === sessionId
@@ -217,6 +262,21 @@ const Feedback = () => {
     );
   }
 
+  if (!feedbackData || feedbackData.length === 0) {
+    return (
+      <div className="w-full h-[50vh] flex flex-col items-center justify-center p-4 space-y-4">
+        <MessageSquare className="w-16 h-16 text-gray-300" />
+        <h2 className="text-xl font-semibold text-gray-600">
+          No Feedback Available
+        </h2>
+        <p className="text-gray-500 text-center max-w-md">
+          There is currently no feedback from any user roles. Feedback will
+          appear here once users start providing it.
+        </p>
+      </div>
+    );
+  }
+
   return (
     <div className="w-full mx-auto space-y-4 p-4 overflow-y-auto mb-8">
       {feedbackData.map((roleData, index) => (
diff --git a/frontendAdmin/src/components/files/Files.jsx b/frontendAdmin/src/components/files/Files.jsx
@@ -3,10 +3,11 @@
 import React, { useState, useEffect } from "react";
 import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
-import { Download } from "lucide-react";
+import { Download, FolderIcon } from "lucide-react";
 import { toast } from "react-toastify";
 import { fetchAuthSession } from "aws-amplify/auth";
 import LoadingScreen from "../Loading/LoadingScreen";
+
 const Files = () => {
   const [categories, setCategories] = useState([]);
   const [filesByCategory, setFilesByCategory] = useState({});
@@ -120,6 +121,22 @@ const Files = () => {
     return <LoadingScreen />;
   }
 
+  // If there are no categories
+  if (categories.length === 0) {
+    return (
+      <div className="w-full h-[50vh] flex flex-col items-center justify-center p-4 space-y-4">
+        <FolderIcon className="w-16 h-16 text-gray-300" />
+        <h2 className="text-xl font-semibold text-gray-600">
+          No Categories Found
+        </h2>
+        <p className="text-gray-500 text-center max-w-md">
+          There are currently no categories available. Categories will appear
+          here once they are created.
+        </p>
+      </div>
+    );
+  }
+
   return (
     <div className="w-full mx-auto p-4 space-y-6">
       {categories.map((category) => (
@@ -129,7 +146,12 @@ const Files = () => {
               char.toUpperCase()
             )}
           </h2>
-          {filesByCategory[category.category_id] &&
+          {!filesByCategory[category.category_id] ||
+          filesByCategory[category.category_id].length === 0 ? (
+            <div className="p-4 border rounded-lg mb-2 text-center text-gray-500">
+              No files available in this category
+            </div>
+          ) : (
             filesByCategory[category.category_id].map((file, index) => {
               const fileName = file.fileName || file.name;
               return (
@@ -165,7 +187,8 @@ const Files = () => {
                   </div>
                 </div>
               );
-            })}
+            })
+          )}
         </div>
       ))}
     </div>
diff --git a/frontendAdmin/src/components/prompt/PreviousPrompts.jsx b/frontendAdmin/src/components/prompt/PreviousPrompts.jsx
@@ -10,8 +10,30 @@ import {
 } from "@/components/ui/card";
 import { ChevronLeft, ChevronRight } from "lucide-react";
 import { useState } from "react";
-export default function PreviousPrompts({ previousPrompts }) {
+
+export default function PreviousPrompts({ previousPrompts = [] }) {
   const [currentPage, setCurrentPage] = useState(0);
+
+  // If there are no prompts, show empty state
+  if (!previousPrompts || previousPrompts.length === 0) {
+    return (
+      <div className="w-full sm:max-w-xl md:max-w-full mx-auto px-4 py-1">
+        <Card className="border-0 shadow-none">
+          <CardHeader>
+            <CardTitle className="text-base sm:text-md font-semibold text-center">
+              Previous Prompts
+            </CardTitle>
+          </CardHeader>
+          <CardContent className="py-1 sm:py-2">
+            <p className="text-center text-gray-500 text-sm">
+              No previous prompts yet
+            </p>
+          </CardContent>
+        </Card>
+      </div>
+    );
+  }
+
   return (
     <div className="w-full sm:max-w-xl md:max-w-full mx-auto px-4 py-1">
       <Card className="border-0 shadow-none">
@@ -64,10 +86,10 @@ export default function PreviousPrompts({ previousPrompts }) {
           {/* Prompt Content */}
           <div className="text-center">
             <p className="text-gray-700 mb-1 text-xs sm:text-sm">
-              {previousPrompts[currentPage].prompt}
+              {previousPrompts[currentPage]?.prompt || ""}
             </p>
             <p className="text-[10px] sm:text-xs text-gray-500">
-              {previousPrompts[currentPage].time_created}
+              {previousPrompts[currentPage]?.time_created || ""}
             </p>
           </div>
         </CardContent>

Original file line number	Diff line number	Diff line change
`@@ -139,9 +139,6 @@ import {`
`139`	`139`	`});`
`140`	`140`
`141`	`141`	`amplifyApp.addBranch("main");`
`142`		`- amplifyApp.addBranch("dev");`
`143`		`-`
`144`	`142`	`amplifyAppAdmin.addBranch("main");`
`145`		`- amplifyAppAdmin.addBranch("dev");`
`146`	`143`	`}`
`147`	`144`	`}`