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

fix: correct text #736

Merged
merged 4 commits into from
Nov 27, 2024
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
6 changes: 6 additions & 0 deletions .changeset/light-books-kiss.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"vscode-ui5-language-assistant": patch
"@ui5-language-assistant/vscode-ui5-language-assistant-bas-ext": patch
---

fix: correct SAPUI5 term
2 changes: 1 addition & 1 deletion examples/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ This folder contains a collection of examples

## sap-ui5-web-server

A local web server to host SAP UI5 SDK
A local web server to host SAPUI5 SDK
4 changes: 2 additions & 2 deletions packages/constant/src/constant.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ export const OPEN_FRAMEWORK = "OpenUI5";
export const DEFAULT_UI5_FRAMEWORK = "SAPUI5";

//https://ui5.sap.com/version.json
export const DEFAULT_UI5_VERSION = "1.71.70";
export const DEFAULT_UI5_VERSION = "1.71.72";
// https://sdk.openui5.org/version.json
export const DEFAULT_OPEN_UI5_VERSION = "1.71.67";
export const DEFAULT_OPEN_UI5_VERSION = "1.71.68";

export const DEFAULT_UI5_VERSION_BASE = "1.71";

Expand Down
8 changes: 4 additions & 4 deletions packages/logic-utils/test/unit/ui5.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ describe("getVersionInfoUrl", () => {
DEFAULT_UI5_VERSION
);
expect(result).toStrictEqual(
"https://ui5.sap.com/1.71.70/resources/sap-ui-version.json"
"https://ui5.sap.com/1.71.72/resources/sap-ui-version.json"
);
});
it("get version info uri for OpenUI5", async () => {
Expand All @@ -81,7 +81,7 @@ describe("getVersionInfoUrl", () => {
DEFAULT_OPEN_UI5_VERSION
);
expect(result).toStrictEqual(
"https://sdk.openui5.org/1.71.67/resources/sap-ui-version.json"
"https://sdk.openui5.org/1.71.68/resources/sap-ui-version.json"
);
});
});
Expand All @@ -93,7 +93,7 @@ it("getLibraryAPIJsonUrl", async () => {
"sap.m"
);
expect(result).toStrictEqual(
"https://ui5.sap.com/1.71.70/test-resources/sap/m/designtime/api.json"
"https://ui5.sap.com/1.71.72/test-resources/sap/m/designtime/api.json"
);
});

Expand All @@ -117,7 +117,7 @@ describe("getVersionsMap", () => {
it("get version map for OpenUI5 - fallback default", async () => {
const data = {
latest: {
version: "1.71.67",
version: "1.71.68",
support: "Maintenance",
lts: true,
},
Expand Down
2 changes: 1 addition & 1 deletion packages/vscode-ui5-language-assistant/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ When working with CAP projects, make sure you have @sap/cds module installed. Fo

### Enabling offline work

You can set up a local web server to host one or more supported versions of SAP UI5 SDK and register it in the user/workspace setting `"UI5LanguageAssistant.SAPUI5WebServer"`. This overrides the public CDN of SAP UI5 SDK in the extension and enables offline work with the apps having the matching hosted `"minUI5Version"` in `manifest.json`.
You can set up a local web server to host one or more supported versions of SAPUI5 SDK and register it in the user/workspace setting `"UI5LanguageAssistant.SAPUI5WebServer"`. This overrides the public CDN of SAPUI5 SDK in the extension and enables offline work with the apps having the matching hosted `"minUI5Version"` in `manifest.json`.
When configuring local web server, make sure it responds to the exact UI5 version defined in manifest.json e.g `<your.local.web.server>/1.111.0`

**Note**: Once online, UI5 Language Assistant also caches required resources for offline usage and performance optimization.
Expand Down
4 changes: 2 additions & 2 deletions packages/vscode-ui5-language-assistant/src/extension.ts
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ async function updateCurrentModel(model: UI5Model | undefined): Promise<void> {
if (response) {
version = `${version} (local)`;
tooltipText =
"Alternative (local) SAP UI5 web server is defined in user or workspace settings. Using SAP UI5 version fetched from the local server";
"Alternative (local) SAPUI5 web server is defined in user or workspace settings. Using SAPUI5 version fetched from the local server";
}
}
statusBarItem.tooltip = tooltipText;
Expand All @@ -234,7 +234,7 @@ function handleContextError(error: Error & { code?: string }) {
showedOnce = true;
if (error.code) {
window.showErrorMessage(
"[SAP UI5 SDK](https://tools.hana.ondemand.com/#sapui5) is not accessible. Connect to the internet or setup local web server for offline work."
"[SAPUI5 SDK](https://tools.hana.ondemand.com/#sapui5) is not accessible. Connect to the internet or setup local web server for offline work."
);
} else {
window.showErrorMessage(
Expand Down
4 changes: 2 additions & 2 deletions test-packages/test-utils/src/utils/semantic-model-provider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const MODEL_CACHE: Record<TestModelVersion, UI5SemanticModel> =
Object.create(null);

const fixes: Record<TestModelVersion, TypeNameFix> = {
"1.71.70": {
"1.71.72": {
array: "any[]",
Array: "any[]",
bloolean: undefined,
Expand Down Expand Up @@ -258,7 +258,7 @@ type LibraryFix = (content: Json) => void;

// Library version -> library name -> fix function
const libraryFixes: Record<TestModelVersion, Record<string, LibraryFix[]>> = {
"1.71.70": {},
"1.71.72": {},
"1.84.41": {},
"1.96.27": {
"sap.ui.mdc": [
Expand Down