@danikokonn/yarik-frontend-lib 2.1.2 → 2.1.4

package/dist/components/DateTimeRangePicker/DateTimeRangePicker.d.ts

@@ -1,4 +1,4 @@
-import "moment/locale/ru";
+import "dayjs/locale/ru";
 import DateTimeRangePickerProps from "./DateTimeRangePickerProps";
 export default function DateTimeRangePicker({ disableFuture, disabled, fromDatetime, toDateTime, required, error, onStartDateSet, onEndDateSet, }: DateTimeRangePickerProps): import("react/jsx-runtime").JSX.Element;
 //# sourceMappingURL=DateTimeRangePicker.d.ts.map

package/dist/components/DateTimeRangePicker/DateTimeRangePicker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DateTimeRangePicker.d.ts","sourceRoot":"","sources":["../../../src/components/DateTimeRangePicker/DateTimeRangePicker.tsx"],"names":[],"mappings":"AAOA,OAAO,kBAAkB,CAAC;AAE1B,OAAO,wBAAwB,MAAM,4BAA4B,CAAC;AAElE,MAAM,CAAC,OAAO,UAAU,mBAAmB,CAAC,EAC1C,aAAa,EACb,QAAQ,EACR,YAAY,EACZ,UAAU,EACV,QAAQ,EACR,KAAK,EACL,cAAc,EACd,YAAY,GACb,EAAE,wBAAwB,2CAmF1B"}
+{"version":3,"file":"DateTimeRangePicker.d.ts","sourceRoot":"","sources":["../../../src/components/DateTimeRangePicker/DateTimeRangePicker.tsx"],"names":[],"mappings":"AAQA,OAAO,iBAAiB,CAAC;AAIzB,OAAO,wBAAwB,MAAM,4BAA4B,CAAC;AAKlE,MAAM,CAAC,OAAO,UAAU,mBAAmB,CAAC,EAC1C,aAAa,EACb,QAAQ,EACR,YAAY,EACZ,UAAU,EACV,QAAQ,EACR,KAAK,EACL,cAAc,EACd,YAAY,GACb,EAAE,wBAAwB,2CAmF1B"}

package/dist/components/DateTimeRangePicker/DateTimeRangePicker.js

@@ -1,17 +1,22 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import Stack from "@mui/material/Stack";
 import { DesktopDateTimePicker, LocalizationProvider, } from "@mui/x-date-pickers";
-import { AdapterMoment } from "@mui/x-date-pickers/AdapterMoment";
-import moment from "moment-timezone";
-import "moment/locale/ru";
+import { AdapterDayjs } from "@mui/x-date-pickers/AdapterDayjs";
+import { ruRU } from "@mui/x-date-pickers/locales";
+import dayjs from "dayjs";
+import "dayjs/locale/ru";
+import timezone from "dayjs/plugin/timezone";
+import utc from "dayjs/plugin/utc";
 import { useState } from "react";
