Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Switch Adaptation Project's generator/wizard to use Open Source writers #1775

Open
wants to merge 55 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
d207584
feat: enhance writer for ADP Project to be able to create proper ADP …
IvoSG Mar 24, 2024
bb4a0a0
feat: enhance s4hana project generation
IvoSG Mar 25, 2024
363a702
feat: enhance cf project generation
IvoSG Apr 2, 2024
2cffde0
Merge branch 'main' of https://github.com/SAP/open-ux-tools into feat…
IvoSG Apr 2, 2024
774f0ac
fix/lint errors and tests
IvoSG Apr 2, 2024
a9ae35a
fix: unit tests and code corrections
IvoSG Apr 3, 2024
ef58dd5
Linting auto fix commit
github-actions[bot] Apr 3, 2024
9aa7edc
chore: add changeset
IvoSG Apr 3, 2024
0d0bef9
Merge branch 'feat/1611/writersForAdpProjects' of https://github.com/…
IvoSG Apr 3, 2024
464b534
fix: sonar security issue
IvoSG Apr 3, 2024
5ad6495
Merge branch 'main' into feat/1611/writersForAdpProjects
IvoSG Apr 3, 2024
82b0238
chore: split the project template files for the different environments
IvoSG Apr 16, 2024
32a3214
chore: use btp-utils to check the running environment
IvoSG Apr 16, 2024
5956a34
chore: split the writers logic
IvoSG Apr 16, 2024
8a25655
chore: add writer factory to instantiate class for different environm…
IvoSG Apr 16, 2024
5d6d4cb
fix: remove cf writer logic, move project utils and fix ui5-deploy.ya…
IvoSG Apr 24, 2024
004b5cb
chore: use one project template for onprem and s4 project types
IvoSG Apr 24, 2024
f28ca6e
fix: ui5-deploy.yaml writer and add appredload middleware
IvoSG Apr 25, 2024
43ca69a
chore: revert all writers factory logic, revert project template stru…
IvoSG Apr 26, 2024
4af85b2
Merge branch 'main' into feat/1611/writersForAdpProjects
IvoSG Apr 26, 2024
8ac89f4
chore: revert autoupdated import type
IvoSG Apr 26, 2024
09d5cf4
fix: add whitespace
IvoSG Apr 26, 2024
d42387b
fix: merge issue
IvoSG Apr 26, 2024
0e31e07
Merge branch 'main' into feat/1611/writersForAdpProjects
IvoSG Apr 30, 2024
2507b01
chore: change types and remove unit tests for cf
IvoSG Apr 30, 2024
cb495b2
fix: default url if not provided
IvoSG Apr 30, 2024
0ca6004
fix: remove .env file, write only changes in apdescr content, use fra…
IvoSG May 16, 2024
3dba791
fix: typo
IvoSG May 16, 2024
6c21e2f
Merge branch 'main' into feat/1611/writersForAdpProjects
IvoSG May 16, 2024
0516fc4
Merge branch 'main' into feat/1611/writersForAdpProjects
IvoSG May 17, 2024
35a6347
fix: migrator ui5 yaml writers
IvoSG May 17, 2024
a2c2b71
chore: remove credentials from ui5.yaml config, move inbound change l…
IvoSG May 22, 2024
1da5255
Merge branch 'main' into feat/1611/writersForAdpProjects
IvoSG May 22, 2024
3bed8d2
Merge branch 'main' of https://github.com/SAP/open-ux-tools into feat…
IvoSG May 23, 2024
edb43db
Merge branch 'main' into feat/1611/writersForAdpProjects
IvoSG May 23, 2024
b970461
Merge branch 'main' into feat/1611/writersForAdpProjects
tobiasqueck May 24, 2024
31153cf
Merge branch 'main' into feat/1611/writersForAdpProjects
tobiasqueck May 27, 2024
196fc44
chore: resolve code review comments
IvoSG May 29, 2024
0e12110
Merge branch 'main' into feat/1611/writersForAdpProjects
IvoSG May 29, 2024
4158c84
Merge branch 'main' into feat/1611/writersForAdpProjects
IvoSG May 29, 2024
113e2af
Merge branch 'main' into feat/1611/writersForAdpProjects
IvoSG May 30, 2024
513b0f7
Merge branch 'main' into feat/1611/writersForAdpProjects
IvoSG Jun 3, 2024
328b15d
Merge branch 'main' into feat/1611/writersForAdpProjects
IvoSG Jun 3, 2024
c05b0dd
fix: add JSDoc to the types, remove unused tests and revert fs, cover…
IvoSG Jun 4, 2024
8f5b365
Merge branch 'main' into feat/1611/writersForAdpProjects
IvoSG Jun 4, 2024
bce2d5c
Merge branch 'main' into feat/1611/writersForAdpProjects
IvoSG Jun 4, 2024
db1a539
Merge branch 'main' into feat/1611/writersForAdpProjects
IvoSG Jun 4, 2024
a6ac36a
chore: move new inbound navigation properties to an internal type
IvoSG Jun 5, 2024
78f7a82
Merge branch 'main' into feat/1611/writersForAdpProjects
IvoSG Jun 5, 2024
c190b64
fix: adapt existed tests
IvoSG Jun 5, 2024
a933d59
test: adding missing tests, refactoring tests
IvoSG Jun 6, 2024
5e74a2a
fix: resolve sonar issue
IvoSG Jun 6, 2024
be4d7e1
Merge branch 'main' into feat/1611/writersForAdpProjects
IvoSG Jun 6, 2024
515d984
Merge branch 'main' into feat/1611/writersForAdpProjects
IvoSG Jun 6, 2024
114591d
Merge branch 'main' into feat/1611/writersForAdpProjects
GDamyanov Jun 7, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changeset/famous-panthers-occur.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@sap-ux/adp-tooling': minor
'@sap-ux/preview-middleware': patch
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please remove preview-middleware and axios-extension from the changeset.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

