Commit Graph

83 Commits

Author SHA1 Message Date
argiro.kokogiannaki defc495e88 [Library|Trunk]
Result landing: update robots tag with "noindex" for newly added records (under curation)



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60038 d315682c-612b-4755-9ff5-7f18f6832af3
2020-12-07 09:14:17 +00:00
k.triantafyllou 3dfe33b5c7 [Library | Trunk]: Annotations add list of related annotations resources
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59962 d315682c-612b-4755-9ff5-7f18f6832af3
2020-11-25 16:09:36 +00:00
argiro.kokogiannaki fd31ff1556 [Library|Trunk]
- comment  second "no summary available when both primary and secondary info is not available"


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59961 d315682c-612b-4755-9ff5-7f18f6832af3
2020-11-25 14:32:56 +00:00
k.triantafyllou 7fc62a8117 [Library | Trunk]: Add graph link on landings
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59942 d315682c-612b-4755-9ff5-7f18f6832af3
2020-11-24 08:21:36 +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 8569010477 [Library|Trunk]
Search Filters fix:
- make them work for static filters (e.g datasource pages)
- make it work when new filter is substring of selected filter (e.g 'Registry'  & 'Registry of repositories')
- make it work with and without quotes

SEO:
- datasource landing add description in meta tags
- result landing make h2 the title in other versions (only one H1 per page)



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59820 d315682c-612b-4755-9ff5-7f18f6832af3
2020-11-12 09:51:34 +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
k.triantafyllou 8b9af0edc2 [Library | Trunk]: Change headings on library
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59575 d315682c-612b-4755-9ff5-7f18f6832af3
2020-10-13 19:04:50 +00:00
k.triantafyllou 8f7d9a54d9 [Library | Trunk]: Landing remove Open on Power by message. Change metrics logo
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59560 d315682c-612b-4755-9ff5-7f18f6832af3
2020-10-13 12:07:16 +00:00
konstantina.galouni 8e50219489 [Trunk | Library]:
1. resultLanding.component.html: [Bug fix]: Remove input property [showAllAuthors]="false" from <landing-header> - "View all authors" button was never visible.
2. showAuthors.component.ts: Integrate orcid to production - Remove restrictions in html.


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59445 d315682c-612b-4755-9ff5-7f18f6832af3
2020-09-22 10:34:06 +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 069dd4214b [Library|Trunk]
Fixing links from properties for search and landing of software & general result



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59359 d315682c-612b-4755-9ff5-7f18f6832af3
2020-09-10 08:48:28 +00:00
argiro.kokogiannaki 0f47fe966f [Library|Trunk]
Author Orcid: rename the field from "ORCID" to "orcid"



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59344 d315682c-612b-4755-9ff5-7f18f6832af3
2020-09-08 12:51: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
k.triantafyllou fd7b774f73 [Library | Trunk]: Fix getDate function
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59197 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-30 09:31:15 +00:00
k.triantafyllou f463131d1d [Library | Trunk]: Fix invalid date exception
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59187 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-29 11:04:37 +00:00
k.triantafyllou 048e3b99b5 [Library | Trunk]: Fix types on landing header. Add message if result summary does not exist
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59150 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-21 09:17:50 +00:00
k.triantafyllou 716a8cb5af [Library | Trunk]: Update annotation list if something changes on the iframe
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59125 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-15 11:32:03 +00:00
k.triantafyllou 4ba22261aa [Library | Trunk]: Change organization parsing. Remove unknown countries
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59105 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-14 09:57:11 +00:00
k.triantafyllou 0c31508f7a [Library | Trunk]: Result Landing fix organization url
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59092 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-13 15:05:18 +00:00
k.triantafyllou 034a9e00a7 [Library | Trunk]: Replace static links with property url
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59090 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-13 14:42:34 +00:00
konstantina.galouni 5c9575ab7a [Trunk | Library]:
1. configuration.service.ts: Use "useLongCache" property for communityFull | Add BehaviorSubject for communityFull | Add filtering methods to check if route is enabled from communityFull info.
2. isRouteEnabled.guard.ts: Get properties from environment (no service needed) | Foreach route do not query API but check if enabled by communityFull info (BehaviorSubject).
3. search.component.ts & searchAll.component.ts & entitiesSelection.component.ts & quick-selections.component.ts & navigationBar.component.ts & bottom.component.ts: 
	Get communityFull info from state (call configurationService.communityInformationState) | Add subscriptions in array to unsubscribe in ngOnDestroy.
	quick-selections.component.ts: Add "uk-disabled" class when needed in <form> elements.
