Merge pull request #92 from shreyas1434shinde/main

Issue #PS-2322 fix: Workspace UI improvements and Fixes
tekdi · Nov 15, 2024 · e4fb80e · e4fb80e
2 parents 3bb8846 + 98cf272
commit e4fb80e
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 26 deletions.
diff --git a/package.json b/package.json
@@ -9,12 +9,12 @@
     "lint": "next lint"
   },
   "dependencies": {
-    "@emotion/react": "11.11.4",
-    "@emotion/styled": "11.11.5",
     "@module-federation/nextjs-mf": "^8.5.5",
     "@module-federation/utilities": "3.0.11",
-    "@mui/icons-material": "^5.15.20",
-    "@mui/material": "^5.16.0",
+    "@emotion/react": "^11.11.4",
+    "@emotion/styled": "^11.11.5",
+    "@mui/icons-material": "^5.15.15",
+    "@mui/material": "^5.15.21",
     "@project-sunbird/sunbird-collection-editor-web-component": "^1.6.0",
     "async": "^3.2.5",
     "body-parser": "^1.20.2",
@@ -55,4 +55,4 @@
     "typescript": "^5.6.2",
     "webpack": "^5.76.2"
   }
-}
+}
diff --git a/src/components/Layout.tsx b/src/components/Layout.tsx
@@ -10,11 +10,11 @@ interface LayoutProps {
 
 const Layout: React.FC<LayoutProps> = ({ children, selectedKey, onSelect }) => {
   return (
-    <Box display="flex" minHeight={"100vh"}>
+    <Box display="flex" sx={{ overflowX: 'hidden !important' }} minHeight={"100vh"}>
       <Box sx={{ height: '100vh', '@media (max-width: 900px)': { position: 'absolute' }, '@media (min-width: 900px)': { background: '#fff' } }}>
         <Sidebar selectedKey={selectedKey} onSelect={onSelect} />
       </Box>
-      <Box sx={{ flex: 1, background: 'rgb(243, 245, 248)' }}>{children}</Box>
+      <Box sx={{ flex: 1, background: 'rgb(243, 245, 248)', '@media (min-width: 900px)': { width: 'calc(100% - 251px)', }, width: '100%' }}>{children}</Box>
     </Box>
   );
 };

diff --git a/src/pages/workspace/content/allContents/index.tsx b/src/pages/workspace/content/allContents/index.tsx
@@ -29,10 +29,10 @@ import { DataType } from 'ka-table/enums';
 import "ka-table/style.css";
 import KaTableComponent from "@/components/KaTableComponent";
 const columns = [
-  { key: 'name', title: 'Content', dataType: DataType.String },
-  { key: 'lastUpdatedOn', title: 'Last Updated', dataType: DataType.String },
-  { key: 'status', title: 'Status', dataType: DataType.String },
-  { key: 'contentAction', title: 'Action', dataType: DataType.String },
+  { key: 'name', title: 'Content', dataType: DataType.String, width: "450px" },
+  { key: 'lastUpdatedOn', title: 'Last Updated', dataType: DataType.String, width: "300px" },
+  { key: 'status', title: 'Status', dataType: DataType.String, width: "300px" },
+  { key: 'contentAction', title: 'Action', dataType: DataType.String, width: "200px" },
 
 ]
 const AllContentsPage = () => {

diff --git a/src/pages/workspace/content/draft/index.tsx b/src/pages/workspace/content/draft/index.tsx
@@ -27,11 +27,11 @@ import Paper from '@mui/material/Paper';
 import { timeAgo } from "@/utils/Helper";
 
 const columns = [
-  { key: 'title_and_description', title: 'Title & Description', dataType: DataType.String, },
-  { key: 'contentType', title: 'Content Type', dataType: DataType.String, },
-  { key: 'status', title: 'Status', dataType: DataType.String, },
-  { key: 'lastUpdatedOn', title: 'Last Modified', dataType: DataType.String, },
-  { key: 'action', title: 'Action', dataType: DataType.String, },
+  { key: 'title_and_description', title: 'Title & Description', dataType: DataType.String, width: "450px" },
+  { key: 'contentType', title: 'Content Type', dataType: DataType.String, width: "300px" },
+  { key: 'status', title: 'Status', dataType: DataType.String, width: "300px" },
+  { key: 'lastUpdatedOn', title: 'Last Modified', dataType: DataType.String, width: "300px" },
+  { key: 'action', title: 'Action', dataType: DataType.String, width: "200px" },
 
 
 ]

diff --git a/src/pages/workspace/content/publish/index.tsx b/src/pages/workspace/content/publish/index.tsx
@@ -26,11 +26,11 @@ import KaTableComponent from "@/components/KaTableComponent";
 import { timeAgo } from "@/utils/Helper";
 
 const columns = [
-  { key: 'title_and_description', title: 'Title & Description', dataType: DataType.String },
-  { key: 'contentType', title: 'Content Type', dataType: DataType.String },
-  { key: 'status', title: 'Status', dataType: DataType.String },
-  { key: 'lastUpdatedOn', title: 'Last Modified', dataType: DataType.String },
-  { key: 'action', title: 'Action', dataType: DataType.String },
+  { key: 'title_and_description', title: 'Title & Description', dataType: DataType.String, width: "450px" },
+  { key: 'contentType', title: 'Content Type', dataType: DataType.String, width: "300px" },
+  { key: 'status', title: 'Status', dataType: DataType.String, width: "300px" },
+  { key: 'lastUpdatedOn', title: 'Last Modified', dataType: DataType.String, width: "300px" },
+  { key: 'action', title: 'Action', dataType: DataType.String, width: "200px" },
 
 
 ]

diff --git a/src/pages/workspace/content/submitted/index.tsx b/src/pages/workspace/content/submitted/index.tsx
@@ -25,11 +25,11 @@ import { DataType } from 'ka-table/enums';
 import KaTableComponent from "@/components/KaTableComponent";
 import { timeAgo } from "@/utils/Helper";
 const columns = [
-  { key: 'title_and_description', title: 'Title & Description', dataType: DataType.String },
-  { key: 'contentType', title: 'Content Type', dataType: DataType.String },
-  { key: 'status', title: 'Status', dataType: DataType.String },
-  { key: 'lastUpdatedOn', title: 'Last Modified', dataType: DataType.String },
-  { key: 'action', title: 'Action', dataType: DataType.String },
+  { key: 'title_and_description', title: 'Title & Description', dataType: DataType.String, width: "450px" },
+  { key: 'contentType', title: 'Content Type', dataType: DataType.String, width: "300px" },
+  { key: 'status', title: 'Status', dataType: DataType.String, width: "300px" },
+  { key: 'lastUpdatedOn', title: 'Last Modified', dataType: DataType.String, width: "300px" },
+  { key: 'action', title: 'Action', dataType: DataType.String, width: "200px" },
 
 
 ]