---

Adds writer functionality for generation of adaptation projects
1 change: 1 addition & 0 deletions packages/adp-tooling/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
],
"dependencies": {
"@sap-ux/axios-extension": "workspace:*",
"@sap-ux/btp-utils": "workspace:*",
"@sap-ux/logger": "workspace:*",
"@sap-ux/system-access": "workspace:*",
"@sap-ux/ui5-config": "workspace:*",
Expand Down
206 changes: 206 additions & 0 deletions packages/adp-tooling/src/base/project-utils.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,206 @@
import { join } from 'path';
import type { Editor } from 'mem-fs-editor';
import { AdpWriterConfig, CfAdpConfig, CfModuleData, ManifestAppdescr, ProjectType } from '../types';
import {
enhanceUI5DeployYaml,
enhanceUI5Yaml,
hasDeployConfig,
enhanceUI5YamlWithCustomConfig,
enhanceUI5YamlWithCustomTask
} from '../writer/options';
import { UI5Config } from '@sap-ux/ui5-config';

/**
* Writes a given project template files within a specified folder in the project directory.
*
* @param {string} templatePath - The root path of the project template.
* @param {string} projectPath - The root path of the project.
* @param {CfModuleData | AdpWriterConfig} data - The data to be populated in the template file.
* @param {Editor} fs - The `mem-fs-editor` instance used for file operations.
* @param {string[]} exclude - Files to be ignored when writing.
* @returns {void}
*/
export function writeTemplateToFolder(
templatePath: string,
projectPath: string,
data: CfModuleData | AdpWriterConfig,
fs: Editor,
exclude: string[] | [] = []
nikmace marked this conversation as resolved.
Show resolved Hide resolved
): void {
try {
fs.copyTpl(templatePath, projectPath, data, undefined, {
globOptions: { dot: true, ignore: exclude },
processDestinationPath: (filePath: string) => filePath.replace(/gitignore.tmpl/g, '.gitignore')
});
} catch (e) {
throw new Error(`Could not write template files to folder. Reason: ${e.message}`);
}
}

/**
* Writes a manifest.adpescr file within a specified folder in the project directory.
*
* @param {string} templatePath - The root path of the project template.
* @param {string} projectPath - The root path of the project.
* @param {ManifestAppdescr} data - The data to be populated in the template file.
* @param {Editor} fs - The `mem-fs-editor` instance used for file operations.
* @returns {void}
*/
export function writeManifestAppdecr(
IvoSG marked this conversation as resolved.
Show resolved Hide resolved
templatePath: string,
projectPath: string,
data: ManifestAppdescr,
fs: Editor
): void {
try {
const appdescrTplPath = join(templatePath, 'webapp/manifest.appdescr_variant');
const appdescrPath = join(projectPath, 'webapp/manifest.appdescr_variant');
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you please use the enum from project access for different folders

const baseAppdescrContent: ManifestAppdescr = JSON.parse(fs.read(appdescrTplPath));
data.content = [...baseAppdescrContent.content, ...data.content];
Object.assign(baseAppdescrContent, data);

fs.writeJSON(appdescrPath, baseAppdescrContent);
} catch (e) {
throw new Error(`Could not write manifest.appdescr_variant file. Reason: ${e.message}`);
}
}

/**
* Writes a .apd/config.json file within a specified folder in the project directory.
*
* @param {string} projectPath - The root path of the project.
* @param {CfAdpConfig} data - The data to be populated in the template file.
* @param {Editor} fs - The `mem-fs-editor` instance used for file operations.
* @returns {void}
*/
export function writeAdpConfig(projectPath: string, data: CfAdpConfig, fs: Editor): void {
try {
const adpConfigPath = join(projectPath, '.adp/config.json');
nikmace marked this conversation as resolved.
Show resolved Hide resolved

fs.writeJSON(adpConfigPath, data);
} catch (e) {
throw new Error(`Could not write .adp/config.json file. Reason: ${e.message}`);
}
}

/**
* Writes a xs-security.json file within a specified folder in the project directory.
*
* @param {string} projectPath - The root path of the project.
* @param {CfModuleData} data - The data to be populated in the template file.
* @param {Editor} fs - The `mem-fs-editor` instance used for file operations.
* @returns {void}
*/
export function writeXsSecurity(templatePath: string, data: CfModuleData, fs: Editor): void {
try {
const projectPath = join(data.projectPath, 'xs-security.json');
if (!fs.exists(projectPath)) {
writeTemplateToFolder(
join(templatePath, 'xs-security.json'),
projectPath,
{
projectName: data.xsSecurityProjectName
} as CfModuleData,
fs
);
}
} catch (e) {
throw new Error(`Could not write xs-security.json file. Reason: ${e.message}`);
}
}

/**
* Writes a given approuter template files within a specified folder in the project directory
*
* @param {string} templatePath - The root path of the project template.
* @param {string} projectPath - The root path of the project.
* @param {CfModuleData} data - The data to be populated in the template file.
* @param {Editor} fs - The `mem-fs-editor` instance used for file operations.
* @returns {void}
*/
export function writeApprouterTemplate(
templatePath: string,
projectPath: string,
data: CfModuleData,
fs: Editor
): void {
try {
if (data.addStandaloneApprouter) {
const approuterProjectPath = join(projectPath, 'approuter');
const approuterTplPath = join(templatePath, 'approuter/*.*');

writeTemplateToFolder(approuterTplPath, approuterProjectPath, data, fs);
}
} catch (e) {
throw new Error(`Could not write approuter template files to folder. Reason: ${e.message}`);
}
}

/**
* Writes a ui5.yaml file within a specified folder in the project directory.
*
* @param {string} projectPath - The root path of the project.
* @param {AdpWriterConfig} data - The data to be populated in the template file.
* @param {Editor} fs - The `mem-fs-editor` instance used for file operations.
* @returns {void}
*/
export async function writeUI5Yaml(projectPath: string, data: AdpWriterConfig, fs: Editor): Promise<void> {
try {
const ui5ConfigPath = join(projectPath, 'ui5.yaml');
const baseUi5ConfigContent = fs.read(ui5ConfigPath);
const ui5Config = await UI5Config.newInstance(baseUi5ConfigContent);
enhanceUI5Yaml(ui5Config, data);
enhanceUI5YamlWithCustomConfig(ui5Config, data?.customConfig);
if (data.customConfig?.adp?.environment === ProjectType.S4) {
enhanceUI5YamlWithCustomTask(ui5Config, data);
}

fs.write(ui5ConfigPath, ui5Config.toString());
} catch (e) {
throw new Error(`Could not write ui5.yaml file. Reason: ${e.message}`);
}
}

/**
* Writes a ui5-deploy.yaml file within a specified folder in the project directory.
*
* @param {string} projectPath - The root path of the project.
* @param {AdpWriterConfig} data - The data to be populated in the template file.
* @param {Editor} fs - The `mem-fs-editor` instance used for file operations.
* @returns {void}
*/
export async function writeUI5DeployYaml(projectPath: string, data: AdpWriterConfig, fs: Editor): Promise<void> {
try {
if (hasDeployConfig(data)) {
const ui5ConfigPath = join(projectPath, 'ui5.yaml');
const baseUi5ConfigContent = fs.read(ui5ConfigPath);
const ui5DeployConfig = await UI5Config.newInstance(baseUi5ConfigContent);
enhanceUI5DeployYaml(ui5DeployConfig, data);

fs.write(join(projectPath, 'ui5-deploy.yaml'), ui5DeployConfig.toString());
}
} catch (e) {
throw new Error(`Could not write ui5-deploy.yaml file. Reason: ${e.message}`);
}
}

/**
* Writes a .env file within a specified folder in the project directory.
*
* @param {string} projectPath - The root path of the project.
* @param {AdpWriterConfig} data - The data to be populated in the template file.
* @param {Editor} fs - The `mem-fs-editor` instance used for file operations.
* @returns {void}
*/
export async function writeEnvFile(projectPath: string, data: AdpWriterConfig, fs: Editor): Promise<void> {
try {
if (data?.flp?.credentials) {
const templateModel = `ABAP_USERNAME: ${data.flp.credentials.username}
ABAP_PASSWORD: ${data.flp.credentials.password}`;

fs.write(join(projectPath, '.env'), templateModel);
}
} catch (e) {
throw new Error(`Could not write .env file. Reason: ${e.message}`);
}
}
102 changes: 100 additions & 2 deletions packages/adp-tooling/src/types.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { UI5FlexLayer } from '@sap-ux/project-access';
import type { DestinationAbapTarget, UrlAbapTarget } from '@sap-ux/system-access';
import type { Adp } from '@sap-ux/ui5-config';
import type { Adp, BspApp } from '@sap-ux/ui5-config';
import type { Editor } from 'mem-fs-editor';

export interface DescriptorVariant {
Expand Down Expand Up @@ -35,21 +35,41 @@ export interface AdpWriterConfig {
target: AbapTarget;
ui5?: {
tobiasqueck marked this conversation as resolved.
Show resolved Hide resolved
minVersion?: string;
ui5Version?: string;
ui5EndpointUrl?: string;
nikmace marked this conversation as resolved.
Show resolved Hide resolved
};
package?: {
name?: string;
description?: string;
};
flp?: {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That object is odd. bspName and credentials are used to access the original app while title, subtitle and inboundId are only being used in the i18n file. Did you miss adding a change to the appdescr if these properties are present or did I miss it in the code or is there some magic backend functionality that does something on deploy?

What is the difference between bspName and reference in the app section?

Copy link
Contributor Author

@IvoSG IvoSG May 13, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Currently, the title, subtitle and inbound id are only used in the i18n file because the appdescr information comes already filtered after the prompting.
bspName is the base app repoName and reference is the base app id

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As discussed on the phone, please add the change for the inbound communication to the appdescr template file with the condtion that the flp object is provided

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The change for the inbound it's more complex to be in the aprdescr template and because of that it's passed with other changes in the content

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If it is too complex for ejs, implement it as a plain function and then add it to the list of changes. Most importantly move the logic here because you have a reference to it in your generated i18n.properties file

flpTitle?: string;
flpSubtitle?: string;
nikmace marked this conversation as resolved.
Show resolved Hide resolved
inboundId?: string;
bspName?: string;
languages?: Language[];
credentials?: {
username: string;
password: string;
};
};
customConfig?: AdpCustomConfig;
/**
* Optional: configuration for deployment to ABAP
*/
deploy?: Adp;
deploy?: Adp | BspApp;
options?: {
/**
* Optional: if set to true then the generated project will be recognized by the SAP Fiori tools
*/
fioriTools?: boolean;
};
appdescr?: ManifestAppdescr;
tobiasqueck marked this conversation as resolved.
Show resolved Hide resolved
}

export interface Language {
sap: string;
i18n: string;
}

export interface ManifestAppdescr {
Expand Down Expand Up @@ -178,6 +198,14 @@ export type IWriterData<T extends ChangeType> = IWriter<GeneratorData<T>>;
*
* @template T - The specific type of data the writer will handle, determined by the associated ChangeType.
*/
export type IProjectWriterData<T extends ProjectType> = IWriter<ProjectGeneratorData<T>>;

/**
* Defines a generic interface for writer classes, specialized by the type of data they handle.
*
* @template T - The specific type of data the writer will handle, determined by the associated ChangeType.
*/

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please remove this extra empty line as it detaches the jsdoc from the interface.

export interface IWriter<T> {
/**
* Writes the provided data to the project.
Expand All @@ -199,6 +227,29 @@ export const enum ChangeType {
CHANGE_INBOUND = 'appdescr_app_changeInbound'
}

/**
* Enumerates the types of projects that can be made, each representing a specific kind of project structure.
*/
export const enum ProjectType {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Both are S/4 systems here, so please change it to something like Cloud and OnPremise. Even better would be if you reuse the type OperationsType (https://github.com/SAP/open-ux-tools/blob/main/packages/axios-extension/src/abap/types/adt-types.ts#L77) because that is exactly what you will get back from the backend as identify during the prompting phase.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

ON_PREM = 'OnPrem',
S4 = 'S4',
CF = 'CF'
}

/**
* Maps a ChangeType to the corresponding data structure needed for that type of change.
* This conditional type ensures type safety by linking each change type with its relevant data model.
*
* @template T - A subtype of ChangeType indicating the specific type of change.
*/
export type ProjectGeneratorData<T extends ProjectType> = T extends ProjectType.ON_PREM
nikmace marked this conversation as resolved.
Show resolved Hide resolved
? AdpWriterConfig
: T extends ProjectType.S4
? AdpWriterConfig
: T extends ProjectType.CF
? CfWriterConfig
: never;

/**
* Maps a ChangeType to the corresponding data structure needed for that type of change.
* This conditional type ensures type safety by linking each change type with its relevant data model.
Expand Down Expand Up @@ -347,3 +398,50 @@ export interface AdpProjectData {
reference: string;
id: string;
}

export interface AdpCustomConfig {
adp: {
safeMode: boolean;
nikmace marked this conversation as resolved.
Show resolved Hide resolved
environment: ProjectType;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TBD: the environment is now 'OnPrem' but our change editors still have checks for 'ABAP'

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nikmace Why would the change editors need to know about the target environment?

};
}

export interface CfModuleData {
appHostId: string;
appName: string;
appVersion: string;
appId: string;
module: string;
moduleTitle: string;
appVariantId: string;
projectName: string;
i18nGuid: string;
projectPath: string;
addSecurity: string;
addStandaloneApprouter: boolean;
sapCloudService: string;
xsSecurityProjectName: string;
org: string;
space: string;
html5RepoRuntime: string;
}

export interface CfAdpConfig {
componentname: string;
nikmace marked this conversation as resolved.
Show resolved Hide resolved
safeMode: boolean;
appvariant: string;
layer: string;
isOVPApp: boolean;
isFioriElement: boolean;
nikmace marked this conversation as resolved.
Show resolved Hide resolved
environment: string;
ui5Version: string;
cfSpace: string;
cfOrganization: string;
cfApiUrl: string;
}

export interface CfWriterConfig {
app: CfModuleData;
appdescr: ManifestAppdescr;
adpConfig: CfAdpConfig;
}