From 842044e7597addac32cad688415158733226dc61 Mon Sep 17 00:00:00 2001 From: Chaim Lev-Ari Date: Wed, 27 Apr 2022 14:10:20 +0300 Subject: [PATCH] chore(app): add typescript check and fix errors [EE-3014] (#6822) --- .github/workflows/lint.yml | 2 ++ .github/workflows/test-client.yaml | 15 ---------- .github/workflows/test.yaml | 29 +++++++++++++++++++ .../edge-compute/EdgeComputeSettingsView.tsx | 3 +- app/portainer/settings/settings.service.ts | 6 ++-- yarn.lock | 17 +++++++---- 6 files changed, 47 insertions(+), 25 deletions(-) delete mode 100644 .github/workflows/test-client.yaml create mode 100644 .github/workflows/test.yaml diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 08899173e..f81a7a331 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -34,3 +34,5 @@ jobs: prettier_dir: app/ gofmt: true gofmt_dir: api/ + - name: Typecheck + uses: icrawl/action-tsc@v1 diff --git a/.github/workflows/test-client.yaml b/.github/workflows/test-client.yaml deleted file mode 100644 index 085a7512e..000000000 --- a/.github/workflows/test-client.yaml +++ /dev/null @@ -1,15 +0,0 @@ -name: Test Frontend -on: push -jobs: - test: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - uses: actions/setup-node@v2 - with: - node-version: '14' - cache: 'yarn' - - run: yarn install --frozen-lockfile - - - name: Run tests - run: yarn test:client diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml new file mode 100644 index 000000000..c4da3b51e --- /dev/null +++ b/.github/workflows/test.yaml @@ -0,0 +1,29 @@ +name: Test +on: push +jobs: + test-client: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-node@v2 + with: + node-version: '14' + cache: 'yarn' + - run: yarn --frozen-lockfile + + - name: Run tests + run: yarn test:client + # test-server: + # runs-on: ubuntu-latest + # env: + # GOPRIVATE: "github.com/portainer" + # steps: + # - uses: actions/checkout@v3 + # - uses: actions/setup-go@v3 + # with: + # go-version: '1.18' + # - name: Run tests + # run: | + # cd api + # go test ./... diff --git a/app/portainer/settings/edge-compute/EdgeComputeSettingsView.tsx b/app/portainer/settings/edge-compute/EdgeComputeSettingsView.tsx index c261dbe3e..261aa282c 100644 --- a/app/portainer/settings/edge-compute/EdgeComputeSettingsView.tsx +++ b/app/portainer/settings/edge-compute/EdgeComputeSettingsView.tsx @@ -1,8 +1,9 @@ import { r2a } from '@/react-tools/react2angular'; +import { Settings } from '../settings.service'; + import { EdgeComputeSettings } from './EdgeComputeSettings'; import { AutomaticEdgeEnvCreation } from './AutomaticEdgeEnvCreation'; -import { Settings } from './types'; interface Props { settings: Settings; diff --git a/app/portainer/settings/settings.service.ts b/app/portainer/settings/settings.service.ts index c11face22..492acaacc 100644 --- a/app/portainer/settings/settings.service.ts +++ b/app/portainer/settings/settings.service.ts @@ -42,9 +42,9 @@ export interface Settings { AgentSecret: string; EdgePortainerUrl: string; EdgeAgentCheckinInterval: number; - EdgePingInterval: string; - EdgeSnapshotInterval: string; - EdgeCommandInterval: string; + EdgePingInterval: number; + EdgeSnapshotInterval: number; + EdgeCommandInterval: number; } export async function getSettings() { diff --git a/yarn.lock b/yarn.lock index 5f2929d35..4378296e1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6566,7 +6566,7 @@ css-tree@^1.1.2, css-tree@^1.1.3: mdn-data "2.0.14" source-map "^0.6.1" -css-what@^5.1.0: +css-what@^5.0.0: version "5.1.0" resolved "https://registry.yarnpkg.com/css-what/-/css-what-5.1.0.tgz#3f7b707aadf633baf62c2ceb8579b545bb40f7fe" integrity sha512-arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw== @@ -7197,7 +7197,7 @@ domexception@^2.0.1: dependencies: webidl-conversions "^5.0.0" -domhandler@^4.0.0, domhandler@^4.3.0: +domhandler@^4.0.0: version "4.3.0" resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.3.0.tgz#16c658c626cf966967e306f966b431f77d4a5626" integrity sha512-fC0aXNQXqKSFTr2wDNZDhsEYjCiYsDWl3D01kwt25hm1YIPyDGHvvi3rw+PLqHAl/m71MaiF7d5zvBr0p5UB2g== @@ -7211,7 +7211,7 @@ domhandler@^4.2.0: dependencies: domelementtype "^2.2.0" -domutils@^2.5.2, domutils@^2.8.0: +domutils@^2.5.2, domutils@^2.6.0: version "2.8.0" resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.8.0.tgz#4437def5db6e2d1f5d6ee859bd95ca7d02048135" integrity sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A== @@ -11300,7 +11300,7 @@ jsesc@^2.5.1: resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4" integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA== -json-parse-better-errors@^1.0.2: +json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw== @@ -11677,7 +11677,7 @@ locate-path@^6.0.0: dependencies: p-locate "^5.0.0" -lodash-es@^4.17.15, lodash-es@^4.17.21: +lodash-es@^4.17.21: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.21.tgz#43e626c46e6591b7750beb2b50117390c609e3ee" integrity sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw== @@ -12356,6 +12356,11 @@ nanoid@^3.1.23: resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.23.tgz#f744086ce7c2bc47ee0a8472574d5c78e4183a81" integrity sha512-FiB0kzdP0FFVGDKlRLEQ1BgDzU87dy5NnzjeW9YZNt+/c3+q82EQDUwniSAUxp/F0gFNI1ZhKU1FqYsMuqZVnw== +nanoid@^3.1.30: + version "3.3.3" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.3.tgz#fd8e8b7aa761fe807dba2d1b98fb7241bb724a25" + integrity sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w== + nanoid@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.2.0.tgz#62667522da6673971cca916a6d3eff3f415ff80c" @@ -12626,7 +12631,7 @@ npmlog@^5.0.1: gauge "^3.0.0" set-blocking "^2.0.0" -nth-check@^2.0.1: +nth-check@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.0.1.tgz#2efe162f5c3da06a28959fbd3db75dbeea9f0fc2" integrity sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w==