Skip to content

Commit

Permalink
customer uk on top of current clarin-v7
Browse files Browse the repository at this point in the history
  • Loading branch information
kosarko committed Nov 8, 2024
1 parent 7899a88 commit 8ace2fa
Show file tree
Hide file tree
Showing 15 changed files with 983 additions and 1,675 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ jobs:
# Direct that step to utilize a DSpace REST service that has been started in docker.
# Spin up UI on 127.0.0.1 to avoid host resolution issues in e2e tests with Node 18+
INSTANCE: '2'
DSPACE_CI_IMAGE: 'ufal/dspace:dspace-7_x-test'
DSPACE_SOLR_IMAGE: ufal/dspace-solr:dspace-7_x
DSPACE_CI_IMAGE: 'ufal/dspace:customer-uk-test'
DSPACE_SOLR_IMAGE: ufal/dspace-solr:customer-uk
DSPACE_REST_HOST: 127.0.0.1
DSPACE_REST_PORT: 8080
DSPACE_REST_NAMESPACE: '/server'
Expand Down
25 changes: 25 additions & 0 deletions cypress/e2e/clarin-licenses-page.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import { TEST_ADMIN_PASSWORD, TEST_ADMIN_USER } from '../support';

/**
* Test to check if the license administration page is loaded after redirecting.
*/
describe('License Administration Page', () => {

it('should pass accessibility tests', {
retries: {
runMode: 8,
openMode: 8,
},
defaultCommandTimeout: 10000
}, () => {
cy.visit('/login');

// Login as admin
cy.loginViaForm(TEST_ADMIN_USER, TEST_ADMIN_PASSWORD);

cy.visit('/licenses/manage-table');

// <ds-clarin-license-table> tag must be loaded
cy.get('ds-clarin-license-table').should('exist');
});
});
31 changes: 31 additions & 0 deletions cypress/e2e/login-modal.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
import { TEST_ADMIN_PASSWORD, TEST_ADMIN_USER } from '../support/e2e';

/**
* Test for checking if the handle page is loaded after redirecting.
*/
describe('Handle Page', () => {

it('should pass accessibility tests', {
retries: {
runMode: 8,
openMode: 8,
},
defaultCommandTimeout: 10000
}, () => {
cy.visit('/login');

// Login as admin
cy.loginViaForm(TEST_ADMIN_USER, TEST_ADMIN_PASSWORD);

cy.visit('/handle-table');

// <ds-handle-page> tag must be loaded
cy.get('ds-handle-page').should('exist');

// <ds-handle-table> tag must be loaded
cy.get('ds-handle-table').should('exist');

// <ds-handle-global-actions> tag must be loaded
cy.get('ds-handle-global-actions').should('exist');
});
});
2 changes: 1 addition & 1 deletion scripts/sourceversion.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# It must also cooperate with argparse

# the idea is, that this will be different on each branch, but could be possibly passed by argv/argparse
RELEASE_TAG_BASE='none'
RELEASE_TAG_BASE='drruk'

def get_time_in_timezone(zone: str = "Europe/Bratislava"):
try:
Expand Down
7 changes: 0 additions & 7 deletions src/aai/aai.js
Original file line number Diff line number Diff line change
Expand Up @@ -64,13 +64,6 @@
djc.textHelpMore = opts.textHelpMore;

