MaDgIK
/
connect
13
0
Fork 0
Code Issues Pull Requests Projects Releases 12 Wiki Activity

Merge remote-tracking branch 'origin/develop'

This commit is contained in:
Konstantinos Triantafyllou 2023-06-19 14:55:44 +03:00
parent 6ef9463216 e3f88bdfd9
commit c0fc4608f2
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server.ts
View File

@ -11,7 +11,7 @@ import {existsSync} from 'fs';
import {REQUEST, RESPONSE} from "./src/app/openaireLibrary/utils/tokens";
import {isArray} from "util";
import {properties} from "./src/environments/environment";
import {Layout} from "./src/app/openaireLibrary/connect/community/CustomizationOptions";
import {CustomizationOptions, Layout} from "./src/app/openaireLibrary/connect/community/CustomizationOptions";
import {Response} from "express";
const fs = require('fs');
@ -79,7 +79,7 @@ function buildAll(res: Response = null) {
axios.get(layoutsURL).then(response => {
if (response.data && Array.isArray(response.data) && response.data.length > 0) {
response.data.forEach((layout: Layout) => {
let variables = Layout.getVariables(layout.layoutOptions);
let variables = Layout.getVariables(CustomizationOptions.checkForObsoleteVersion(layout.layoutOptions, layout.portalPid));
buildCss(layout.portalPid, layout.date ? layout.date : null, variables);
});
if (res) {
@ -185,7 +185,7 @@ export function app() {
});
server.post('/build-css/:id/:suffix', jsonParser,(req, res) => {
let variables = Layout.getVariables(req.body);
let variables = Layout.getVariables(CustomizationOptions.checkForObsoleteVersion(req.body, req.params.id));
if (variables) {
buildCss(req.params.id , req.params.suffix, variables);
res.status(200).send({
@ -198,7 +198,7 @@ export function app() {
});
server.post('/build-css/preview/:id/:suffix', jsonParser, (req, res) => {
let variables = Layout.getVariables(req.body);
let variables = Layout.getVariables(CustomizationOptions.checkForObsoleteVersion(req.body, req.params.id));
if (variables) {
buildCss(req.params.id, req.params.suffix, variables);
res.status(200).send({code: 200, message: 'CSS build for ' + req.params.id + ' layout was successful'});

2
src/app/openaireLibrary

@ -1 +1 @@
Subproject commit 8a22f2a8ad357453335279d7404c950a734ee0ce
Subproject commit db55273b685a7f0fc6ca7e79cd20d7cf68d6747a