From 1b2f74a29da76279b35c1f7ed748fdc9f153341d Mon Sep 17 00:00:00 2001 From: Nicolas Merget <104347736+nmerget@users.noreply.github.com> Date: Wed, 15 Feb 2023 15:38:37 +0100 Subject: [PATCH] fix: issue with power apps and test in ci (#440) * fix: issue with power apps and test in ci * chore: rename ci job --- .github/workflows/01-build-power-apps.yml | 18 +- .github/workflows/03-publish-packages.yml | 18 + .github/workflows/default.yml | 9 +- .github/workflows/release.yml | 16 +- build-power-apps/package-lock.json | 400 ++++++++++++++++++ .../src/components/card/card.lite.tsx | 2 +- 6 files changed, 438 insertions(+), 25 deletions(-) diff --git a/.github/workflows/01-build-power-apps.yml b/.github/workflows/01-build-power-apps.yml index 3cec648bf86..8d03ba4eef5 100644 --- a/.github/workflows/01-build-power-apps.yml +++ b/.github/workflows/01-build-power-apps.yml @@ -1,5 +1,5 @@ --- -name: Deploy Power Apps +name: Build Power Apps on: workflow_call: @@ -9,8 +9,8 @@ on: type: string jobs: - build-showcases: - name: Deploy Power Apps + build-power-apps: + name: Build Power Apps runs-on: ubuntu-latest steps: - name: ⬇ Checkout repo @@ -51,18 +51,6 @@ jobs: name: db-ui-powerapps path: build-power-apps/DBUI - - name: ⬆ Upload Release Asset - id: upload-release-asset - uses: actions/github-script@v6 - with: - result-encoding: json - script: | - const { default: uploadAsset } = await import('${{ github.workspace }}/.github/scripts/upload-asset.js'); - const release_id = context.payload.release.id; - const assetName = 'DBUI.zip'; - const assetPath = '${{ github.workspace }}/build-power-apps/DBUI/bin/Release/DBUI.zip'; - return await uploadAsset({github, context, release_id, assetName, assetPath}); - - name: 💀 Killing me softly uses: ./.github/actions/cancel-workflow if: failure() diff --git a/.github/workflows/03-publish-packages.yml b/.github/workflows/03-publish-packages.yml index 42358f37963..42e750492b6 100644 --- a/.github/workflows/03-publish-packages.yml +++ b/.github/workflows/03-publish-packages.yml @@ -33,6 +33,12 @@ jobs: name: db-ui-outputs path: build-outputs + - name: ⬇ Download Power Apps zip + uses: ./.github/actions/download-tar-artifact + with: + name: db-ui-powerapps + path: build-power-apps/DBUI + - name: 📰 Publish to NPM Registries run: | chmod +rx ./.github/scripts/publish-npm.sh @@ -44,6 +50,18 @@ jobs: NPM_TOKEN: ${{ secrets.NPM_TOKEN }} GPR_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: ⬆ Upload Power Apps Release Asset + id: upload-release-asset + uses: actions/github-script@v6 + with: + result-encoding: json + script: | + const { default: uploadAsset } = await import('${{ github.workspace }}/.github/scripts/upload-asset.js'); + const release_id = context.payload.release.id; + const assetName = 'DBUI.zip'; + const assetPath = '${{ github.workspace }}/build-power-apps/DBUI/bin/Release/DBUI.zip'; + return await uploadAsset({github, context, release_id, assetName, assetPath}); + - name: 💀 Killing me softly uses: ./.github/actions/cancel-workflow if: failure() diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml index b8bf13e86f9..71105f18d81 100644 --- a/.github/workflows/default.yml +++ b/.github/workflows/default.yml @@ -35,12 +35,19 @@ jobs: uses: ./.github/workflows/01-build-showcases.yml needs: [build-packages] + build-power-apps: + uses: ./.github/workflows/01-build-power-apps.yml + needs: [build-packages] + secrets: inherit + with: + version: 0.0.0-test + checks-done: runs-on: ubuntu-latest steps: - name: 🎉 Checks done run: echo "🎉 All tests were successful." - needs: [build-showcases, build-outputs, test-packages] + needs: [build-showcases, build-outputs, test-packages, build-power-apps] deploy: uses: ./.github/workflows/03-deploy-gh-pages.yml diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5a829737956..ef61731745b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -36,12 +36,19 @@ jobs: uses: ./.github/workflows/02-e2e.yml needs: [build-packages] + build-power-apps: + uses: ./.github/workflows/01-build-power-apps.yml + needs: [get-publish-version, build-packages] + secrets: inherit + with: + version: ${{ needs.get-publish-version.outputs.version }} + checks-done: runs-on: ubuntu-latest steps: - name: 🎉 Checks done run: echo "🎉 All builds were successful." - needs: [test-packages, build-outputs, build-showcases] + needs: [test-packages, build-outputs, build-showcases, build-power-apps] deploy: uses: ./.github/workflows/03-deploy-gh-pages.yml @@ -50,13 +57,6 @@ jobs: release: ${{ needs.get-publish-version.outputs.release }} preRelease: ${{ needs.get-publish-version.outputs.preRelease }} - build-power-apps: - uses: ./.github/workflows/01-build-power-apps.yml - needs: [get-publish-version, checks-done, build-packages] - secrets: inherit - with: - version: ${{ needs.get-publish-version.outputs.version }} - publishpackages: uses: ./.github/workflows/03-publish-packages.yml needs: [get-publish-version, checks-done, build-outputs] diff --git a/build-power-apps/package-lock.json b/build-power-apps/package-lock.json index 109862c5e72..b483eb8b0bf 100644 --- a/build-power-apps/package-lock.json +++ b/build-power-apps/package-lock.json @@ -11,6 +11,54 @@ "*" ] }, + "alert": { + "version": "1.0.0", + "dependencies": { + "@db-ui/foundations": "*", + "react": "17.0.2", + "react-dom": "17.0.2" + }, + "devDependencies": { + "@types/node": "^16.4", + "@types/powerapps-component-framework": "^1.3.0", + "@types/react-dom": "^18.0.7", + "@typescript-eslint/eslint-plugin": "^4.29.0", + "@typescript-eslint/parser": "^4.29.0", + "eslint": "^7.32.0", + "eslint-plugin-import": "^2.23.4", + "eslint-plugin-node": "^11.1.0", + "eslint-plugin-promise": "^5.1.0", + "pcf-scripts": "^1", + "pcf-start": "^1", + "sass": "^1.55.0", + "sass-loader": "^13.1.0", + "typescript": "^4.3" + } + }, + "brand": { + "version": "1.0.0", + "dependencies": { + "@db-ui/foundations": "*", + "react": "17.0.2", + "react-dom": "17.0.2" + }, + "devDependencies": { + "@types/node": "^16.4", + "@types/powerapps-component-framework": "^1.3.0", + "@types/react-dom": "^18.0.7", + "@typescript-eslint/eslint-plugin": "^4.29.0", + "@typescript-eslint/parser": "^4.29.0", + "eslint": "^7.32.0", + "eslint-plugin-import": "^2.23.4", + "eslint-plugin-node": "^11.1.0", + "eslint-plugin-promise": "^5.1.0", + "pcf-scripts": "^1", + "pcf-start": "^1", + "sass": "^1.55.0", + "sass-loader": "^13.1.0", + "typescript": "^4.3" + } + }, "button": { "name": "@db-ui/db-pcf-button", "version": "1.0.0", @@ -86,6 +134,30 @@ "typescript": "^4.3" } }, + "header": { + "version": "1.0.0", + "dependencies": { + "@db-ui/foundations": "*", + "react": "17.0.2", + "react-dom": "17.0.2" + }, + "devDependencies": { + "@types/node": "^16.4", + "@types/powerapps-component-framework": "^1.3.0", + "@types/react-dom": "^18.0.7", + "@typescript-eslint/eslint-plugin": "^4.29.0", + "@typescript-eslint/parser": "^4.29.0", + "eslint": "^7.32.0", + "eslint-plugin-import": "^2.23.4", + "eslint-plugin-node": "^11.1.0", + "eslint-plugin-promise": "^5.1.0", + "pcf-scripts": "^1", + "pcf-start": "^1", + "sass": "^1.55.0", + "sass-loader": "^13.1.0", + "typescript": "^4.3" + } + }, "icon": { "name": "@db-ui/db-pcf-icon", "version": "1.0.0", @@ -111,6 +183,78 @@ "typescript": "^4.3" } }, + "infotext": { + "version": "1.0.0", + "dependencies": { + "@db-ui/foundations": "*", + "react": "17.0.2", + "react-dom": "17.0.2" + }, + "devDependencies": { + "@types/node": "^16.4", + "@types/powerapps-component-framework": "^1.3.0", + "@types/react-dom": "^18.0.7", + "@typescript-eslint/eslint-plugin": "^4.29.0", + "@typescript-eslint/parser": "^4.29.0", + "eslint": "^7.32.0", + "eslint-plugin-import": "^2.23.4", + "eslint-plugin-node": "^11.1.0", + "eslint-plugin-promise": "^5.1.0", + "pcf-scripts": "^1", + "pcf-start": "^1", + "sass": "^1.55.0", + "sass-loader": "^13.1.0", + "typescript": "^4.3" + } + }, + "input": { + "version": "1.0.0", + "dependencies": { + "@db-ui/foundations": "*", + "react": "17.0.2", + "react-dom": "17.0.2" + }, + "devDependencies": { + "@types/node": "^16.4", + "@types/powerapps-component-framework": "^1.3.0", + "@types/react-dom": "^18.0.7", + "@typescript-eslint/eslint-plugin": "^4.29.0", + "@typescript-eslint/parser": "^4.29.0", + "eslint": "^7.32.0", + "eslint-plugin-import": "^2.23.4", + "eslint-plugin-node": "^11.1.0", + "eslint-plugin-promise": "^5.1.0", + "pcf-scripts": "^1", + "pcf-start": "^1", + "sass": "^1.55.0", + "sass-loader": "^13.1.0", + "typescript": "^4.3" + } + }, + "link": { + "version": "1.0.0", + "dependencies": { + "@db-ui/foundations": "*", + "react": "17.0.2", + "react-dom": "17.0.2" + }, + "devDependencies": { + "@types/node": "^16.4", + "@types/powerapps-component-framework": "^1.3.0", + "@types/react-dom": "^18.0.7", + "@typescript-eslint/eslint-plugin": "^4.29.0", + "@typescript-eslint/parser": "^4.29.0", + "eslint": "^7.32.0", + "eslint-plugin-import": "^2.23.4", + "eslint-plugin-node": "^11.1.0", + "eslint-plugin-promise": "^5.1.0", + "pcf-scripts": "^1", + "pcf-start": "^1", + "sass": "^1.55.0", + "sass-loader": "^13.1.0", + "typescript": "^4.3" + } + }, "node_modules/@azure/abort-controller": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@azure/abort-controller/-/abort-controller-1.1.0.tgz", @@ -308,6 +452,14 @@ "resolved": "https://registry.npmjs.org/@csstools/normalize.css/-/normalize.css-12.0.0.tgz", "integrity": "sha512-M0qqxAcwCsIVfpFQSlGN5XjXWu8l5JDZN+fPt1LeW5SZexQTgnaEvgXAY+CeygRw0EeppWHi12JxESWiWrB0Sg==" }, + "node_modules/@db-ui/db-pcf-alert": { + "resolved": "alert", + "link": true + }, + "node_modules/@db-ui/db-pcf-brand": { + "resolved": "brand", + "link": true + }, "node_modules/@db-ui/db-pcf-button": { "resolved": "button", "link": true @@ -320,10 +472,34 @@ "resolved": "divider", "link": true }, + "node_modules/@db-ui/db-pcf-header": { + "resolved": "header", + "link": true + }, "node_modules/@db-ui/db-pcf-icon": { "resolved": "icon", "link": true }, + "node_modules/@db-ui/db-pcf-infotext": { + "resolved": "infotext", + "link": true + }, + "node_modules/@db-ui/db-pcf-input": { + "resolved": "input", + "link": true + }, + "node_modules/@db-ui/db-pcf-link": { + "resolved": "link", + "link": true + }, + "node_modules/@db-ui/db-pcf-page": { + "resolved": "page", + "link": true + }, + "node_modules/@db-ui/db-pcf-section": { + "resolved": "section", + "link": true + }, "node_modules/@db-ui/db-pcf-tab": { "resolved": "tab", "link": true @@ -7453,6 +7629,54 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "page": { + "version": "1.0.0", + "dependencies": { + "@db-ui/foundations": "*", + "react": "17.0.2", + "react-dom": "17.0.2" + }, + "devDependencies": { + "@types/node": "^16.4", + "@types/powerapps-component-framework": "^1.3.0", + "@types/react-dom": "^18.0.7", + "@typescript-eslint/eslint-plugin": "^4.29.0", + "@typescript-eslint/parser": "^4.29.0", + "eslint": "^7.32.0", + "eslint-plugin-import": "^2.23.4", + "eslint-plugin-node": "^11.1.0", + "eslint-plugin-promise": "^5.1.0", + "pcf-scripts": "^1", + "pcf-start": "^1", + "sass": "^1.55.0", + "sass-loader": "^13.1.0", + "typescript": "^4.3" + } + }, + "section": { + "version": "1.0.0", + "dependencies": { + "@db-ui/foundations": "*", + "react": "17.0.2", + "react-dom": "17.0.2" + }, + "devDependencies": { + "@types/node": "^16.4", + "@types/powerapps-component-framework": "^1.3.0", + "@types/react-dom": "^18.0.7", + "@typescript-eslint/eslint-plugin": "^4.29.0", + "@typescript-eslint/parser": "^4.29.0", + "eslint": "^7.32.0", + "eslint-plugin-import": "^2.23.4", + "eslint-plugin-node": "^11.1.0", + "eslint-plugin-promise": "^5.1.0", + "pcf-scripts": "^1", + "pcf-start": "^1", + "sass": "^1.55.0", + "sass-loader": "^13.1.0", + "typescript": "^4.3" + } + }, "tab": { "name": "@db-ui/db-pcf-tab", "version": "1.0.0", @@ -7665,6 +7889,50 @@ "resolved": "https://registry.npmjs.org/@csstools/normalize.css/-/normalize.css-12.0.0.tgz", "integrity": "sha512-M0qqxAcwCsIVfpFQSlGN5XjXWu8l5JDZN+fPt1LeW5SZexQTgnaEvgXAY+CeygRw0EeppWHi12JxESWiWrB0Sg==" }, + "@db-ui/db-pcf-alert": { + "version": "file:alert", + "requires": { + "@db-ui/foundations": "*", + "@types/node": "^16.4", + "@types/powerapps-component-framework": "^1.3.0", + "@types/react-dom": "^18.0.7", + "@typescript-eslint/eslint-plugin": "^4.29.0", + "@typescript-eslint/parser": "^4.29.0", + "eslint": "^7.32.0", + "eslint-plugin-import": "^2.23.4", + "eslint-plugin-node": "^11.1.0", + "eslint-plugin-promise": "^5.1.0", + "pcf-scripts": "^1", + "pcf-start": "^1", + "react": "17.0.2", + "react-dom": "17.0.2", + "sass": "^1.55.0", + "sass-loader": "^13.1.0", + "typescript": "^4.3" + } + }, + "@db-ui/db-pcf-brand": { + "version": "file:brand", + "requires": { + "@db-ui/foundations": "*", + "@types/node": "^16.4", + "@types/powerapps-component-framework": "^1.3.0", + "@types/react-dom": "^18.0.7", + "@typescript-eslint/eslint-plugin": "^4.29.0", + "@typescript-eslint/parser": "^4.29.0", + "eslint": "^7.32.0", + "eslint-plugin-import": "^2.23.4", + "eslint-plugin-node": "^11.1.0", + "eslint-plugin-promise": "^5.1.0", + "pcf-scripts": "^1", + "pcf-start": "^1", + "react": "17.0.2", + "react-dom": "17.0.2", + "sass": "^1.55.0", + "sass-loader": "^13.1.0", + "typescript": "^4.3" + } + }, "@db-ui/db-pcf-button": { "version": "file:button", "requires": { @@ -7731,6 +7999,28 @@ "typescript": "^4.3" } }, + "@db-ui/db-pcf-header": { + "version": "file:header", + "requires": { + "@db-ui/foundations": "*", + "@types/node": "^16.4", + "@types/powerapps-component-framework": "^1.3.0", + "@types/react-dom": "^18.0.7", + "@typescript-eslint/eslint-plugin": "^4.29.0", + "@typescript-eslint/parser": "^4.29.0", + "eslint": "^7.32.0", + "eslint-plugin-import": "^2.23.4", + "eslint-plugin-node": "^11.1.0", + "eslint-plugin-promise": "^5.1.0", + "pcf-scripts": "^1", + "pcf-start": "^1", + "react": "17.0.2", + "react-dom": "17.0.2", + "sass": "^1.55.0", + "sass-loader": "^13.1.0", + "typescript": "^4.3" + } + }, "@db-ui/db-pcf-icon": { "version": "file:icon", "requires": { @@ -7753,6 +8043,116 @@ "typescript": "^4.3" } }, + "@db-ui/db-pcf-infotext": { + "version": "file:infotext", + "requires": { + "@db-ui/foundations": "*", + "@types/node": "^16.4", + "@types/powerapps-component-framework": "^1.3.0", + "@types/react-dom": "^18.0.7", + "@typescript-eslint/eslint-plugin": "^4.29.0", + "@typescript-eslint/parser": "^4.29.0", + "eslint": "^7.32.0", + "eslint-plugin-import": "^2.23.4", + "eslint-plugin-node": "^11.1.0", + "eslint-plugin-promise": "^5.1.0", + "pcf-scripts": "^1", + "pcf-start": "^1", + "react": "17.0.2", + "react-dom": "17.0.2", + "sass": "^1.55.0", + "sass-loader": "^13.1.0", + "typescript": "^4.3" + } + }, + "@db-ui/db-pcf-input": { + "version": "file:input", + "requires": { + "@db-ui/foundations": "*", + "@types/node": "^16.4", + "@types/powerapps-component-framework": "^1.3.0", + "@types/react-dom": "^18.0.7", + "@typescript-eslint/eslint-plugin": "^4.29.0", + "@typescript-eslint/parser": "^4.29.0", + "eslint": "^7.32.0", + "eslint-plugin-import": "^2.23.4", + "eslint-plugin-node": "^11.1.0", + "eslint-plugin-promise": "^5.1.0", + "pcf-scripts": "^1", + "pcf-start": "^1", + "react": "17.0.2", + "react-dom": "17.0.2", + "sass": "^1.55.0", + "sass-loader": "^13.1.0", + "typescript": "^4.3" + } + }, + "@db-ui/db-pcf-link": { + "version": "file:link", + "requires": { + "@db-ui/foundations": "*", + "@types/node": "^16.4", + "@types/powerapps-component-framework": "^1.3.0", + "@types/react-dom": "^18.0.7", + "@typescript-eslint/eslint-plugin": "^4.29.0", + "@typescript-eslint/parser": "^4.29.0", + "eslint": "^7.32.0", + "eslint-plugin-import": "^2.23.4", + "eslint-plugin-node": "^11.1.0", + "eslint-plugin-promise": "^5.1.0", + "pcf-scripts": "^1", + "pcf-start": "^1", + "react": "17.0.2", + "react-dom": "17.0.2", + "sass": "^1.55.0", + "sass-loader": "^13.1.0", + "typescript": "^4.3" + } + }, + "@db-ui/db-pcf-page": { + "version": "file:page", + "requires": { + "@db-ui/foundations": "*", + "@types/node": "^16.4", + "@types/powerapps-component-framework": "^1.3.0", + "@types/react-dom": "^18.0.7", + "@typescript-eslint/eslint-plugin": "^4.29.0", + "@typescript-eslint/parser": "^4.29.0", + "eslint": "^7.32.0", + "eslint-plugin-import": "^2.23.4", + "eslint-plugin-node": "^11.1.0", + "eslint-plugin-promise": "^5.1.0", + "pcf-scripts": "^1", + "pcf-start": "^1", + "react": "17.0.2", + "react-dom": "17.0.2", + "sass": "^1.55.0", + "sass-loader": "^13.1.0", + "typescript": "^4.3" + } + }, + "@db-ui/db-pcf-section": { + "version": "file:section", + "requires": { + "@db-ui/foundations": "*", + "@types/node": "^16.4", + "@types/powerapps-component-framework": "^1.3.0", + "@types/react-dom": "^18.0.7", + "@typescript-eslint/eslint-plugin": "^4.29.0", + "@typescript-eslint/parser": "^4.29.0", + "eslint": "^7.32.0", + "eslint-plugin-import": "^2.23.4", + "eslint-plugin-node": "^11.1.0", + "eslint-plugin-promise": "^5.1.0", + "pcf-scripts": "^1", + "pcf-start": "^1", + "react": "17.0.2", + "react-dom": "17.0.2", + "sass": "^1.55.0", + "sass-loader": "^13.1.0", + "typescript": "^4.3" + } + }, "@db-ui/db-pcf-tab": { "version": "file:tab", "requires": { diff --git a/packages/components/src/components/card/card.lite.tsx b/packages/components/src/components/card/card.lite.tsx index a5cec960a2d..ab5f34ff116 100644 --- a/packages/components/src/components/card/card.lite.tsx +++ b/packages/components/src/components/card/card.lite.tsx @@ -13,7 +13,7 @@ useMetadata({ { key: 'Interactive', name: 'Interactive', - value: 'ia' + value: 'interactive' }, { key: 'Full Width',