Commit Graph

141 Commits

Author SHA1 Message Date
k.triantafyllou e8774312f5 [Library | Trunk]: 1. Community Service refactor. 2. Subscribe service refactor. 3. Add service on role-verification
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60453 d315682c-612b-4755-9ff5-7f18f6832af3
2021-02-19 17:50:34 +00:00
argiro.kokogiannaki fd8a89ffe5 [Library|Trunk]
SEO updates: url in results preview:
	- use pid?  and the first valid pid if available
	- use the canonical id instead of dedup if available



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60410 d315682c-612b-4755-9ff5-7f18f6832af3
2021-02-11 10:20:10 +00:00
konstantina.galouni b3e5a0a947 [Trunk | Library]: searchResearchResults.service.ts: Add method "searchForMyOrcidLinks()". (update of file missing from commit r60394 (where my-orcid-links folder was added).
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60398 d315682c-612b-4755-9ff5-7f18f6832af3
2021-02-10 09:36:39 +00:00
k.triantafyllou 1b1e0170e1 [Library | Trunk]: 1. Fix user info id on parsing. 2. Add activeRoute field on MenuItem. 3. Finish inivte subscriber
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60284 d315682c-612b-4755-9ff5-7f18f6832af3
2021-01-22 18:09:44 +00:00
konstantina.galouni 902cd4933f [Trunk | Library]: Missing "searchResearchResults.service.ts" from previous commit.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60232 d315682c-612b-4755-9ff5-7f18f6832af3
2021-01-13 18:40:05 +00:00
konstantina.galouni eb4a1f13f6 [Trunk | Library]:
1. error-interceptor.service.ts: Add "properties.orcidAPIURL" in UNAUTHORIZED_WHITELIST.
2. resultLanding.component.html: If result has identifiers and user is logged in, call <orcid-work>.
3. resultLanding.module.ts: Import OrcidModule.
4. searchResult.component.ts: If user is logged in, call "orcidService.getPutCodes()" and set orcidPutCodes of previewResults.
5. searchResults.module.ts: Add "OrcidService" in providers.
6. searchResearchResults.service.ts: In method "parseResults()", call "this.parsingFunctions.parseIdentifiers(resData['pid'])" to set identifiers.
7. customOptions.class.ts: Change method return type: "public static registryOptions(): any" --> public static registryOptions(): {}". (caused problem in return type of services (e.g. HttpEvent<string> instead of string).
8. searchResult.ts: Add field "identifiers: Map<string, string[]>".
9. env-properties.ts: Add field "orcidAPIURL".
10. result-preview.component.html: 
	a. If result has identifiers and user is logged in, call <orcid-work>.
	b. In bottom line with impact factors and orcid, add class "result-preview-bottom" (set color to #747474 (like muted text) when not on hover).
11. result-preview.component.ts: Add field "loggedIn" and check on init if user is logged in (via Session).
12. result-preview.module.ts: Import OrcidModule.
13. result-preview.ts: Add field "orcidPutCodes" | In method "searchResultConvert()", set resultPreview.identifiers with all identifiers (not only dois).


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60231 d315682c-612b-4755-9ff5-7f18f6832af3
2021-01-13 18:30:25 +00:00
argiro.kokogiannaki 75e2d6bcdc [Library | Trunk]
update parsing for doi - add check if it is array and get value when it is not



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60159 d315682c-612b-4755-9ff5-7f18f6832af3
2020-12-17 13:41:07 +00:00
k.triantafyllou f2ff8cfe8a [Library | Trunk]: Add unauthorized whitelist to avoid logout in certain calls
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59965 d315682c-612b-4755-9ff5-7f18f6832af3
2020-11-25 16:45:41 +00:00
k.triantafyllou 9bbfddad8c [Library | Trunk]: 1. Add compose email for invitation in monitor dashboard. 2. Add messages on invitation modals.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59921 d315682c-612b-4755-9ff5-7f18f6832af3
2020-11-19 17:13:27 +00:00
argiro.kokogiannaki c30d10ee1f [Library|Trunk]
Usermanagement service: remove timeout from get userinfo request



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59838 d315682c-612b-4755-9ff5-7f18f6832af3
2020-11-13 14:52:59 +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 889bd1db17 [Library | Trunk]: Merge members managers. Add create group for portal admins
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59757 d315682c-612b-4755-9ff5-7f18f6832af3
2020-11-03 18:25:03 +00:00
argiro.kokogiannaki 36bfc07747 [Library|Trunk]
New roles update:
- user component: update user formating
- Sesssion: add methods about Curators


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59746 d315682c-612b-4755-9ff5-7f18f6832af3
2020-11-03 09:38:11 +00:00
argiro.kokogiannaki 5ccca64ee0 [Library|Trunk]
Admin tool pages:
        updates after migration
        css updates after theme change
	portal: add piwik id

Navbar: optionto enable/disable sticky animation


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59726 d315682c-612b-4755-9ff5-7f18f6832af3
2020-10-30 14:01:44 +00:00
konstantina.galouni f1e46be3cc [Trunk | Library]:
1. contexts.service.ts: Add BehaviorSubject for getting communities (with status) only once (providedIn: 'root') - used by searchResearchResults.component.ts & claimContextSearchForm.component.ts.
2. claimContextSearchForm.component.ts & claimContextSearchForm.module.ts: Use 'getPublicCommunitiesByState()' instead of 'getPublicCommunities()' (contexts.service.ts) | Do not import in module (singlet$
3. refineResults.class.ts: In 'includeValue()' add checks if name is empty or undefined (do not include filter value in that case).
4. searchResearchResults.component.ts: For 'community' filter, add query for getting communities with public status and filtering values accordingly (timeout 300ms after filters request is over).
5. searchResearchResults.component.ts: & searchDataProviders.component.ts & searchOrganizations.component.ts & searchProjects.component.ts:
        Add methods "filtersReturned()" and "resultsReturned()" - when refine or search query returns with no results or page is out of bounds, stop the other query and initialize statuses and values 
                (stop loading when we know there are no results).
6. newSearchPage.component.html: Improve some checks to better display filters and results (out of bounds message, loading for filters, etc..).


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59648 d315682c-612b-4755-9ff5-7f18f6832af3
2020-10-20 14:47:54 +00:00
k.triantafyllou c7beacfec2 [Library | Trunk]: Add role-verification and managers-members admin pages
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59504 d315682c-612b-4755-9ff5-7f18f6832af3
2020-10-05 13:15:33 +00:00
k.triantafyllou b4c9dffda6 [Library | Trunk]: Make utils service injectable root
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59486 d315682c-612b-4755-9ff5-7f18f6832af3
2020-09-28 21:29:46 +00:00
k.triantafyllou 278bf04edd [Library | Trunk]: Help content service remove duplicate function
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59474 d315682c-612b-4755-9ff5-7f18f6832af3
2020-09-25 09:20:35 +00:00
konstantina.galouni 9261419e2d [Trunk | Library]: Merging branch 'use-UoaAdminToolsLibrary' into trunk for revisions 58402:59464
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59465 d315682c-612b-4755-9ff5-7f18f6832af3
2020-09-24 11:18:24 +00:00
k.triantafyllou 6d593aaa27 [Library | Trunk]: Remove deprecated from getCommunity, add methods on user registry service
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59348 d315682c-612b-4755-9ff5-7f18f6832af3
2020-09-08 14:33:06 +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
k.triantafyllou 4189a8f114 [Library | trunk]: Add methods on user registry service
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59315 d315682c-612b-4755-9ff5-7f18f6832af3
2020-08-31 11:33:48 +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 1dae58490f [Library | Trunk]: Add verification component
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59271 d315682c-612b-4755-9ff5-7f18f6832af3
2020-08-14 09:54:12 +00:00
k.triantafyllou c17f6e5597 [Library | Trunk]: Make PreviousRouteRecorder singleton. Add verification guard and component
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59261 d315682c-612b-4755-9ff5-7f18f6832af3
2020-08-12 15:16:09 +00:00
k.triantafyllou c1977b1404 [Library | Trunk]: Fix parse roles for userinfo
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59250 d315682c-612b-4755-9ff5-7f18f6832af3
2020-08-11 12:54:14 +00:00
k.triantafyllou 07783fa92e [Library | Trunk]: Add on error for some subjects calls.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59245 d315682c-612b-4755-9ff5-7f18f6832af3
2020-08-11 12:16:50 +00:00
argiro.kokogiannaki be7db77508 [Library|Trunk]
- revome extra headers in CustomOptions (services fail with it)

-Claims: set properly the type of openaire results in claims search results



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59237 d315682c-612b-4755-9ff5-7f18f6832af3
2020-08-07 10:27:50 +00:00
k.triantafyllou 122437e58c [Library | Trunk]: Revert userinfo method
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59234 d315682c-612b-4755-9ff5-7f18f6832af3
2020-08-07 08:12:54 +00:00
k.triantafyllou ae76e56dab [Library | Trunk]: Finish annotations. Add new registry url property. Add new registry service
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59228 d315682c-612b-4755-9ff5-7f18f6832af3
2020-08-06 11:50:08 +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
argiro.kokogiannaki 720396ab2d [Library|Trunk]
add organization query restrictions for method numOfSearchOrganizations2



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59193 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-29 14:04:18 +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
konstantina.galouni 72eeff6561 [Trunk | Library]:
1. parsingFunctions.class.ts: [ticket #3796] When hostedby name is "Unknown repository" or "other resources" show part or url as name.
2. organization.service.ts & searchOrganizations.service.ts: [ticket #5753] Compatibility limitation in landing page removed | Compatibility "openaire-cris_1.1" added in search organizations.


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59124 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-15 11:25:17 +00:00
argiro.kokogiannaki ed9b39dfb6 [Library | Trunk]
Search Filter - radio input:
	make it work for radio and make unique selection
	add field radioValue
	initiate it (in parse refine results) and clear it properly (from new search page)
	


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59117 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-14 15:18:14 +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 34fbdcf44b [Library | Trunk]: Revert parameter to user Info back
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59041 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-02 15:02:14 +00:00
k.triantafyllou 885999c8ad [Library | Trunk]: Remove parameter from userInfo.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59040 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-02 14:51:58 +00:00
k.triantafyllou 409231cef6 [Library | Trunk]: Add setItem to localStorage for directLink.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58989 d315682c-612b-4755-9ff5-7f18f6832af3
2020-06-24 18:20:19 +00:00
k.triantafyllou 1044737f9d [Library | Trunk]: Remove dashboard menu on usage-statistics.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58902 d315682c-612b-4755-9ff5-7f18f6832af3
2020-06-12 13:22:04 +00:00
k.triantafyllou 5efde8bc99 [Library | Trunk]: Localstorage service typo fixed
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58866 d315682c-612b-4755-9ff5-7f18f6832af3
2020-06-05 16:29:06 +00:00
konstantina.galouni 8fdaac2d0d [Trunk | Library]:
1. fetchResearchResults.class.ts & searchResearchResults.service.ts: Change queries when searching results of organizations/ projects/ dataproviders to sort by date (landing page tabs).
2. dataProvider.component & project.component: 
	a. Use <search-result> instead of <result-preview>.
	b. Add in "view all" link of search tabs parameter for sorting by date.
	c. [Bug fix] Show tabs loading only when tabs are not initialized (if not tabs, don't show loading forever).
3. project.component: 
	d. Make "#search_tab" template same as in "dataprovider.component" (will be possibly replaced by common component).
	e. In Deposit link use secondary button.
	f. In pie chart (in statistics), enable "dataLabels".


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58799 d315682c-612b-4755-9ff5-7f18f6832af3
2020-05-28 10:53:29 +00:00
argiro.kokogiannaki 895a28162d [Library|Trunk]
Impact Factors:
	Search results: keep an array of DOIs for each result.
	Get impact factors for all DOIs of a result (the first may have not impact factors)
	In the external link use the DOI assigned to the displayed impact factors



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58759 d315682c-612b-4755-9ff5-7f18f6832af3
2020-05-25 12:24:48 +00:00
k.triantafyllou 3810952189 [Library | Trunk]: Quick fix: lowercase the email of user
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58624 d315682c-612b-4755-9ff5-7f18f6832af3
2020-05-07 09:50:59 +00:00
k.triantafyllou ffd9ceffb8 [Library | Trunk]L SearchResultsService: revert parameter resultType
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58463 d315682c-612b-4755-9ff5-7f18f6832af3
2020-04-10 07:31:14 +00:00
k.triantafyllou 2940114ff5 [Library | Trunk]: SearchResultService: Add an if condition to check if pid exists on the results
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58450 d315682c-612b-4755-9ff5-7f18f6832af3
2020-04-09 09:40:54 +00:00
konstantina.galouni 6331a47039 [Trunk | Library]:
1. searchDataproviders.service.ts & searchProjects.service.ts & searchZenodoCommunities.service.ts & email.service.ts: Rename "communityId" to "pid".
2. curator.service.ts: create request path in service.
3. help-content.service.ts: Added method "statisticsIsActiveToggle()" (already added in help-content.service.ts in Admin portal).
4. layout.service.ts: "properties" as first parameter in methods | build request path in service.


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58443 d315682c-612b-4755-9ff5-7f18f6832af3
2020-04-08 11:25:41 +00:00
konstantina.galouni 4d6d459f41 [Trunk | Library]:
1. community.service.ts: Mark unused method "isSubscribedToCommunity()" as "deprecated" (This service calls community API - made in Italy, not uoa-admin-tools - made in Greece).
2. connectSubscriber.guard.ts: Call "isSubscribedToCommunity()" method from "subscribe.service.ts" (not "community.service.ts").
3. curator.service.ts: getCurators(properties: EnvProperties, url: string) --> getCurators(properties: EnvProperties, emails: string): Build path for request in service.
4. email.service.ts: Build request path in service
	a. sendEmail(url: string, email: Email) --> sendEmail(properties: EnvProperties, email: Email)
	b. contact(url: string, email: Email, recaptcha: string = null) --> contact(properties: EnvProperties, email: Email, recaptcha: string = null)
	c. Create method "notifyForNewManagers(properties: EnvProperties, communityId: string, email: Email)" (sendEmail was used for everything).
5. subscribe.service.ts: 
	a. subscribeToCommunity(pid: string, email: string, url: string) --> subscribeToCommunity(properties: EnvProperties, pid: string, email: string)
	b. unSubscribeToCommunity(pid: string, email: string, url: string) --> unSubscribeToCommunity(properties: EnvProperties, pid: string, email: string)
6. layout.service.ts: getLayout(communityId: string, url: string) -->  getLayout(properties: EnvProperties, communityId: string): Build path for request in service.
7. feedback.component.ts: In method "contact" from "emailService", build request path in service.


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58420 d315682c-612b-4755-9ff5-7f18f6832af3
2020-04-07 14:57:26 +00:00
argiro.kokogiannaki 5a1f545b52 [Library|Trunk]
Search Find:
	count query: use /resources2, use newSearchPage method, for creating the parameters (DOI, orcid, quotes)
	count outcomes: add open access filter
	fix keyword parameters
	for the active tab, initialize results total number with null



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58416 d315682c-612b-4755-9ff5-7f18f6832af3
2020-04-07 11:11:31 +00:00
argiro.kokogiannaki 55c77ca0cb [Library|Trunk]
Apply changes from Elixir branch r58296
	add impact factors:
		parse DOI for search results
		make a call to bip finder API to get impact factors
		show impact factors in search results (for community elixir-gr & dev)



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58413 d315682c-612b-4755-9ff5-7f18f6832af3
2020-04-06 14:49:38 +00:00