From ba916df4e11cb46dd078b6a183568711dd1598f0 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Thu, 16 Nov 2023 16:45:01 +0200 Subject: [PATCH] Add domain property. Disable caching indicators. Fix an error in server. --- angular.json | 12 +++--------- package.json | 1 + server.ts | 25 ++++++++++++++++++++++--- src/app/openaireLibrary | 2 +- src/app/shared/irish.ts | 4 +++- src/environments/environment.beta.ts | 2 ++ src/environments/environment.ts | 2 ++ 7 files changed, 34 insertions(+), 14 deletions(-) diff --git a/angular.json b/angular.json index 4e552be..83a836d 100644 --- a/angular.json +++ b/angular.json @@ -6,12 +6,6 @@ "irish-monitor": { "projectType": "application", "schematics": { - "@schematics/angular:component": { - "inlineTemplate": true, - "inlineStyle": true, - "style": "less", - "skipTests": true - }, "@schematics/angular:class": { "skipTests": true }, @@ -90,7 +84,7 @@ { "type": "initial", "maximumWarning": "2mb", - "maximumError": "5mb" + "maximumError": "20mb" }, { "type": "anyComponentStyle", @@ -123,7 +117,7 @@ { "type": "initial", "maximumWarning": "2mb", - "maximumError": "5mb" + "maximumError": "20mb" }, { "type": "anyComponentStyle", @@ -168,7 +162,7 @@ { "type": "initial", "maximumWarning": "2mb", - "maximumError": "5mb" + "maximumError": "20mb" }, { "type": "anyComponentStyle", diff --git a/package.json b/package.json index 36867fd..b6e2660 100644 --- a/package.json +++ b/package.json @@ -47,6 +47,7 @@ "@angular/cli": "~16.2.0", "@angular/compiler-cli": "^16.2.0", "@nguniversal/builders": "^16.2.0", + "@types/compression": "^1.7.0", "@types/express": "^4.17.0", "@types/node": "^16.11.7", "typescript": "~5.1.3" diff --git a/server.ts b/server.ts index 6a5169c..f006ceb 100644 --- a/server.ts +++ b/server.ts @@ -3,19 +3,23 @@ import 'zone.js/node'; import { APP_BASE_HREF } from '@angular/common'; import { ngExpressEngine } from '@nguniversal/express-engine'; import * as express from 'express'; +import * as compression from 'compression'; import { existsSync } from 'node:fs'; import { join } from 'node:path'; import { AppServerModule } from './src/main.server'; +import {REQUEST, RESPONSE} from "./src/app/openaireLibrary/utils/tokens"; // The Express app is exported so that it can be used by serverless Functions. export function app(): express.Express { const server = express(); + server.use(compression()); const distFolder = join(process.cwd(), 'dist/irish-monitor/browser'); const indexHtml = existsSync(join(distFolder, 'index.original.html')) ? 'index.original.html' : 'index'; // Our Universal express-engine (found @ https://github.com/angular/universal/tree/main/modules/express-engine) server.engine('html', ngExpressEngine({ - bootstrap: AppServerModule + bootstrap: AppServerModule, + inlineCriticalCss: false })); server.set('view engine', 'html'); @@ -30,9 +34,24 @@ export function app(): express.Express { // All regular routes use the Universal engine server.get('*', (req, res) => { - res.render(indexHtml, { req, providers: [{ provide: APP_BASE_HREF, useValue: req.baseUrl }] }); + res.render(indexHtml, { + req, providers: [ + { + provide: APP_BASE_HREF, + useValue: req.baseUrl + }, + { + provide: REQUEST, useValue: (req) + }, + { + provide: RESPONSE, useValue: (res) + } + ] + } + ); }); + return server; } @@ -56,4 +75,4 @@ if (moduleFilename === __filename || moduleFilename.includes('iisnode')) { run(); } -export * from './src/main.server'; \ No newline at end of file +export * from './src/main.server'; diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 79d49c8..3c1b72e 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 79d49c80e334c7674456b427e5cb59f2a9e4ae50 +Subproject commit 3c1b72e7e4c2e551f15315a2ddd4e62ec0880423 diff --git a/src/app/shared/irish.ts b/src/app/shared/irish.ts index b622039..2574ef9 100644 --- a/src/app/shared/irish.ts +++ b/src/app/shared/irish.ts @@ -20,7 +20,7 @@ export class Irish { {value: 'organization', label: StakeholderConfiguration.ENTITIES.organization}, {value: 'country', label: StakeholderConfiguration.ENTITIES.country}, {value: 'datasource', label: StakeholderConfiguration.ENTITIES.datasource} - ] + ]; StakeholderConfiguration.FUNDER_TYPES = [ {value: null, label: 'None'}, @@ -32,6 +32,8 @@ export class Irish { {icon: 'earth', value: "PUBLIC", label: 'Public'}, ]; + StakeholderConfiguration.CACHE_INDICATORS = false; + LayoutService.HEADER_HEIGHT = '60px'; } diff --git a/src/environments/environment.beta.ts b/src/environments/environment.beta.ts index 6a6031d..0bf8d66 100644 --- a/src/environments/environment.beta.ts +++ b/src/environments/environment.beta.ts @@ -10,6 +10,8 @@ let props: EnvProperties = { piwikBaseUrl: 'https://beta.analytics.openaire.eu/piwik.php?idsite=', adminToolsPortalType: 'irish', adminToolsCommunity: 'irish', + baseLink: "/", + domain: "https://beta.oamonitor.ireland.openaire.eu", } export let properties: EnvProperties = { diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 22664be..f4cd0a5 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -17,6 +17,8 @@ let props: EnvProperties = { disableFrameLoad: true, adminToolsPortalType: 'irish', adminToolsCommunity: 'irish', + baseLink: "/", + domain: "http://mpagasas.di.uoa.gr:4600", } export let properties: EnvProperties = {