Merge pull request #438 from culturecreates/feature/issue-420

Feature/issue 420
culturecreates · Jul 12, 2023 · 5fff685 · 5fff685
2 parents 2bfc309 + b2f4db5
commit 5fff685
Show file tree

Hide file tree

Showing 13 changed files with 454 additions and 24 deletions.
diff --git a/src/locales/en/translationEn.json b/src/locales/en/translationEn.json
@@ -395,6 +395,20 @@
         "description": "Are you sure you want to permanently delete this organization?",
         "ok": "OK",
         "cancel": "Cancel"
+      },
+      "readOnly": {
+        "details": "Details",
+        "name": "Name",
+        "disambiguatingDescription": "Disambiguating description",
+        "description": "Description",
+        "website": "Website",
+        "contact": "Contact",
+        "frenchContactTitle": "French contact title",
+        "englishContactTitle": "English contact title",
+        "phoneNumber": "Phone number",
+        "email": "Email",
+        "memberOf": "Member of",
+        "location": "Location"
       }
     },
     "places": {

diff --git a/src/locales/fr/transalationFr.json b/src/locales/fr/transalationFr.json
@@ -394,6 +394,20 @@
         "description": "Êtes-vous sûr de vouloir supprimer définitivement cet organisation?",
         "ok": "OK",
         "cancel": "Annuler"
+      },
+      "readOnly": {
+        "details": "Détails",
+        "name": "Nom",
+        "disambiguatingDescription": "Description identifiante",
+        "description": "Description",
+        "website": "Site web",
+        "contact": "Contact",
+        "frenchContactTitle": "Titre du contact en français",
+        "englishContactTitle": "Titre du contact en anglais",
+        "phoneNumber": "Numéro de téléphone",
+        "email": "Courriel",
+        "memberOf": "Membre de",
+        "location": "Endroit"
       }
     },
     "places": {

diff --git a/src/pages/CreateAccount/index.js b/src/pages/CreateAccount/index.js
@@ -0,0 +1 @@
+export { default } from './CreateAccount';
diff --git a/src/pages/Dashboard/Dashboard.jsx b/src/pages/Dashboard/Dashboard.jsx
@@ -23,6 +23,7 @@ function Dashboard() {
   const timestampRef = useRef(Date.now()).current;
   const { accessToken, user } = useSelector(getUserDetails);
   const [getCalendar, { currentData: currentCalendarData }] = useLazyGetCalendarQuery();
+
   const { currentData: allCalendarsData, isLoading } = useGetAllCalendarsQuery(
     { sessionId: timestampRef },
     { skip: accessToken ? false : true },

diff --git a/src/pages/Dashboard/EventReadOnly/EventReadOnly.jsx b/src/pages/Dashboard/EventReadOnly/EventReadOnly.jsx
@@ -147,24 +147,20 @@ function EventReadOnly() {
       <div>
         <Row gutter={[32, 24]} className="read-only-wrapper">
           <Col span={24}>
-            <Row>
-              <Col>
-                <Breadcrumb className="breadcrumb-item">
-                  <Breadcrumb.Item>
-                    <LeftOutlined style={{ marginRight: '17px' }} />
-                    {t('dashboard.sidebar.events')}
-                  </Breadcrumb.Item>
-                  <Breadcrumb.Item className="breadcrumb-item">
-                    {contentLanguageBilingual({
-                      en: eventData?.name?.en,
-                      fr: eventData?.name?.fr,
-                      interfaceLanguage: user?.interfaceLanguage?.toLowerCase(),
-                      calendarContentLanguage: calendarContentLanguage,
-                    })}
-                  </Breadcrumb.Item>
-                </Breadcrumb>
-              </Col>
-            </Row>
+            <Breadcrumb className="breadcrumb-item">
+              <Breadcrumb.Item>
+                <LeftOutlined style={{ marginRight: '17px' }} />
+                {t('dashboard.sidebar.events')}
+              </Breadcrumb.Item>
+              <Breadcrumb.Item className="breadcrumb-item">
+                {contentLanguageBilingual({
+                  en: eventData?.name?.en,
+                  fr: eventData?.name?.fr,
+                  interfaceLanguage: user?.interfaceLanguage?.toLowerCase(),
+                  calendarContentLanguage: calendarContentLanguage,
+                })}
+              </Breadcrumb.Item>
+            </Breadcrumb>
           </Col>
 
           <Col span={24}>

diff --git a/src/pages/Dashboard/Organizations/Organizations.jsx b/src/pages/Dashboard/Organizations/Organizations.jsx
@@ -13,7 +13,7 @@ import NoContent from '../../../components/NoContent/NoContent';
 import ListItem from '../../../components/List/ListItem.jsx/ListItem';
 import { useDeleteOrganizationMutation, useLazyGetAllOrganizationQuery } from '../../../services/organization';
 import LoadingIndicator from '../../../components/LoadingIndicator/LoadingIndicator';
-import { useOutletContext, useParams } from 'react-router-dom';
+import { useLocation, useNavigate, useOutletContext, useParams } from 'react-router-dom';
 import { contentLanguageBilingual } from '../../../utils/bilingual';
 import { useSelector } from 'react-redux';
 import { getUserDetails } from '../../../redux/reducer/userSlice';
@@ -25,6 +25,8 @@ const { useBreakpoint } = Grid;
 
 function Organizations() {
   const { t } = useTranslation();
+  const navigate = useNavigate();
+  const location = useLocation();
   const screens = useBreakpoint();
   const timestampRef = useRef(Date.now()).current;
   const { calendarId } = useParams();
@@ -67,6 +69,10 @@ function Organizations() {
     else return false;
   };
 
+  const listItemHandler = (id) => {
+    navigate(`${location.pathname}/${id}`);
+  };
+
   useEffect(() => {
     getAllOrganization({
       calendarId,
@@ -132,6 +138,7 @@ function Organizations() {
                     createdByFirstName={item?.creator?.firstName}
                     createdByLastName={item?.creator?.lastName}
                     artsDataLink={artsDataLinkChecker(item?.sameAs)}
+                    listItemHandler={() => listItemHandler(item?.id)}
                     actions={[
                       adminCheckHandler() && (
                         <DeleteOutlined