Skip to content

Commit

Permalink
Merge pull request #27 from micro-lc/html-editor-format
Browse files Browse the repository at this point in the history
Add html-editor format in dataschema
  • Loading branch information
LiliumCandidum authored Feb 28, 2024
2 parents e453ae0 + 2fec4d6 commit 2fe0c8e
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 7 deletions.
9 changes: 4 additions & 5 deletions .github/workflows/back-kit-engine.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ jobs:
strategy:
matrix:
node-version:
- 16.x
- 17.x
- 18.x
steps:
- uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node-version }}
Expand Down Expand Up @@ -53,7 +52,7 @@ jobs:
path-to-lcov: '${{ env.context }}coverage/lcov.info'
base-path: '${{ env.context }}'
- name: Compile file and build
if: ${{ (startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/main' || github.base_ref == 'main') && matrix.node-version == '16.x' }}
if: ${{ (startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/main' || github.base_ref == 'main') && matrix.node-version == '18.x' }}
run: yarn build
- name: Cache dist directory
uses: actions/cache@v3
Expand All @@ -70,10 +69,10 @@ jobs:

steps:
- uses: actions/checkout@v2
- name: Use Node.js 16.x
- name: Use Node.js 18.x
uses: actions/setup-node@v1
with:
node-version: 16.x
node-version: 18.x
always-auth: true
registry-url: 'https://registry.npmjs.org'
scope: '@micro-lc'
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
lts/gallium
lts/hydrogen
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## Unreleased

- `dataschema`: format `html-editor` is now available

## [1.0.16] - 2024-01-28

- `customLocale` property is available in `bk-base` component
Expand Down Expand Up @@ -60,6 +62,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [1.0.4] - 2023-01-31

- `dataschema` `description` field is now of type `LocalizedText`

## [1.0.3] - 2023-01-30

- `http-client` `get` and `post` methods reject the promise on `downloadAsFile` when response is not ok
Expand Down
4 changes: 3 additions & 1 deletion src/schemas/data-schema.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,9 @@ export type DateFormat = 'date-time' | 'time' | 'date'

export type TextFormat = 'email' | 'uri' | 'regex' | 'password' | 'text'

export type StringFormat = DateFormat | TextFormat | 'text-area' | 'lookup'
export type EditorFormat = 'editor' | 'html-editor'

export type StringFormat = DateFormat | TextFormat | EditorFormat | 'text-area' | 'lookup'

export type ObjectFormat = 'file' | 'localized-text'

Expand Down

0 comments on commit 2fe0c8e

Please sign in to comment.