Merge branch '#564/feat/event-handler-for-csv' of github.com:ohtutrai…

…ninghub/traininghub into #564/feat/event-handler-for-csv
ohtutraininghub · Apr 17, 2024 · 73b527e · 73b527e
2 parents 00c7ef1 + c65cc09
commit 73b527e
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/cypress/e2e/profileView.cy.ts b/cypress/e2e/profileView.cy.ts
@@ -123,7 +123,7 @@ describe('Profile View', () => {
       // close ended created courses dropdown
       cy.getCy('listControls\\.endedCreated').click();
       // trainer user is the creator of 2 upcoming courses and one ongoing course
-      cy.contains('Upcoming created courses (3)');
+      cy.contains('Created courses (3)');
       cy.contains(testCourses[0].name).should('not.exist');
       cy.contains(testCourses[1].name).contains('In Progress');
       cy.contains(testCourses[2].name);
@@ -180,7 +180,7 @@ describe('Profile View', () => {
     it('should not show upcoming created courses for admin', () => {
       cy.getCy('myCoursesTab').click();
       // admin isn't the creator of any courses
-      cy.contains('Upcoming created courses (0)');
+      cy.contains('Created courses (0)');
       cy.contains('No courses to show.');
     });
     it('should not show ended created courses for admin', () => {
@@ -220,7 +220,7 @@ describe('Profile View', () => {
       cy.visit('/profile/cluo35ozy000208jy18sdfe4a'); // trainer's user id
       cy.contains('Tim Trainer');
       cy.getCy('myCoursesTab').click();
-      cy.contains('Upcoming created courses (3)');
+      cy.contains('Created courses (3)');
       cy.contains('Ended created courses (2)');
       cy.contains('Course templates (0)');
     });

diff --git a/src/app/[lang]/locales/en/components.json b/src/app/[lang]/locales/en/components.json
@@ -149,13 +149,13 @@
   "ProfileView": {
     "header": {
       "coursesInprogress": "Courses in progress",
+      "createdCourses": "Created courses",
       "endedCourses": "Ended courses",
       "endedCreatedCourses": "Ended created courses",
       "templates": "Course templates",
       "templatesAdmin": "All course templates",
       "templatesTrainer": "My course templates",
-      "upcomingCourses": "Upcoming courses",
-      "upcomingCreatedCourses": "Upcoming created courses"
+      "upcomingCourses": "Upcoming courses"
     },
     "label": {
       "Courses": "Courses",

diff --git a/src/components/ProfileView/ProfileCourseList.tsx b/src/components/ProfileView/ProfileCourseList.tsx
@@ -183,7 +183,7 @@ export default function ProfileCourseList({
                               flexDirection: { xs: 'column', sm: 'row' },
                             }}
                           >
-                            {ownProfile && (
+                            {ownProfile && course.createdById === userId && (
                               <CreateSlackButton
                                 lang={lang}
                                 onclick={(
@@ -197,7 +197,7 @@ export default function ProfileCourseList({
                                 buttonDisabled={Boolean(course.slackChannelId)}
                               />
                             )}
-                            {ownProfile && (
+                            {ownProfile && course.createdById === userId && (
                               <CreateFeedbackButton
                                 lang={lang}
                                 onclick={(

diff --git a/src/components/ProfileView/index.test.tsx b/src/components/ProfileView/index.test.tsx
@@ -242,7 +242,7 @@ describe('ProfileView Tests', () => {
 
     fireEvent.click(myCourses);
     const upcomingCreatedCourses = screen.getByText(
-      'ProfileView.header.upcomingCreatedCourses (1)' // trainers created courses are in the past
+      'ProfileView.header.createdCourses (1)' // trainers created courses are in the past
     );
     const endedCreatedCourses = screen.getByText(
       'ProfileView.header.endedCreatedCourses (1)'
@@ -309,7 +309,7 @@ describe('ProfileView Tests', () => {
 
     fireEvent.click(myCourses);
     const upcomingCreatedCourses = screen.getByText(
-      'ProfileView.header.upcomingCreatedCourses (1)'
+      'ProfileView.header.createdCourses (1)'
     );
     const endedCreatedCourses = screen.getByText(
       'ProfileView.header.endedCreatedCourses (0)' // there are no ended courses that were created by the admin

diff --git a/src/components/ProfileView/index.tsx b/src/components/ProfileView/index.tsx
@@ -146,7 +146,7 @@ export default function ProfileView({
         <>
           <ProfileCourseList
             lang={lang}
-            headerText={t('ProfileView.header.upcomingCreatedCourses')}
+            headerText={t('ProfileView.header.createdCourses')}
             courses={createdCourses.filter(
               (createdCourse: Course) =>
                 createdCourse.startDate >= currentDate ||