diff --git a/.prettierrc b/.prettierrc index 9d8e3881bc..92cde390ac 100644 --- a/.prettierrc +++ b/.prettierrc @@ -1,11 +1,3 @@ { - "singleQuote": true, - "overrides": [ - { - "files": "*.html", - "options": { - "parser": "angular" - } - } - ] + "singleQuote": true } \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 06af6a0c0b..612ecb7768 100644 --- a/package-lock.json +++ b/package-lock.json @@ -265,7 +265,7 @@ "postcss-import": "14.1.0", "postcss-preset-env": "7.5.0", "postcss-url": "10.1.3", - "prettier": "3.2.5", + "prettier": "2.8.4", "tailwindcss": "3.3.3", "ts-jest": "29.1.1", "ts-node": "10.9.1", @@ -31574,15 +31574,15 @@ } }, "node_modules/prettier": { - "version": "3.2.5", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.2.5.tgz", - "integrity": "sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==", + "version": "2.8.4", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.4.tgz", + "integrity": "sha512-vIS4Rlc2FNh0BySk3Wkd6xmwxB0FpOndW5fisM5H8hsZSxU2VWVB5CWIkIjWvrHjIhxk2g3bfMKM87zNTrZddw==", "dev": true, "bin": { - "prettier": "bin/prettier.cjs" + "prettier": "bin-prettier.js" }, "engines": { - "node": ">=14" + "node": ">=10.13.0" }, "funding": { "url": "https://github.com/prettier/prettier?sponsor=1" diff --git a/package.json b/package.json index 5dd9512740..76b3968b0c 100644 --- a/package.json +++ b/package.json @@ -278,7 +278,7 @@ "postcss-import": "14.1.0", "postcss-preset-env": "7.5.0", "postcss-url": "10.1.3", - "prettier": "3.2.5", + "prettier": "2.8.4", "tailwindcss": "3.3.3", "ts-jest": "29.1.1", "ts-node": "10.9.1", diff --git a/packages/pieces/community/activepieces/package.json b/packages/pieces/community/activepieces/package.json index 7b51f54999..cb3321afed 100644 --- a/packages/pieces/community/activepieces/package.json +++ b/packages/pieces/community/activepieces/package.json @@ -3,7 +3,7 @@ "version": "0.0.4", "dependencies": { "@activepieces/pieces-common": "0.2.12", - "@activepieces/pieces-framework": "0.7.25", + "@activepieces/pieces-framework": "0.7.28", "tslib": "2.6.2" } } \ No newline at end of file diff --git a/packages/pieces/community/brilliant-directories/package.json b/packages/pieces/community/brilliant-directories/package.json index 09dba1b67d..f6a3fce99f 100644 --- a/packages/pieces/community/brilliant-directories/package.json +++ b/packages/pieces/community/brilliant-directories/package.json @@ -2,7 +2,7 @@ "name": "@activepieces/piece-brilliant-directories", "version": "0.0.6", "dependencies": { - "@activepieces/pieces-framework": "0.7.25", + "@activepieces/pieces-framework": "0.7.28", "@activepieces/pieces-common": "0.2.12", "tslib": "^2.6.2", "@activepieces/shared": "*" diff --git a/packages/pieces/community/convertkit/package.json b/packages/pieces/community/convertkit/package.json index 8debb5440b..eb19e1c13b 100644 --- a/packages/pieces/community/convertkit/package.json +++ b/packages/pieces/community/convertkit/package.json @@ -2,7 +2,7 @@ "name": "@activepieces/piece-convertkit", "version": "0.1.3", "dependencies": { - "@activepieces/pieces-framework": "0.7.25", + "@activepieces/pieces-framework": "0.7.28", "@activepieces/pieces-common": "0.2.12", "tslib": "^2.6.2", "@activepieces/shared": "*" diff --git a/packages/pieces/community/math-helper/package.json b/packages/pieces/community/math-helper/package.json index f6ec869f97..55a9966e13 100644 --- a/packages/pieces/community/math-helper/package.json +++ b/packages/pieces/community/math-helper/package.json @@ -2,8 +2,8 @@ "name": "@activepieces/piece-math-helper", "version": "0.0.6", "dependencies": { - "@activepieces/pieces-framework": "0.7.25", - "@activepieces/shared": "0.10.97", + "@activepieces/pieces-framework": "0.7.28", + "@activepieces/shared": "0.10.98", "tslib": "2.6.2" } } \ No newline at end of file diff --git a/packages/pieces/community/retune/package.json b/packages/pieces/community/retune/package.json index b784acc374..0a46227247 100644 --- a/packages/pieces/community/retune/package.json +++ b/packages/pieces/community/retune/package.json @@ -3,8 +3,8 @@ "version": "0.0.5", "dependencies": { "@activepieces/pieces-common": "0.2.12", - "@activepieces/pieces-framework": "0.7.25", - "@activepieces/shared": "0.10.97", + "@activepieces/pieces-framework": "0.7.28", + "@activepieces/shared": "0.10.98", "tslib": "2.6.2" } } \ No newline at end of file diff --git a/packages/pieces/community/saastic/package.json b/packages/pieces/community/saastic/package.json index 3988803475..4dd343661c 100644 --- a/packages/pieces/community/saastic/package.json +++ b/packages/pieces/community/saastic/package.json @@ -2,7 +2,7 @@ "name": "@activepieces/piece-saastic", "version": "0.0.6", "dependencies": { - "@activepieces/pieces-framework": "0.7.25", + "@activepieces/pieces-framework": "0.7.28", "@activepieces/pieces-common": "0.2.12", "tslib": "^2.6.2", "@activepieces/shared": "*" diff --git a/packages/ui/common/src/index.ts b/packages/ui/common/src/index.ts index 1d2566717f..93dfbd05a1 100644 --- a/packages/ui/common/src/index.ts +++ b/packages/ui/common/src/index.ts @@ -27,3 +27,4 @@ export * from './lib/pipe/comma-seperated.pipe'; export * from './lib/utils/consts'; export * from './lib/components/is-feature-enabled-base/is-feature-enabled-base.component'; export * from './lib/models/mention-list-item'; +export * from './lib/components/control-description/control-description.component'; diff --git a/packages/ui/common/src/lib/components/control-description/control-description.component.ts b/packages/ui/common/src/lib/components/control-description/control-description.component.ts index 9749b589b0..9e39672ba9 100644 --- a/packages/ui/common/src/lib/components/control-description/control-description.component.ts +++ b/packages/ui/common/src/lib/components/control-description/control-description.component.ts @@ -1,4 +1,4 @@ -import { Component, Input } from '@angular/core'; +import { Component, Input } from '@angular/core'; import { AbstractControl } from '@angular/forms'; import { BOTTOM_MARGIN_FOR_DESCRIPTION_IN_PIECE_PROPERTIES_FORM, @@ -12,21 +12,17 @@ import { CheckOverflowDirective } from '../../directives'; standalone: true, imports: [CommonModule, MarkdownModule, CheckOverflowDirective], template: ` - @if( !(description || (passedFormControl.touched && passedFormControl.invalid))) - { -
- } - @else() { + @if( !(description || (passedFormControl.touched && + passedFormControl.invalid))) { +
+ } @else() {
-