Merge pull request #81 from suvarnakale/release-1.0.0

Issue #0000 fix: issue fixes in search , filter, sortby functionality
tekdi · Nov 12, 2024 · e48eb24 · e48eb24
2 parents 510b833 + 74a0551
commit e48eb24
Show file tree

Hide file tree

Showing 7 changed files with 58 additions and 21 deletions.
diff --git a/src/components/SearchBox.tsx b/src/components/SearchBox.tsx
@@ -101,6 +101,7 @@ const SearchBox: React.FC<SearchBarProps> = ({
         <Box sx={{ mt: 2, px: theme.spacing(2.5) }}>
           <Paper
             component="form"
+            onSubmit={(e) => e.preventDefault()}
             sx={{
               display: "flex",
               alignItems: "center",

diff --git a/src/pages/workspace/content/allContents/index.tsx b/src/pages/workspace/content/allContents/index.tsx
@@ -102,7 +102,7 @@ const AllContentsPage = () => {
         ];
         const query = debouncedSearchTerm || "";
         const primaryCategory = filter.length ? filter : [];
-        const order = sortBy === "Modified On" ? "desc" : "asc";
+        const order = sortBy === "Created On" ? "asc" : "desc";
         const sort_by = {
           lastUpdatedOn: order,
         };
@@ -159,8 +159,13 @@ const AllContentsPage = () => {
     <Layout selectedKey={selectedKey} onSelect={setSelectedKey}>
       <WorkspaceText />
       <Box p={3}>
-      <Box sx={{background: "#FFFFFF"}} p={2}>
-        <Typography variant="h4" sx={{fontWeight:"bold", fontSize: "16px"}}>All My Contents</Typography>
+        <Box sx={{ background: "#FFFFFF" }} p={2}>
+          <Typography
+            variant="h4"
+            sx={{ fontWeight: "bold", fontSize: "16px" }}
+          >
+            All My Contents
+          </Typography>
         </Box>
         {/* <Typography mb={2}>Here you see all your content.</Typography> */}
 
@@ -197,7 +202,10 @@ const AllContentsPage = () => {
                           sx={{ cursor: "pointer" }}
                         >
                           {content?.appIcon ? (
-                            <img src={content?.appIcon || '/logo.png'} height={"25px"} />
+                            <img
+                              src={content?.appIcon || "/logo.png"}
+                              height={"25px"}
+                            />
                           ) : (
                             <UpReviewTinyImage fontSize="small" />
                           )}

diff --git a/src/pages/workspace/content/draft/index.tsx b/src/pages/workspace/content/draft/index.tsx
@@ -90,7 +90,7 @@ const DraftPage = () => {
         const query = debouncedSearchTerm || "";
         const offset = page * LIMIT;
         const primaryCategory = filter.length ? filter : [];
-        const order = sortBy === "Modified On" ? "desc" : "asc";
+        const order = sortBy === "Created On" ? "asc" : "desc";
         const sort_by = { lastUpdatedOn: order };
         const response = await getContent(
           ["Draft", "FlagDraft"],
@@ -118,8 +118,13 @@ const DraftPage = () => {
     <Layout selectedKey={selectedKey} onSelect={setSelectedKey}>
       <WorkspaceText />
       <Box p={3}>
-      <Box sx={{background: "#FFFFFF"}} p={2}>
-        <Typography variant="h4" sx={{fontWeight: "bold", fontSize: "16px"}}>Drafts</Typography>
+        <Box sx={{ background: "#FFFFFF" }} p={2}>
+          <Typography
+            variant="h4"
+            sx={{ fontWeight: "bold", fontSize: "16px" }}
+          >
+            Drafts
+          </Typography>
         </Box>
         {/* <Typography mb={2}>
           Create, organize, and manage all types of content in one place.
@@ -160,7 +165,7 @@ const DraftPage = () => {
                     <TableCell onClick={() => openEditor(content)}>
                       <Box display="flex" alignItems="center">
                         <img
-                          src={content?.appIcon || '/logo.png'}
+                          src={content?.appIcon || "/logo.png"}
                           alt={content.name}
                           style={{
                             width: 60,

diff --git a/src/pages/workspace/content/publish/index.tsx b/src/pages/workspace/content/publish/index.tsx
@@ -90,7 +90,7 @@ const PublishPage = () => {
         const query = debouncedSearchTerm || "";
         const offset = page * LIMIT;
         const primaryCategory = filter.length ? filter : [];
-        const order = sortBy === "Modified On" ? "desc" : "asc";
+        const order = sortBy === "Created On" ? "asc" : "desc";
         const sort_by = { lastUpdatedOn: order };
         const response = await getContent(
           ["Live"],
@@ -119,7 +119,12 @@ const PublishPage = () => {
       <WorkspaceText />
       <Box p={3}>
         <Box sx={{ background: "#FFFFFF" }} p={2}>
-          <Typography variant="h4" sx={{ fontWeight: "bold", fontSize: "16px" }}>Published</Typography>
+          <Typography
+            variant="h4"
+            sx={{ fontWeight: "bold", fontSize: "16px" }}
+          >
+            Published
+          </Typography>
         </Box>
         {/* <Typography mb={2}>Here you see all your published content.</Typography> */}
 
@@ -158,7 +163,7 @@ const PublishPage = () => {
                     <TableCell onClick={() => openEditor(content)}>
                       <Box display="flex" alignItems="center">
                         <img
-                          src={content?.appIcon || '/logo.png'}
+                          src={content?.appIcon || "/logo.png"}
                           alt={content.name}
                           style={{
                             width: 60,

diff --git a/src/pages/workspace/content/submitted/index.tsx b/src/pages/workspace/content/submitted/index.tsx
@@ -68,7 +68,7 @@ const SubmittedForReviewPage = () => {
         const query = debouncedSearchTerm || "";
         const offset = page * LIMIT;
         const primaryCategory = filter.length ? filter : [];
-        const order = sortBy === "Modified On" ? "desc" : "asc";
+        const order = sortBy === "Created On" ? "asc" : "desc";
         const sort_by = { lastUpdatedOn: order };
         const response = await getContent(
           ["Review", "FlagReview"],
@@ -101,7 +101,10 @@ const SubmittedForReviewPage = () => {
       content?.mimeType &&
       MIME_TYPE.GENERIC_MIME_TYPE.includes(content?.mimeType)
     ) {
-      router.push({ pathname: `/workspace/content/review`, query: { identifier, mode } });
+      router.push({
+        pathname: `/workspace/content/review`,
+        query: { identifier, mode },
+      });
     } else if (
       content?.mimeType &&
       MIME_TYPE.COLLECTION_MIME_TYPE.includes(content?.mimeType)
@@ -114,9 +117,13 @@ const SubmittedForReviewPage = () => {
     <Layout selectedKey={selectedKey} onSelect={setSelectedKey}>
       <WorkspaceText />
       <Box p={3}>
-
-        <Box sx={{background: "#FFFFFF"}} p={2}>
-        <Typography variant="h4" sx={{fontWeight: "bold", fontSize: "16px"}}>Submitted For Review</Typography>
+        <Box sx={{ background: "#FFFFFF" }} p={2}>
+          <Typography
+            variant="h4"
+            sx={{ fontWeight: "bold", fontSize: "16px" }}
+          >
+            Submitted For Review
+          </Typography>
         </Box>
         {/* <Typography mb={2}>
           Here you can see all your content submitted for review.
@@ -157,7 +164,7 @@ const SubmittedForReviewPage = () => {
                     <TableCell onClick={() => openEditor(content)}>
                       <Box display="flex" alignItems="center">
                         <img
-                          src={content?.appIcon || '/logo.png'}
+                          src={content?.appIcon || "/logo.png"}
                           alt={content?.name}
                           style={{
                             width: 60,

diff --git a/src/services/ContentService.ts b/src/services/ContentService.ts
@@ -6,7 +6,7 @@ import { MIME_TYPE, TENANTID } from "@/utils/app.config";
 const authToken = process.env.NEXT_PUBLIC_AUTH_API_TOKEN;
 const baseUrl = process.env.NEXT_PUBLIC_BASE_URL;
 import { v4 as uuidv4 } from "uuid";
-import { ChannelID } from "@/utils/app.constant";
+import { ChannelID, PrimaryCategoryValue } from "@/utils/app.constant";
 
 const userId = getLocalStoredUserData();
 console.log("userId ==>", userId);
@@ -54,9 +54,9 @@ const getReqBodyWithStatus = (
   sort_by: any
 ) => {
   if (typeof window !== "undefined" && typeof localStorage !== "undefined") {
-    var PrimaryCategory = JSON.parse(
-      localStorage.getItem("PrimaryCategory") as string
-    );
+    var PrimaryCategory =
+      JSON.parse(localStorage.getItem("PrimaryCategory") as string) ||
+      PrimaryCategoryValue;
   }
   primaryCategory =
     primaryCategory.length === 0 ? PrimaryCategory : primaryCategory;

diff --git a/src/utils/app.constant.ts b/src/utils/app.constant.ts
@@ -12,3 +12,14 @@ export const SortOptions = ["Modified On", "Created On"];
 
 export const LIMIT = 6;
 export const ChannelID = "test-k12-channel";
+
+export const PrimaryCategoryValue = [
+  "Course",
+  "Course Assessment",
+  "eTextbook",
+  "Explanation Content",
+  "Learning Resource",
+  "Practice Question Set",
+  "Teacher Resource",
+  "Exam Question",
+];