+dayjs.extend(utc);
+dayjs.extend(timezone);
 export default function DateTimeRangePicker({ disableFuture, disabled, fromDatetime, toDateTime, required, error, onStartDateSet, onEndDateSet, }) {
     const [fromDatetimePickerOpen, setFromDatetimePickerOpen] = useState(false);
     const [toDatetimePickerOpen, setToDatetimePickerOpen] = useState(false);
-    const fromDttm = fromDatetime.length > 0 ? moment(fromDatetime) : null;
-    const toDttm = toDateTime.length > 0 ? moment(toDateTime) : null;
-    return (_jsx(LocalizationProvider, { dateAdapter: AdapterMoment, adapterLocale: "ru", dateLibInstance: moment, children: _jsxs(Stack, { direction: "row", sx: { m: 2 }, spacing: 2, children: [_jsx(DesktopDateTimePicker, { disabled: disabled, open: fromDatetimePickerOpen, reduceAnimations: true, onChange: (v, _c) => {
-                        onStartDateSet((v && v.toISOString(true)) || "");
+    const fromDttm = fromDatetime.length > 0 ? dayjs(fromDatetime) : null;
+    const toDttm = toDateTime.length > 0 ? dayjs(toDateTime) : null;
+    return (_jsx(LocalizationProvider, { dateAdapter: AdapterDayjs, adapterLocale: "ru", localeText: ruRU.components.MuiLocalizationProvider.defaultProps.localeText, children: _jsxs(Stack, { direction: "row", sx: { m: 2 }, spacing: 2, children: [_jsx(DesktopDateTimePicker, { disabled: disabled, open: fromDatetimePickerOpen, reduceAnimations: true, onChange: (v) => {
+                        onStartDateSet((v && v.format()) || "");
                     }, disableFuture: disableFuture, views: ["year", "month", "day", "hours", "minutes", "seconds"], timezone: "Europe/Moscow", ampm: false, ampmInClock: false, value: fromDttm, timeSteps: { hours: 1, minutes: 1, seconds: 1 }, slotProps: {
                         field: {
                             clearable: true,
@@ -27,8 +32,8 @@ export default function DateTimeRangePicker({ disableFuture, disabled, fromDatet
                             position: "start",
                             onClick: () => setFromDatetimePickerOpen(true),
                         },
-                    }, onClose: () => setFromDatetimePickerOpen(false) }), _jsx(DesktopDateTimePicker, { disabled: disabled, open: toDatetimePickerOpen, reduceAnimations: true, onChange: (v, _c) => {
-                        onEndDateSet((v && v.toISOString(true)) || "");
+                    }, onClose: () => setFromDatetimePickerOpen(false) }), _jsx(DesktopDateTimePicker, { disabled: disabled, open: toDatetimePickerOpen, reduceAnimations: true, onChange: (v) => {
+                        onEndDateSet((v && v.format()) || "");
                     }, disableFuture: disableFuture, views: ["year", "month", "day", "hours", "minutes", "seconds"], timezone: "Europe/Moscow", ampm: false, ampmInClock: false, timeSteps: { hours: 1, minutes: 1, seconds: 1 }, value: toDttm, slotProps: {
                         field: {
                             clearable: true,

package/dist/components/DatetimeRangeInput/DatetimeRangeInput.d.ts

@@ -1,4 +1,3 @@
-import "moment/locale/ru";
 import { JSX } from "react";
 import DatetimeRangeInputProps from "./DatetimeRangeInputProps";
 /**

package/dist/components/DatetimeRangeInput/DatetimeRangeInput.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DatetimeRangeInput.d.ts","sourceRoot":"","sources":["../../../src/components/DatetimeRangeInput/DatetimeRangeInput.tsx"],"names":[],"mappings":"AAOA,OAAO,kBAAkB,CAAC;AAC1B,OAAO,EAAE,GAAG,EAAoC,MAAM,OAAO,CAAC;AAE9D,OAAO,uBAAuB,MAAM,2BAA2B,CAAC;AAKhE;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAM,CAAC,OAAO,UAAU,kBAAkB,CAAC,EACzC,cAAc,EACd,IAAI,EACJ,EAAE,EACF,OAAO,EACP,EAAE,EACF,WAAW,EACX,IAAI,EACJ,QAAQ,EACR,QAAQ,GACT,EAAE,uBAAuB,GAAG,GAAG,CAAC,OAAO,CAiHvC"}
+{"version":3,"file":"DatetimeRangeInput.d.ts","sourceRoot":"","sources":["../../../src/components/DatetimeRangeInput/DatetimeRangeInput.tsx"],"names":[],"mappings":"AAMA,OAAO,EAAE,GAAG,EAAoB,MAAM,OAAO,CAAC;AAG9C,OAAO,uBAAuB,MAAM,2BAA2B,CAAC;AAEhE;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAM,CAAC,OAAO,UAAU,kBAAkB,CAAC,EACzC,cAAc,EACd,IAAI,EACJ,EAAE,EACF,OAAO,EACP,EAAE,EACF,WAAW,EACX,IAAI,EACJ,QAAQ,EACR,QAAQ,GACT,EAAE,uBAAuB,GAAG,GAAG,CAAC,OAAO,CA8FvC"}

package/dist/components/DatetimeRangeInput/DatetimeRangeInput.js

@@ -1,15 +1,13 @@
-import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import ClearIcon from "@mui/icons-material/Clear";
 import DateRangeIcon from "@mui/icons-material/DateRange";
-import { Skeleton, Stack } from "@mui/material";
 import IconButton from "@mui/material/IconButton";
 import Popover from "@mui/material/Popover";
 import TextField from "@mui/material/TextField";
-import moment from "moment-timezone";
-import "moment/locale/ru";
-import { lazy, Suspense, useRef, useState } from "react";
+import dayjs from "dayjs";
+import { useRef, useState } from "react";
 import { prettyDatetime } from "../../utils";
-const DateTimeRangePicker = lazy(() => import("../DateTimeRangePicker/DateTimeRangePicker"));
+import DateTimeRangePicker from "../DateTimeRangePicker/DateTimeRangePicker";
 /**
  * Компонент выбора диапазона дат и времени.
  *
@@ -40,7 +38,7 @@ export default function DatetimeRangeInput({ onDateRangeSet, from, to, variant,
     const rangeValid = fromDatetime &&
         toDateTime &&
         fromDatetime !== toDateTime &&
-        moment(fromDatetime) < moment(toDateTime);
+        dayjs(fromDatetime).isBefore(dayjs(toDateTime));
     return (_jsxs(_Fragment, { children: [_jsx(TextField, { size: size, variant: variant || "standard", disabled: disabled, required: required, placeholder: variant === "outlined" ? undefined : placeholder, label: variant === "outlined" ? placeholder : undefined, slotProps: {
                     input: {
                         startAdornment: _jsx(DateRangeIcon, {}),
@@ -64,11 +62,11 @@ export default function DatetimeRangeInput({ onDateRangeSet, from, to, variant,
                     paper: {
                         sx: { minWidth: "30rem" },
                     },
-                }, children: _jsx(Suspense, { fallback: _jsxs(Stack, { direction: "row", spacing: 2, sx: { m: 1 }, children: [_jsx(Skeleton, { variant: "rounded", width: 231, height: 32, animation: "wave" }), _jsx(Skeleton, { variant: "rounded", width: 231, height: 32, animation: "wave" })] }), children: _jsx(DateTimeRangePicker, { required: required, disableFuture: true, disabled: disabled, fromDatetime: fromDatetime, toDateTime: toDateTime, onStartDateSet: (s) => {
-                            setFromDatetime(s);
-                            onDateRangeSet(s, toDateTime);
-                        }, onEndDateSet: (e) => {
-                            setToDatetime(e);
-                            onDateRangeSet(fromDatetime, e);
-                        } }) }) })] }));
+                }, children: _jsx(DateTimeRangePicker, { required: required, disableFuture: true, disabled: disabled, fromDatetime: fromDatetime, toDateTime: toDateTime, onStartDateSet: (s) => {
+                        setFromDatetime(s);
+                        onDateRangeSet(s, toDateTime);
+                    }, onEndDateSet: (e) => {
+                        setToDatetime(e);
+                        onDateRangeSet(fromDatetime, e);
+                    } }) })] }));
 }

package/dist/components/LocalizedDatetimePicker/LocalizedDatetimePicker.d.ts

@@ -1,4 +1,4 @@
-import "moment/locale/ru";
+import "dayjs/locale/ru";
 import LocalizedDatetimePickerProps from "./LocalizedDatetimePickerProps";
 export default function LocalizedDateTimePicker({ disableFuture, disabled, value, required, variant, size, onChange, }: LocalizedDatetimePickerProps): import("react/jsx-runtime").JSX.Element;
 //# sourceMappingURL=LocalizedDatetimePicker.d.ts.map

package/dist/components/LocalizedDatetimePicker/LocalizedDatetimePicker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"LocalizedDatetimePicker.d.ts","sourceRoot":"","sources":["../../../src/components/LocalizedDatetimePicker/LocalizedDatetimePicker.tsx"],"names":[],"mappings":"AAMA,OAAO,kBAAkB,CAAC;AAG1B,OAAO,4BAA4B,MAAM,gCAAgC,CAAC;AAE1E,MAAM,CAAC,OAAO,UAAU,uBAAuB,CAAC,EAC9C,aAAa,EACb,QAAQ,EACR,KAAK,EACL,QAAQ,EACR,OAAO,EACP,IAAI,EACJ,QAAQ,GACT,EAAE,4BAA4B,2CA6C9B"}
+{"version":3,"file":"LocalizedDatetimePicker.d.ts","sourceRoot":"","sources":["../../../src/components/LocalizedDatetimePicker/LocalizedDatetimePicker.tsx"],"names":[],"mappings":"AAOA,OAAO,iBAAiB,CAAC;AAKzB,OAAO,4BAA4B,MAAM,gCAAgC,CAAC;AAK1E,MAAM,CAAC,OAAO,UAAU,uBAAuB,CAAC,EAC9C,aAAa,EACb,QAAQ,EACR,KAAK,EACL,QAAQ,EACR,OAAO,EACP,IAAI,EACJ,QAAQ,GACT,EAAE,4BAA4B,2CA6C9B"}

package/dist/components/LocalizedDatetimePicker/LocalizedDatetimePicker.js

@@ -1,15 +1,20 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { DesktopDateTimePicker, LocalizationProvider, } from "@mui/x-date-pickers";
-import { AdapterMoment } from "@mui/x-date-pickers/AdapterMoment";
-import moment from "moment-timezone";
-import "moment/locale/ru";
+import { AdapterDayjs } from "@mui/x-date-pickers/AdapterDayjs";
+import { ruRU } from "@mui/x-date-pickers/locales";
+import dayjs from "dayjs";
+import "dayjs/locale/ru";
+import timezone from "dayjs/plugin/timezone";
+import utc from "dayjs/plugin/utc";
 import { useState } from "react";
 import { useDebounce } from "../../utils";
+dayjs.extend(utc);
+dayjs.extend(timezone);
 export default function LocalizedDateTimePicker({ disableFuture, disabled, value, required, variant, size, onChange, }) {
     const [open, setOpen] = useState(false);
-    const datetime = value?.length > 0 ? moment(value) : null;
-    return (_jsx(LocalizationProvider, { dateAdapter: AdapterMoment, adapterLocale: "ru", dateLibInstance: moment, children: _jsx(DesktopDateTimePicker, { disabled: disabled, open: open, reduceAnimations: true, onChange: useDebounce((v, _c) => {
-                onChange((v && v.toISOString(true)) || "");
+    const datetime = value?.length > 0 ? dayjs(value) : null;
+    return (_jsx(LocalizationProvider, { dateAdapter: AdapterDayjs, adapterLocale: "ru", localeText: ruRU.components.MuiLocalizationProvider.defaultProps.localeText, children: _jsx(DesktopDateTimePicker, { disabled: disabled, open: open, reduceAnimations: true, onChange: useDebounce((v) => {
+                onChange((v && v.format()) || "");
             }, 200), disableFuture: disableFuture, views: ["year", "month", "day", "hours", "minutes", "seconds"], timezone: "Europe/Moscow", ampm: false, ampmInClock: false, value: datetime, timeSteps: { hours: 1, minutes: 1, seconds: 1 }, slotProps: {
                 field: {
                     clearable: true,

package/dist/components/SubtaskItem/SubtaskItem.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SubtaskItem.d.ts","sourceRoot":"","sources":["../../../src/components/SubtaskItem/SubtaskItem.tsx"],"names":[],"mappings":"AAgBA,OAAO,gBAAgB,MAAM,oBAAoB,CAAC;AAyBlD,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,EAClC,YAAY,EACZ,IAAI,EACJ,QAAQ,EACR,UAAU,EACV,uBAAuB,GACxB,EAAE,gBAAgB,2CAsIlB"}
+{"version":3,"file":"SubtaskItem.d.ts","sourceRoot":"","sources":["../../../src/components/SubtaskItem/SubtaskItem.tsx"],"names":[],"mappings":"AAiBA,OAAO,gBAAgB,MAAM,oBAAoB,CAAC;AA2BlD,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,EAClC,YAAY,EACZ,IAAI,EACJ,QAAQ,EACR,UAAU,EACV,uBAAuB,GACxB,EAAE,gBAAgB,2CAyHlB"}

package/dist/components/SubtaskItem/SubtaskItem.js

@@ -11,9 +11,11 @@ import Accordion from "@mui/material/Accordion";
 import AccordionDetails from "@mui/material/AccordionDetails";
 import AccordionSummary from "@mui/material/AccordionSummary";
 import CircularProgress from "@mui/material/CircularProgress";
-import moment from "moment";
+import dayjs from "dayjs";
+import duration from "dayjs/plugin/duration";
 import { useEffect, useState } from "react";
-import { taskStateText } from "../../utils";
+import { formatDuration, prettyDatetime, taskStateText } from "../../utils";
+dayjs.extend(duration);
 const SubtaskState = ({ state }) => {
     switch (state) {
         case "success":
@@ -46,21 +48,10 @@ export default function SubtaskItem({ taskInstance, logs, expanded, onShowLogs,
             setCopyText("Копировать");
         }
     }, [expanded]);
-    const formatEndDate = new Date(taskInstance.executionDate).toLocaleString("ru", {
-        weekday: "short",
-        month: "short",
-        day: "numeric",
-        year: "numeric",
-        hour: "2-digit",
-        minute: "2-digit",
-        second: "2-digit",
-    });
-    const formatTaskDuration = moment
-        .duration(taskInstance.duration, "seconds")
-        .format({
-        precision: 1,
-        template: "h [ч], m [мин], s [сек]",
-    });
+    const formatEndDate = prettyDatetime(taskInstance.executionDate, true);
+    const formatTaskDuration = taskInstance.duration !== null
+        ? formatDuration(taskInstance.duration)
+        : "н/д";
     return (_jsxs(Accordion, { disableGutters: true, expanded: expanded, onChange: () => onShowLogs(taskInstance.taskId, taskInstance.tryNumber), disabled: !["running", "success", "failed"].includes(taskInstance.state || ""), sx: {
             position: "relative",
         }, children: [_jsx(AccordionSummary, { expandIcon: _jsx(ExpandMore, {}), children: _jsxs("div", { style: { display: "flex", alignItems: "center", gap: "0.5rem" }, children: [_jsx(SubtaskState, { state: taskInstance.state }), _jsxs("span", { children: [taskInstance.taskId, " - ", taskStateText(taskInstance.state), taskInstance.state === "success"

package/dist/components/TaskLoader/TaskLoader.js

@@ -17,7 +17,7 @@ import useSWR from "swr";
 import { postRequest } from "../../http";
 import { useAirflowContext } from "../../providers/AirflowProvider";
 import { useDagRunStateContext } from "../../providers/DagStateProvider";
-import { formatDate, formatDuration, getCSRFToken, taskStateText, useDebounce, } from "../../utils";
+import { formatDuration, getCSRFToken, prettyDatetime, taskStateText, useDebounce, } from "../../utils";
 import ProcessingIcon from "../icons/ProcessingIcon";
 import SubtaskItem from "../SubtaskItem/SubtaskItem";
 const TaskStateIcon = ({ taskState, }) => {
@@ -228,7 +228,7 @@ const TaskLoader = ({ style, subTitle, onUnauthorized }) => {
             },
         });
     }, 200);
-    const formatEndDate = formatDate(dagRun?.logicalDate || "");
+    const formatEndDate = prettyDatetime(dagRun?.logicalDate, true);
     const formatTaskDuration = formatDuration(taskInstances?.taskInstances.reduce((a, b) => a + (b.duration || 0), 0) ||
         0);
     const activeTaskElem = taskInstances?.taskInstances.find((ti) => {

package/dist/components/TaskStateDialog/TaskStateDialog.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TaskStateDialog.d.ts","sourceRoot":"","sources":["../../../src/components/TaskStateDialog/TaskStateDialog.tsx"],"names":[],"mappings":"AAOA,OAAO,oBAAoB,MAAM,wBAAwB,CAAC;AAwB1D,MAAM,CAAC,OAAO,UAAU,eAAe,CAAC,EACtC,SAAS,EACT,QAAQ,EACR,aAAa,EACb,OAAO,EACP,QAAQ,EACR,cAAc,EACd,kBAAkB,EAClB,iBAAiB,EACjB,OAAO,EACP,cAAc,GACf,EAAE,oBAAoB,2CA8LtB"}
+{"version":3,"file":"TaskStateDialog.d.ts","sourceRoot":"","sources":["../../../src/components/TaskStateDialog/TaskStateDialog.tsx"],"names":[],"mappings":"AAgBA,OAAO,oBAAoB,MAAM,wBAAwB,CAAC;AAY1D,MAAM,CAAC,OAAO,UAAU,eAAe,CAAC,EACtC,SAAS,EACT,QAAQ,EACR,aAAa,EACb,OAAO,EACP,QAAQ,EACR,cAAc,EACd,kBAAkB,EAClB,iBAAiB,EACjB,OAAO,EACP,cAAc,GACf,EAAE,oBAAoB,2CA8LtB"}

package/dist/components/TaskStateDialog/TaskStateDialog.js

@@ -1,20 +1,20 @@
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import { useTheme } from "@mui/material";
+import AppBar from "@mui/material/AppBar";
+import Badge from "@mui/material/Badge";
+import CircularProgress from "@mui/material/CircularProgress";
 import Dialog from "@mui/material/Dialog";
+import IconButton from "@mui/material/IconButton";
+import Stack from "@mui/material/Stack";
+import Toolbar from "@mui/material/Toolbar";
+import Tooltip from "@mui/material/Tooltip";
+import Typography from "@mui/material/Typography";
 import Zoom from "@mui/material/Zoom";
+import CloseIcon from "@mui/icons-material/Close";
 import React from "react";
 import { useAirflowContext } from "../../providers/AirflowProvider";
 import { useDagRunStateContext } from "../../providers/DagStateProvider";
-const AppBar = React.lazy(() => import("@mui/material/AppBar"));
-const Stack = React.lazy(() => import("@mui/material/Stack"));
-const Toolbar = React.lazy(() => import("@mui/material/Toolbar"));
-const IconButton = React.lazy(() => import("@mui/material/IconButton"));
-const Typography = React.lazy(() => import("@mui/material/Typography"));
-const Tooltip = React.lazy(() => import("@mui/material/Tooltip"));
-const Badge = React.lazy(() => import("@mui/material/Badge"));
-const CloseIcon = React.lazy(() => import("@mui/icons-material/Close"));
-const CircularProgress = React.lazy(() => import("@mui/material/CircularProgress"));
-const TaskLoader = React.lazy(() => import("../TaskLoader/TaskLoader"));
+import TaskLoader from "../TaskLoader/TaskLoader";
 const Transition = React.forwardRef(function Transition(props, ref) {
     return _jsx(Zoom, { ref: ref, ...props });
 });
@@ -69,7 +69,7 @@ export default function TaskStateDialog({ taskTitle, subTitle, appendedTitle, vi
                     setLoading(true);
                 },
             },
-        }, children: _jsxs(React.Suspense, { fallback: _jsx(_Fragment, {}), children: [_jsx(AppBar, { sx: { position: "relative" }, color: color, children: _jsxs(Toolbar, { children: [_jsx(IconButton, { disabled: disableClosing, edge: "start", color: "inherit", onClick: () => onClose(), "aria-label": "close", children: _jsx(CloseIcon, {}) }), _jsx(Stack, { sx: {
+        }, children: _jsxs(_Fragment, { children: [_jsx(AppBar, { sx: { position: "relative" }, color: color, children: _jsxs(Toolbar, { children: [_jsx(IconButton, { disabled: disableClosing, edge: "start", color: "inherit", onClick: () => onClose(), "aria-label": "close", children: _jsx(CloseIcon, {}) }), _jsx(Stack, { sx: {
                                     ml: 2,
                                     flex: 1,
                                     flexWrap: "nowrap",

package/dist/utils.d.ts

@@ -1,12 +1,10 @@
 import { PopoverOrigin } from "@mui/material";
-import "moment-duration-format";
-import "moment/locale/ru";
+import "dayjs/locale/ru";
 import { DagState, TaskState } from "./types";
 export declare function getCSRFToken(): string;
 export declare function setCSRFToken(newToken: string): void;
-export declare function prettyDatetime(datetime?: string | null): string;
+export declare function prettyDatetime(datetime?: string | null, utc?: boolean): string;
 export declare const taskStateText: (taskState: DagState | TaskState | string | null | undefined) => "Завершена" | "Ошибка" | "В очереди" | "Запланирована" | "Выполняется" | "Недоступно" | "Нет состояния";
-export declare const formatDate: (date: string) => string;
 export declare const formatDuration: (duration: number) => string;
 export declare const getSlugTableName: (name: string) => string;
 export declare const getShiftedColor: (colorHex: string, shift: number) => string;

package/dist/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAE9C,OAAO,wBAAwB,CAAC;AAEhC,OAAO,kBAAkB,CAAC;AAG1B,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAE9C,wBAAgB,YAAY,WAI3B;AAED,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,QAI5C;AAED,wBAAgB,cAAc,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,UAMtD;AAED,eAAO,MAAM,aAAa,GACxB,WAAW,QAAQ,GAAG,SAAS,GAAG,MAAM,GAAG,IAAI,GAAG,SAAS,4GAkB5D,CAAC;AAEF,eAAO,MAAM,UAAU,GAAI,MAAM,MAAM,WAWtC,CAAC;AAEF,eAAO,MAAM,cAAc,GAAI,UAAU,MAAM,WAK9C,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAAI,MAAM,MAAM,WAyC5C,CAAC;AAEF,eAAO,MAAM,eAAe,GAAI,UAAU,MAAM,EAAE,OAAO,MAAM,WAkB9D,CAAC;AAEF,eAAO,MAAM,aAAa,GACxB,aAAa,MAAM,EACnB,WAAW,MAAM,EACjB,QAAQ,MAAM,EACd,QAAQ,MAAM,EACd,UAAU,OAAO,EACjB,aAAa,MAAM,WAWpB,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAAI,aAAa,MAAM,EAAE,WAAW,MAAM,WACR,CAAC;AAEhE,wBAAgB,WAAW,CAAC,IAAI,SAAS,OAAO,EAAE,EAChD,QAAQ,EAAE,CAAC,GAAG,IAAI,EAAE,IAAI,KAAK,IAAI,EACjC,KAAK,EAAE,MAAM,aAKD,IAAI,UAUjB;AAED,eAAO,MAAM,yBAAyB,GACpC,UAAU,WAAW,EACrB,eAAe,MAAM,KAOhB,aACN,CAAC;AAEF,eAAO,MAAM,4BAA4B,GACvC,UAAU,WAAW,EACrB,eAAe,MAAM,KAOhB,aACN,CAAC;AAEF,eAAO,MAAM,SAAS,GAAI,OAAO,MAAM,KAAG,MAMzC,CAAC;AAEF,eAAO,MAAM,UAAU,GACrB,UAAU,MAAM,EAChB,QAAQ,MAAM,EACd,OAAO,MAAM,KACZ,MAMF,CAAC;AACF,eAAO,MAAM,UAAU,GAAI,SAAS,MAAM,EAAE,OAAO,MAAM,KAAG,MAM3D,CAAC;AACF,eAAO,MAAM,WAAW,GACtB,SAAS,MAAM,EACf,UAAU,MAAM,EAChB,QAAQ,MAAM,EACd,OAAO,MAAM,KACZ,MAMF,CAAC;AACF,eAAO,MAAM,aAAa,GAAI,OAAO,MAAM,KAAG,MAM7C,CAAC;AACF,eAAO,MAAM,aAAa,GACxB,KAAK,MAAM,EAEX,KAAK,GAAG,EACR,QAAQ,OAAO,KACd,MAKF,CAAC;AACF,eAAO,MAAM,WAAW,GAAI,YAAY,MAAM,KAAG,MAKhD,CAAC;AACF,eAAO,MAAM,WAAW,GAAI,OAAO,MAAM,KAAG,MAK3C,CAAC"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAE9C,OAAO,iBAAiB,CAAC;AAKzB,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAK9C,wBAAgB,YAAY,WAI3B;AAED,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,QAI5C;AAED,wBAAgB,cAAc,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,EAAE,GAAG,CAAC,EAAE,OAAO,UAerE;AAED,eAAO,MAAM,aAAa,GACxB,WAAW,QAAQ,GAAG,SAAS,GAAG,MAAM,GAAG,IAAI,GAAG,SAAS,4GAkB5D,CAAC;AAEF,eAAO,MAAM,cAAc,GAAI,UAAU,MAAM,WAa9C,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAAI,MAAM,MAAM,WAyC5C,CAAC;AAEF,eAAO,MAAM,eAAe,GAAI,UAAU,MAAM,EAAE,OAAO,MAAM,WAkB9D,CAAC;AAEF,eAAO,MAAM,aAAa,GACxB,aAAa,MAAM,EACnB,WAAW,MAAM,EACjB,QAAQ,MAAM,EACd,QAAQ,MAAM,EACd,UAAU,OAAO,EACjB,aAAa,MAAM,WAWpB,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAAI,aAAa,MAAM,EAAE,WAAW,MAAM,WACR,CAAC;AAEhE,wBAAgB,WAAW,CAAC,IAAI,SAAS,OAAO,EAAE,EAChD,QAAQ,EAAE,CAAC,GAAG,IAAI,EAAE,IAAI,KAAK,IAAI,EACjC,KAAK,EAAE,MAAM,aAKD,IAAI,UAUjB;AAED,eAAO,MAAM,yBAAyB,GACpC,UAAU,WAAW,EACrB,eAAe,MAAM,KAOhB,aACN,CAAC;AAEF,eAAO,MAAM,4BAA4B,GACvC,UAAU,WAAW,EACrB,eAAe,MAAM,KAOhB,aACN,CAAC;AAEF,eAAO,MAAM,SAAS,GAAI,OAAO,MAAM,KAAG,MAMzC,CAAC;AAEF,eAAO,MAAM,UAAU,GACrB,UAAU,MAAM,EAChB,QAAQ,MAAM,EACd,OAAO,MAAM,KACZ,MAMF,CAAC;AACF,eAAO,MAAM,UAAU,GAAI,SAAS,MAAM,EAAE,OAAO,MAAM,KAAG,MAM3D,CAAC;AACF,eAAO,MAAM,WAAW,GACtB,SAAS,MAAM,EACf,UAAU,MAAM,EAChB,QAAQ,MAAM,EACd,OAAO,MAAM,KACZ,MAMF,CAAC;AACF,eAAO,MAAM,aAAa,GAAI,OAAO,MAAM,KAAG,MAM7C,CAAC;AACF,eAAO,MAAM,aAAa,GACxB,KAAK,MAAM,EAEX,KAAK,GAAG,EACR,QAAQ,OAAO,KACd,MAKF,CAAC;AACF,eAAO,MAAM,WAAW,GAAI,YAAY,MAAM,KAAG,MAKhD,CAAC;AACF,eAAO,MAAM,WAAW,GAAI,OAAO,MAAM,KAAG,MAK3C,CAAC"}

package/dist/utils.js

@@ -1,21 +1,32 @@
-import moment from "moment";
-import "moment-duration-format";
-import moment_tz from "moment-timezone";
-import "moment/locale/ru";
+import dayjs from "dayjs";
+import "dayjs/locale/ru";
+import timezone from "dayjs/plugin/timezone";
+import utc from "dayjs/plugin/utc";
 import { useCallback, useRef } from "react";
 import { slugify } from "transliteration";
+dayjs.extend(utc);
+dayjs.extend(timezone);
 export function getCSRFToken() {
     return document.getElementsByName("csrfmiddlewaretoken")[0].value;
 }
 export function setCSRFToken(newToken) {
     document.getElementsByName("csrfmiddlewaretoken")[0].value = newToken;
 }
-export function prettyDatetime(datetime) {
-    if (datetime && datetime.length > 0) {
-        return moment_tz(datetime).locale("ru").format("dd DD MMM YYYY, HH:mm:ss");
-    }
-    else {
+export function prettyDatetime(datetime, utc) {
+    if (!datetime || datetime.length === 0)
         return "";
+    const fmt = "dd DD MMM YYYY, HH:mm:ss";
+    const tz = dayjs.tz.guess();
+    try {
+        if (utc) {
+            return dayjs.utc(datetime).tz(tz).locale("ru").format(fmt);
+        }
+        else {
+            return dayjs.tz(datetime, tz).locale("ru").format(fmt);
+        }
+    }
+    catch {
+        return datetime;
     }
 }
 export const taskStateText = (taskState) => {
@@ -36,23 +47,17 @@ export const taskStateText = (taskState) => {
             return "Нет состояния";
     }
 };
-export const formatDate = (date) => {
-    return new Date(date).toLocaleString("ru", {
-        weekday: "short",
-        month: "short",
-        day: "numeric",
-        year: "numeric",
-        hour: "2-digit",
-        minute: "2-digit",
-        second: "2-digit",
-        timeZone: "Europe/Moscow",
-    });
-};
 export const formatDuration = (duration) => {
-    return moment.duration(duration, "seconds").format({
-        precision: 1,
-        template: "h [ч], m [мин], s [сек]",
-    });
+    const d = dayjs.duration(duration, "seconds");
+    const totalSeconds = d.asSeconds();
+    const hours = Math.floor(totalSeconds / 3600);
+    if (hours > 0)
+        return `${hours} ч`;
+    const minutes = Math.floor(totalSeconds / 60);
+    if (minutes > 0)
+        return `${minutes} мин`;
+    const seconds = totalSeconds;
+    return `${Number(seconds.toFixed(1))} сек`;
 };
 export const getSlugTableName = (name) => {
     const replaces = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@danikokonn/yarik-frontend-lib",
-  "version": "2.1.2",
+  "version": "2.1.4",
   "license": "Apache-2.0",
   "description": "",
   "author": "",
@@ -14,6 +14,7 @@
   },
   "devDependencies": {
     "@eslint/js": "^9.34.0",
+    "@tsconfig/strictest": "^2.0.8",
     "@testing-library/jest-dom": "^6.9.1",
     "@testing-library/react": "^16.3.2",
     "@testing-library/user-event": "^14.6.1",
@@ -21,7 +22,7 @@
     "@types/moment-duration-format": "^2.2.7",
     "@types/react": "^19.2.14",
     "@types/react-dom": "^19.2.3",
-    "@vitest/coverage-v8": "^4.1.0",
+    "@vitest/coverage-v8": "^4.1.2",
     "eslint": "^9.39.4",
     "eslint-plugin-react": "^7.37.5",
     "eslint-plugin-unicorn": "^62.0.0",
@@ -30,35 +31,28 @@
     "prettier": "3.6.2",
     "react": "^19.2.4",
     "react-dom": "^19.2.4",
-    "ts-loader": "^9.5.4",
-    "tss-react": "^4.9.20",
     "typescript": "^5.9.3",
-    "typescript-eslint": "^8.57.1",
+    "typescript-eslint": "^8.57.2",
     "vitest": "^4.1.0"
   },
   "dependencies": {
+    "dayjs": "^1.11.20",
+    "react-json-tree": "^0.20.0",
+    "transliteration": "^2.6.1"
+  },
+  "peerDependencies": {
     "@emotion/react": "^11.14.0",
     "@emotion/styled": "^11.14.1",
     "@mui/icons-material": "^7.3.9",
     "@mui/material": "^7.3.9",
     "@mui/x-date-pickers": "^8.27.2",
-    "@tsconfig/strictest": "^2.0.8",
-    "css-loader": "^7.1.4",
-    "moment": "^2.30.1",
-    "moment-duration-format": "^2.3.2",
-    "moment-timezone": "^0.6.1",
     "notistack": "^3.0.2",
+    "react": ">=18 <20",
+    "react-dom": ">=18 <20",
     "react-imask": "^7.6.1",
-    "react-json-tree": "^0.20.0",
-    "react-router": "^7.13.1",
+    "react-router": "^7.13.2",
     "react-virtuoso": "^4.18.3",
-    "style-loader": "^4.0.0",
-    "swr": "^2.4.1",
-    "transliteration": "^2.6.1"
-  },
-  "peerDependencies": {
-    "react": ">=18 <20",
-    "react-dom": ">=18 <20"
+    "swr": "^2.4.1"
   },
   "scripts": {
     "test": "vitest",