djc.inlinemetadata = typeof opts.inlinemetadata === 'object' ? opts.inlinemetadata : [];
djc.inlinemetadata.push({
'country': '_all_',
'entityID': 'https://idm.clarin.eu',
'geo': {'lat': 51.833298, 'lon': 5.866699},
'title': 'Clarin.eu website account',
'weight': 1000
});
djc.inlinemetadata.push({
'country': 'CZ',
'entityID': 'https://cas.cuni.cz/idp/shibboleth',
Expand Down
11 changes: 2 additions & 9 deletions src/aai/aai_config.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,8 @@ jQuery(document).ready(
"themes/UFAL/lib/html/disco-juice.html?";
// e.g., instance.metadataFeed = "http://localhost:8080/server/api/discojuice/feeds?callback=dj_md_1";
instance.metadataFeed = instance.target + "discojuice/feeds";
instance.serviceName = "LINDAT/CLARIAH-CZ Repository";
instance.localauth =
'<form method="post" action="' + instance.target + 'password-login"> ' +
'<p>Sign in using your local account obtained from the LINDAT/CLARIAH-CZ administrator.</p>' +
'<p style="margin: 5px; color: #888" ><input type="text" name="login_email" style="font-size: 160%; width: 100%" id="login" /> <label for="login">E-Mail Address</label></p>' +
'<p style="margin: 5px; color: #888" ><input type="password" name="login_password" style="font-size: 160%; width: 100%" id="pass" /> <label for="pass">Password</label></p>' +
'<p style="margin: 5px; color: #607890; text-decoration: underline;"><a href="' + instance.target + 'forgot">Forgot your password?</a></p>' +
'<p style="" ><input type="submit" style="margin: 20px 2px" name="submit" value="Sign in" /></p>' +
'</form>';
instance.serviceName = "Data repository at CUNI";
instance.localauth = true; // used to be html snippet; that was not used anymore
instance.target = instance.target + "authn/shibboleth";
return instance;
})();
Expand Down
115 changes: 1 addition & 114 deletions src/app/footer/footer.component.html
Original file line number Diff line number Diff line change
@@ -1,116 +1,3 @@
<footer class="text-lg-start">
<div class="lindat-common2 lindat-common-footer">
<footer data-version="3.0.5" data-build="05eff1186f12528f221a63b021c7b7dc81301429">
<div id="about-lindat">
<h4><a href="https://lindat.cz/sites/default/files/2021-01/lindat_clariah_flyer.pdf">LINDAT/CLARIAH-CZ</a></h4>
<ul>
<li><a href="https://lindat.cz/files/mission-en.pdf">Mission Statement</a></li>
<li><a href="https://lindat.cz/ab">Advisory Board</a></li>
<li><a href="https://lindat.cz/events">Events</a></li>
<li><a href="https://www.clarin.eu/">CLARIN Participation</a></li>
<li><a href="https://www.dariah.eu/">DARIAH Participation</a></li>
<br/>
<li><a href="https://lindat.cz/faq-repository">FAQ</a></li>
<li><a href="mailto:[email protected]">Helpdesk</a></li>
<li><a href="https://lindat.cz/user_feedback">User Feedback Form</a></li>
<br/>
<li><a href="https://lindat.cz/acknowledgement">Acknowledge LINDAT/CLARIAH-CZ</a></li>
</ul>
</div>
<div id="about-partners">
<h4><a href="https://lindat.cz/partners">Partners</a></h4>
<ul>
<li>Charles University
<ul>
<li><a href="https://lindat.cz/partners/mff-uk">Faculty <i>of</i> Mathematics <i>and</i> Physics</a></li>
<li><a href="https://lindat.cz/partners/ff-uk">Faculty <i>of</i> Arts</a></li>
</ul>
</li>
<li>Masaryk University
<ul>
<li><a href="https://lindat.cz/partners/ff-mu">Faculty <i>of</i> Arts</a></li>
<li><a href="https://lindat.cz/partners/fi-mu">Faculty <i>of</i> Informatics</a></li>
</ul>
</li>
<li>University of West Bohemia
<ul>
<li><a href="https://lindat.cz/partners/zcu">Faculty <i>of</i> Applied Sciences</a></li>
</ul>
</li>
<li>Czech Academy of Sciences
<ul>
<li><a href="https://lindat.cz/partners/ujc">Czech Language Institute</a></li>
<li><a href="https://lindat.cz/partners/knav">Library <i>of</i> Academy</a></li>
<li><a href="https://lindat.cz/partners/hu">Institute <i>of</i> History</a></li>
<li><a href="https://lindat.cz/partners/flu">Institute <i>of</i> Philosophy</a></li>
</ul>
</li>
<li>Archives, Libraries and Galleries
<ul>
<li><a href="https://lindat.cz/partners/nk">National Library <i>of the Czech Republic</i></a></li>
<li><a href="https://lindat.cz/partners/mzk">Moravian Library <i>in Brno</i></a></li>
<li><a href="https://lindat.cz/partners/ng">National Gallery Prague</a></li>
<li><a href="https://lindat.cz/partners/nfa">National Film Archive</a></li>
</ul>
</li>
</ul>
</div>
<div id="about-website">
<h4><a href="https://lindat.cz/services">Services</a></h4>
<ul>
<li><a href="https://lindat.mff.cuni.cz/en/monitoring">Service Status</a></li>
<li><a href="https://lindat.mff.cuni.cz/repository/static/about">About and Policies</a></li>
<li><a href="https://lindat.mff.cuni.cz/en/terms-of-use">Terms of Use</a></li>
</ul>
</div>
<div id="badges-a">
<a href="https://www.clarin.eu/content/certified-centres"><img src="https://lindat.mff.cuni.cz/images/b-centre.png" alt="CLARIN CENTRE B" /></a>
<a href="https://www.clarin.eu/content/knowledge-centres"><img src="https://lindat.mff.cuni.cz/images/k-centre.png" alt="CLARIN CENTRE K" style="filter:brightness(0.88)" /></a>
<a href="https://www.coretrustseal.org/wp-content/uploads/2019/08/LINDAT-CLARIN.pdf"><img src="https://lindat.mff.cuni.cz/images/core-trust-seal-mono.png" alt="CoreTrustSeal Certification" /></a>
</div>
<div id="badges-b">
<a href="https://twitter.com/lindatclariahcz">Follow us on Twitter <img src="https://lindat.mff.cuni.cz/images/twitter-circular.svg" alt="Link to Profile" /></a>
<a href="https://lindat.cz/user/login"><img src="https://lindat.mff.cuni.cz/sites/default/files/LINDAT-CLARIAH-cz-gray_0.svg" alt="Home Page" /></a>
</div>
<div id="ack-msmt">
THE LINDAT/CLARIAH-CZ PROJECT (LM2018101; formerly LM2010013, LM2015071) IS FULLY SUPPORTED BY THE MINISTRY OF EDUCATION, SPORTS AND YOUTH OF THE CZECH REPUBLIC UNDER THE&#160;PROGRAMME LM OF "LARGE INFRASTRUCTURES"
</div>
<div id="ack-freepik">Icons © Smashicons and Freepik from flaticon.com licensed by <a href="https://creativecommons.org/licenses/by/3.0/">CC 3.0 BY</a></div>
<div id="ack-ufal">website © 2022 by <a href="https://ufal.mff.cuni.cz/">ÚFAL</a></div>
<script type="text/javascript">
//<![CDATA[
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');

// main LINDAT/CLARIAH-CZ tracker
ga('create', 'UA-27008245-2', 'cuni.cz');
ga('send', 'pageview');
//]]>
</script>
<!-- Piwik LINDAT/CLARIAH-CZ tracker -->
<script type="text/javascript">
//<![CDATA[
var _paq = _paq || [];
_paq.push(["setDocumentTitle", document.domain + "/" + document.title]);
_paq.push(["setCookieDomain", "*.mff.cuni.cz"]);
_paq.push(["setDomains", ["*.mff.cuni.cz"]]);
_paq.push(['setCustomVariable', 1, "source", "common-theme", "page"]);
_paq.push(['trackPageView']);
_paq.push(['enableLinkTracking']);
(function() {
var u='//lindat.mff.cuni.cz/piwik/';
_paq.push(['setTrackerUrl', u+'piwik.php']);
_paq.push(['setSiteId', 2]);
var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
})();
//]]>
</script>
<noscript><p><img src="//lindat.mff.cuni.cz/piwik/piwik.php?idsite=2" style="border:0;" alt="" /></p></noscript>
<!-- End Piwik Code -->
<!-- End TRACKING CODE -->
</footer>
</div>
<p style="color:white">Test version of Data Repository at Charles University</p>
</footer>
Loading

0 comments on commit 8ace2fa

Please sign in to comment.