fix: download fails with empty $expand parameter (#703)

spreadsheetimporter · Feb 7, 2025 · 0a930c2 · 0a930c2
1 parent 6fe3c90
commit 0a930c2
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/.github/workflows/opa5-test.yml b/.github/workflows/opa5-test.yml
@@ -35,7 +35,7 @@ jobs:
         with:
           ref: ${{ github.head_ref }}
 
-      - run: corepack enable pnpm
+      - run: npm i -g --force corepack && corepack enable
       - name: use node 20
         uses: actions/setup-node@v4
         with:
@@ -97,7 +97,7 @@ jobs:
           ui5-test-runner --url http://localhost:${{ env.TESTAPPPORT }}/test/integration/opaTests.qunit.html --screenshot false
 
       - name: upload artifact of report folder
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ui5testrunner-report-${{ matrix.scenario }}-${{ matrix.ui5version }}
           path: ./report

diff --git a/.github/workflows/ui5-lint.yml b/.github/workflows/ui5-lint.yml
@@ -17,7 +17,7 @@ jobs:
         with:
           ref: ${{ github.head_ref }}
 
-      - run: corepack enable pnpm
+      - run: npm i -g --force corepack && corepack enable
       - name: use node 20
         uses: actions/setup-node@v4
         with:

diff --git a/.github/workflows/wdi5-test.yml b/.github/workflows/wdi5-test.yml
@@ -44,7 +44,7 @@ jobs:
         with:
           ref: ${{ github.head_ref }}
 
-      - run: corepack enable pnpm
+      - run: npm i -g --force corepack && corepack enable
       - name: use node 20
         uses: actions/setup-node@v4
         with:

diff --git a/packages/ui5-cc-spreadsheetimporter/src/controller/odata/ODataV4.ts b/packages/ui5-cc-spreadsheetimporter/src/controller/odata/ODataV4.ts
@@ -278,15 +278,25 @@ export default class ODataV4 extends OData {
 	}
 
 	getBindingFromBinding(binding: ODataListBinding, expand?: any): ODataListBinding {
-		const expandParameter = expand ? expand : "";
 		let path = binding.getPath();
 		if (binding.getResolvedPath) {
 			path = binding.getResolvedPath();
 		} else {
 			// workaround for getResolvedPath only available from 1.88
 			path = (binding.getModel() as ODataModel).resolve(binding.getPath(), binding.getContext());
 		}
-		return binding.getModel().bindList(path, null, [], [], { $$updateGroupId: this.updateGroupId, $count: true, $expand: expand }) as ODataListBinding;
+
+		const bindingParameters: any = {
+			$$updateGroupId: this.updateGroupId,
+			$count: true
+		};
+
+		// Only add $expand if it exists and is not empty
+		if (expand && Object.keys(expand).length > 0) {
+			bindingParameters.$expand = expand;
+		}
+
+		return binding.getModel().bindList(path, null, [], [], bindingParameters) as ODataListBinding;
 	}
 
 	fetchBatch(customBinding: ODataListBinding, batchSize: number): Promise<any> {