Merge pull request #3018 from statisticsnorway/HOTFIX-remove-twitter

Remove twitter urls
statisticsnorway · Nov 6, 2024 · f9bb86f · f9bb86f
2 parents a6cf6fa + 000b345
commit f9bb86f
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 13 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,6 @@
 # Gradle Project settings
 projectName = mimir
-version = 2.17.0
+version = 2.17.1
 
 # XP App values
 appDisplayName = Mimir application

diff --git a/src/main/resources/lib/ssb/parts/footer.ts b/src/main/resources/lib/ssb/parts/footer.ts
@@ -27,7 +27,6 @@ export function getFooterContent(language: Language): FooterContent | undefined
         locale: language.code,
       }),
       facebookUrl: footerContent.data.facebookUrl,
-      twitterUrl: footerContent.data.twitterUrl,
       linkedinUrl: footerContent.data.linkedinUrl,
       instagramUrl: footerContent.data.instagramUrl,
       rssUrl: footerContent.data.rssUrl,

diff --git a/src/main/resources/lib/types/footer.ts b/src/main/resources/lib/types/footer.ts
@@ -6,7 +6,6 @@ export interface FooterContent {
   copyrightUrl: string
   copyrightText: string
   facebookUrl: string
-  twitterUrl: string
   linkedinUrl: string
   instagramUrl: string
   rssUrl: string

diff --git a/src/main/resources/react4xp/_entries/Footer.tsx b/src/main/resources/react4xp/_entries/Footer.tsx
@@ -1,6 +1,6 @@
 import React from 'react'
 import { Accordion, Button, Link } from '@statisticsnorway/ssb-component-library'
-import { ArrowRight, ArrowUp, Facebook, Twitter, Rss, Linkedin, Instagram } from 'react-feather'
+import { ArrowRight, ArrowUp, Facebook, Rss, Linkedin, Instagram } from 'react-feather'
 import { FooterContent } from '../../lib/types/footer'
 
 const Footer = (props: FooterContent) => {
@@ -11,7 +11,6 @@ const Footer = (props: FooterContent) => {
     hiddenFooterText,
     language,
     facebookUrl,
-    twitterUrl,
     linkedinUrl,
     instagramUrl,
     rssUrl,
@@ -78,9 +77,6 @@ const Footer = (props: FooterContent) => {
         {facebookUrl && (
           <Link ariaLabel='Facebook' href={facebookUrl} isExternal negative icon={<Facebook size={24} />} standAlone />
         )}
-        {twitterUrl && (
-          <Link ariaLabel='Twitter' href={twitterUrl} isExternal negative icon={<Twitter size={24} />} standAlone />
-        )}
         {linkedinUrl && (
           <Link ariaLabel='Linkedin' href={linkedinUrl} isExternal negative icon={<Linkedin size={24} />} standAlone />
         )}

diff --git a/src/main/resources/site/content-types/footer/footer.xml b/src/main/resources/site/content-types/footer/footer.xml
@@ -69,11 +69,6 @@
                     <occurrences minimum="1" maximum="1"/>
                     <default>https://www.facebook.com/statistisksentralbyra/</default>
                 </input>
-                <input name="twitterUrl" type="TextLine" >
-                    <label>Lenke Twitter</label>
-                    <occurrences minimum="1" maximum="1"/>
-                    <default>https://twitter.com/ssbnytt</default>
-                </input>
                 <input name="linkedinUrl" type="TextLine" >
                     <label>Lenke Linkedin</label>
                     <occurrences minimum="1" maximum="1"/>