diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/CustomPropertyTable/PropertyValue.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/CustomPropertyTable/PropertyValue.test.tsx index 9b3f21183a7..2c39221e4e4 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/CustomPropertyTable/PropertyValue.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/CustomPropertyTable/PropertyValue.test.tsx @@ -200,7 +200,7 @@ describe('Test PropertyValue Component', () => { const iconElement = await screen.findByTestId('edit-icon'); expect(await screen.findByTestId('value')).toHaveTextContent( - '20-03-2024 2:00:00' + '20-03-2024 | 2:00:00' ); await act(async () => { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/CustomPropertyTable/PropertyValue.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/CustomPropertyTable/PropertyValue.tsx index ab23bfd442e..a2117e612c2 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/CustomPropertyTable/PropertyValue.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/CustomPropertyTable/PropertyValue.tsx @@ -495,6 +495,7 @@ export const PropertyValue: FC = ({ rules={[ { pattern: TIMESTAMP_UNIX_IN_MILLISECONDS_REGEX, + message: t('message.invalid-unix-epoch-time-milliseconds'), }, ]} style={commonStyle}> @@ -550,6 +551,7 @@ export const PropertyValue: FC = ({ rules={[ { pattern: TIMESTAMP_UNIX_IN_MILLISECONDS_REGEX, + message: t('message.invalid-unix-epoch-time-milliseconds'), }, ]} style={{ ...commonStyle, marginBottom: '16px' }}> @@ -567,6 +569,7 @@ export const PropertyValue: FC = ({ rules={[ { pattern: TIMESTAMP_UNIX_IN_MILLISECONDS_REGEX, + message: t('message.invalid-unix-epoch-time-milliseconds'), }, ]} style={commonStyle}> @@ -967,11 +970,26 @@ export const PropertyValue: FC = ({ ); } + case 'dateTime-cp': { + if (isUndefined(value)) { + return null; + } + + const [date, time] = value?.split(' '); + + return ( + + {`${date} | ${time}`} + + ); + } + case 'string': case 'integer': case 'number': case 'date-cp': - case 'dateTime-cp': case 'time-cp': case 'email': case 'timestamp': diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/CustomPropertyTable/property-value.less b/openmetadata-ui/src/main/resources/ui/src/components/common/CustomPropertyTable/property-value.less index 07e9881f0e0..41a63751998 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/CustomPropertyTable/property-value.less +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/CustomPropertyTable/property-value.less @@ -11,8 +11,7 @@ * limitations under the License. */ -@btn-bg-color: #00000005; -@enum-tag-bg-color: #00000008; +@import (reference) url('../../../styles/variables.less'); .entity-reference-list-item:last-child { border-bottom: none; @@ -45,12 +44,12 @@ } } -.enum-key-tag { +.ant-tag.enum-key-tag { width: max-content; margin: 0px; - border: none; - padding: 4px; - background: @enum-tag-bg-color; + padding: 2px 8px; + border: 1px solid @text-color; + background: @white; } .sql-query-custom-property { diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/de-de.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/de-de.json index 05e1ab1d111..c9978b067f0 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/de-de.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/de-de.json @@ -1565,6 +1565,7 @@ "integration-description": "Configure applications and bots to amplify productivity.", "invalid-object-key": "Ungültiger Objektschlüssel. Muss mit einem Buchstaben, einem Unterstrich oder einem Dollarzeichen beginnen, gefolgt von Buchstaben, Unterstrichen, Dollarzeichen oder Ziffern.", "invalid-property-name": "Ungültiger Eigenschaftsname.", + "invalid-unix-epoch-time-milliseconds": "Invalid Unix epoch time in milliseconds", "jwt-token": "Das von Ihnen generierte Token, das zum Zugriff auf die OpenMetadata-API verwendet werden kann.", "jwt-token-expiry-time-message": "JWT token expiry timer in seconds.", "kill-ingestion-warning": "Wenn Sie diese Erfassung abbrechen, werden alle laufenden und wartenden Workflows gestoppt und als fehlgeschlagen markiert.", diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/en-us.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/en-us.json index 071a7db2bea..4d2ff226b7c 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/en-us.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/en-us.json @@ -1565,6 +1565,7 @@ "integration-description": "Configure applications and bots to amplify productivity.", "invalid-object-key": "Invalid object key. Must start with a letter, underscore, or dollar sign, followed by letters, underscores, dollar signs, or digits.", "invalid-property-name": "Invalid Property Name", + "invalid-unix-epoch-time-milliseconds": "Invalid Unix epoch time in milliseconds", "jwt-token": "Token you have generated that can be used to access the OpenMetadata API.", "jwt-token-expiry-time-message": "JWT token expiry timer in seconds.", "kill-ingestion-warning": "Once you kill this Ingestion, all running and queued workflows will be stopped and marked as Failed.", diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/es-es.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/es-es.json index 4ad021db095..885dd80fac4 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/es-es.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/es-es.json @@ -1565,6 +1565,7 @@ "integration-description": "Configure aplicaciones y bots para amplificar la productividad.", "invalid-object-key": "Clave de objeto no válida. Debe comenzar con una letra, un guion bajo o un signo de dólar, seguido de letras, guiones bajos, signos de dólar o dígitos.", "invalid-property-name": "Nombre de propiedad no válido", + "invalid-unix-epoch-time-milliseconds": "Invalid Unix epoch time in milliseconds", "jwt-token": "Token que ha generado que se puede utilizar para acceder a la API de OpenMetadata.", "jwt-token-expiry-time-message": "JWT token expiry timer in seconds.", "kill-ingestion-warning": "Una vez que se detenga esta ingestión, se detendrán y marcarán como fallidas todos los flujos de trabajo en ejecución y en cola.", diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/fr-fr.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/fr-fr.json index dd8b4ebed21..abb24e274d7 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/fr-fr.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/fr-fr.json @@ -1565,6 +1565,7 @@ "integration-description": "Configureez les applications et bots pour augmenter votre productivité.", "invalid-object-key": "Clé d'objet non valide. Doit commencer par une lettre, un underscore ou signe dollar, suivi de lettres, underscores, signes dollars, ou chiffres.", "invalid-property-name": "Nom de propriété non valide", + "invalid-unix-epoch-time-milliseconds": "Invalid Unix epoch time in milliseconds", "jwt-token": "Le Jeton que vous avez généré peut être utilisé pour accéder à l’API OpenMetadata.", "jwt-token-expiry-time-message": "Délai d'expiration du jeton JWT en secondes.", "kill-ingestion-warning": "Une fois que vous avez interrompu cette Ingestion, tous les workflows en cours d'éxécutions et en files d'attente seront arrêtés et marqués comme aillant échoué.", diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/he-he.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/he-he.json index 38ef441c318..e02dff9d6bc 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/he-he.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/he-he.json @@ -1565,6 +1565,7 @@ "integration-description": "Configure applications and bots to amplify productivity.", "invalid-object-key": "מפתח אובייקט לא חוקי. חייב להתחיל עם אות, קו תחתון או סימן דולר, ולפניו אות, קו תחתון או סימן דולר או ספרות.", "invalid-property-name": "שם מאפיין לא חוקי", + "invalid-unix-epoch-time-milliseconds": "Invalid Unix epoch time in milliseconds", "jwt-token": "אסימון שיצרת שימוש בו כדי לגשת ל-OpenMetadata API.", "jwt-token-expiry-time-message": "JWT token expiry timer in seconds.", "kill-ingestion-warning": "ברגע שאתה מפסיק את הקליטה הזו, כל הזרמים הפועלים והשורות הממתנות יופסקו ויסומנו כנכשלים.", diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/ja-jp.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/ja-jp.json index 56f92d835c0..d1ead9821e6 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/ja-jp.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/ja-jp.json @@ -1565,6 +1565,7 @@ "integration-description": "Configure applications and bots to amplify productivity.", "invalid-object-key": "Invalid object key. Must start with a letter, underscore, or dollar sign, followed by letters, underscores, dollar signs, or digits.", "invalid-property-name": "無効なプロパティ名", + "invalid-unix-epoch-time-milliseconds": "Invalid Unix epoch time in milliseconds", "jwt-token": "Token you have generated that can be used to access the OpenMetadata API.", "jwt-token-expiry-time-message": "JWT token expiry timer in seconds.", "kill-ingestion-warning": "Once you kill this Ingestion, all running and queued workflows will be stopped and marked as Failed.", diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/nl-nl.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/nl-nl.json index b3e97c9a73f..82ef8cad96e 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/nl-nl.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/nl-nl.json @@ -1565,6 +1565,7 @@ "integration-description": "Configureer applicaties en bots voor hogere productiviteit.", "invalid-object-key": "Ongeldige objectnaam. Moet beginnen met een letter, underscore of dollarteken, gevolgd door letters, underscores, dollartekens of cijfers.", "invalid-property-name": "Ongeldige eigenschapsnaam", + "invalid-unix-epoch-time-milliseconds": "Invalid Unix epoch time in milliseconds", "jwt-token": "Token dat je hebt gegenereerd en dat kan worden gebruikt om toegang te krijgen tot de OpenMetadata API.", "jwt-token-expiry-time-message": "JWT token expiry timer in seconds.", "kill-ingestion-warning": "Zodra je deze ingestie stopt, worden alle lopende en in de wachtrij staande workflows gestopt en gemarkeerd als mislukt.", diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/pt-br.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/pt-br.json index 75628c1b4b5..33258aa4a32 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/pt-br.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/pt-br.json @@ -1565,6 +1565,7 @@ "integration-description": "Configure aplicações e bots para melhorar a produtividade.", "invalid-object-key": "Chave de objeto inválida. Deve começar com uma letra, sublinhado ou cifrão, seguido por letras, sublinhados, cifrões ou dígitos.", "invalid-property-name": "Nome de Propriedade Inválido", + "invalid-unix-epoch-time-milliseconds": "Invalid Unix epoch time in milliseconds", "jwt-token": "Token que você gerou que pode ser usado para acessar a API do OpenMetadata.", "jwt-token-expiry-time-message": "JWT token expiry timer in seconds.", "kill-ingestion-warning": "Uma vez que você encerrar esta Ingestão, todos os fluxos de trabalho em execução e na fila serão interrompidos e marcados como Falha.", diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/ru-ru.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/ru-ru.json index 6e7307e676f..4f8eed0b514 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/ru-ru.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/ru-ru.json @@ -1565,6 +1565,7 @@ "integration-description": "Configure applications and bots to amplify productivity.", "invalid-object-key": "Неверный ключ объекта. Должен начинаться с буквы, знака подчеркивания или знака доллара, за которыми следуют буквы, знаки подчеркивания, знаки доллара или цифры.", "invalid-property-name": "Недопустимое имя свойства", + "invalid-unix-epoch-time-milliseconds": "Invalid Unix epoch time in milliseconds", "jwt-token": "Сгенерированный вами токен, который можно использовать для доступа к API OpenMetadata.", "jwt-token-expiry-time-message": "JWT token expiry timer in seconds.", "kill-ingestion-warning": "Как только вы завершите это действие, все запущенные рабочие процессы и процессы, находящиеся в очереди, будут остановлены и помечены как неудавшиеся.", diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/zh-cn.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/zh-cn.json index 7955f2e4b2b..369d5efecf8 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/zh-cn.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/zh-cn.json @@ -1565,6 +1565,7 @@ "integration-description": "配置应用和机器人以提高生产力", "invalid-object-key": "无效的对象键名, 命名首字母必须由字母、下划线、美元符号开始, 再跟随字母、下划线、美元符号或数字", "invalid-property-name": "无效属性名称", + "invalid-unix-epoch-time-milliseconds": "Invalid Unix epoch time in milliseconds", "jwt-token": "您生成的, 用于访问 OpenMetadata API 的令牌", "jwt-token-expiry-time-message": "JWT 令牌到期计时器(秒)", "kill-ingestion-warning": "一旦您终止此提取工作流, 所有正在运行和排队的工作流任务都将停止并标记为失败",