Merged PR 2329: welsh link for events
welsh link for events Related work items: #23054
This commit is contained in:
@@ -396,7 +396,9 @@ const CaseSummary = (props) => {
|
|||||||
|
|
||||||
<a
|
<a
|
||||||
href={
|
href={
|
||||||
livePublishedEvent.pinswg_linktotheevent
|
locale === "en"
|
||||||
|
? livePublishedEvent.pinswg_linktotheevent
|
||||||
|
: livePublishedEvent.pinswg_linktotheeventstreamwelsh
|
||||||
}
|
}
|
||||||
className="govuk-link govuk-link--no-visited-state"
|
className="govuk-link govuk-link--no-visited-state"
|
||||||
target="_blank"
|
target="_blank"
|
||||||
|
|||||||
@@ -400,6 +400,7 @@ const SearchResults = (props) => {
|
|||||||
appealType={
|
appealType={
|
||||||
item.pinswg_appealcasetype
|
item.pinswg_appealcasetype
|
||||||
}
|
}
|
||||||
|
locale={locale}
|
||||||
/>
|
/>
|
||||||
</dd>
|
</dd>
|
||||||
<dd className="govuk-summary-list__value govuk-!-font-size-16">
|
<dd className="govuk-summary-list__value govuk-!-font-size-16">
|
||||||
|
|||||||
@@ -476,6 +476,7 @@ const DNSSearchResults = (props) => {
|
|||||||
appealType={
|
appealType={
|
||||||
item.pinswg_appealcasetype
|
item.pinswg_appealcasetype
|
||||||
}
|
}
|
||||||
|
locale={locale}
|
||||||
/>
|
/>
|
||||||
</dd>
|
</dd>
|
||||||
<dd className="govuk-summary-list__value govuk-!-font-size-16">
|
<dd className="govuk-summary-list__value govuk-!-font-size-16">
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import useTranslation from "next-translate/useTranslation";
|
import useTranslation from "next-translate/useTranslation";
|
||||||
import { getLivePublishedEvent } from "../case/summary/utils/liveEvent";
|
import { getLivePublishedEvent } from "../case/summary/utils/liveEvent";
|
||||||
|
|
||||||
const LiveLink = ({ detailsObj }) => {
|
const LiveLink = ({ detailsObj, locale }) => {
|
||||||
let { t } = useTranslation();
|
let { t } = useTranslation();
|
||||||
|
|
||||||
const eventsObj = {
|
const eventsObj = {
|
||||||
@@ -15,7 +15,11 @@ const LiveLink = ({ detailsObj }) => {
|
|||||||
return (
|
return (
|
||||||
<div className="govuk-!-margin-top-3">
|
<div className="govuk-!-margin-top-3">
|
||||||
<a
|
<a
|
||||||
href={liveEvent.pinswg_linktotheevent}
|
href={
|
||||||
|
locale === "en"
|
||||||
|
? liveEvent.pinswg_linktotheevent
|
||||||
|
: liveEvent.pinswg_linktotheeventstreamwelsh
|
||||||
|
}
|
||||||
className="govuk-link"
|
className="govuk-link"
|
||||||
target="_blank"
|
target="_blank"
|
||||||
rel="noopener noreferrer"
|
rel="noopener noreferrer"
|
||||||
|
|||||||
@@ -486,6 +486,7 @@ const SearchResults = (props) => {
|
|||||||
appealType={
|
appealType={
|
||||||
item.pinswg_appealcasetype
|
item.pinswg_appealcasetype
|
||||||
}
|
}
|
||||||
|
locale={locale}
|
||||||
/>
|
/>
|
||||||
</dd>
|
</dd>
|
||||||
<dd className="govuk-summary-list__value govuk-!-font-size-16">
|
<dd className="govuk-summary-list__value govuk-!-font-size-16">
|
||||||
|
|||||||
@@ -88,7 +88,7 @@ export default async function ApiProxy(req, res) {
|
|||||||
navigationProperty +
|
navigationProperty +
|
||||||
"($select=ticketnumber,statuscode)" +
|
"($select=ticketnumber,statuscode)" +
|
||||||
(primaryIdAttribute == "pinswg_sipscase"
|
(primaryIdAttribute == "pinswg_sipscase"
|
||||||
? ",pinswg_sipscase($select=ticketnumber),pinswg_CaseDeadlineExtension_pinswg_sips($select=pinswg_casedeadlineextensionid,pinswg_noofdaysextended,pinswg_reasonforextension,pinswg_agreedorimposedextension,pinswg_newcasedeadline),pinswg_sips_pinswg_sipsevent($select=pinswg_enddateofevent,pinswg_eventpublishflag,pinswg_linktotheevent,pinswg_name,pinswg_dateeventrequested,pinswg_typeofevent,createdon,modifiedon)"
|
? ",pinswg_sipscase($select=ticketnumber),pinswg_CaseDeadlineExtension_pinswg_sips($select=pinswg_casedeadlineextensionid,pinswg_noofdaysextended,pinswg_reasonforextension,pinswg_agreedorimposedextension,pinswg_newcasedeadline),pinswg_sips_pinswg_sipsevent($select=pinswg_enddateofevent,pinswg_eventpublishflag,pinswg_linktotheevent,pinswg_linktotheeventstreamwelsh,pinswg_name,pinswg_dateeventrequested,pinswg_typeofevent,createdon,modifiedon)"
|
||||||
: "");
|
: "");
|
||||||
|
|
||||||
queryUrl = queryUrl + getSelectQuery(appealTypeName);
|
queryUrl = queryUrl + getSelectQuery(appealTypeName);
|
||||||
|
|||||||
@@ -88,7 +88,7 @@ export default async function ApiProxy(req, res) {
|
|||||||
navigationProperty +
|
navigationProperty +
|
||||||
"($select=ticketnumber,statuscode)" +
|
"($select=ticketnumber,statuscode)" +
|
||||||
(primaryIdAttribute == "pinswg_sipscase"
|
(primaryIdAttribute == "pinswg_sipscase"
|
||||||
? ",pinswg_sipscase($select=ticketnumber),pinswg_CaseDeadlineExtension_pinswg_sips($select=pinswg_casedeadlineextensionid,pinswg_noofdaysextended,pinswg_reasonforextension,pinswg_agreedorimposedextension,pinswg_newcasedeadline),pinswg_sips_pinswg_sipsevent($select=pinswg_enddateofevent,pinswg_eventpublishflag,pinswg_linktotheevent,pinswg_name,pinswg_dateeventrequested,pinswg_typeofevent,createdon,modifiedon)"
|
? ",pinswg_sipscase($select=ticketnumber),pinswg_CaseDeadlineExtension_pinswg_sips($select=pinswg_casedeadlineextensionid,pinswg_noofdaysextended,pinswg_reasonforextension,pinswg_agreedorimposedextension,pinswg_newcasedeadline),pinswg_sips_pinswg_sipsevent($select=pinswg_enddateofevent,pinswg_eventpublishflag,pinswg_linktotheevent,pinswg_linktotheeventstreamwelsh,pinswg_name,pinswg_dateeventrequested,pinswg_typeofevent,createdon,modifiedon)"
|
||||||
: "");
|
: "");
|
||||||
|
|
||||||
queryUrl =
|
queryUrl =
|
||||||
|
|||||||
Reference in New Issue
Block a user