Commit Graph

106 Commits

Author SHA1 Message Date
Konstantina Galouni 2df2661184 Updated libraries 2022-10-20 23:26:57 +03:00
Konstantina Galouni 224ad78c22 Updated libraries 2022-10-20 23:22:54 +03:00
Konstantina Galouni ca8fbac27c [Aggregator]: canada-custom.less: Set @button-primary-active-background: @aggregator-secondary-color; 2022-10-20 23:19:32 +03:00
Konstantina Galouni 07c6c04ed7 [Aggregator]: app.component.ts: Set menuPosition of header to center. 2022-10-20 23:05:43 +03:00
Konstantina Galouni 4779fbb4a4 [Aggregator]: home.component.html: Updated width of search form and width of each step of the form. 2022-10-20 19:34:55 +03:00
Konstantina Galouni 27a08bdad6 [Aggregator]: Updated libraries. 2022-10-20 13:34:08 +03:00
Konstantina Galouni 9c06b32a65 Updating libraries 2022-10-04 15:54:10 +03:00
Konstantina Galouni a5a26bc593 [Aggregator]: Updates in css | Bug fix in isRouteEnabled check.
1. portal.ts & aggregators.ts: [Bug fix] In method "getMockCommunityInfo()" set also pid for community (isRouteEnabled.guard needs it) | Updates in less files (overrides of colors)
2. styles.less: Updated imports (added linking, landing and canada-custom and removed aggregator-custom).
3. numbers.component.ts: Updated default value of @Input() colorClass to "uk-text-primary".
4. connectHelper.ts: In method "getCommunityFromDomain()" added also "aggregator" and "eosc" portal types to set domain on development.
2022-10-03 20:25:37 +03:00
Konstantina Galouni dc784afe4b [Aggregator | Trunk]: Renaming and using less files for assets | Updating home page to look ok | TODO: Fix less files to be real less & organize rules among files. 2022-09-23 16:33:26 +03:00
Konstantina Galouni 9b22660e8a [Aggregator | new-theme]: Updated uikit paths | Re-added <app-root> in index.html | Removed RootMenuItem.
1. app.component.ts: Removed deprecated RootMenuItem and used MenuItem instead.
2. index.html: [Bug fix] Re-added <app-root> which was accidentally deleted in previous commit.
3. package.json: Added in dependencies "uikit": "3.12.0".
4. angular.json: Updated uikit paths in scripts, to get them from node_modules.
2022-09-21 01:05:21 +03:00
Konstantina Galouni f5968ca7b5 [Aggregator | new-theme]: environments/: Removed old properties "searchLinkToEntityRegistriesDataProvidersTable" and "searchLinkToJournalsTable" | Removed checks and configurations for eosc (created dedicated project for eosc). 2022-08-08 17:20:28 +03:00
argirok 1da2632c2e Eosc explore: latest changes/ corrections before review 2022-08-08 12:47:14 +03:00
argirok 1839b3a82a Bug with optional routes: move the error case in the end of all routes 2022-06-22 17:20:19 +03:00
argirok 513bb83769 remove property metricsAPIURL 2022-06-08 15:02:56 +03:00
Konstantina Galouni d2a90a4b7b [Library | new-theme]: [Bug fix] searchAll.component.html: Add class "uk-flex uk-flex-center" in ul uk-slider-items instead of div with uk-position-relative - on eosc the arrows were visible when they shouldn't. 2022-06-01 18:29:12 +03:00
Konstantina Galouni 844832d97a [Library | new-theme]: [Bug fix] dataProvider.component.ts: Set typeQueryPathParam="services" when ?pid in url and type=="service". 2022-06-01 15:48:58 +03:00
argirok 34f176f9fd add beta bagde in eosc 2022-05-26 14:06:01 +03:00
argirok ae08a296cf Aggregator update home entry text 2022-05-25 17:56:23 +03:00
Konstantina Galouni 44ed7c37f8 [Aggregator & Library| new-theme]: Use <modal-alert> common component in transferData.component.ts instead of uk-modal.
1. transferData.module.ts: Imported AlertModalModule.
2. transferData.component.ts: Use <modal-alert> common component instead of uk-modal | Comment logs.
3 alert.ts:
  a. Added "@Input() public emitHidden: boolean = false;" and "  @Output() public alertHidden: EventEmitter<any> = new EventEmitter();"
  b. On ngAfterViewInit, if emitHidden is true, check when modal is hidden and emit alertHidden (currently used only in transferData.component.ts to reinitialize local fields and route).
