From a81e35bc3e2890e9b4b0c8dcb279b288391d3c4f Mon Sep 17 00:00:00 2001 From: Khuda Dad Nomani <32505158+KhudaDad414@users.noreply.github.com> Date: Thu, 2 Nov 2023 15:37:22 +0000 Subject: [PATCH 1/7] [ADR-0005] support component styling with tailwind css in design system (#823) Co-authored-by: samz --- doc/adr/0005-use-tailwind-in-design-system.md | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 doc/adr/0005-use-tailwind-in-design-system.md diff --git a/doc/adr/0005-use-tailwind-in-design-system.md b/doc/adr/0005-use-tailwind-in-design-system.md new file mode 100644 index 0000000000..8f059955ba --- /dev/null +++ b/doc/adr/0005-use-tailwind-in-design-system.md @@ -0,0 +1,24 @@ +# 5. Integrate Tailwind CSS into Design System for Styling + +Date: 2023-10-24 + +## Status + +Accepted + +## Context + +As of now, the design system doesn't provide a way to style components. +All of the styling has to be done in the `ui` package. why do we want to styling in design system? +Well, if we want to showcase how [Organisms](https://atomicdesign.bradfrost.com/chapter-2/#organisms) like Forms behave we need some basic styling support in design system as well. +The studio is already planning to use Tailwind CSS for its UI, making it a logical choice to consider Tailwind for the design system as well. + +## Decision + +We propose to integrate Tailwind CSS into our design system. This will allow us to use the tailwind utility classes in our design system as well, such as Forms. + +## Consequences + +- Tailwind utility classes will be usable in design system. +- Another tool (`concurently`) have to be used to run storybook and tailwind css side by side. +- design system will be more complex and harder to understand for newcomers. From 6a7d3673087dddddd434af5be02c21127e6e7763 Mon Sep 17 00:00:00 2001 From: asyncapi-bot Date: Thu, 2 Nov 2023 18:31:06 +0100 Subject: [PATCH 2/7] chore: update @asyncapi/go-watermill-template to 0.2.44 version (#839) --- apps/studio/package.json | 2 +- package-lock.json | 72 ++++++++++++++++++++-------------------- 2 files changed, 37 insertions(+), 37 deletions(-) diff --git a/apps/studio/package.json b/apps/studio/package.json index 3a1867f88b..a13b4dd32d 100644 --- a/apps/studio/package.json +++ b/apps/studio/package.json @@ -75,7 +75,7 @@ }, "devDependencies": { "@asyncapi/dotnet-nats-template": "^0.12.1", - "@asyncapi/go-watermill-template": "^0.2.43", + "@asyncapi/go-watermill-template": "^0.2.44", "@asyncapi/html-template": "^0.28.4", "@asyncapi/java-spring-cloud-stream-template": "^0.13.4", "@asyncapi/java-spring-template": "^1.4.0", diff --git a/package-lock.json b/package-lock.json index 67a5e5100f..909848eacf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -522,7 +522,7 @@ }, "devDependencies": { "@asyncapi/dotnet-nats-template": "^0.12.1", - "@asyncapi/go-watermill-template": "^0.2.43", + "@asyncapi/go-watermill-template": "^0.2.44", "@asyncapi/html-template": "^0.28.4", "@asyncapi/java-spring-cloud-stream-template": "^0.13.4", "@asyncapi/java-spring-template": "^1.4.0", @@ -1184,21 +1184,21 @@ } }, "node_modules/@asyncapi/go-watermill-template": { - "version": "0.2.43", - "resolved": "https://registry.npmjs.org/@asyncapi/go-watermill-template/-/go-watermill-template-0.2.43.tgz", - "integrity": "sha512-lV4O/wTXShZN1jCnH8jpAbVWp7fdNrNDaiGK8wd4Haw2nHbKVKOdCFVmhi0Ufn6tclTM164Vf9sXHmQ/u7/eyw==", + "version": "0.2.44", + "resolved": "https://registry.npmjs.org/@asyncapi/go-watermill-template/-/go-watermill-template-0.2.44.tgz", + "integrity": "sha512-aDlpfW64eev8a+EesyRi4sT/XnsWsrqxEO3svDU/i/tfyB88gPX9l+hgdPWE3CzkHhrufk6XEIdkdj0W2MckZQ==", "dev": true, "dependencies": { "@asyncapi/generator-filters": "^2.0.0", "@asyncapi/generator-hooks": "^0.1.0", "@asyncapi/generator-react-sdk": "^0.2.23", - "@asyncapi/modelina": "^2.0.1" + "@asyncapi/modelina": "^2.0.2" } }, "node_modules/@asyncapi/go-watermill-template/node_modules/@asyncapi/modelina": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@asyncapi/modelina/-/modelina-2.0.1.tgz", - "integrity": "sha512-ypXgAh4D5nIhoLoKPTnI/qBSoWo9aG28+ONOyZN29j68JswAoMeEm7ga9HGIQ+J+j4LmcojuJlttO83m4SJTZg==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@asyncapi/modelina/-/modelina-2.0.2.tgz", + "integrity": "sha512-5sI21s8ZyBQhJvc8TdLNj3Z1LDFUvEUUTDCTi7nwSGbBfumRTYCqvX3YcNuMHsACo4bNQPrcFKyzAhiXUWYCIA==", "dev": true, "dependencies": { "@apidevtools/json-schema-ref-parser": "^9.0.9", @@ -1234,12 +1234,12 @@ } }, "node_modules/@asyncapi/go-watermill-template/node_modules/@types/node": { - "version": "20.8.7", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.8.7.tgz", - "integrity": "sha512-21TKHHh3eUHIi2MloeptJWALuCu5H7HQTdTrWIFReA8ad+aggoX+lRes3ex7/FtpC+sVUpFMQ+QTfYr74mruiQ==", + "version": "20.8.10", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.8.10.tgz", + "integrity": "sha512-TlgT8JntpcbmKUFzjhsyhGfP2fsiz1Mv56im6enJ905xG1DAYesxJaeSbGqQmAw8OWPdhyJGhGSQGKRNJ45u9w==", "dev": true, "dependencies": { - "undici-types": "~5.25.1" + "undici-types": "~5.26.4" } }, "node_modules/@asyncapi/html-template": { @@ -32473,9 +32473,9 @@ } }, "node_modules/typescript-json-schema/node_modules/@types/node": { - "version": "16.18.59", - "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.59.tgz", - "integrity": "sha512-PJ1w2cNeKUEdey4LiPra0ZuxZFOGvetswE8qHRriV/sUkL5Al4tTmPV9D2+Y/TPIxTHHgxTfRjZVKWhPw/ORhQ==", + "version": "16.18.60", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.60.tgz", + "integrity": "sha512-ZUGPWx5vKfN+G2/yN7pcSNLkIkXEvlwNaJEd4e0ppX7W2S8XAkdc/37hM4OUNJB9sa0p12AOvGvxL4JCPiz9DA==", "dev": true }, "node_modules/typescript-json-schema/node_modules/cliui": { @@ -32591,9 +32591,9 @@ } }, "node_modules/undici-types": { - "version": "5.25.3", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.25.3.tgz", - "integrity": "sha512-Ga1jfYwRn7+cP9v8auvEXN1rX3sWqlayd4HP7OKk4mZWylEmu3KzXDUGrQUN6Ol7qo1gPvB2e5gX6udnyEPgdA==", + "version": "5.26.5", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", + "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==", "dev": true }, "node_modules/unfetch": { @@ -34794,21 +34794,21 @@ } }, "@asyncapi/go-watermill-template": { - "version": "0.2.43", - "resolved": "https://registry.npmjs.org/@asyncapi/go-watermill-template/-/go-watermill-template-0.2.43.tgz", - "integrity": "sha512-lV4O/wTXShZN1jCnH8jpAbVWp7fdNrNDaiGK8wd4Haw2nHbKVKOdCFVmhi0Ufn6tclTM164Vf9sXHmQ/u7/eyw==", + "version": "0.2.44", + "resolved": "https://registry.npmjs.org/@asyncapi/go-watermill-template/-/go-watermill-template-0.2.44.tgz", + "integrity": "sha512-aDlpfW64eev8a+EesyRi4sT/XnsWsrqxEO3svDU/i/tfyB88gPX9l+hgdPWE3CzkHhrufk6XEIdkdj0W2MckZQ==", "dev": true, "requires": { "@asyncapi/generator-filters": "^2.0.0", "@asyncapi/generator-hooks": "^0.1.0", "@asyncapi/generator-react-sdk": "^0.2.23", - "@asyncapi/modelina": "^2.0.1" + "@asyncapi/modelina": "^2.0.2" }, "dependencies": { "@asyncapi/modelina": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@asyncapi/modelina/-/modelina-2.0.1.tgz", - "integrity": "sha512-ypXgAh4D5nIhoLoKPTnI/qBSoWo9aG28+ONOyZN29j68JswAoMeEm7ga9HGIQ+J+j4LmcojuJlttO83m4SJTZg==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@asyncapi/modelina/-/modelina-2.0.2.tgz", + "integrity": "sha512-5sI21s8ZyBQhJvc8TdLNj3Z1LDFUvEUUTDCTi7nwSGbBfumRTYCqvX3YcNuMHsACo4bNQPrcFKyzAhiXUWYCIA==", "dev": true, "requires": { "@apidevtools/json-schema-ref-parser": "^9.0.9", @@ -34841,12 +34841,12 @@ } }, "@types/node": { - "version": "20.8.7", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.8.7.tgz", - "integrity": "sha512-21TKHHh3eUHIi2MloeptJWALuCu5H7HQTdTrWIFReA8ad+aggoX+lRes3ex7/FtpC+sVUpFMQ+QTfYr74mruiQ==", + "version": "20.8.10", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.8.10.tgz", + "integrity": "sha512-TlgT8JntpcbmKUFzjhsyhGfP2fsiz1Mv56im6enJ905xG1DAYesxJaeSbGqQmAw8OWPdhyJGhGSQGKRNJ45u9w==", "dev": true, "requires": { - "undici-types": "~5.25.1" + "undici-types": "~5.26.4" } } } @@ -35403,7 +35403,7 @@ "@asyncapi/avro-schema-parser": "^3.0.2", "@asyncapi/converter": "^1.3.1", "@asyncapi/dotnet-nats-template": "^0.12.1", - "@asyncapi/go-watermill-template": "^0.2.43", + "@asyncapi/go-watermill-template": "^0.2.44", "@asyncapi/html-template": "^0.28.4", "@asyncapi/java-spring-cloud-stream-template": "^0.13.4", "@asyncapi/java-spring-template": "^1.4.0", @@ -55553,9 +55553,9 @@ }, "dependencies": { "@types/node": { - "version": "16.18.59", - "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.59.tgz", - "integrity": "sha512-PJ1w2cNeKUEdey4LiPra0ZuxZFOGvetswE8qHRriV/sUkL5Al4tTmPV9D2+Y/TPIxTHHgxTfRjZVKWhPw/ORhQ==", + "version": "16.18.60", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.60.tgz", + "integrity": "sha512-ZUGPWx5vKfN+G2/yN7pcSNLkIkXEvlwNaJEd4e0ppX7W2S8XAkdc/37hM4OUNJB9sa0p12AOvGvxL4JCPiz9DA==", "dev": true }, "cliui": { @@ -55635,9 +55635,9 @@ } }, "undici-types": { - "version": "5.25.3", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.25.3.tgz", - "integrity": "sha512-Ga1jfYwRn7+cP9v8auvEXN1rX3sWqlayd4HP7OKk4mZWylEmu3KzXDUGrQUN6Ol7qo1gPvB2e5gX6udnyEPgdA==", + "version": "5.26.5", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", + "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==", "dev": true }, "unfetch": { From 1c92cf35854aa5eef77f4784aa7c64f15bf0ca23 Mon Sep 17 00:00:00 2001 From: samz Date: Mon, 6 Nov 2023 10:56:25 +0100 Subject: [PATCH 3/7] ci: fix issue metrics action (#838) Co-authored-by: Khuda Dad Nomani <32505158+KhudaDad414@users.noreply.github.com> --- .github/workflows/issues-metrics.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/issues-metrics.yml b/.github/workflows/issues-metrics.yml index 4c2500064a..f0ad4d02d1 100644 --- a/.github/workflows/issues-metrics.yml +++ b/.github/workflows/issues-metrics.yml @@ -32,7 +32,7 @@ jobs: uses: github/issue-metrics@v2 env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - SEARCH_QUERY: 'repo:shapeitapp/shapeitapp created:${{ env.last_month }}' + SEARCH_QUERY: 'repo:asyncapi/studio created:${{ env.last_month }}' - name: Create issue uses: peter-evans/create-issue-from-file@v4 From a15d06b2f613107f81fa943f85583026be351fac Mon Sep 17 00:00:00 2001 From: samz Date: Mon, 6 Nov 2023 15:01:45 +0100 Subject: [PATCH 4/7] chore: add missing issues templates (#830) --- .github/ISSUE_TEMPLATE/bug.md | 18 ++++++++++++++++++ .github/ISSUE_TEMPLATE/config.yml | 11 +++++++++++ .github/ISSUE_TEMPLATE/enhancement.md | 18 ++++++++++++++++++ .github/ISSUE_TEMPLATE/pitch.yml | 2 +- .github/pull_request_template.md | 15 +++++++++++++++ 5 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 .github/ISSUE_TEMPLATE/bug.md create mode 100644 .github/ISSUE_TEMPLATE/config.yml create mode 100644 .github/ISSUE_TEMPLATE/enhancement.md create mode 100644 .github/pull_request_template.md diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md new file mode 100644 index 0000000000..665a150bc1 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug.md @@ -0,0 +1,18 @@ +--- +name: Bug report +about: Report a bug so we can fix and improve +labels: bug +--- + +#### Describe the bug +A clear and concise description of what the bug is. + +#### How to Reproduce +Steps to reproduce the issue. Attach all resources that can help us understand the issue: + +- Screenshots +- Link to GitHub repository with project that has issues +- Files that can help reproduce the issue, like your AsyncAPI file, either paste inside the issue in a code block or in a sharable [gist](https://gist.github.com/) + +#### Expected behavior +A clear and concise description of what you expected to happen. \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml new file mode 100644 index 0000000000..8d679eae38 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -0,0 +1,11 @@ +blank_issues_enabled: true +contact_links: + - name: Project Communication + url: https://github.com/asyncapi/asyncapi/issues/115 + about: Check out all the options to communicate with AsyncAPI community. + - name: Slack + url: https://www.asyncapi.com/slack-invite/ + about: Don't open issues for questions or support, better talk to us on Slack first. + - name: AsyncAPI Website + url: https://www.asyncapi.com/ + about: For more information about AsyncAPI visit our website. \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/enhancement.md b/.github/ISSUE_TEMPLATE/enhancement.md new file mode 100644 index 0000000000..92cbf241d7 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/enhancement.md @@ -0,0 +1,18 @@ +--- +name: Feature request +about: Suggest how we can improve +labels: enhancement +--- + +#### Reason/Context +Please try answering few of those questions +- Why we need this improvement? +- How will this change help? +- What is the motivation? + + +#### Description +Please try answering few of those questions +- What changes have to be introduced? +- Will this be a breaking change? +- How could it be implemented/designed? diff --git a/.github/ISSUE_TEMPLATE/pitch.yml b/.github/ISSUE_TEMPLATE/pitch.yml index c58c9af176..efbcfc271a 100644 --- a/.github/ISSUE_TEMPLATE/pitch.yml +++ b/.github/ISSUE_TEMPLATE/pitch.yml @@ -1,7 +1,7 @@ name: Pitch description: 'Do you have an idea and a product enhancement? Time to pitch!' title: '[PITCH]:' -labels: ['Pitch'] +labels: ['pitch'] body: - type: markdown attributes: diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md new file mode 100644 index 0000000000..5d37508607 --- /dev/null +++ b/.github/pull_request_template.md @@ -0,0 +1,15 @@ + + +**Description** + +- ... +- ... +- ... + +**Related issue(s)** + \ No newline at end of file From 35f07eb3491012cccabedd06b14cc9f57cf0ff0f Mon Sep 17 00:00:00 2001 From: asyncapi-bot Date: Tue, 7 Nov 2023 11:44:02 +0100 Subject: [PATCH 5/7] fix: update @asyncapi/converter to 1.4.0 version (#843) --- apps/studio/package.json | 2 +- package-lock.json | 17 ++++++++++------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/apps/studio/package.json b/apps/studio/package.json index a13b4dd32d..fa10525751 100644 --- a/apps/studio/package.json +++ b/apps/studio/package.json @@ -24,7 +24,7 @@ ], "dependencies": { "@asyncapi/avro-schema-parser": "^3.0.2", - "@asyncapi/converter": "^1.3.1", + "@asyncapi/converter": "^1.4.0", "@asyncapi/openapi-schema-parser": "^3.0.4", "@asyncapi/parser": "^3.0.0-next-major-spec.3", "@asyncapi/react-component": "^1.0.2", diff --git a/package-lock.json b/package-lock.json index 909848eacf..652e67be05 100644 --- a/package-lock.json +++ b/package-lock.json @@ -498,7 +498,7 @@ "license": "Apache-2.0", "dependencies": { "@asyncapi/avro-schema-parser": "^3.0.2", - "@asyncapi/converter": "^1.3.1", + "@asyncapi/converter": "^1.4.0", "@asyncapi/openapi-schema-parser": "^3.0.4", "@asyncapi/parser": "^3.0.0-next-major-spec.3", "@asyncapi/react-component": "^1.0.2", @@ -999,10 +999,11 @@ } }, "node_modules/@asyncapi/converter": { - "version": "1.3.1", - "license": "Apache-2.0", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@asyncapi/converter/-/converter-1.4.0.tgz", + "integrity": "sha512-YGmfb1K7sN9OpmOa1gjbNBTTv9QsQWfXaD7ibKFzHjgsIuQyUjwhp4++psiyw82iRQEUb1RoNPK8/X5knbG/Zg==", "dependencies": { - "@asyncapi/parser": "^2.0.0-next-major.11", + "@asyncapi/parser": "^2.1.1", "js-yaml": "^3.14.1" } }, @@ -34646,9 +34647,11 @@ } }, "@asyncapi/converter": { - "version": "1.3.1", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@asyncapi/converter/-/converter-1.4.0.tgz", + "integrity": "sha512-YGmfb1K7sN9OpmOa1gjbNBTTv9QsQWfXaD7ibKFzHjgsIuQyUjwhp4++psiyw82iRQEUb1RoNPK8/X5knbG/Zg==", "requires": { - "@asyncapi/parser": "^2.0.0-next-major.11", + "@asyncapi/parser": "^2.1.1", "js-yaml": "^3.14.1" }, "dependencies": { @@ -35401,7 +35404,7 @@ "version": "file:apps/studio", "requires": { "@asyncapi/avro-schema-parser": "^3.0.2", - "@asyncapi/converter": "^1.3.1", + "@asyncapi/converter": "^1.4.0", "@asyncapi/dotnet-nats-template": "^0.12.1", "@asyncapi/go-watermill-template": "^0.2.44", "@asyncapi/html-template": "^0.28.4", From e68eb50b7b0169c8ee6e5c141696bda88bd2d082 Mon Sep 17 00:00:00 2001 From: asyncapi-bot Date: Tue, 7 Nov 2023 12:33:42 +0100 Subject: [PATCH 6/7] fix: update @asyncapi/converter to 1.4.1 version (#844) --- apps/studio/package.json | 2 +- package-lock.json | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/apps/studio/package.json b/apps/studio/package.json index fa10525751..8a8b857b22 100644 --- a/apps/studio/package.json +++ b/apps/studio/package.json @@ -24,7 +24,7 @@ ], "dependencies": { "@asyncapi/avro-schema-parser": "^3.0.2", - "@asyncapi/converter": "^1.4.0", + "@asyncapi/converter": "^1.4.1", "@asyncapi/openapi-schema-parser": "^3.0.4", "@asyncapi/parser": "^3.0.0-next-major-spec.3", "@asyncapi/react-component": "^1.0.2", diff --git a/package-lock.json b/package-lock.json index 652e67be05..7e0c907342 100644 --- a/package-lock.json +++ b/package-lock.json @@ -498,7 +498,7 @@ "license": "Apache-2.0", "dependencies": { "@asyncapi/avro-schema-parser": "^3.0.2", - "@asyncapi/converter": "^1.4.0", + "@asyncapi/converter": "^1.4.1", "@asyncapi/openapi-schema-parser": "^3.0.4", "@asyncapi/parser": "^3.0.0-next-major-spec.3", "@asyncapi/react-component": "^1.0.2", @@ -999,9 +999,9 @@ } }, "node_modules/@asyncapi/converter": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/@asyncapi/converter/-/converter-1.4.0.tgz", - "integrity": "sha512-YGmfb1K7sN9OpmOa1gjbNBTTv9QsQWfXaD7ibKFzHjgsIuQyUjwhp4++psiyw82iRQEUb1RoNPK8/X5knbG/Zg==", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/@asyncapi/converter/-/converter-1.4.1.tgz", + "integrity": "sha512-nWcm4pZd1ECwy/R+9qNXDhdFxtBk3Ae8OEPcw9Qdubd+ZqZvwQ9zKEDClathPASE/NiWto3NXP8wyaKCqVtUkg==", "dependencies": { "@asyncapi/parser": "^2.1.1", "js-yaml": "^3.14.1" @@ -34647,9 +34647,9 @@ } }, "@asyncapi/converter": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/@asyncapi/converter/-/converter-1.4.0.tgz", - "integrity": "sha512-YGmfb1K7sN9OpmOa1gjbNBTTv9QsQWfXaD7ibKFzHjgsIuQyUjwhp4++psiyw82iRQEUb1RoNPK8/X5knbG/Zg==", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/@asyncapi/converter/-/converter-1.4.1.tgz", + "integrity": "sha512-nWcm4pZd1ECwy/R+9qNXDhdFxtBk3Ae8OEPcw9Qdubd+ZqZvwQ9zKEDClathPASE/NiWto3NXP8wyaKCqVtUkg==", "requires": { "@asyncapi/parser": "^2.1.1", "js-yaml": "^3.14.1" @@ -35404,7 +35404,7 @@ "version": "file:apps/studio", "requires": { "@asyncapi/avro-schema-parser": "^3.0.2", - "@asyncapi/converter": "^1.4.0", + "@asyncapi/converter": "^1.4.1", "@asyncapi/dotnet-nats-template": "^0.12.1", "@asyncapi/go-watermill-template": "^0.2.44", "@asyncapi/html-template": "^0.28.4", From 3af6078062bac30b94ed57b871edf6e2cc4f08a1 Mon Sep 17 00:00:00 2001 From: Ashish Padhy <100484401+Shurtu-gal@users.noreply.github.com> Date: Wed, 8 Nov 2023 23:16:16 +0530 Subject: [PATCH 7/7] chore: make v3 default (#841) --- apps/studio/src/components/Content.tsx | 5 +- .../Modals/Settings/SettingsModal.tsx | 18 +-- apps/studio/src/components/Sidebar.tsx | 5 +- .../src/components/Terminal/TerminalTabs.tsx | 5 +- .../src/services/specification.service.ts | 8 +- apps/studio/src/state/files.state.ts | 149 ++++++++++++------ apps/studio/src/state/settings.state.ts | 4 +- 7 files changed, 112 insertions(+), 82 deletions(-) diff --git a/apps/studio/src/components/Content.tsx b/apps/studio/src/components/Content.tsx index cea67ccc66..1c147165fc 100644 --- a/apps/studio/src/components/Content.tsx +++ b/apps/studio/src/components/Content.tsx @@ -6,7 +6,7 @@ import { Template } from './Template'; import { VisualiserTemplate } from './Visualiser'; import { debounce } from '../helpers'; -import { usePanelsState, useDocumentsState, useSettingsState } from '../state'; +import { usePanelsState, useDocumentsState } from '../state'; import type { FunctionComponent } from 'react'; @@ -15,8 +15,7 @@ interface ContentProps {} export const Content: FunctionComponent = () => { // eslint-disable-line sonarjs/cognitive-complexity const { show, secondaryPanelType } = usePanelsState(); const document = useDocumentsState(state => state.documents['asyncapi']?.document) || null; - const v3Enabled = useSettingsState(state => state.editor.v3support) || false; - const isV3 = document?.version() === '3.0.0' && v3Enabled; + const isV3 = document?.version() === '3.0.0'; const navigationEnabled = show.primarySidebar; const editorEnabled = show.primaryPanel; const viewEnabled = show.secondaryPanel; diff --git a/apps/studio/src/components/Modals/Settings/SettingsModal.tsx b/apps/studio/src/components/Modals/Settings/SettingsModal.tsx index 085fdc45ec..8df9bd0292 100644 --- a/apps/studio/src/components/Modals/Settings/SettingsModal.tsx +++ b/apps/studio/src/components/Modals/Settings/SettingsModal.tsx @@ -62,14 +62,12 @@ export const SettingsModal = create(({ activeTab = 'editor' const [governanceHints, setGovernanceHints] = useState(settings.governance.show.hints); const [autoRendering, setAutoRendering] = useState(settings.templates.autoRendering); const [confirmDisabled, setConfirmDisabled] = useState(true); - const [v3support, setV3support] = useState(settings.editor.v3support); const createNewState = (): SettingsState => { return { editor: { autoSaving, savingDelay, - v3support }, governance: { show: { @@ -88,7 +86,7 @@ export const SettingsModal = create(({ activeTab = 'editor' const newState = createNewState(); const isThisSameObjects = settingsSvc.isEqual(newState); setConfirmDisabled(isThisSameObjects); - }, [autoSaving, savingDelay, autoRendering, governanceWarnings, governanceInformations, governanceHints, v3support]); + }, [autoSaving, savingDelay, autoRendering, governanceWarnings, governanceInformations, governanceHints]); const onCancel = useCallback(() => { modal.hide(); @@ -131,20 +129,6 @@ export const SettingsModal = create(({ activeTab = 'editor' Save automatically after each change in the document or manually. -
-
- - setV3support(v)} - /> -
-