Skip to content
Merged
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
29 changes: 29 additions & 0 deletions .github/workflows/lint-ui5_v2.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
name: Lint ui5_v2

on:
pull_request:
workflow_dispatch:

jobs:
lint:
runs-on: ubuntu-latest
defaults:
run:
working-directory: ui5_v2
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: "20"

- name: Install dependencies
run: npm install --no-audit --no-fund

- name: Run ESLint
run: npm run lint:eslint

- name: Run UI5 linter
run: npm run lint:ui5
6 changes: 0 additions & 6 deletions app2/webapp/model/data.json

This file was deleted.

File renamed without changes.
File renamed without changes.
File renamed without changes.
6 changes: 4 additions & 2 deletions app2/package.json → ui5_v2/package.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
{
"name": "app2",
"name": "ui5_v2",
"version": "0.0.1",
"description": "Modern UI5 2.x application (legacy-free)",
"private": true,
"scripts": {
"start": "ui5 serve --open index.html",
"build": "ui5 build --clean-dest",
"lint": "eslint webapp"
"lint": "npm run lint:eslint && npm run lint:ui5",
"lint:eslint": "eslint webapp",
"lint:ui5": "ui5lint"
},
"devDependencies": {
"@eslint/js": "^9.17.0",
Expand Down
2 changes: 1 addition & 1 deletion app2/ui5.yaml → ui5_v2/ui5.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
specVersion: "4.0"
metadata:
name: app2
name: ui5_v2
type: application
framework:
name: OpenUI5
Expand Down
4 changes: 2 additions & 2 deletions app2/webapp/Component.js → ui5_v2/webapp/Component.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
sap.ui.define([
"sap/ui/core/UIComponent",
"sap/ui/Device",
"app2/model/models",
"ui5_v2/model/models",
], (UIComponent, Device, models) => {
"use strict";

return UIComponent.extend("app2.Component", {
return UIComponent.extend("ui5_v2.Component", {
metadata: {
manifest: "json",
interfaces: ["sap.ui.core.IAsyncContentCreation"],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ sap.ui.define([
], (Controller) => {
"use strict";

return Controller.extend("app2.controller.App", {
return Controller.extend("ui5_v2.controller.App", {
onInit() {
},
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ sap.ui.define([
], (Controller, MessageToast) => {
"use strict";

return Controller.extend("app2.controller.Main", {
return Controller.extend("ui5_v2.controller.Main", {
onInit() {
},

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# Application Descriptors
appTitle=App2
appTitle=UI5 v2
appDescription=Modern UI5 2.x application built with legacy-free standards

# Main View
welcomeTitle=Welcome to App2
welcomeTitle=Welcome to UI5 v2
welcomeText=This application is built on OpenUI5 2.x using the latest legacy-free standards: asynchronous content creation, Horizon theme, manifest-first routing, and ES module style definitions.

# Device Info
Expand All @@ -14,4 +14,4 @@ devicePhone=Running on phone

# Actions
sayHelloButton=Say Hello
helloMessage=Hello from App2
helloMessage=Hello from UI5 v2
8 changes: 3 additions & 5 deletions app2/webapp/index.html → ui5_v2/webapp/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,14 @@
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>App2</title>
<title>UI5 v2</title>

<script

Check failure on line 9 in ui5_v2/webapp/index.html

View workflow job for this annotation

GitHub Actions / lint

Missing bootstrap parameter 'data-sap-ui-compat-version'

Check failure on line 9 in ui5_v2/webapp/index.html

View workflow job for this annotation

GitHub Actions / lint

Missing bootstrap parameter 'data-sap-ui-async'
id="sap-ui-bootstrap"
src="resources/sap-ui-core.js"
data-sap-ui-theme="sap_horizon"
data-sap-ui-resource-roots='{"app2": "./"}'
data-sap-ui-on-init="module:app2/index"
data-sap-ui-async="true"
data-sap-ui-compat-version="edge"
data-sap-ui-resource-roots='{"ui5_v2": "./"}'
data-sap-ui-on-init="module:ui5_v2/index"
></script>
</head>
<body class="sapUiBody sapUiSizeCompact" id="content"></body>
Expand Down
4 changes: 2 additions & 2 deletions app2/webapp/index.js → ui5_v2/webapp/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ sap.ui.define([
"use strict";

new ComponentContainer({
id: "app2Container",
name: "app2",
id: "ui5_v2Container",
name: "ui5_v2",
async: true,
manifest: true,
height: "100%",
Expand Down
32 changes: 16 additions & 16 deletions app2/webapp/manifest.json → ui5_v2/webapp/manifest.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
{
"_version": "1.65.0",

Check failure on line 2 in ui5_v2/webapp/manifest.json

View workflow job for this annotation

GitHub Actions / lint

manifest.json must be migrated to Version 2
"sap.app": {
"id": "app2",
"id": "ui5_v2",
"type": "application",
"i18n": "i18n/i18n.properties",
"i18n": {
"bundleUrl": "i18n/i18n.properties",
"supportedLocales": [""],
"fallbackLocale": ""
},
"title": "{{appTitle}}",
"description": "{{appDescription}}",
"applicationVersion": {
"version": "0.0.1"
},
"dataSources": {}
}
},
"sap.ui": {
"technology": "UI5",
Expand All @@ -19,11 +22,15 @@
"phone": true
}
},
"sap.fiori": {
"registrationIds": [],
"archeType": "transactional"
},
"sap.ui5": {
"handleValidation": true,
"rootView": {
"viewName": "app2.view.App",
"viewName": "ui5_v2.view.App",
"type": "XML",
"async": true,
"id": "app"
},
"dependencies": {
Expand All @@ -44,27 +51,20 @@
"i18n": {
"type": "sap.ui.model.resource.ResourceModel",
"settings": {
"bundleName": "app2.i18n.i18n",
"bundleName": "ui5_v2.i18n.i18n",
"supportedLocales": [""],
"fallbackLocale": ""
}
},
"": {
"type": "sap.ui.model.json.JSONModel",
"settings": {},
"uri": "model/data.json",
"preload": true
}
},
"routing": {
"config": {
"routerClass": "sap.m.routing.Router",
"type": "View",
"viewType": "XML",
"path": "app2.view",
"path": "ui5_v2.view",
"controlId": "app",
"controlAggregation": "pages",
"async": true
"controlAggregation": "pages"
},
"routes": [
{
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<mvc:View
controllerName="app2.controller.App"
controllerName="ui5_v2.controller.App"
xmlns="sap.m"
xmlns:mvc="sap.ui.core.mvc"
displayBlock="true">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<mvc:View
controllerName="app2.controller.Main"
controllerName="ui5_v2.controller.Main"
xmlns="sap.m"
xmlns:core="sap.ui.core"
xmlns:mvc="sap.ui.core.mvc">
Expand Down
Loading