Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release v4.2.3 #1056

Merged
merged 19 commits into from
Aug 10, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
70e5d47
Qoldev 515 funnelack upgrade set location (#1029)
ghazal-salehi Jul 27, 2023
1af5329
Updated package-lock reference
stvp-qld Jul 27, 2023
e56d0dc
New SWE version and package refs for Node 18.17
stvp-qld Jul 27, 2023
07bfa04
QOLDEV 518 update all funnelback refs and JS replacement function
stvp-qld Jul 28, 2023
dfbf826
Revert "New SWE version and package refs for Node 18.17"
stvp-qld Jul 28, 2023
5b2ed14
Merge pull request #1034 from qld-gov-au/QOLDEV-518-set-funnelback-re…
stvp-qld Jul 31, 2023
8dea57f
QOLDEV-518 added console notice when a string replacement occurs
stvp-qld Jul 31, 2023
8f234e9
QOLDEV-518 added console notice when a string replacement occurs
stvp-qld Jul 31, 2023
78e7b29
QOLDEV-518 wording changes to console message
stvp-qld Jul 31, 2023
8008ace
Merge pull request #1039 from qld-gov-au/QOLDEV-518-console-log-legac…
stvp-qld Jul 31, 2023
f78ecc9
QOLDEV-518 double to single quotes
stvp-qld Jul 31, 2023
116e882
Merge branch 'release-v4.2.3' into QOLDEV-518-console-log-legacy-url
stvp-qld Jul 31, 2023
351e8f9
Merge pull request #1041 from qld-gov-au/QOLDEV-518-console-log-legac…
stvp-qld Aug 1, 2023
bde3862
QOLDEV-515 Updating rexpected results from search for 'jobs' (#1046)
ghazal-salehi Aug 1, 2023
8a49256
Qoldev 515 funnelback filter results (#1055)
ghazal-salehi Aug 7, 2023
897a8c2
Release v4.2.3 (#1045) (#1057)
ghazal-salehi Aug 7, 2023
b1811df
Resolving conflicts v4.2.3 (#1061)
ghazal-salehi Aug 8, 2023
ce43ea3
Resolving conflict v2 (#1065)
ghazal-salehi Aug 9, 2023
a8994aa
Merge branch 'master' into release-v4.2.3
ThrawnCA Aug 9, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
QOLDEV 518 update all funnelback refs and JS replacement function
  • Loading branch information
stvp-qld committed Jul 28, 2023
commit 07bfa04ec5d8867d231b57e5186dbab38de216fb
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
(function() {
const replacements = [
['find.search.qld.gov.au', 'discover.search.qld.gov.au'],
['qld-gov', 'qgov~sp-search'],
['qgov-content', 'qgov~sp-content'],
['services-web', 'qgov~sp-services'],
];

function updateRefs(originalValue) {
let newValue = originalValue;
replacements.forEach(pair => {
newValue = newValue.replace(new RegExp(pair[0], 'g'), pair[1]);
});
return newValue;
}

document.querySelectorAll('form[data-suggestions], form[data-results-url], div[data-centres], input[name=collection]').forEach(element => {
if (element.hasAttribute('data-suggestions')) {
const currentValue = element.getAttribute('data-suggestions');
element.setAttribute('data-suggestions', updateRefs(currentValue));
}
if (element.hasAttribute('data-results-url')) {
const currentValue = element.getAttribute('data-results-url');
element.setAttribute('data-results-url', updateRefs(currentValue));
}
if (element.hasAttribute('data-centres')) {
const currentValue = element.getAttribute('data-centres');
element.setAttribute('data-centres', updateRefs(currentValue));
}
if (element.getAttribute('name') === 'collection') {
const currentValue = element.getAttribute('value');
element.setAttribute('value', updateRefs(currentValue));
}
});
})();
5 changes: 4 additions & 1 deletion src/assets/_project/_blocks/qg-main.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ import './layout/content/content';
import './layout/content/content-types/figure-credits-toggle';
import feedbackForm from './layout/footer/feedback-form';

//Funnelback refs
import './components/site-search/qg-funnelback-v16-refs';

(function () {
'use strict';
let franchiseTitle = window.qg.swe.franchiseTitle;
Expand All @@ -30,4 +33,4 @@ $(function () {
if ($('#qg-quick-exit__input').length > 0) {
$('body').addClass('qg-private-content');
}
});
});
6 changes: 3 additions & 3 deletions src/docs/examples/breadcrumb.html
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ <h2>lorem ipsum</h2>
</div>
</div>
<span>Search</span>
</button><form action="https://www.qld.gov.au/search" id="qg-global-search-form" role="search" class="qg-search-form collapse qg-global-web-autocomplete" data-suggestions="https://find.search.qld.gov.au/s/suggest.json?collection=qld-gov&fmt=json%2B%2B&alpha=0.5&profile=qld" data-results-url="https://find.search.qld.gov.au/s/search.json?collection=qld-gov&profile=qld&meta_sfinder_sand=yes">
</button><form action="https://www.qld.gov.au/search" id="qg-global-search-form" role="search" class="qg-search-form collapse qg-global-web-autocomplete" data-suggestions="https://discover.search.qld.gov.au/s/suggest.json?collection=qgov~sp-search&fmt=json%2B%2B&alpha=0.5&profile=qld" data-results-url="https://discover.search.qld.gov.au/s/search.json?collection=qgov~sp-search&profile=qld&meta_sfinder_sand=yes">
<div class="input-group">
<label for="qg-search-query" class="qg-visually-hidden">Search Queensland Government</label>
<input type="text" name="query" id="qg-search-query" accesskey="5" class="form-control" autocomplete="off" placeholder="Search website" tabindex="0" aria-expanded="false" role="combobox"/>
Expand Down Expand Up @@ -299,7 +299,7 @@ <h4>Browse by category</h4>
<!--parameters to display results on search page-->
<input type="hidden" name="num_ranks" value="10">
<input type="hidden" name="tiers" value="off">
<input type="hidden" name="collection" value="qld-gov">
<input type="hidden" name="collection" value="qgov~sp-search">
<input type="hidden" name="profile" value="qld">
</form>

Expand Down Expand Up @@ -610,7 +610,7 @@ <h2>Head to Health</h2>
<p><a href="https://headtohealth.gov.au/lorem ipsum-support"><img src="https://www.qld.gov.au/__data/assets/image/0013/121432/head-to-health.PNG" alt="lorem ipsum Support online - Head to health.gov.au" width="611" vspace="5" height="491" /></a></p><p>Prioritising&nbsp;your mental health is important in difficult times. If you are feeling worried or anxious about&nbsp;lorem ipsum there are steps you can take. <a href="https://headtohealth.gov.au/lorem ipsum-support/lorem ipsum">Find out more on Head to Health</a></p><p><a href="https://www.qld.gov.au/__data/assets/pdf_file/0019/142084/mh-easy-read.pdf"><img src="https://www.qld.gov.au/__data/assets/image/0018/142083/varieties/250w.jpg" alt="mh-easy-read.jpg" width="250" height="354" />Looking after your mental health during lorem ipsum: Easy read fact sheet&nbsp;(PDF)</a></p>
</div>

<!--https://find.search.qld.gov.au/s/search.json?collection=qgov-content&query=!null&meta_ContentType=aside&meta_Tags_or=&fmo=true&profile=_default-->
<!--https://discover.search.qld.gov.au/s/search.json?collection=qgov~sp-content&query=!null&meta_ContentType=aside&meta_Tags_or=&fmo=true&profile=_default-->
</aside>


Expand Down
6 changes: 3 additions & 3 deletions src/docs/examples/cut-in.html
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ <h2>COVID-19</h2>
</div>
</div>
<span>Search</span>
</button><form action="https://www.qld.gov.au/search" id="qg-global-search-form" role="search" class="qg-search-form collapse qg-global-web-autocomplete" data-suggestions="https://find.search.qld.gov.au/s/suggest.json?collection=qld-gov&fmt=json%2B%2B&alpha=0.5&profile=qld" data-results-url="https://find.search.qld.gov.au/s/search.json?collection=qld-gov&profile=qld&meta_sfinder_sand=yes">
</button><form action="https://www.qld.gov.au/search" id="qg-global-search-form" role="search" class="qg-search-form collapse qg-global-web-autocomplete" data-suggestions="https://discover.search.qld.gov.au/s/suggest.json?collection=qgov~sp-search&fmt=json%2B%2B&alpha=0.5&profile=qld" data-results-url="https://discover.search.qld.gov.au/s/search.json?collection=qgov~sp-search&profile=qld&meta_sfinder_sand=yes">
<div class="input-group">
<label for="qg-search-query" class="qg-visually-hidden">Search Queensland Government</label>
<input type="text" name="query" id="qg-search-query" accesskey="5" class="form-control" autocomplete="off" placeholder="Search website" tabindex="0" aria-expanded="false" role="combobox"/>
Expand Down Expand Up @@ -290,7 +290,7 @@ <h4>Browse by category</h4>
<!--parameters to display results on search page-->
<input type="hidden" name="num_ranks" value="10">
<input type="hidden" name="tiers" value="off">
<input type="hidden" name="collection" value="qld-gov">
<input type="hidden" name="collection" value="qgov~sp-search">
<input type="hidden" name="profile" value="qld">
</form>

Expand Down Expand Up @@ -595,7 +595,7 @@ <h2>Lorem ipsum dolor sit amet</h2>

</div>

<!--https://find.search.qld.gov.au/s/search.json?collection=qgov-content&query=!null&meta_ContentType=aside&meta_Tags_or=&fmo=true&profile=_default-->
<!--https://discover.search.qld.gov.au/s/search.json?collection=qgov~sp-content&query=!null&meta_ContentType=aside&meta_Tags_or=&fmo=true&profile=_default-->
</aside>


Expand Down
6 changes: 3 additions & 3 deletions src/docs/examples/form-new-styles.html
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ <h2 id="landmark-label" tabindex="1">Skip links and keyboard navigation</h2>
</div>
</div>
<span>Search</span>
</button><form action="https://oss-uat.clients.squiz.net/search" id="qg-global-search-form" role="search" class="qg-search-form collapse qg-global-web-autocomplete" data-suggestions="https://find.search.qld.gov.au/s/suggest.json?collection=qld-gov&fmt=json%2B%2B&alpha=0.5&profile=qld" data-results-url="https://find.search.qld.gov.au/s/search.json?collection=qld-gov&profile=qld&meta_sfinder_sand=yes">
</button><form action="https://oss-uat.clients.squiz.net/search" id="qg-global-search-form" role="search" class="qg-search-form collapse qg-global-web-autocomplete" data-suggestions="https://discover.search.qld.gov.au/s/suggest.json?collection=qgov~sp-search&fmt=json%2B%2B&alpha=0.5&profile=qld" data-results-url="https://discover.search.qld.gov.au/s/search.json?collection=qgov~sp-search&profile=qld&meta_sfinder_sand=yes">
<div class="input-group">
<label for="qg-search-query" class="qg-visually-hidden">Search Queensland Government</label>
<input type="text" name="query" id="qg-search-query" accesskey="5" class="form-control" autocomplete="off" placeholder="Search website" tabindex="0" aria-expanded="false" role="combobox"/>
Expand Down Expand Up @@ -262,7 +262,7 @@ <h4>Browse by category</h4>
<!--parameters to display results on search page-->
<input type="hidden" name="num_ranks" value="10">
<input type="hidden" name="tiers" value="off">
<input type="hidden" name="collection" value="qld-gov">
<input type="hidden" name="collection" value="qgov~sp-search">
<input type="hidden" name="profile" value="qld">
</form>

Expand Down Expand Up @@ -892,7 +892,7 @@ <h2>What is ‘after hours’?</h2>
<div id="def"><ul><li>Public holidays</li><li>Weekends (Saturday and Sunday)</li><li>After 5pm (Mon&ndash;Fri)</li><li>Before 7.30am (North Queensland and Cannon Hill regions)</li><li>Before 8am (all other regions)</li></ul></div>
</div>

<!--https://find.search.qld.gov.au/s/search.json?collection=qgov-content&query=!null&meta_ContentType=aside&meta_Tags_or=&fmo=true&profile=_default-->
<!--https://discover.search.qld.gov.au/s/search.json?collection=qgov~sp-content&query=!null&meta_ContentType=aside&meta_Tags_or=&fmo=true&profile=_default-->
</aside>


Expand Down
6 changes: 3 additions & 3 deletions src/docs/examples/formio.html
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ <h2 id="landmark-label" tabindex="1">Skip links and keyboard navigation</h2>
</div>
</div>
<span>Search</span>
</button><form action="https://oss-uat.clients.squiz.net/search" id="qg-global-search-form" role="search" class="qg-search-form collapse qg-global-web-autocomplete" data-suggestions="https://find.search.qld.gov.au/s/suggest.json?collection=qld-gov&fmt=json%2B%2B&alpha=0.5&profile=qld" data-results-url="https://find.search.qld.gov.au/s/search.json?collection=qld-gov&profile=qld&meta_sfinder_sand=yes">
</button><form action="https://oss-uat.clients.squiz.net/search" id="qg-global-search-form" role="search" class="qg-search-form collapse qg-global-web-autocomplete" data-suggestions="https://discover.search.qld.gov.au/s/suggest.json?collection=qgov~sp-search&fmt=json%2B%2B&alpha=0.5&profile=qld" data-results-url="https://discover.search.qld.gov.au/s/search.json?collection=qgov~sp-search&profile=qld&meta_sfinder_sand=yes">
<div class="input-group">
<label for="qg-search-query" class="qg-visually-hidden">Search Queensland Government</label>
<input type="text" name="query" id="qg-search-query" accesskey="5" class="form-control" autocomplete="off" placeholder="Search website" tabindex="0" aria-expanded="false" role="combobox"/>
Expand Down Expand Up @@ -259,7 +259,7 @@ <h4>Browse by category</h4>
<!--parameters to display results on search page-->
<input type="hidden" name="num_ranks" value="10">
<input type="hidden" name="tiers" value="off">
<input type="hidden" name="collection" value="qld-gov">
<input type="hidden" name="collection" value="qgov~sp-search">
<input type="hidden" name="profile" value="qld">
</form>

Expand Down Expand Up @@ -528,7 +528,7 @@ <h1>Example</h1>

<aside id="qg-secondary-content">

<!--https://find.search.qld.gov.au/s/search.json?collection=qgov-content&query=!null&meta_ContentType=aside&meta_Tags_or=&fmo=true&profile=_default-->
<!--https://discover.search.qld.gov.au/s/search.json?collection=qgov~sp-content&query=!null&meta_ContentType=aside&meta_Tags_or=&fmo=true&profile=_default-->
</aside>


Expand Down
6 changes: 3 additions & 3 deletions src/docs/examples/guide-page.html
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ <h2 id="landmark-label" tabindex="1">Skip links and keyboard navigation</h2>
</div>
</div>
<span>Search</span>
</button><form action="https://www.qld.gov.au/search" id="qg-global-search-form" role="search" class="qg-search-form collapse qg-global-web-autocomplete" data-suggestions="https://find.search.qld.gov.au/s/suggest.json?collection=qld-gov&fmt=json%2B%2B&alpha=0.5&profile=qld" data-results-url="https://find.search.qld.gov.au/s/search.json?collection=qld-gov&profile=qld&meta_sfinder_sand=yes">
</button><form action="https://www.qld.gov.au/search" id="qg-global-search-form" role="search" class="qg-search-form collapse qg-global-web-autocomplete" data-suggestions="https://discover.search.qld.gov.au/s/suggest.json?collection=qgov~sp-search&fmt=json%2B%2B&alpha=0.5&profile=qld" data-results-url="https://discover.search.qld.gov.au/s/search.json?collection=qgov~sp-search&profile=qld&meta_sfinder_sand=yes">
<div class="input-group">
<label for="qg-search-query" class="qg-visually-hidden">Search Queensland Government</label>
<input type="text" name="query" id="qg-search-query" accesskey="5" class="form-control" autocomplete="off" placeholder="Search website" tabindex="0" aria-expanded="false" role="combobox"/>
Expand Down Expand Up @@ -254,7 +254,7 @@ <h4>Browse by category</h4>
<!--parameters to display results on search page-->
<input type="hidden" name="num_ranks" value="10">
<input type="hidden" name="tiers" value="off">
<input type="hidden" name="collection" value="qld-gov">
<input type="hidden" name="collection" value="qgov~sp-search">
<input type="hidden" name="profile" value="qld">
</form>

Expand Down Expand Up @@ -487,7 +487,7 @@ <h2>What's this?</h2><p><a href="./?a=180298">For government</a> (<i>For gov</i>

<aside id="qg-secondary-content">

<!--https://find.search.qld.gov.au/s/search.json?collection=qgov-content&query=!null&meta_ContentType=aside&meta_Tags_or=&fmo=true&profile=_default-->
<!--https://discover.search.qld.gov.au/s/search.json?collection=qgov~sp-content&query=!null&meta_ContentType=aside&meta_Tags_or=&fmo=true&profile=_default-->
</aside>


Expand Down
6 changes: 3 additions & 3 deletions src/docs/examples/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ <h2 id="landmark-label" tabindex="1">Skip links and keyboard navigation</h2>
<span>Search</span>
</button>

<form action="https://www.qld.gov.au/search" id="qg-global-search-form" role="search" class="qg-site-search__form qg-search-form collapse qg-global-web-autocomplete" data-suggestions="https://find.search.qld.gov.au/s/suggest.json?collection=qld-gov&fmt=json%2B%2B&alpha=0.5&profile=qld" data-results-url="https://find.search.qld.gov.au/s/search.json?collection=qld-gov&profile=qld&meta_sfinder_sand=yes">
<form action="https://www.qld.gov.au/search" id="qg-global-search-form" role="search" class="qg-site-search__form qg-search-form collapse qg-global-web-autocomplete" data-suggestions="https://discover.search.qld.gov.au/s/suggest.json?collection=qgov~sp-search&fmt=json%2B%2B&alpha=0.5&profile=qld" data-results-url="https://discover.search.qld.gov.au/s/search.json?collection=qgov~sp-search&profile=qld&meta_sfinder_sand=yes">
<div class="input-group">
<label for="qg-search-query" class="qg-visually-hidden">Search Queensland Government</label>
<input type="text" name="query" id="qg-search-query" class="form-control qg-search-site__input" autocomplete="off" placeholder="Search website" tabindex="0" aria-expanded="false" role="combobox"/>
Expand Down Expand Up @@ -221,7 +221,7 @@ <h4>Related services</h4>
<!--parameters to display results on search page-->
<input type="hidden" name="num_ranks" value="10">
<input type="hidden" name="tiers" value="off">
<input type="hidden" name="collection" value="qld-gov">
<input type="hidden" name="collection" value="qgov~sp-search">
<input type="hidden" name="profile" value="qld">
</form>

Expand Down Expand Up @@ -393,7 +393,7 @@ <h3>Contact us</h3>
<div class="qg-footer-col-content qg-service-centre">
<h3>Your nearest service centre</h3>

<div class="qg-service-centre__wrapper" data-types="QGAP; HSC" data-centres="https://find.search.qld.gov.au/s/search.json?collection=services-web&sort=prox&num_ranks=2">
<div class="qg-service-centre__wrapper" data-types="QGAP; HSC" data-centres="https://discover.search.qld.gov.au/s/search.json?collection=qgov~sp-services&sort=prox&num_ranks=2">
<div class="qg-location-default">
<p>Help us provide you with the most useful information by setting your location.</p>
<button class="btn btn-global-primary-white qg-service-centre-set-location collapsed" data-analytics-link-group="qg-nearest-service-set-location" data-toggle="collapse" data-target="#qg-service-centre-location-setter" role="button" aria-expanded="false" aria-controls="qg-service-centre-location-setter">
Expand Down
6 changes: 3 additions & 3 deletions src/docs/examples/recaptcha2.html
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ <h2>COVID-19</h2>
</div>
</div>
<span>Search</span>
</button><form action="https://www.qld.gov.au/search" id="qg-global-search-form" role="search" class="qg-search-form collapse qg-global-web-autocomplete" data-suggestions="https://find.search.qld.gov.au/s/suggest.json?collection=qld-gov&fmt=json%2B%2B&alpha=0.5&profile=qld" data-results-url="https://find.search.qld.gov.au/s/search.json?collection=qld-gov&profile=qld&meta_sfinder_sand=yes">
</button><form action="https://www.qld.gov.au/search" id="qg-global-search-form" role="search" class="qg-search-form collapse qg-global-web-autocomplete" data-suggestions="https://discover.search.qld.gov.au/s/suggest.json?collection=qgov~sp-search&fmt=json%2B%2B&alpha=0.5&profile=qld" data-results-url="https://discover.search.qld.gov.au/s/search.json?collection=qgov~sp-search&profile=qld&meta_sfinder_sand=yes">
<div class="input-group">
<label for="qg-search-query" class="qg-visually-hidden">Search Queensland Government</label>
<input type="text" name="query" id="qg-search-query" accesskey="5" class="form-control" autocomplete="off" placeholder="Search website" tabindex="0" aria-expanded="false" role="combobox"/>
Expand Down Expand Up @@ -307,7 +307,7 @@ <h4>Browse by category</h4>
<!--parameters to display results on search page-->
<input type="hidden" name="num_ranks" value="10">
<input type="hidden" name="tiers" value="off">
<input type="hidden" name="collection" value="qld-gov">
<input type="hidden" name="collection" value="qgov~sp-search">
<input type="hidden" name="profile" value="qld">
</form>

Expand Down Expand Up @@ -923,7 +923,7 @@ <h2>What is after hours?</h2>
<div id="def"><ul><li>Public holidays</li><li>Weekends (Saturday and Sunday)</li><li>After 5pm (Mon&ndash;Fri)</li><li>Before 7.30am (North Queensland and Cannon Hill regions)</li><li>Before 8am (all other regions)</li></ul></div>
</div>

<!--https://find.search.qld.gov.au/s/search.json?collection=qgov-content&query=!null&meta_ContentType=aside&meta_Tags_or=&fmo=true&profile=_default-->
<!--https://discover.search.qld.gov.au/s/search.json?collection=qgov~sp-content&query=!null&meta_ContentType=aside&meta_Tags_or=&fmo=true&profile=_default-->
</aside>


Expand Down
Loading