Merge pull request #2263 from tekdi/feat-new-issue-fix

Feat new issue fix

Author: rushi-tekdi

mfes/scp-teacher-repo/src/pages/observation/[observationId]/index.tsx

@@ -271,6 +271,7 @@ const ObservationDetails = () => {
           }
         }
       } catch (error) {
+        
         console.error('Error fetching cohort list:', error);
       }
     };
@@ -303,7 +304,7 @@ const ObservationDetails = () => {
     if (entity !== ObservationEntityType.CENTER) {
       result = Data.map((user) => {
         const submission =
-          fetchEntityResponse.find((sub) => sub._id === user.userId) || {};
+          fetchEntityResponse?.find((sub) => sub._id === user.userId) || {};
         return {
           name: user.name,
           _id: user.userId,
@@ -318,7 +319,7 @@ const ObservationDetails = () => {
       result =
         myCohortListForCenter?.map((cohort) => {
           const submission =
-            fetchEntityResponse.find((sub) => sub._id === cohort.cohortId) ||
+            fetchEntityResponse?.find((sub) => sub._id === cohort.cohortId) ||
             {};
           return {
             name: cohort?.name,
@@ -771,7 +772,7 @@ const ObservationDetails = () => {
                   mx: '11px',
                 }}
               >
-                {loading ? (
+                {loading || !observationId || observationId === '' ? (
                   <Box mx="auto">
                     <Loader
                       showBackdrop={false}

mfes/workspace/src/pages/workspace/content/allContents/index.tsx

@@ -81,7 +81,7 @@ const columns = [
     key: 'contentAction',
     title: 'ACTION',
     dataType: DataType.String,
-    width: '140px',
+    width: '220px',
   },
 ];
 const AllContentsPage = () => {

mfes/workspace/src/pages/workspace/content/publish/index.tsx

@@ -42,7 +42,7 @@ const columns = [
     dataType: DataType.String,
     width: '180px',
   },
-  { key: 'action', title: 'ACTION', dataType: DataType.String, width: '200px' },
+  { key: 'action', title: 'ACTION', dataType: DataType.String, width: '220px' },
 ];
 const PublishPage = () => {
   const tenantConfig = useTenantConfig();