2022-05-25 12:52:00 +03:00
argirok 68ef4a96b9 update eosc properties with beta services/ apis 2022-05-24 14:25:28 +03:00
Konstantina Galouni 82913f68a2 [Library | new-theme]: parsingFunctions.class.ts: Updated links for eoscSubjects. 2022-05-23 13:23:24 +03:00
Konstantina Galouni 9898990385 [Aggregator | new-theme]: home.component.ts: In home search set input unchecked for research products categories as default & in "name" use OpenaireEntities. 2022-05-20 16:21:11 +03:00
Konstantina Galouni 723dc20219 [Aggregator | new-theme]: home.component.html: [Bug fix] Updated height, margin and padding of section with logo and search form so that dropdown for entity selection is visible. 2022-05-20 16:02:42 +03:00
Konstantina Galouni a551ed38a9 [Aggregator & Library | new-theme]: Fixes in search forms and logo | Removed animation in card results | Added service landing links for incompatible datasources in eosc portal.
1. home.component.html:
   a. Removed uk-margin-large-top from search form and logo.
   b. Removed uk-height-medium from  search form and logo.
   c. Move searchImage on top of search form (uk-width-1-1) for small screens.
2. searchMyOrcidResults.component.html: Removed animation with uk-scrollspy.
3. searchAll.component.html: Move searchImage on top of search form (uk-width-1-1) for small screens.
4. newSearchPage.component.html:
   a. Removed animation with uk-scrollspy.
   b. For simple search, move searchImage on top of search form (uk-width-1-1) for small screens.
   c. For advanced search, searchImage is on top of search form for any screen size.
5. result-preview.component.html & result-preview.component.ts: For eosc portalType, added in incompatible datasources link to the service landing page.
6. aggregators.ts:
   a. In #searchImage commented custom margin-left.
   b. In #searchForm commented custom padding and width.
   c. Exclude also .uk-button-link from custom css for buttons with parent .search_box_bg or #searchForm.
