diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/InfoController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/InfoController.java index 66e5d70bd3..cdda3d0953 100644 --- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/InfoController.java +++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/InfoController.java @@ -17,9 +17,16 @@ public class InfoController extends AbstractController implements TimeStampForma @Value("${timestamp.format:dd.MM.YYYY HH:mm:ss}") private String timeStampFormat; + @Value("${timestamp.format:DD.MM.YYYY HH:mm:ss}") + private String timeStampFormatIso; @Override public Mono> getTimeStampFormat(ServerWebExchange exchange) { return Mono.just(ResponseEntity.ok(new TimeStampFormatDTO().timeStampFormat(timeStampFormat))); } + + @Override + public Mono> getTimeStampFormatISO(ServerWebExchange exchange) { + return Mono.just(ResponseEntity.ok(new TimeStampFormatDTO().timeStampFormat(timeStampFormatIso))); + } } diff --git a/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml b/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml index 6a71863c7e..a1ba87d85a 100644 --- a/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml +++ b/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml @@ -1733,7 +1733,7 @@ paths: get: tags: - TimeStampFormat - summary: getTimeStampFormat + summary: get system default datetime format operationId: getTimeStampFormat responses: 200: @@ -1742,6 +1742,21 @@ paths: application/json: schema: $ref: '#/components/schemas/TimeStampFormat' + + /api/info/timestampformat/iso: + get: + tags: + - TimeStampFormat + summary: get system default datetime format (in ISO format, for JS) + operationId: getTimeStampFormatISO + responses: + 200: + description: OK + content: + application/json: + schema: + $ref: '#/components/schemas/TimeStampFormat' + components: schemas: TopicSerdeSuggestion: diff --git a/kafka-ui-react-app/src/lib/hooks/api/__tests__/timeFormat.spec.ts b/kafka-ui-react-app/src/lib/hooks/api/__tests__/timeFormat.spec.ts index cc080f58e1..c6984c40b1 100644 --- a/kafka-ui-react-app/src/lib/hooks/api/__tests__/timeFormat.spec.ts +++ b/kafka-ui-react-app/src/lib/hooks/api/__tests__/timeFormat.spec.ts @@ -3,7 +3,7 @@ import { expectQueryWorks, renderQueryHook } from 'lib/testHelpers'; import * as hooks from 'lib/hooks/api/timeFormat'; import { timeFormatPayload } from 'lib/fixtures/timeFormat'; -const timeFormatPath = '/api/info/timestampformat'; +const timeFormatPath = '/api/info/timestampformat/iso'; describe('Time format hooks', () => { beforeEach(() => fetchMock.restore()); diff --git a/kafka-ui-react-app/src/lib/hooks/api/timeFormat.ts b/kafka-ui-react-app/src/lib/hooks/api/timeFormat.ts index fcbdf93152..3b36f74066 100644 --- a/kafka-ui-react-app/src/lib/hooks/api/timeFormat.ts +++ b/kafka-ui-react-app/src/lib/hooks/api/timeFormat.ts @@ -5,7 +5,7 @@ import { QUERY_REFETCH_OFF_OPTIONS } from 'lib/constants'; export function useTimeFormat() { return useQuery( ['settings', 'timestampformat'], - () => api.getTimeStampFormat(), + () => api.getTimeStampFormatISO(), QUERY_REFETCH_OFF_OPTIONS ); }