Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions lib/build.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ const _ = require("lodash");
const Piscina = require("piscina");
const cliProgress = require("cli-progress");

const defaults = require("./defaults.js");
const { ord } = require("./index");
const defaults = require("./defaults.js");
const { localize } = require("./common/utils.js");
const registerCompileTargets = require("./common/register-compile-targets");
const { BUILD_DEFAULT_PATH, ORD_DOCUMENT_FILE_NAME, DOCUMENT_PERSPECTIVES } = require("./constants");

Expand Down Expand Up @@ -89,7 +90,7 @@ module.exports = class OrdBuildPlugin extends cds.build.Plugin {
return Promise.all(
tasks.map(({ url, ordId }) =>
pool.run({ url }).then((response) =>
this.write(response)
this.write(localize(model, response))
.to(path.join(ordId, url.split("/").pop()).replace(/:/g, "_"))
.then(() => progressBar.increment()),
),
Expand Down
5 changes: 5 additions & 0 deletions lib/common/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ const {

const DEFAULT_ACCESS_STRATEGIES = Object.freeze([ORD_ACCESS_STRATEGY.Open]);

function localize(model, resource) {
return JSON.parse(Array.from(cds.localize(JSON.stringify(resource)).for("en").from(model))?.[0]?.[1] ?? resource);
}

function prune(object) {
return Object.fromEntries(
Object.entries(object)
Expand Down Expand Up @@ -175,6 +179,7 @@ function resolveAccessStrategies(authConfig, options = {}) {

module.exports = {
prune,
localize,
isValidService,
getRFC3339Date,
readORDExtensions,
Expand Down
7 changes: 4 additions & 3 deletions lib/services/ord-service.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
const cds = require("@sap/cds");

const { slice } = require("../common/slice");
const ord = require("../ord.js");
const Logger = require("../logger.js");
const defaults = require("../defaults.js");
const { slice } = require("../common/slice");
const { localize } = require("../common/utils.js");
const compileMetadata = require("../meta-data.js");
const { createAuthConfig, createAuthMiddleware } = require("../auth/authentication.js");
const { LOCAL_TENANT_ID_HEADER_KEY, DOCUMENT_PERSPECTIVES } = require("../constants");
const { createAuthConfig, createAuthMiddleware } = require("../auth/authentication.js");

const validationMiddleware = (req, res, next) => {
const toggles = cds.env.requires.toggles;
Expand Down Expand Up @@ -39,7 +40,7 @@ const metadataResponseHandler = async (req, res) => {
const model = await resolveCdsModel(perspective, tenant);
const { contentType, response } = await compileMetadata(req.path, model);

return res.status(200).contentType(contentType).send(response);
return res.status(200).contentType(contentType).send(localize(model, response));
} catch (error) {
Logger.error(error, "Error while processing the resource definition document");
return res.status(500).send(error.message);
Expand Down