MaDgIK
/
irish-monitor
13
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

Resolver PR v1.0.0#2

This commit is contained in:
Konstantinos Triantafyllou 2024-06-26 14:49:48 +03:00
parent e4d1a0bc11 f7302ff615
commit f531074e1c
8 changed files with 55 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
CHANGELOG.md
View File

@ -14,6 +14,17 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- *Fixed (for any bug fixes)*
- *Security (in case of vulnerabilities)*
## v1.0.0 - 26.06.2024 - Official Release
### Added
Add banner for announcements. Disabled by default.
Add guide text in researcher search bar for more accurate results.
### Removed
Remove final release text from footer.
### Changed
Improvements in User Interface of browse RPOs/RFOs pages.
## v0.1.5 - 19.6.2024
### Added
Add open access indicator in browse pages.
@ -125,7 +136,7 @@ Improve performance in search pages.
* Add info floating button to all pages and link to terminology page.
### Changed
* Change OA Routed to Access Routes.
* Change OA Routes to Access Routes.
* Make contact-us full screen modal.
* Move floating message button to root components.

5
package.json
View File

@ -1,6 +1,6 @@
{
"name": "irish-monitor",
"version": "0.1.5",
"version": "1.0.0",
"scripts": {
"ng": "ng",
"start": "ng serve --port 5500 --disable-host-check --host 0.0.0.0",
@ -15,7 +15,8 @@
"build:ssr-beta": "npm run build-beta && ng run irish-monitor:server:beta",
"build:ssr-prod": "npm run build-prod && ng run irish-monitor:server:production",
"prerender": "ng run irish-monitor:prerender",
"after-build-clean": "rm -rf dist/irish-monitor/browser/assets/common-assets/.git src/app/openaireLibrary/.git node_modules .angular src/assets/common-assets/.git .git"
"release": "chmod +x release.sh && ./release.sh",
"after-build-clean": "rm -rf release.sh .vscode dist/irish-monitor/browser/assets/common-assets/.git* src/app/openaireLibrary/.git* node_modules .angular src/assets/common-assets/.git* .git*"
},
"private": true,
"dependencies": {

16
release.sh Executable file
View File

@ -0,0 +1,16 @@
rm -f release.zip
git clone https://code-repo.d4science.org/MaDgIK/irish-monitor.git
cd irish-monitor
git checkout master
git submodule update --init --recursive
cd src/app/openaireLibrary
git checkout master
cd ../../assets/common-assets
git checkout master
cd ../openaire-theme
git checkout master
cd ../../../
npm run after-build-clean
cd ../
zip -r release.zip irish-monitor
rm -rf irish-monitor

26
src/app/app.component.ts
View File

@ -16,11 +16,15 @@ import {SearchOrcidService} from "./openaireLibrary/claims/claim-utils/service/s
import {SearchResearchResultsService} from "./openaireLibrary/services/searchResearchResults.service";
import {Identifier} from "./openaireLibrary/utils/string-utils.class";
import {ConnectHelper} from "./openaireLibrary/connect/connectHelper";
import {HelperService} from "./openaireLibrary/utils/helper/helper.service";
@Component({
selector: 'app-root',
template: `
<div class="uk-background-default">
<div *ngIf="divContents['banner']" class="uk-tile uk-tile-default uk-padding uk-border-bottom">
<helper [texts]="divContents['banner']"></helper>
</div>
<navbar *ngIf="hasHeader" portal="irish_monitor" [menuItems]="menuItems" [showMenu]="true"
[header]="header" [user]="user" [userMenuItems]="userMenuItems"></navbar>
<div *ngIf="loading">
@ -43,12 +47,11 @@ import {ConnectHelper} from "./openaireLibrary/connect/connectHelper";
<footer id="bottom" class="uk-text-center uk-text-small uk-border-top">
<div class="uk-tile-default">
<div class="uk-section uk-container">
<div class="uk-flex uk-flex-middle uk-flex-center">
<div class="uk-flex uk-flex-middle uk-flex-center uk-margin-medium-bottom">
<img src="assets/logo/small.svg" alt="National Open Access Monitor Ireland" style="width: 40px;"/>
<div class="uk-margin-small-left">
Platform in <span class="uk-text-bold">Pilot</span> Phase - Final Release June 2024
Platform in <span class="uk-text-bold">Pilot</span> Phase
</div>
</div>
<div class="uk-margin-medium-bottom">
<a href="https://graph.openaire.eu" target="_blank" class="uk-width-1-1 uk-width-auto@m">
@ -103,6 +106,7 @@ export class AppComponent extends ResearcherBaseComponent implements OnInit, Aft
compactMenuItems: boolean = false;
hasHelpPopUp: boolean = true;
isBottomIntersecting: boolean = false;
divContents: any;
constructor(protected _route: ActivatedRoute,
protected _router: Router,
@ -113,12 +117,11 @@ export class AppComponent extends ResearcherBaseComponent implements OnInit, Aft
private customFilterService: CustomFilterService,
private userManagementService: UserManagementService,
private userProfileService: UserProfileService,
private helper: HelperService,
protected _searchOrcidService: SearchOrcidService,
protected _searchResearchResultsService: SearchResearchResultsService
) {
super();
// this.configurationService.initStaticPortal(this.irish.portal);
// this.configurationService.initPortal(this.properties, this.properties.adminToolsCommunity);
this.setProperties(this.properties.adminToolsCommunity, this.properties.adminToolsPortalType);
this.userManagementService.fixRedirectURL = this.properties.afterLoginRedirectLink;
this.userManagementService.allowDoubleRedirectToFixAndCurrentPage = true;
@ -170,6 +173,7 @@ export class AppComponent extends ResearcherBaseComponent implements OnInit, Aft
}
this.initialize();
}));
this.getDivContents();
}
ngAfterViewInit() {
@ -289,6 +293,12 @@ export class AppComponent extends ResearcherBaseComponent implements OnInit, Aft
}
}
private getDivContents() {
this.subscriptions.push(this.helper.getDivHelpContents(this.properties, 'irish', '/').subscribe(contents => {
this.divContents = contents;
}));
}
setProperties(id, type = null) {
this.properties.adminToolsCommunity = id;
if (type) {
@ -307,10 +317,6 @@ export class AppComponent extends ResearcherBaseComponent implements OnInit, Aft
this.windowWidth = window.innerWidth;
let mBreakpoint = Number.parseInt(getComputedStyle(document.documentElement).getPropertyValue('--uk-breakpoint-m'));
let xlBreakpoint = Number.parseInt(getComputedStyle(document.documentElement).getPropertyValue('--uk-breakpoint-xl'));
if(this.windowWidth > mBreakpoint && this.windowWidth <= xlBreakpoint) {
this.compactMenuItems = true;
} else {
this.compactMenuItems = false;
}
this.compactMenuItems = this.windowWidth > mBreakpoint && this.windowWidth <= xlBreakpoint;
}
}

4
src/app/app.module.ts
View File

@ -20,6 +20,7 @@ import {SearchOrcidServiceModule} from "./openaireLibrary/claims/claim-utils/ser
import {HelpPopUpModule} from './shared/help-pop-up/help-pop-up.module';
import {RouteReuseStrategy} from '@angular/router';
import {CustomRouteReuseStrategy} from './openaireLibrary/shared/custom-route-reuse-strategy';
import {HelperModule} from "./openaireLibrary/utils/helper/helper.module";
@NgModule({
declarations: [
@ -38,7 +39,8 @@ import {CustomRouteReuseStrategy} from './openaireLibrary/shared/custom-route-re
CookieLawModule,
SearchResearchResultsServiceModule,
SearchOrcidServiceModule,
HelpPopUpModule
HelpPopUpModule,
HelperModule
],
providers: [
SearchOrcidService,

4
src/app/repository/browse-repositories/browse-repositories.component.html
View File

@ -9,7 +9,7 @@
placeholder="Search for {{typeAsLabel}} {{entities.stakeholders}}" [disabled]="stakeholders.length === 0" class="uk-width-xlarge@l uk-width-large@m uk-width-1-1">
</div>
</div>
<div class="uk-flex uk-flex-middle uk-flex-between uk-margin-large-top">
<div class="uk-flex uk-flex-middle uk-flex-between uk-margin-large-top" [id]="id">
<div class="uk-flex uk-flex-middle">
<div class="uk-width-small uk-margin-medium-right">
<div input
@ -32,7 +32,7 @@
</paging-no-load>
</div>
</div>
<div class="uk-margin-large-top" id="target">
<div class="uk-margin-large-top">
<div *ngIf="!filteredStakeholders || filteredStakeholders?.length == 0" class="uk-flex uk-flex-center">
<div class="uk-alert uk-alert-primary uk-text-center uk-width-2-3@m uk-width-1-1">
No {{entities.stakeholders}} available

2
src/app/researcher/search-researcher/search-researcher.component.html
View File

@ -1,6 +1,6 @@
<div class="uk-section-small">
<div class="uk-flex uk-flex-center">
<div search-input [(value)]="keyword" [placeholder]="'Search for author or ORCID...'" [disabled]="orcidStatus ==errorCodes.LOADING"
<div search-input [(value)]="keyword" placeholder="Search by full name or ORCID for accurate results." tooltip="e.g: James Smith or 0000-0001-2345-6789" [disabled]="orcidStatus ==errorCodes.LOADING"
[searchInputClass]="'flat'" [iconPosition]="'left'" (searchEmitter)="searchByKeyword()" (valueChange)="checkForReset()" class="uk-width-xlarge@l uk-width-large@m uk-width-1-1"></div>
</div>
<div class="uk-margin-large-top">

4
src/app/shared/browse-stakeholders/browse-stakeholders.component.html
View File

@ -28,7 +28,7 @@
</div>
</div>
</div>
<div class="uk-flex uk-flex-middle uk-flex-between uk-margin-large-top">
<div class="uk-grid uk-flex-middle uk-flex-between@m uk-flex-center uk-margin-large-top" [id]="id" uk-grid>
<div class="uk-flex uk-flex-middle">
<div *ngIf="sortOptions?.length > 0" class="uk-width-small uk-margin-medium-right">
<div input
@ -153,7 +153,7 @@
</div>
</td>
<td>
<div class="uk-text-truncate uk-text-capitalize uk-text-italic uk-text-small uk-text-bold"
<div class="uk-text-truncate uk-text-capitalize uk-text-italic uk-text-small uk-text-bold uk-width-large"
[title]="item.name">
{{ item.name }}
</div>