4. resultLanding.module.ts & navigationBar.module.ts & bottom.module.ts & entitiesSelection.module.ts & quick-selections.module.ts: 
	Remove ConfigurationService from providers (singleton service, providedIn: 'root').


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59074 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-12 22:19:30 +00:00
konstantina.galouni 9f569ac4c4 [Trunk | Library]:
1. resultLanding.component.ts: Get provenanceAction vocabulary from ISVocabulariesService.
2. resultLanding.service.ts: Remove methods for "provenanceAction" vocabulary | [Bug fix] Do not stringify "dateofacceptance" when undefined.
3. ISVocabularies.service.ts: Add BehaviorSubjects for vocabularies | Add methods for provenanceAction vocabulary (called by result landing pages).
4. staticAutoComplete.module.ts: Remove ISVocabulariesService from providers (singleton service, providedIn: 'root').


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59072 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-12 22:10:43 +00:00
argiro.kokogiannaki 979921c536 [Library |Trunk]
Landing: metrics charts -- > change size to 200 values


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59063 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-10 08:48:33 +00:00
k.triantafyllou db7bd35f62 [Library | Trunk]: Changes for adding search and langing pages to monitor dashboard
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59060 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-10 08:37:17 +00:00
konstantina.galouni 650964f962 [Trunk | Library]: resultLanding.component.html & project.component.html: [Bug fix] On modal for linking, when linking option was clicked, modal was not closing.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59049 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-06 17:46:11 +00:00
argiro.kokogiannaki eb1f91160a [Library|Trunk]
Search: createKeywordQuery() add properly the operator when it is needed.

LAnding result: set properly the type when the route changes and it is result.


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59042 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-02 15:53:43 +00:00
konstantina.galouni 71c1206619 [Trunk | Library]:
1. result-preview.ts & resultLanding.service.ts & deletedByInference.service.ts: Add "icon" field in HostedByCollectedFrom interface.
2. availableOn.component.ts: Access mode icons set at parsing (not here).
3. result-preview.component.html: Add access mode icon & remove external link functionality for collected from (provider).
4. parsingFunctions.class.ts: 
	a. When instance.hostedby has no name (or "Unknown Repository" or "other resources") and no name from "source" found, set url (first 30 chars) as name.
	b. Access mode icons set at parsing for HostedByCollectedFrom interface.


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59038 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-01 12:11:57 +00:00
argiro.kokogiannaki 5157c3614c [Library|Trunk]
Result Landing: Fix issue reading the parameter id when the type changes. Read it based on the param name instead of the type.



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59037 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-01 09:11:58 +00:00
k.triantafyllou d07a30b5ca [Library | Trunk]: 1. Contact us css changes. 2. Search for monitor. 3. Landing for monitor
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59007 d315682c-612b-4755-9ff5-7f18f6832af3
2020-06-29 13:15:52 +00:00
argiro.kokogiannaki 1b576e5a40 [Library | Trunk]
Search:
1. advanced link in home and /search/find
2. DOI issue in /search/find/
3. update of numbers in tabs when there is an error in /search/find/
4. order of filters in search outcomes
5. In Landingpages:  rename "Publication Summary" --> "Summary" kai "Related outcomes" --> "Related research"

Linking:
get communities but not hidden ones



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59003 d315682c-612b-4755-9ff5-7f18f6832af3
2020-06-29 11:10:32 +00:00
konstantina.galouni 9338c43a23 [Trunk | Library]: resultLanding.component: Load <citeThis> component, only if button to open modal is clicked (this will load javascript for cite this when needed) - improve performance.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58951 d315682c-612b-4755-9ff5-7f18f6832af3
2020-06-17 10:32:32 +00:00
argiro.kokogiannaki b819a68e96 [Library|Trunk]
Landing pages: add check for openaire id

Search Page: support quoted queries only if the number is even



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58940 d315682c-612b-4755-9ff5-7f18f6832af3
2020-06-16 16:42:51 +00:00
konstantina.galouni c20391f3fc [Trunk | Library]:
1. src/assets/common-assets/common/custom.css: Add 'font-display: swap;' in '@font-face' css rules - improve performance.
2. dataProvider.component.html & organizations.component.html & project.component.html & resultLanding.component.html: Add check if 'indexUpdateDate' is initialized.
3. dataProvider.component.ts & organization.component.ts & project.component.ts & resultLanding.component.ts: 
	Initialize 'indexUpdateDate' and tabs counts only if "typeof document !== 'undefined'" (javascript is enabled) - improve performance.
