diff --git a/packages/blocks/blocksAntd/src/blocks/Alert/Alert.js b/packages/blocks/blocksAntd/src/blocks/Alert/Alert.js index 708b5617f..55f5b095c 100644 --- a/packages/blocks/blocksAntd/src/blocks/Alert/Alert.js +++ b/packages/blocks/blocksAntd/src/blocks/Alert/Alert.js @@ -33,14 +33,13 @@ const AlertBlock = ({ blockId, events, methods, properties }) => { banner={properties.banner} closable={properties.closable} closeText={properties.closeText} - description={} + description={ + properties.description && + } id={blockId} message={ - properties.message ? ( - - ) : ( - !properties.description &&
- ) + (properties.message && ) || + (!properties.description &&
) } onClose={() => methods.triggerEvent({ name: 'onClose' })} showIcon={properties.showIcon === false ? false : true} diff --git a/packages/blocks/blocksAntd/tests/__snapshots__/Alert.mock.test.js.snap b/packages/blocks/blocksAntd/tests/__snapshots__/Alert.mock.test.js.snap index 10f7b483b..06cdfe4a1 100644 --- a/packages/blocks/blocksAntd/tests/__snapshots__/Alert.mock.test.js.snap +++ b/packages/blocks/blocksAntd/tests/__snapshots__/Alert.mock.test.js.snap @@ -8,16 +8,7 @@ Array [ "banner": undefined, "closable": undefined, "closeText": undefined, - "description": , + "description": undefined, "id": "default", "message":
, + "description": undefined, "id": "properties.closable: true", "message": , + "description": undefined, "id": "properties.closeText: Close Text", "message": , + "description": undefined, "icon": , + "description": undefined, "icon": , + "description": undefined, "id": "properties.message", "message": , + "description": undefined, "id": "properties.type: error", "message": , + "description": undefined, "id": "properties.type: error banner: true", "message": , + "description": undefined, "id": "properties.type: error showIcon: false", "message": , + "description": undefined, "id": "properties.type: info", "message": , + "description": undefined, "id": "properties.type: info banner: true", "message": , + "description": undefined, "id": "properties.type: info showIcon: false", "message": , + "description": undefined, "id": "properties.type: success", "message": , + "description": undefined, "id": "properties.type: success banner: true", "message": , + "description": undefined, "id": "properties.type: success showIcon: false", "message": , + "description": undefined, "id": "properties.type: warning", "message": , + "description": undefined, "id": "properties.type: warning banner: true", "message": , + "description": undefined, "id": "properties.type: warning showIcon: false", "message": , + "description": undefined, "id": "with message uses html", "message": diff --git a/packages/blocks/blocksAntd/tests/__snapshots__/Alert.test.js.snap b/packages/blocks/blocksAntd/tests/__snapshots__/Alert.test.js.snap index 4c3bfe793..cdc8bbb86 100644 --- a/packages/blocks/blocksAntd/tests/__snapshots__/Alert.test.js.snap +++ b/packages/blocks/blocksAntd/tests/__snapshots__/Alert.test.js.snap @@ -2,7 +2,7 @@ exports[`Render default - value[0] 1`] = `
- @@ -40,15 +37,13 @@ exports[`Render default - value[0] 1`] = ` - - + />
`; exports[`Render properties.closable: true - value[0] 1`] = `
- @@ -82,9 +74,7 @@ exports[`Render properties.closable: true - value[0] 1`] = ` - - + />
`; exports[`Render properties.icon string - value[0] 1`] = `
- - + />
`; exports[`Render properties.message - value[0] 1`] = `
- @@ -288,15 +266,13 @@ exports[`Render properties.message - value[0] 1`] = ` - - + />
`; exports[`Render properties.type: error - value[0] 1`] = `
- @@ -330,15 +303,13 @@ exports[`Render properties.type: error - value[0] 1`] = ` - - + />
`; exports[`Render properties.type: error banner: true - value[0] 1`] = `
- @@ -372,15 +340,13 @@ exports[`Render properties.type: error banner: true - value[0] 1`] = ` - - + />
`; exports[`Render properties.type: error showIcon: false - value[0] 1`] = `
- - + />
`; exports[`Render properties.type: info - value[0] 1`] = `
- @@ -434,15 +395,13 @@ exports[`Render properties.type: info - value[0] 1`] = ` - - + />
`; exports[`Render properties.type: info banner: true - value[0] 1`] = `
- @@ -476,15 +432,13 @@ exports[`Render properties.type: info banner: true - value[0] 1`] = ` - - + />
`; exports[`Render properties.type: info showIcon: false - value[0] 1`] = `
- - + />
`; exports[`Render properties.type: success - value[0] 1`] = `
- @@ -538,15 +487,13 @@ exports[`Render properties.type: success - value[0] 1`] = ` - - + />
`; exports[`Render properties.type: success banner: true - value[0] 1`] = `
- @@ -580,15 +524,13 @@ exports[`Render properties.type: success banner: true - value[0] 1`] = ` - - + />
`; exports[`Render properties.type: success showIcon: false - value[0] 1`] = `
- - + />
`; exports[`Render properties.type: warning - value[0] 1`] = `
- @@ -642,15 +579,13 @@ exports[`Render properties.type: warning - value[0] 1`] = ` - - + />
`; exports[`Render properties.type: warning banner: true - value[0] 1`] = `
- @@ -684,15 +616,13 @@ exports[`Render properties.type: warning banner: true - value[0] 1`] = ` - - + />
`; exports[`Render properties.type: warning showIcon: false - value[0] 1`] = `
- - + />
`; @@ -1508,7 +1436,7 @@ exports[`Render with description uses html - value[0] 1`] = ` exports[`Render with message uses html - value[0] 1`] = `
- @@ -1542,9 +1467,7 @@ exports[`Render with message uses html - value[0] 1`] = ` - - + />
`; diff --git a/packages/docs/menus.yaml b/packages/docs/menus.yaml index e665311e8..cca1ef6cb 100644 --- a/packages/docs/menus.yaml +++ b/packages/docs/menus.yaml @@ -625,6 +625,9 @@ - id: _gte type: MenuLink pageId: _gte + - id: _hash + type: MenuLink + pageId: _hash - id: _if type: MenuLink pageId: _if diff --git a/packages/docs/pages.yaml b/packages/docs/pages.yaml index 75c63320b..c21b03955 100644 --- a/packages/docs/pages.yaml +++ b/packages/docs/pages.yaml @@ -169,6 +169,7 @@ - _ref: operators/_global.yaml - _ref: operators/_gt.yaml - _ref: operators/_gte.yaml +- _ref: operators/_hash.yaml - _ref: operators/_if.yaml - _ref: operators/_if_none.yaml - _ref: operators/_index.yaml