Merge pull request #1522 from culturecreates/develop

Develop
culturecreates · Jan 2, 2025 · 40c32b3 · 40c32b3
2 parents c67f6ff + 0317da0
commit 40c32b3
Show file tree

Hide file tree

Showing 11 changed files with 690 additions and 83 deletions.
diff --git a/src/components/TreeSelectOption/treeSelectOption.settings.js b/src/components/TreeSelectOption/treeSelectOption.settings.js
@@ -88,14 +88,16 @@ export const treeEntitiesOption = (
     isFieldsDirty[langKey] = false;
   });
   let options = data?.map((entity) => {
+    let mainImageData = entity?.image;
+
     return {
       label: (
         <SelectionItem
           itemWidth="100%"
           icon={
             entity?.type?.toUpperCase() == taxonomyClass.ORGANIZATION ? (
-              entity?.logo?.thumbnail?.uri ? (
-                <img src={entity?.logo?.thumbnail?.uri} />
+              entity?.logo?.thumbnail?.uri || mainImageData?.original?.uri ? (
+                <img src={entity?.logo?.thumbnail?.uri ?? mainImageData?.original?.uri} />
               ) : (
                 <Icon component={Organizations} style={{ color: '#607EFC' }} />
               )

diff --git a/src/constants/fonts.js → src/constants/widgetConstants.js b/src/constants/fonts.js → src/constants/widgetConstants.js
@@ -1,3 +1,5 @@
+import { Translation } from 'react-i18next';
+
 export const widgetFontCollection = [
   { label: 'Roboto', value: 'Roboto' },
   { label: 'Open Sans', value: 'Open Sans' },
@@ -9,3 +11,15 @@ export const widgetFontCollection = [
   { label: 'Raleway', value: 'Raleway' },
   { label: 'Helvetica', value: 'Helvetica' },
 ];
+
+export const redirectionModes = [
+  {
+    label: <Translation>{(t) => t('dashboard.settings.widgetSettings.redirectionModeNone')}</Translation>,
+    value: 'NONE',
+  },
+  {
+    label: <Translation>{(t) => t('dashboard.settings.widgetSettings.redirectionModeExternal')}</Translation>,
+    value: 'EXTERNAL',
+    disabled: true,
+  },
+];
diff --git a/src/layout/Main/Main.jsx b/src/layout/Main/Main.jsx
@@ -25,7 +25,8 @@ function Main(props) {
             {children?.length > 2 && children[2]}
           </Col>
           <Col>{children?.length > 3 && children[3]}</Col>
-
+        </Row>
+        <Row style={{ paddingTop: 16 }}>
           <Col>
             <Row gutter={20}>{children?.length > 4 && children[4]}</Row>
           </Col>

diff --git a/src/locales/en/translationEn.json b/src/locales/en/translationEn.json
@@ -468,6 +468,13 @@
       "search": {
         "placeholder": "Search Organizations"
       },
+      "filter": {
+        "users": {
+          "label": "Users",
+          "placeholderSearch": "Search name",
+          "myEvents": "My Organizations"
+        }
+      },
       "deleteOrganization": {
         "title": "Confirm Delete",
         "description": "Are you sure you want to permanently delete this organization? The organization will be deleted everywhere it is used.",
@@ -549,6 +556,13 @@
       "search": {
         "placeholder": "Search Places"
       },
+      "filter": {
+        "users": {
+          "label": "Users",
+          "placeholderSearch": "Search name",
+          "myEvents": "My Places"
+        }
+      },
       "deletePlace": {
         "title": "Confirm Delete",
         "description": "Are you sure you want to permanently delete this place? The organization will be deleted everywhere it is used.",
@@ -703,6 +717,13 @@
       "search": {
         "placeholder": "Search People"
       },
+      "filter": {
+        "users": {
+          "label": "Users",
+          "placeholderSearch": "Search name",
+          "myEvents": "My People"
+        }
+      },
       "deletePerson": {
         "title": "Confirm Delete",
         "description": "Are you sure you want to permanently delete this person? The person will be deleted everywhere it is used.",
@@ -935,6 +956,9 @@
         "height": "Height",
         "width": "Max width",
         "font": "Font selection",
+        "redirectionMode": "Redirection Mode",
+        "redirectionModeNone": "None",
+        "redirectionModeExternal": "External",
         "language": "Language selection",
         "eventType": "Event type",
         "region": "Region",

diff --git a/src/locales/fr/transalationFr.json b/src/locales/fr/transalationFr.json
@@ -468,6 +468,13 @@
       "search": {
         "placeholder": "Recherche d'organisations"
       },
+      "filter": {
+        "users": {
+          "label": "Utilisateurs",
+          "placeholderSearch": "Rechercher un nom",
+          "myEvents": "Mes Organisations"
+        }
+      },
       "deleteOrganization": {
         "title": "Confirmer la suppression",
         "description": "Êtes-vous sûr de vouloir supprimer définitivement cette fiche d'organization ? Elle sera supprimée dans tout CMS Footlight.",
@@ -548,6 +555,13 @@
       "search": {
         "placeholder": "Recherche de lieux"
       },
+      "filter": {
+        "users": {
+          "label": "Utilisateurs",
+          "placeholderSearch": "Rechercher un nom",
+          "myEvents": "Mes Lieux"
+        }
+      },
       "deletePlace": {
         "title": "Confirmer la suppression",
         "description": "Êtes-vous sûr de vouloir supprimer définitivement cette fiche de lieu ? Elle sera supprimée dans tout CMS Footlight.",
@@ -703,6 +717,13 @@
       "search": {
         "placeholder": "Rechercher une personne"
       },
+      "filter": {
+        "users": {
+          "label": "Utilisateurs",
+          "placeholderSearch": "Rechercher un nom",
+          "myEvents": "Mes Personnes"
+        }
+      },
       "deletePerson": {
         "title": "Confirmer la suppression",
         "description": "Êtes-vous sûr de vouloir supprimer définitivement la fiche de cette personne ? Elle sera supprimée dans tout CMS Footlight.",