4. resultLanding.component.ts: Get "provenanceActionVocabulary" and "altMetrics" only if "typeof document !== 'undefined'" (javascript is enabled) - improve performance.
5. organization.component.ts: [Bug fix] Get 'indexUpdateDate' from service (not properties) if available.
6. project.component.ts: [Bug fix] Call 'getProjectInfo()' only once (was called twice).
7. project.service.ts: [Bug fix] Add check for rels.rel.to.class=="hasParticipant" (when not array).
8. metrics.component.ts: Get metrics if "typeof document !== 'undefined'" (javascript is enabled) | Show charts only if user clicked on metrics badge | Do not set "width" for <i-frame> elements.
9. iframe.component.ts: Add case when only height is sent as input.
10. searchDataProviders.component.ts & searchOrganizations.component.ts: [Bug fix] Set "firstLoad" to false after getting results (was asking refine filters in paging too). 
11. search-tab.component.ts: [Bug fix]: In method "getEntityName()" add cases when 'entityType == "project"' and 'entityType == "dataprovider"' and fix case when 'entityType == "result"'.
12. navigationBar.component.ts: [Bug fix] Do not initialize navbar inside route.queryParams subscription - !!! check it carefully when deployed in all portals !!! .


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58874 d315682c-612b-4755-9ff5-7f18f6832af3
2020-06-10 11:05:59 +00:00
konstantina.galouni ad44991cd1 [Trunk | Library]:
1. tabs.component.ts: If tabs are more than 2, add class (in all html) 'uk-visible@m' - <small-tabs> will be displayed instead.
2. small-tabs.component.ts: Show small tabs if they are more than 2 and add class 'uk-hidden@m'.   
3. resultLanding.component & project.component & organization.component & dataProvider.component:
        a. Show tabs without waiting for initialization - do not calculate number of tabs.
        b. Show summary tab always - if no primary or secondary information, show alert message.
        c. Remove checks and 'uk-visible@m', 'uk-hidden@m' from calling <my-tabs> and <my-small-tabs> - chekcs are now inside components.
        d. Add 'uk-active' in first tab (no need to calculate which tab is first).
        e. resultLanding.component & project.component & dataProvider.component: 
                Summary tab always visible - if no primary or secondary information, show alert message.
        f. organizations.component: projects tab always visible.
        g. resultLanding.component & project.component: Add margins in linking button.
4. organization.component: 
        a. [Bug fix] Execute search queries only once for each tab.
        b. [Bug fix] In datasets and other tab, show appropriate view (not projects tab).
        c. [Bug fix] On initialization, get projects results (not just count).


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58807 d315682c-612b-4755-9ff5-7f18f6832af3
2020-05-29 14:15:35 +00:00
k.triantafyllou 4fd8439224 [Library | Trunk]: Remove other from research product.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58802 d315682c-612b-4755-9ff5-7f18f6832af3
2020-05-28 15:51:56 +00:00
k.triantafyllou cb31df5c26 [Library | Trunk]: Add view more related organizations
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58792 d315682c-612b-4755-9ff5-7f18f6832af3
2020-05-27 14:32:25 +00:00
k.triantafyllou a0abd21625 [Library | Trunk]: Add organization tabs. Add small tabs on results too
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58790 d315682c-612b-4755-9ff5-7f18f6832af3
2020-05-27 10:47:40 +00:00
k.triantafyllou 3154babcaa [Library | Trunk]: Results change last index info display
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58785 d315682c-612b-4755-9ff5-7f18f6832af3
2020-05-26 14:53:22 +00:00
k.triantafyllou 632f1586c2 [Library | Trunk]: Landing: 1. Remove uk-text-small from Results. 2. Revert copyright policy link on Journal. 3. Add tag free text keywords on subjects
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58784 d315682c-612b-4755-9ff5-7f18f6832af3
2020-05-26 14:42:47 +00:00
k.triantafyllou 1fe05f52d6 [Library | Trunk]: Remove active from tabs. Change tabs, authos and funded by to work on js disable.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58778 d315682c-612b-4755-9ff5-7f18f6832af3
2020-05-25 18:58:13 +00:00
k.triantafyllou 0012fd0003 [Library | Trunk]: Finish result landing base on new mocks
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58748 d315682c-612b-4755-9ff5-7f18f6832af3
2020-05-22 14:51:28 +00:00
k.triantafyllou 23a355f6a4 [Library | Trunk]: Add active on first tab to avoid error
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58746 d315682c-612b-4755-9ff5-7f18f6832af3
2020-05-21 14:36:49 +00:00
k.triantafyllou 22a9f9aad1 [Library | Trunk]: Result Landing add bioentities and references. Result-Preview fix a bug with before title section
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58745 d315682c-612b-4755-9ff5-7f18f6832af3
2020-05-21 14:18:52 +00:00
k.triantafyllou 3c476e39f9 [Library | Trunk]: Tab add height match for tab-header
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58738 d315682c-612b-4755-9ff5-7f18f6832af3
2020-05-21 09:35:05 +00:00
k.triantafyllou cbc32aaa46 [Library | Trunk]: Some changes on result landing page base on new mocks.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58735 d315682c-612b-4755-9ff5-7f18f6832af3
2020-05-20 20:34:29 +00:00
k.triantafyllou 32c2758b66 [Library | Trunk]: Some changes on result landing base on mocks.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58731 d315682c-612b-4755-9ff5-7f18f6832af3
2020-05-20 12:56:21 +00:00
k.triantafyllou 95a3ae82e8 [Library | Trunk]: Change landing-header base on new mocks. Add indexInfoService on result landing.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58723 d315682c-612b-4755-9ff5-7f18f6832af3
2020-05-19 15:33:47 +00:00