Merge pull request #616 from culturecreates/feature/issue-471

fix: artsdata links redirection url added
culturecreates · Sep 25, 2023 · d070646 · d070646
2 parents 53cf96c + fe76669
commit d070646
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 10 deletions.
diff --git a/.env.production b/.env.production
@@ -1,10 +1,14 @@
 REACT_APP_API_URL="https://api.cms.footlight.io"
+REACT_APP_ARTS_DATA_URI="https://api.artsdata.ca/"
+REACT_APP_ARTS_DATA_PAGE_URI="https://kg.artsdata.ca/resource/"
 REACT_APP_DEEPL_URL="https://www.deepl.com/translator#"
 REACT_APP_HELP_EN_URL="https://footlight.gitbook.io/footlight-cms-guide"
 REACT_APP_HELP_FR_URL="https://footlight.gitbook.io/guide-footlight-cms"
 REACT_APP_FEATURE_FLAG_QUICK_CREATE_ORGANIZATION=true
 REACT_APP_FEATURE_FLAG_ORG_PERSON_PLACE_VIEW=true
 REACT_APP_FEATURE_FLAG_QUICK_CREATE_PEOPLE_PLACE=true
+REACT_APP_FEATURE_FLAG_EDIT_SCREEN_PEOPLE_PLACE_ORGANIZATION=false
+REACT_APP_FEATURE_FLAG_USERS=false
 REACT_APP_FEATURE_FLAG_IMAGE_CROP=false
 REACT_APP_ENV="production"
 REACT_APP_INVITE_URL=" https://cms.footlight.io/join?invitationId="

diff --git a/.env.staging b/.env.staging
@@ -1,5 +1,6 @@
 REACT_APP_API_URL="https://staging.api.cms.footlight.io"
 REACT_APP_ARTS_DATA_URI="https://api.artsdata.ca/"
+REACT_APP_ARTS_DATA_PAGE_URI="https://kg.artsdata.ca/resource/"
 REACT_APP_DEEPL_URL="https://www.deepl.com/translator#"
 REACT_APP_HELP_EN_URL="https://footlight.gitbook.io/footlight-cms-guide"
 REACT_APP_HELP_FR_URL="https://footlight.gitbook.io/guide-footlight-cms"

diff --git a/src/components/Card/Common/EntityCard.jsx b/src/components/Card/Common/EntityCard.jsx
@@ -13,14 +13,16 @@ const EntityCard = (props) => {
         <div className="description">{description}</div>
       </div>
       <div className="link-container">
-        <ArtsDataLink
-          onClick={(e) => {
-            e.stopPropagation();
-            window.open(`${artsDataLink}`, '_blank', 'noopener,noreferrer');
-          }}>
-          <span style={{ textDecoration: 'underline' }}>{linkText}</span>
-          <LinkOutlined />
-        </ArtsDataLink>
+        {artsDataLink && (
+          <ArtsDataLink
+            onClick={(e) => {
+              e.stopPropagation();
+              window.open(`${artsDataLink}`, '_blank', 'noopener,noreferrer');
+            }}>
+            <span style={{ textDecoration: 'underline' }}>{linkText}</span>
+            <LinkOutlined />
+          </ArtsDataLink>
+        )}
       </div>
     </div>
   );

diff --git a/src/pages/Dashboard/SearchOrganizations/SearchOrganizations.jsx b/src/pages/Dashboard/SearchOrganizations/SearchOrganizations.jsx
@@ -157,7 +157,7 @@ function SearchOrganizations() {
                             <EntityCard
                               title={organizer?.name}
                               description={organizer?.description}
-                              artsDataLink={`${process.env.REACT_APP_ARTS_DATA_URI}${organizer?.id}`}
+                              artsDataLink={`${process.env.REACT_APP_ARTS_DATA_PAGE_URI}${organizer?.id}`}
                               Logo={organizer.logo ? <img src={organizer?.logo?.thumbnail?.uri} /> : <Logo />}
                               linkText={t('dashboard.organization.createNew.search.linkText')}
                               onClick={() => artsDataClickHandler(organizer)}

diff --git a/src/pages/Dashboard/SearchPlaces/SearchPlaces.jsx b/src/pages/Dashboard/SearchPlaces/SearchPlaces.jsx
@@ -160,7 +160,7 @@ function SearchPlaces() {
                             <EntityCard
                               title={place?.name}
                               description={place?.description}
-                              artsDataLink={`${process.env.REACT_APP_ARTS_DATA_URI}${place?.id}`}
+                              artsDataLink={`${process.env.REACT_APP_ARTS_DATA_PAGE_URI}${place?.id}`}
                               Logo={
                                 place.logo ? (
                                   place.logo?.thumbnail?.uri