2022-05-20 15:20:50 +03:00
Konstantina Galouni 8629d61a95 [Library | new-theme]: dataProvider.component.html: Do not show "not available" compatibility label in service landing page. 2022-05-19 19:01:37 +03:00
Konstantina Galouni 644e884b00 [Aggregator & Library | new-theme]: Hide datasources in eosc & Do not show compatibility "Not yet registered" in services.
1. app.component.ts: [Bug fix] Add services search page in menu items if "service" entity is enabled (not datasource".
2.  aggregators.ts: Added "datasource" entity and "/search/find/datasources" page in disabled list for eosc.
3. result-preview.component.html:
   a. Do not show "Not yet registered" compatibility label in services.
   b. For eosc, show in datasources "Not yet registered in OpenAIRE".
4. quick-selections.component.ts: Changed uk-child-width-auto@l to uk-child-width-auto@m (not nice in medium screens for 2 types).
5. newSearchPage.component.ts: "Include" filter name for services changed to "Other Services"
2022-05-19 18:35:59 +03:00
argirok 0cf54149bb move datatransfer modules to library 2022-05-19 12:15:53 +03:00
Konstantina Galouni 1e30595f3d [Aggregator | Library | new-theme]: Fixes for eosc portal in search forms.
1. advancedSearchForm.component.html: Updated width in div for entity selection in advanced search form (uk-width-large@m uk-width-2-5@xl uk-width-1-1).
2. newSearchPage.component.html:  In <advanced-search-form> added horizontal padding (on the left it was already there) - the form is centered and leaves some space from the right side of page.
3. aggregators.ts:
   a. Commented background css in .search_box_bg.
   b. Do not apply custom button css for .uk-button-text with parent .search_box_bg or #searchForm.
   c. Added padding: 10px in buttons with parent .search_box_bg or #searchForm.
2022-05-19 12:14:28 +03:00
Konstantina Galouni 586b81311a [Aggregator | new-theme]:[Bug fix] advancedSearchServices.module.ts: Imported AdvancedSearchServicesRoutingModule instead of AdvancedSearchDataProvidersRoutingModule. 2022-05-18 17:50:25 +03:00
argirok ce0733f17d update portal custom css 2022-05-18 17:20:36 +03:00
argirok 3d578992d6 Merge branch 'new-theme' of https://code-repo.d4science.org/MaDgIK/aggregator into new-theme 2022-05-18 17:04:42 +03:00
argirok 43773285db library changes 2022-05-18 17:04:15 +03:00
argirok 5d6d7bcc78 EOSC transfer service: checklogin when modal opens 2022-05-18 16:59:36 +03:00
argirok e233a32875 set login redirect to the current url 2022-05-18 15:25:11 +03:00
Konstantina Galouni a76954cbbc Merge remote-tracking branch 'origin/new-theme' into new-theme 2022-05-18 15:14:38 +03:00
Konstantina Galouni 6820f4c0ad [Aggregator | new-theme]: Use of properties.errorLink | Link to simple/advanced page dark or not depending on background.
1. directLinking-routing.module.ts & linking-routing.module.ts & myClaims-routing.module.ts & deposit-routing.module.ts & searchDataProviders-routing.module.ts & errorPage.component.ts & dataProvider-routing.module.ts & dataset-routing.module.ts & organization-routing.module.ts & orp-routing.module.ts & project-routing.module.ts & publication-routing.module.ts & result-routing.module.ts & service-routing.module.ts & advancedSearchDataProviders-routing.module.ts & advancedSearchOrganizations-routing.module.ts & advancedSearchProjects-routing.module.ts & advancedSearchServices-routing.module.ts & searchResearchResults-routing.module.ts & searchDataProviders-routing.module.ts & searchOrganizations-routing.module.ts & searchProjects-routing.module.ts & searchResearchResults-routing.module.ts & searchServices-routing.module.ts: Replaced /error path with properties.errorLink.
2. advancedSearchDataProviders.component.ts & advancedSearchOrganizations.component.ts & advancedSearchProjects.component.ts & advancedSearchServices.component.ts & searchResearchResults.component.ts & search.component.ts & searchDataproviders.component.ts & searchOrganizations.component.ts & searchProjects.component.ts & searchResearchResults.component.ts & searchServices.component.ts: Added field searchForm: SearchForm, which sets dark to false for eosc, otherwise true - this is passed to the corresponding search component.
2022-05-18 15:13:42 +03:00
argirok 7ffe95f12b update eosc properties: to use BETA services 2022-05-18 14:47:35 +03:00
argirok cbc205d2d5 add eosc data transfer action button in landing
update properties
2022-05-18 13:30:00 +03:00
argirok 3112689645 add reload path 2022-05-18 12:40:51 +03:00
argirok 1927b04d7a update data transfer service - add selection for dois and destination Storages 2022-05-18 12:40:31 +03:00
argirok 4f9fdce645 Merge branch 'new-theme' of code-repo.d4science.org:MaDgIK/aggregator into new-theme 2022-05-18 12:19:53 +03:00
Konstantina Galouni 2b620d4e26 [Library | new-theme]: 1. showSubjects.component.ts: Ignore specialSubjects and do not add links. | 2. resultLanding.component.html & resultLanding.component.ts: Show button "Check compatible EOSC services" not only in development or beta environments. 2022-05-16 18:42:23 +03:00
Konstantina Galouni 1500084e78 [Aggregator & Library | new-theme]: [Bug fix] Set properly "dashboard" and "adminToolsPortalType" properties and show "Check compatible EOSC services" button in eosc portal too.
1. env-properties.ts:
   a. In Dashboard type added "aggregator".
   b. In PortalType added "funder", "ri", "project", "organization", "aggregator", "eosc".
2. environments/: Set "dashboard" property to "aggregator" and only for eosc set "adminToolsPortalType" property to "eosc".
3. entitiesSelection.component.ts: Added check if adminToolsPortalType is "eosc".
4. resultLanding.component.ts: In method "hasRightSidebarInfo()" check if adminToolsPortalType is "eosc" to show "Check compatible EOSC services" button.
5. resultLanding.component.html: Show "Check compatible EOSC services" for adminToolsPortalType "explore" or "eosc".
2022-05-16 17:14:50 +03:00
Konstantina Galouni e2ca8d3e4b [Library | new-theme]: [NEW] #6915 - Added new fields in datasources/services.
1. dataProviderInfo.ts: Added fields jurisdiction, thematic, contentpolicy, identifiers.
2. dataProvider.service.ts: Parse new fields.
3. dataProvider.component.html: Added label "Thematic" when true | moved "web page" under the labels | Show identifiers, jurisdiction and contentpolicy.
4. dataProvider.module.ts: Import ResultLandingUtilsModule.
5. parsingFunctions.class.ts: In method "parseIdentifiers()" added parsing for classid "re3data".
6. showIdentifiers.component.ts: Show identifier when key is "re3data" too.
7. string-utils.class.ts: In Identifier class added class and check for "re3data".
8. searchDataproviders.service.ts: In method "parseResults()" parse "pid" and set identifiers.
9. newSearchPage.component.ts: In method "createKeywordQuery()" added check for identifiers for entityTypes "datasource" and "service".
2022-05-16 17:01:36 +03:00
Konstantina Galouni 0bd5589342 [Aggregator | new-theme]: angular.json: Update UIKIT scripts (get them from the "openaire-theme" folder instead of the "common-assets"). 2022-05-16 16:42:03 +03:00
Konstantina Galouni bdda998127 [Aggregator | new-theme]: [NEW] Added service entity in Menu, properties and added landing and search pages.
1. aggregators.ts: Added in PortalAggregators.disabled object, service entity & route.
2. app.component.ts: Added in menuItems "Serive" and use for menuItems entity names from OpenaireEntities.
3. app-routing.module.ts: Added routes for service landing, search and advanced search pages.
4. environments/: Added values for properties searchLinkToService, searchLinkToServices, searchLinkToAdvancedServices, errorLink
5. [NEW] Files added for services landing, search and advanced search pages: landingPages/service/, advancedSearchServices.component.ts, advancedSearchServices.module.ts, advancedSearchServices-routing.module.ts, searchServices.component.ts, searchServices.module.ts, searchServices-routing.module.ts
2022-05-13 16:07:09 +03:00
Konstantina Galouni 12d4473e54 [Library | Trunk]: [NEW] Added service entity.
1. result-preview.component.ts & datasourcesHelper.class.ts & entitiesSelection.component.ts & newSearchPage.component.ts & errorPage.component.ts & searchAll.component.ts: Added case for service entity.
2. searchFields.ts: Added  in OpenaireEntities names for Services | In methods "getFieldName()" and "getFieldParam()" case for service entity.
3. searchDataProviders.component.ts: Parametrize component to show/query for datasources or services.
4. quick-selections.component.ts: Delete reset of resultTypes from "initializeFilters()" method.
5. searchDataproviders.service.ts: In method "numOfSearchDataproviders2()" added parameter "typePathParam" to search for datasources or services | In method "parseResults()" set "entityType" according to eosctype field.
6. portal.ts: In method "getmockPortalInfo()" added entity and routes for service.
7. env-properties.ts: Added properties "searchLinkToService", "searchLinkToServices", "searchLinkToAdvancedServices".
8. dataProvider.component.html: Parametrize component to show for datasources or services | [Bug fix] Added [class.uk-invisible]="!dataProviderInfo" in #graph_and_feedback_template.
9. dataProvider.component.ts: Parametrize component to show/query for datasources or services.
10. dataProvider.service.ts: In method "getDataproviderInfo()" added parameter "typePathParam" to search for datasources or services.
11. searchAll.component.html: Added tab for search services.
2022-05-13 15:57:31 +03:00
Konstantina Galouni 19dbcf328d [openaire-theme | Trunk]: In class .uk-dropdown.options, updated max-height: 216px to be enough for 6 entities (5 old + services). 2022-05-13 15:50:16 +03:00
Konstantina Galouni c142a5fe21 [Library | Trunk]: advancedSearchForm.component.html: Dropdown for advanced search link (all content) replaced with a link to advanced search results (research products). 2022-05-13 15:46:54 +03:00
argirok 3b3f1e38d7 EGI data transfer: mock login process with reload 2022-05-10 15:39:21 +03:00