Commit Graph

98 Commits

Author SHA1 Message Date
Konstantina Galouni 99caf5aacc [develop | DONE | CHANGED] Renamed property "eoscMarketplaceURL" to "openScienceCloudURL" and added new property "eoscMarketplaceURL" (new value) | Updated current domain and marketplace domain from eosc-portal.eu to eosc-beyond.eu.
1. env-properties.ts: Added property openScienceCloudURL?: string.
2. environment.ts: Renamed property "eoscMarketplaceURL" to "openScienceCloudURL" and set value for new property "eoscMarketplaceURL".
3. dataProviderInfo.ts: Use properties.openScienceCloudURL instead of properties.eoscMarketplaceURL.
4. dataProvider.component.ts & organization.component.ts & project.component.ts & resultLanding.component.ts: Updated method "eoscBackLink()" to use "properties.eoscMarketplaceURL" instead of static url "https://search.marketplace.eosc-portal.eu/".
5. parsingFunctions.class.ts: In eoscSubjects use "properties.eoscMarketplaceURL" instead of static url "https://search.marketplace.eosc-portal.eu/".
6. connectHelper.ts: In method "getCommunityFromDomain()", added check domain.indexOf('eosc-beyond.eu') != -1.
2024-09-11 21:04:03 +03:00
Konstantina Galouni 1401a68256 [develop | DONE | FIXED]: Initialize properties on field definition (files: displayClaims.component.ts & directLinking.component.ts & approved.component.ts & curators.component.ts & portals.component.ts & depositFirstPage.component.ts & searchResultsInDeposit.component.ts & statisticsTab.component.ts & citeThis.component.ts & deletedByInference.component.ts & organization.component.ts & project.component.ts & deletedByInference.component.ts & myOrcidLinks.component.ts & searchMyOrcidResults.component.ts & searchRecommendedResultsForOrcid.component.ts & searchResultsForOrcid.component.ts & searchAll.component.ts & advancedSearchForm.component.ts & searchDataProviders.component.ts & searchDataProviders.component.ts & searchOrganizations.component.ts & searchProjects.component.ts). 2024-07-02 13:51:15 +03:00
Konstantinos Triantafyllou 3a6b01ebe8 [develop | DONE]: Add isBottomIntersecting in layoutService and use is when it is needed. Add capitalize all in order to capitalize all words with whitespace separator. 2024-06-03 17:12:52 +03:00
Konstantinos Triantafyllou df2516f8f7 [develop | DONE]: Add belongs to all entities and add message in html. 2024-05-31 13:59:23 +03:00
Konstantina Galouni cc6b5aeffe [develop | DONE | CHANGED]: Excluded (filter out) unidentified projects from search.
1. searchProjects.service.ts: Added filter &fq=(projectcode<>"unidentified") in methods "getProjectsforDataProvider()", "advancedSearchProjects()", "getProjectsForOrganizations()", "numOfSearchProjects2()".
2. organization.component.ts: In method call "searchProjectsService.getProjectsForOrganizations()" updated parameter for funder to be in fq instead of keyword query.
3. projects-in-modal.component.ts: In method "updateFilters()", format filterQuery to be in fq instead of keyword query.
4. entitySearch.service.ts: In method "search()", for type "project", added in the query &fq=(projectcode<>"unidentified").
2024-05-28 15:27:33 +03:00
Konstantina Galouni 6a41954109 [develop | DONE | CHANGED & ADDED]: env-properties.ts & environment.ts: Added properties "rorURL", "isniURL", "wikiDataURL", "fundRefURL" | organizationInfo.ts: Added identifiers | searchOrganizations.service.ts & organization.service.ts: Parse identifiers (pid) [BETA ONLY] | organization.module.ts: Import ResultLandingUtilsModule (to call <showIdentifiers> | organization.component: Removed old unused code & Added <showIdentifiers> & In mobile added country and website url | parsingFunctions.class.ts: Added parsing for organization pids | showIdentifiers.component.ts: Added cases for organization pids & check if pid value is a url, do not add prefix. 2024-03-04 13:14:09 +02:00
Konstantina Galouni b89278af70 [develop | DONE | CHANGED]: Do not request page help contents (helptexts) in EXPLORE. (FILES: displayClaims.component.ts & linkingGeneric.component.ts & dataProvider.component.ts & organization.component.ts & project.component.ts & resultLanding.component.ts & newSearchPage.component.ts) 2024-02-08 14:19:26 +02:00
Konstantinos Triantafyllou 37b7423e7f Simplify piwik logic: All work is done in piwik.service. 2023-07-12 15:05:25 +03:00
Konstantinos Triantafyllou 50422c0ab3 Merge remote-tracking branch 'origin/develop' into dynamic-piwik 2023-07-12 13:56:18 +03:00
Konstantina Galouni a6dee41979 Merging 'develop' branch into explore-redesign. 2023-07-05 11:40:43 +03:00
Konstantinos Triantafyllou aa10b35f7a Fix ResizeObserver condition in landings and fs-modal 2023-07-04 11:53:08 +03:00
Konstantinos Triantafyllou a37662cd7e Merge remote-tracking branch 'origin/develop' into dynamic-piwik 2023-06-08 11:31:27 +03:00
Konstantina Galouni d24576a5c7 [Library | develop & Eosc Explore | develop]: Added in eoscSubjects, "EOSC::Data Cube" | Updated eosc url params in landing for back "Go to Search" link - "return_path" and "search_params" (instead of pv).
1. parsingFunctions.class.ts: Added in eoscSubjects, subject "EOSC::Data Cube" (linked with Adam plarform).
2. result-preview.component.ts & fundedBy.component.ts & availableOn.component.ts & relatedDatasourcesTab.component.ts: Updated method "addEoscPrevInParams()" to add 2 parameters: "return_path" and "search_params" (instead of pv).
3. resultLanding.component.ts:
   a. Updated how this.prevPath is initialized (parse url params "return_path" and "search_params" instead of "pv").
   b. Added method "getEoscParams()" to return eosc params as a string (to be used in href).
   c. Updated method "addEoscPrevInParams()" to add 2 parameters: "return_path" and "search_params" (instead of pv).
4. project.component.ts & dataProvider.component.ts:
   a. Updated how this.prevPath is initialized (parse url params "return_path" and "search_params" instead of "pv").
   b. Updated method "addEoscPrevInParams()" to add 2 parameters: "return_path" and "search_params" (instead of pv).
5. organization.component.ts: Updated how this.prevPath is initialized (parse url params "return_path" and "search_params" instead of "pv").
6. metrics.component.ts: Added method "getEoscParams()" to return eosc params as a string (to be used in href).
2023-05-25 18:10:58 +03:00
Konstantina Galouni 128c03c671 Merged develop branch into explore-redesign 2023-05-09 19:04:06 +03:00
Konstantinos Triantafyllou 49e2edfe84 Change piwik service methods in order to get the piwik from portal configuration 2023-04-26 14:10:45 +03:00
Konstantina Galouni c547dfa945 [Library | develop]: resultLanding.component.ts & project.component.ts & organization.component.ts & dataProvider.component.ts: [Bug fix] Removed atob method call from get method "eoscBackLink()" - pv param is not expected to be base64 encoded but url encoded. 2023-04-21 19:56:19 +03:00
Konstantina Galouni 055434ab36 [Library | develop & Eosc Explore | develop]: resultLanding.component.ts & project.component.ts & organization.component.ts & dataProvider.component.ts: [Bug fix] In method "eoscBackLink()" added a dot (.) after beta | environment.beta.ts: Added "eoscDataTransferAPI" and "eoscDataTransferDestinations" properties. 2023-04-20 20:48:12 +03:00
Konstantina Galouni f22a0bc806 [Library | develop & Eosc Explore | develop]: Added font-family "Inter" to align with Marketplace | Updated how back button "Go to search" is build - combine referrer and the new url parameter "pv", which is expected to have the previous url path and params.
1. /assets: Added /media/fonts/inter folder with the "Inter" font-family.
2. eosc-custom.less: Override the default font family to use 'Inter', sans-serif.
3. routerHelper.class.ts: Added method "addQueryParam()" to add a query parameter in already existing or not object with parameters.
4. search-tab.component.ts & searchResult.component & projects-in-modal.component.ts & result/deletedByInference/deletedByInference.component.ts & organization/deletedByInference/deletedByInference.component.ts: Added @Input() prevPath: string = ""; and pass it to the appropriate children components.
5. result-preview.component & fundedBy.component.ts & availableOn.component.ts & relatedDatasourcesTab.component.ts: Added @Input() prevPath: string = ""; and method "addEoscPrevInParams()" and call it when building queryParams of internal links.
6. metrics.component.ts: Added @Input() prevPath: string = ""; and use it when building internal urls.
7. resultLanding.component.ts & project.component.ts & organization.component.ts & dataProvider.component.ts:
   a. Added fields public referrer: string; and public prevPath: string;
   b. Read "pv" url property and get referrer.
   c. Added methods "addEoscPrevInParams()" and "eoscBackLink()".
8. resultLanding.component.html & project.component.html & organization.component.html & dataProvider.component.html:
   a. Update "Go to Search" back link.
   b. Call "addEoscPrevInParams()" method when building queryParams of internal links.
   c. Pass "prevPath" to the appropriate children components.
2023-04-20 20:06:53 +03:00
Konstantina Galouni e1b5f4a46d Library | explore-redesign: Merging develop branch into explore-redesign 2023-04-06 12:06:12 +03:00
Konstantina Galouni 4c19e65edb [Library | develop & EOSC Explore | master]: resultLanding.component & project.component & organization.component & dataProvider.component: Added top bar to go "back" to eosc search | Added asset top-bar.svg | eosc-custom.less: Updated colors and added ".eosc-explore-back-search-bar". 2023-03-16 17:53:28 +02:00
Konstantina Galouni 4aa350ff2b [Library | explore-redesign]: Mobile redesign for organization landing complete and functional.
1. loadingModal.module.ts: Imported LoadingModule.
2. loading.component.ts:
   a. [Bug fix] loading icon (spinner) was not visible.
   b. Added inputs title: string, @Input() isMobile: boolean = false, @Input() classTitle: string = "uk-background-primary uk-light".
   c. Added html for small screens (mobile) when isMobile.
3. search-tab.component.ts: Added @Input() public isMobile: boolean = false and [class.uk-flex-column]="isMobile" to not show title and view all link in the same row when isMobile.
4. organization.module.ts: Imported FullScreenModalModule.
5. organization.component.ts & organization.component.html: Mobile redesign complete and functional.
2023-02-22 00:09:12 +02:00
Alex Martzios 3b962dc0e5 create mobile view structure for organization landing, add @media rules for project and dataProvider landing, change size of result title 2023-02-21 15:06:28 +02:00
Konstantina Galouni e9e2ee9f3a [Library]: [Bug fix] Strip html tags for titles and descriptions and show them as innerHTML.
1. dataProvider.component.ts & organization.component.ts & project.component.ts & resultLanding.component.ts & orcid-work.component.ts: Commented unused @ViewChild fields.
2. dataProvider.service.ts & project.service.ts & resultLanding.service.ts: Strip html tags from title.
3. resultLanding.component.ts: [Bug fix] resultLanding.description is string, not array.
4. orcidWork.ts: [Bug fix] resultLanding.description is string, not array & strip html tags from description.
5. refineFieldResults.service.ts: In method "getSearchAPIURLForEntity()", for entityType "result" set suffix to "results/".
6. searchDataproviders.service.ts & searchOrganizations.service.ts & searchProjects.service.ts & searchResearchResults.service.ts: Strip html tags from title | Do not cut description (multi line ellipsis is used in html).
7. jsonld-document-serializer.service.ts: [Bug fix] resultLanding.description is string, not array.
8. result-preview.component.html: Show description as innerHTML to properly display special characters.
2022-11-28 19:22:01 +02:00
Konstantina Galouni 14bd18c9d8 [Library | new-theme]: Organizations: Use openorgs identifier when available | In social sharing button and modal (landing) use OpenaireEntities.
1. organization.service.ts & searchOrganizations.service.ts: When "objIdentifier" starts with "openorgs____", set canonicalId and id to openorgs id.
2. dataProvider.component & organization.component & project.component: In button and modal for social media sharing, use name of entity by OpenaireEntities.
2022-07-12 13:20:28 +03:00
Konstantinos Triantafyllou d6fa3a87fa Change navbar-height to header-height in langing pages 2022-06-16 01:44:03 +03:00
Alex Martzios a89710765e fix for loading animation in landing pages 2022-06-10 14:56:32 +03:00
Konstantina Galouni 0946bd73b5 [Library | new-theme]: Fix display of errorMessages | Use <landing-header> instead of <showTitle> in all landing pages | Stop sticky header before graph & feedback line | Fix bug in eoscSubjectsFound intialization - set it as local variable.
1. resultLanding.component.html & project.component.html & organization.component.html & dataProvider.component.html:
   a. Move errorMessages and loading inside center box.
   b. In center box, after graph & feedback line, set [style]="'margin-bottom: '+graph_height+'px'", so that sticky header stop before graph & feedback.
2. resultLanding.component.html: Removed "uk-height-1-1" class from center box.
3. organization.component.html & project.component.html: In sticky header use <landing-header> instead of <showTitle> (forgotten in commit 8b94b7f98a).
4. organization.component.ts & project.component.ts & resultLanding.component.ts: In errorMessage, use OpenaireEntities in singular.
5. parsingFunctions.class.ts: [Bug fix] Removed "eoscSubjectsFound" from class fields and set it as local variable - bug fixed on back and again on landing.
2022-06-01 15:29:19 +03:00
Konstantina Galouni 7d563c19a8 [Explore & Library | new-theme]: Updates of paging in claims and orcid links pages | Fixes for server side rendering.
1. fos.component.ts & sdg.component.ts: [Bug fix] Added properties.domain as prefix in request for vocabulary - Network error on server.
2. displayClaims.component.html: Used <results-and-pages> before results and <paging-no-load> after results.
3. searchMyOrcidResults.component.html: After results use <paging-no-load>.
4. displayClaims.module.ts & searchMyOrcidResults.module.ts: Imported NoLoadPaging.
5. dataProvider.component.ts & organization.component.ts & project.component.ts & resultLanding.component.ts: [Bug fix] Fixed checks in ngAfterContentChecked, not to run on server.
6. dataProvider.service.ts: Added check if there are subjects.
7. orcid-work.component.ts: [Bug fix] On search view, add classes uk-button uk-button-link in orcid actions.
8. newSearchPage.component.ts: Removed console.log.
2022-05-17 00:31:28 +03:00
Konstantinos Triantafyllou 78b46ae45f Add errorLink property and change routing to this. Add searchPageParams to errorPage 2022-05-11 12:55:14 +03:00
Alex Martzios 10c70ad1da delete unused files/methods in landing pages 2022-05-10 12:44:10 +03:00
Konstantina Galouni 84cb6b6d96 [Library | new-theme]: In landing pages, title & tabs sticky even when bottom is in viewport | Other versions modals title updated | DMPs tab updated.
1. dataProvider.component.html & project.component.html & resultLanding.component.html: Removed "shouldSticky" check from id="main-tabs-div" - title & tabs sticky even when bottom is in viewport.
2. dataProvider.component.ts & organization.component.ts & project.component.ts & resultLanding.component.ts: Commented shouldSticky and observer for bottom - title & tabs sticky even when bottom is in viewport.
3. organization.component.ts & resultLanding.component.ts: In modal for other versions, title updated without "of".
4. project.component.html: In <search-tab> for DMPs added resultType="DMPs" | Title in DMPs tab changed to Data Management Plans.
5. search-tab.component.ts: Moved <errorMessages> after tab title and <ng-content> | In method "getEntityName()" return "this.resultType" if exists and no other condition matches.
2022-05-06 16:31:40 +03:00
Konstantina Galouni 8b94b7f98a [Library & common-assets | new-theme]:
1. landing-utils.css: Deleted .landing-background-default-color (replaced in html with uk-background-default).
2. resultLanding.component.html & project.component.html & organization.component.html & dataProvider.component.html: Updates and fixes for redesign.
   a. #graph_and_feedback outside margins and checks (invisible when no info).
   b. [Bug fix] margin-top of center column fixed (uk-sticky-placeholder was adding space).
   c. [Bug fix] Show again right sidebar when screen becomes medium+.
   d. [Bug fix] Added grid in labels.
3. resultLanding.component.ts & project.component.ts & organization.component.ts & dataProvider.component.ts: Added ResizeObserver and updated how graph_offset is calculated | Added graph_height field to set margin-top of center column.
4. project.component.ts: In getFileNameType() use OpenaireEntities.
5. organization.component.ts:
   a. In contentTypes field added type file names from OpenaireEntities
   b. Added field contentFileName.
   c. Added field shouldSticky and observer for "bottom" to stop sticky title & tabs when bottom is in viewport.
6. dataProvider.component.ts: Added field "provenanceUrls" and method "getProvenanceUrls()" to flatten all urls from dataProviderInfo.provenance.
2022-05-05 20:54:01 +03:00
Alex Martzios 07d3c0407d forgotten ; 2022-05-05 15:29:15 +03:00
Alex Martzios a40dfa0165 finish organization landing page 2022-05-05 13:44:46 +03:00
Alex Martzios 06e8eb29dd progress on org landing and some other tweaks 2022-05-05 09:32:18 +03:00
Alex Martzios 6c3d1c5127 progress on organization landing - almost ready 2022-05-04 12:47:51 +03:00
argirok f911dec31e landing pages: keep the loaded url as canonical if there is a timeout error - show the correct message 2021-12-17 15:39:32 +02:00
konstantina.galouni 5227f96b3b [Trunk | Library]:
1. timeout-interceptor.service.ts: Added whitelist, so that urls included in the list are not cut by this timeout interceptor.
2. services/reports.service.ts & landingPages/htmlProjectReport/htmlProjectReport.service.ts: In calls for CSV and HTML reports, added timeout 10 in seconds.
3. organization.component.ts: Created array "innerReportSubscriptions" where inner request of "downloading research results of a funder" are added - on error, all innerReportSubscriptions are unsubscribed.


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@61262 d315682c-612b-4755-9ff5-7f18f6832af3
2021-06-22 08:04:38 +00:00
konstantina.galouni 8c92a7fcdb [Trunk | Library]: organization.component.ts & project.component.ts: [Bug fix] Close report modal when opening loading modal (after clicking on some download button).
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@61249 d315682c-612b-4755-9ff5-7f18f6832af3
2021-06-17 13:33:16 +00:00
k.triantafyllou 1e785e4fd9 [Library | Trunk]: Remove scroll to top from pages initiliazation
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60926 d315682c-612b-4755-9ff5-7f18f6832af3
2021-04-20 15:18:15 +00:00
argiro.kokogiannaki 5791c1452a [Library|Trunk]
Organization + Result landing: 
	reset id with the dedup id (objidentifier) in case the parameters id was a pid or a canonical url. 
	this  fixes issues with related requests that need the dedup identifier

Result landing:
	- SEO no-index filter: add supplementary rules (title or authors contain spam record keywords e.g film, movie,hd, 4k,etc)
	- when the route is /result?id=  update url with pid if exists.



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60604 d315682c-612b-4755-9ff5-7f18f6832af3
2021-03-08 14:42:26 +00:00
argiro.kokogiannaki 8a315f3963 [Library|Trunk]
Track Downloads:
- add the type of report (filename) in the url - to separate the different actions
- Organization: add piwik track in 2 reports that was missing
- Add track download for citations



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60406 d315682c-612b-4755-9ff5-7f18f6832af3
2021-02-10 12:50:02 +00:00
argiro.kokogiannaki ce1b7a2c86 [Library|Trunk]
Piwik: download give the current url instead of the blob url. Remove url parameter from trackDownload()

Metrics: add usage counts link in the logo


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60280 d315682c-612b-4755-9ff5-7f18f6832af3
2021-01-22 15:28:08 +00:00
argiro.kokogiannaki 8d9420e4a1 [Library|Trunk]
properties: remove reading properties from route data

Aggregator: add aggregator checks in navbar, entities selection and as adminToolsPortalType



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59899 d315682c-612b-4755-9ff5-7f18f6832af3
2020-11-18 16:06:27 +00:00
argiro.kokogiannaki 1d5c753ff6 [Library|Trunk]
code clean up:
-remove app.* files from library
-remove unused imports, code, files (Old search pages for results, dataproviders, map search page, etc)
-remove Freeguard from modules
-unsubscribe all subscriptions
-Services: configuration, isvocabularies, user management: unsubscribe from app component or the component that uses them (clearSubscriptions())
-Fetchers: unsubscribe from  the component that uses them (clearSubscriptions())




git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59816 d315682c-612b-4755-9ff5-7f18f6832af3
2020-11-11 14:43:13 +00:00
argiro.kokogiannaki 479a76b318 [Library|Trunk]
apply in all pages domain and baseLink changes (part 2)



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59413 d315682c-612b-4755-9ff5-7f18f6832af3
2020-09-18 10:10:18 +00:00
argiro.kokogiannaki 7526ef56e3 [Library|Trunk]
properties changes: 
	domain:
	  -is https://{explore,connect,monitor, etc}.openaire.eu 
	  -initialized in environment files
	  -reset for communities in EnvironmentSpecificService
	baseLink: is the prefix after the domain / or /dahsboard for monitor_dashboard
apply in all pages domain and baseLink changes

	


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59411 d315682c-612b-4755-9ff5-7f18f6832af3
2020-09-18 07:57:42 +00:00
argiro.kokogiannaki c22e64c46c [Library|Trunk]
update meta urls and canonicalurl to get domain from properties  instead of baseLink to work for community gateways



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59403 d315682c-612b-4755-9ff5-7f18f6832af3
2020-09-16 13:50:16 +00:00
argiro.kokogiannaki 7c54692d2c [Library|Trunk]
update indexInfo service to get last claim date
in landing use only the service response not the properties value 


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59367 d315682c-612b-4755-9ff5-7f18f6832af3
2020-09-14 15:48:43 +00:00
argiro.kokogiannaki 530a441f4a [Library|Trunk]
Update canonical url policy:
	for organizations & results
	instead of the dedup id put the first id of the merged records.



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59293 d315682c-612b-4755-9ff5-7f18f6832af3
2020-08-19 11:01:22 +00:00