From d3e1c5478b6e24253290671f90a050c970f83ebb Mon Sep 17 00:00:00 2001 From: Abhishek P Anil Date: Fri, 7 Jul 2023 18:59:37 +0530 Subject: [PATCH 1/2] feat: default logo for person place and orgs added --- src/components/List/ListItem.jsx/ListItem.jsx | 23 ++++++++++++++++--- .../Dashboard/Organizations/Organizations.jsx | 4 +++- src/pages/Dashboard/People/People.jsx | 17 +++++++------- src/pages/Dashboard/Places/Places.jsx | 3 ++- 4 files changed, 34 insertions(+), 13 deletions(-) diff --git a/src/components/List/ListItem.jsx/ListItem.jsx b/src/components/List/ListItem.jsx/ListItem.jsx index 6b7d1fad7..009516b01 100644 --- a/src/components/List/ListItem.jsx/ListItem.jsx +++ b/src/components/List/ListItem.jsx/ListItem.jsx @@ -15,6 +15,7 @@ function ListItem(props) { title, description, logo, + defaultLogo, artsDataLink, createdDate, createdByFirstName, @@ -35,9 +36,25 @@ function ListItem(props) { className="event-list-item-meta" onClick={listItemHandler} avatar={ -
- -
+ logo ? ( +
+ +
+ ) : ( +
+ {defaultLogo} +
+ ) } description={
diff --git a/src/pages/Dashboard/Organizations/Organizations.jsx b/src/pages/Dashboard/Organizations/Organizations.jsx index 39f552310..1049e050d 100644 --- a/src/pages/Dashboard/Organizations/Organizations.jsx +++ b/src/pages/Dashboard/Organizations/Organizations.jsx @@ -1,7 +1,7 @@ import React, { useState, useEffect, useRef } from 'react'; import './organizations.css'; import { List, Grid, Modal } from 'antd'; -import { DeleteOutlined, ExclamationCircleOutlined } from '@ant-design/icons'; +import Icon, { DeleteOutlined, ExclamationCircleOutlined } from '@ant-design/icons'; import { useTranslation } from 'react-i18next'; import FeatureFlag from '../../../layout/FeatureFlag/FeatureFlag'; import { featureFlags } from '../../../utils/featureFlags'; @@ -19,6 +19,7 @@ import { useSelector } from 'react-redux'; import { getUserDetails } from '../../../redux/reducer/userSlice'; import { artsDataLinkChecker } from '../../../utils/artsDataLinkChecker'; import { userRoles } from '../../../constants/userRoles'; +import { ReactComponent as OrganizationLogo } from '../../../assets/icons/organisations.svg'; const { confirm } = Modal; const { useBreakpoint } = Grid; @@ -114,6 +115,7 @@ function Organizations() { key={index} id={index} logo={item?.logo?.thumbnail?.uri} + defaultLogo={} title={contentLanguageBilingual({ en: item?.name?.en, fr: item?.name?.fr, diff --git a/src/pages/Dashboard/People/People.jsx b/src/pages/Dashboard/People/People.jsx index 4d4434ce0..5aaa06d1e 100644 --- a/src/pages/Dashboard/People/People.jsx +++ b/src/pages/Dashboard/People/People.jsx @@ -1,13 +1,13 @@ import React, { useRef, useState, useEffect } from 'react'; import './people.css'; import { List, Grid, Modal } from 'antd'; -import { DeleteOutlined, ExclamationCircleOutlined } from '@ant-design/icons'; +import { DeleteOutlined, ExclamationCircleOutlined, UserOutlined } from '@ant-design/icons'; import { useTranslation } from 'react-i18next'; import FeatureFlag from '../../../layout/FeatureFlag/FeatureFlag'; import { featureFlags } from '../../../utils/featureFlags'; import Main from '../../../layout/Main/Main'; -import PlaceSearch from '../../../components/Search/Events/EventsSearch'; -import AddPlace from '../../../components/Button/AddEvent'; +import PersonSearch from '../../../components/Search/Events/EventsSearch'; +import AddPerson from '../../../components/Button/AddEvent'; import Sort from '../../../components/Sort/Sort'; import NoContent from '../../../components/NoContent/NoContent'; import ListItem from '../../../components/List/ListItem.jsx/ListItem'; @@ -44,7 +44,7 @@ function People() { return calendar.calendarId === calendarId; }); - const deletePlaceHandler = (placeId) => { + const deletePersonHandler = (personId) => { confirm({ title: t('dashboard.people.deletePerson.title'), icon: , @@ -54,7 +54,7 @@ function People() { cancelText: t('dashboard.people.deletePerson.cancel'), className: 'delete-modal-container', onOk() { - deletePerson({ id: placeId, calendarId: calendarId }); + deletePerson({ id: personId, calendarId: calendarId }); }, }); }; @@ -75,8 +75,8 @@ function People() {

{t('dashboard.people.people')}

- - + onSearchHandler(e)} // defaultValue={eventSearchQuery} @@ -112,6 +112,7 @@ function People() { key={index} id={index} logo={item?.logo?.thumbnail?.uri} + defaultLogo={} title={contentLanguageBilingual({ en: item?.name?.en, fr: item?.name?.fr, @@ -136,7 +137,7 @@ function People() { deletePlaceHandler(item?.id)} + onClick={() => deletePersonHandler(item?.id)} /> ), ]} diff --git a/src/pages/Dashboard/Places/Places.jsx b/src/pages/Dashboard/Places/Places.jsx index 919d3be05..a9f62639e 100644 --- a/src/pages/Dashboard/Places/Places.jsx +++ b/src/pages/Dashboard/Places/Places.jsx @@ -1,7 +1,7 @@ import React, { useRef, useState, useEffect } from 'react'; import './places.css'; import { List, Grid, Modal } from 'antd'; -import { DeleteOutlined, ExclamationCircleOutlined } from '@ant-design/icons'; +import { DeleteOutlined, ExclamationCircleOutlined, EnvironmentOutlined } from '@ant-design/icons'; import { useTranslation } from 'react-i18next'; import FeatureFlag from '../../../layout/FeatureFlag/FeatureFlag'; import { featureFlags } from '../../../utils/featureFlags'; @@ -112,6 +112,7 @@ function Places() { key={index} id={index} logo={item?.logo?.thumbnail?.uri} + defaultLogo={} title={contentLanguageBilingual({ en: item?.name?.en, fr: item?.name?.fr, From 07d7711b3da61cff61bcd360b26a32397ca6edfe Mon Sep 17 00:00:00 2001 From: Abhishek P Anil Date: Fri, 7 Jul 2023 19:57:20 +0530 Subject: [PATCH 2/2] feat: removed the dropdown for sort in places person and orgs --- src/components/Sort/Sort.jsx | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/components/Sort/Sort.jsx b/src/components/Sort/Sort.jsx index 509339d26..6e9f4d499 100644 --- a/src/components/Sort/Sort.jsx +++ b/src/components/Sort/Sort.jsx @@ -2,7 +2,7 @@ import React, { useState } from 'react'; import { sortByOptionsOrgsPlacesPerson, sortOrder } from '../../constants/sortByOptions'; import { useTranslation } from 'react-i18next'; import { Button, Dropdown, Space } from 'antd'; -import { DownOutlined, SortAscendingOutlined, SortDescendingOutlined } from '@ant-design/icons'; +import { SortAscendingOutlined, SortDescendingOutlined } from '@ant-design/icons'; function Sort() { const { t } = useTranslation(); @@ -22,13 +22,14 @@ function Sort() { defaultSelectedKeys: [filter?.sort], // onSelect: onSortSelect, }} - trigger={['click']}> -