From 47fac2d067c649e31fb38a12d1728e202958c5e3 Mon Sep 17 00:00:00 2001 From: Gerviba Date: Thu, 1 Feb 2024 19:42:01 +0100 Subject: [PATCH 1/3] Fix path interpreters --- .../cmsch/component/conference/ConferencePresentationEntity.kt | 2 +- .../sch/cmsch/component/conference/ConferencePresenterEntity.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/src/main/kotlin/hu/bme/sch/cmsch/component/conference/ConferencePresentationEntity.kt b/backend/src/main/kotlin/hu/bme/sch/cmsch/component/conference/ConferencePresentationEntity.kt index 36fd9e8dd..0ad26b4d7 100644 --- a/backend/src/main/kotlin/hu/bme/sch/cmsch/component/conference/ConferencePresentationEntity.kt +++ b/backend/src/main/kotlin/hu/bme/sch/cmsch/component/conference/ConferencePresentationEntity.kt @@ -43,7 +43,7 @@ data class ConferencePresentationEntity( override var id: Int = 0, @Column(nullable = false) - @property:GenerateInput(maxLength = 128, order = 1, label = "Slug", interpreter = INTERPRETER_PATH) + @property:GenerateInput(maxLength = 128, order = 1, label = "Slug") @property:GenerateOverview(columnName = "Slug", order = 2) @property:ImportFormat(ignore = false) var slug: String = "", diff --git a/backend/src/main/kotlin/hu/bme/sch/cmsch/component/conference/ConferencePresenterEntity.kt b/backend/src/main/kotlin/hu/bme/sch/cmsch/component/conference/ConferencePresenterEntity.kt index a55c79523..e0de4faf9 100644 --- a/backend/src/main/kotlin/hu/bme/sch/cmsch/component/conference/ConferencePresenterEntity.kt +++ b/backend/src/main/kotlin/hu/bme/sch/cmsch/component/conference/ConferencePresenterEntity.kt @@ -24,7 +24,7 @@ data class ConferencePresenterEntity( override var id: Int = 0, @Column(nullable = false) - @property:GenerateInput(maxLength = 128, order = 1, label = "Név", interpreter = INTERPRETER_PATH) + @property:GenerateInput(maxLength = 128, order = 1, label = "Név") @property:GenerateOverview(columnName = "Név", order = 1) @property:ImportFormat(ignore = false) var name: String = "", From cb28cf1b27044ae09f745d9a86c39886c826bcec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1lint=20Berente?= <30603208+berenteb@users.noreply.github.com> Date: Mon, 19 Feb 2024 17:56:51 +0100 Subject: [PATCH 2/3] fix: lint check --- .github/workflows/lint.yml | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index dd3648ed6..8b94cbdae 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -23,23 +23,19 @@ jobs: - name: Check out Git repository uses: actions/checkout@v3 - - name: Set up Node.js 16 + - name: Set up Node.js 20 uses: actions/setup-node@v3 with: - node-version: 16 + node-version: 20 - name: Install Node.js dependencies run: yarn install - - name: ESLint + Prettier CI - uses: wearerequired/lint-action@v2 - with: - eslint: true - eslint_args: "--ignore-path .gitignore ." - eslint_extensions: ts,tsx,js,jsx - eslint_dir: frontend/ - prettier: true - prettier_args: "--check --ignore-path .gitignore ." - prettier_dir: frontend/ - auto_fix: true - commit_message: "[lint] Fix code ${linter}" + - name: ESLint + run: yarn lint:eslint + + - name: Prettier + run: yarn lint:eslint + + - name: TSC + run: yarn lint:typescript From eabf8942483b3c66890a35d13dd88c454a57e9da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Horv=C3=A1th=20Istv=C3=A1n?= Date: Thu, 22 Feb 2024 01:07:54 +0100 Subject: [PATCH 3/3] Set yarn version --- .github/workflows/lint.yml | 5 ++++- frontend/package.json | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 8b94cbdae..9ef2a58d9 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -28,8 +28,11 @@ jobs: with: node-version: 20 + - name: Set yarn version + run: yarn set version 1.22.17 + - name: Install Node.js dependencies - run: yarn install + run: yarn install --frozen-lockfile - name: ESLint run: yarn lint:eslint diff --git a/frontend/package.json b/frontend/package.json index 90dd55bb1..60007f879 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -87,5 +87,5 @@ "last 1 safari version" ] }, - "packageManager": "yarn@3.2.1" + "packageManager": "yarn@1.22.17" }