From 13d300b02b423752f00a5d566994fff78924ca07 Mon Sep 17 00:00:00 2001 From: Tanmaya Panda <108695755+tanmaya-panda1@users.noreply.github.com> Date: Wed, 17 Jan 2024 12:36:50 +0530 Subject: [PATCH 1/4] ci: add Azure Static Web Apps workflow file on-behalf-of: @Azure opensource@microsoft.com --- ...e-static-web-apps-polite-sky-09f253410.yml | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 .github/workflows/azure-static-web-apps-polite-sky-09f253410.yml diff --git a/.github/workflows/azure-static-web-apps-polite-sky-09f253410.yml b/.github/workflows/azure-static-web-apps-polite-sky-09f253410.yml new file mode 100644 index 0000000..fcf6a8a --- /dev/null +++ b/.github/workflows/azure-static-web-apps-polite-sky-09f253410.yml @@ -0,0 +1,46 @@ +name: Azure Static Web Apps CI/CD + +on: + push: + branches: + - master + pull_request: + types: [opened, synchronize, reopened, closed] + branches: + - master + +jobs: + build_and_deploy_job: + if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed') + runs-on: ubuntu-latest + name: Build and Deploy Job + steps: + - uses: actions/checkout@v3 + with: + submodules: true + lfs: false + - name: Build And Deploy + id: builddeploy + uses: Azure/static-web-apps-deploy@v1 + with: + azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_POLITE_SKY_09F253410 }} + repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments) + action: "upload" + ###### Repository/Build Configurations - These values can be configured to match your app requirements. ###### + # For more information regarding Static Web App workflow configurations, please visit: https://aka.ms/swaworkflowconfig + app_location: "/" # App source code path + api_location: "" # Api source code path - optional + output_location: "" # Built app content directory - optional + ###### End of Repository/Build Configurations ###### + + close_pull_request_job: + if: github.event_name == 'pull_request' && github.event.action == 'closed' + runs-on: ubuntu-latest + name: Close Pull Request Job + steps: + - name: Close Pull Request + id: closepullrequest + uses: Azure/static-web-apps-deploy@v1 + with: + azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_POLITE_SKY_09F253410 }} + action: "close" From 58edc14089c97a8909e27c1451e3d4a229c3ec93 Mon Sep 17 00:00:00 2001 From: Tanmaya Panda Date: Tue, 5 Mar 2024 20:10:18 +0530 Subject: [PATCH 2/4] fix y-axis bug --- src/UXClient/Components/LineChart/LineChart.ts | 12 +++++++----- webpack.common.js | 10 ---------- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/src/UXClient/Components/LineChart/LineChart.ts b/src/UXClient/Components/LineChart/LineChart.ts index 498124c..f4adcb0 100644 --- a/src/UXClient/Components/LineChart/LineChart.ts +++ b/src/UXClient/Components/LineChart/LineChart.ts @@ -1286,11 +1286,13 @@ class LineChart extends TemporalXAxisComponent { aEO.swimLane = 0; }); // consolidate horizontal markers - const horizontalMarkers = []; - Object.values(this.chartOptions.swimLaneOptions).forEach((lane) => { - horizontalMarkers.push(...lane.horizontalMarkers); - }); - this.chartOptions.swimLaneOptions = {0: {yAxisType: this.chartOptions.yAxisState, horizontalMarkers: horizontalMarkers}}; + if (this.chartOptions.swimLaneOptions) { + const horizontalMarkers = []; + Object.values(this.chartOptions.swimLaneOptions).forEach((lane) => { + horizontalMarkers.push(...lane.horizontalMarkers); + }); + this.chartOptions.swimLaneOptions = {0: {yAxisType: this.chartOptions.yAxisState, horizontalMarkers: horizontalMarkers}}; + } } else { let minimumPresentSwimLane = this.aggregateExpressionOptions.reduce((currMin, aEO) => { return Math.max(aEO.swimLane, currMin); diff --git a/webpack.common.js b/webpack.common.js index e8f799e..f647c7d 100644 --- a/webpack.common.js +++ b/webpack.common.js @@ -28,16 +28,6 @@ module.exports = { 'css-loader', 'sass-loader' ] - }, - { - test: /\.(png|jp(e*)g|svg)$/, - use: [{ - loader: 'url-loader', - options: { - limit: 8000, // Convert images < 8kb to base64 strings - name: 'images/[hash]-[name].[ext]' - } - }] } ] }, From d9ae85f39cf9aad279256693da36cfa32c3854d8 Mon Sep 17 00:00:00 2001 From: Tanmaya Panda Date: Tue, 23 Apr 2024 18:34:24 +0530 Subject: [PATCH 3/4] fix invisible button --- webpack.common.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/webpack.common.js b/webpack.common.js index f647c7d..e8f799e 100644 --- a/webpack.common.js +++ b/webpack.common.js @@ -28,6 +28,16 @@ module.exports = { 'css-loader', 'sass-loader' ] + }, + { + test: /\.(png|jp(e*)g|svg)$/, + use: [{ + loader: 'url-loader', + options: { + limit: 8000, // Convert images < 8kb to base64 strings + name: 'images/[hash]-[name].[ext]' + } + }] } ] }, From bc49e7fd8bb2b517e81f00a267cf69abb453f6ec Mon Sep 17 00:00:00 2001 From: Tanmaya Panda <108695755+tanmaya-panda1@users.noreply.github.com> Date: Tue, 23 Apr 2024 21:09:11 +0530 Subject: [PATCH 4/4] delete unnecessary file --- ...e-static-web-apps-polite-sky-09f253410.yml | 46 ------------------- 1 file changed, 46 deletions(-) delete mode 100644 .github/workflows/azure-static-web-apps-polite-sky-09f253410.yml diff --git a/.github/workflows/azure-static-web-apps-polite-sky-09f253410.yml b/.github/workflows/azure-static-web-apps-polite-sky-09f253410.yml deleted file mode 100644 index fcf6a8a..0000000 --- a/.github/workflows/azure-static-web-apps-polite-sky-09f253410.yml +++ /dev/null @@ -1,46 +0,0 @@ -name: Azure Static Web Apps CI/CD - -on: - push: - branches: - - master - pull_request: - types: [opened, synchronize, reopened, closed] - branches: - - master - -jobs: - build_and_deploy_job: - if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed') - runs-on: ubuntu-latest - name: Build and Deploy Job - steps: - - uses: actions/checkout@v3 - with: - submodules: true - lfs: false - - name: Build And Deploy - id: builddeploy - uses: Azure/static-web-apps-deploy@v1 - with: - azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_POLITE_SKY_09F253410 }} - repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments) - action: "upload" - ###### Repository/Build Configurations - These values can be configured to match your app requirements. ###### - # For more information regarding Static Web App workflow configurations, please visit: https://aka.ms/swaworkflowconfig - app_location: "/" # App source code path - api_location: "" # Api source code path - optional - output_location: "" # Built app content directory - optional - ###### End of Repository/Build Configurations ###### - - close_pull_request_job: - if: github.event_name == 'pull_request' && github.event.action == 'closed' - runs-on: ubuntu-latest - name: Close Pull Request Job - steps: - - name: Close Pull Request - id: closepullrequest - uses: Azure/static-web-apps-deploy@v1 - with: - azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_POLITE_SKY_09F253410 }} - action: "close"