diff --git a/cypress/e2e/020_visit/visit.plan.authorization.spec.js b/cypress/e2e/020_visit/visit.plan.authorization.spec.js index c3c980151..b2e397b5e 100644 --- a/cypress/e2e/020_visit/visit.plan.authorization.spec.js +++ b/cypress/e2e/020_visit/visit.plan.authorization.spec.js @@ -70,7 +70,7 @@ describe('Plan "huisbezoek"', () => { it("Schedule visit from date", () => { cy.get('[data-testid="visit_from_datetime"]') - .type(moment().format("YYYY-MM-DD")) + .type(dayjs().format("YYYY-MM-DD")) }) it("Schedule priority", () => { diff --git a/cypress/e2e/020_visit/visit.plan.spec.js b/cypress/e2e/020_visit/visit.plan.spec.js index 0d332926f..f10803f1f 100644 --- a/cypress/e2e/020_visit/visit.plan.spec.js +++ b/cypress/e2e/020_visit/visit.plan.spec.js @@ -1,4 +1,4 @@ -import moment from "moment"; +import dayjs from "dayjs"; import address from "../../fixtures/address.json"; import visit from "../../fixtures/visit.json"; @@ -67,7 +67,7 @@ describe('Test visit.plan.spec', () => { cy.get('[data-testid="visit_from"]').select(visit.visitFrom); cy.get('[data-testid="visit_from_datetime"]').type( - moment().format("YYYY-MM-DD") + dayjs().format("YYYY-MM-DD") ); cy.get('[data-testid="priority"]').select(visit.priority); diff --git a/package-lock.json b/package-lock.json index cf2a34c06..545236d98 100644 --- a/package-lock.json +++ b/package-lock.json @@ -28,7 +28,7 @@ "@types/styled-components": "^5.1.26", "@vitejs/plugin-react": "^4.3.1", "axios": "^1.7.3", - "dayjs": "^1.11.11", + "dayjs": "^1.11.13", "env-cmd": "^10.1.0", "eslint-config-react-app": "^7.0.1", "final-form": "^4.20.10", @@ -38,7 +38,6 @@ "lodash.debounce": "^4.0.8", "lodash.isempty": "^4.4.0", "lodash.merge": "^4.6.2", - "moment": "^2.29.4", "qs": "^6.13.0", "react": "^17.0.2", "react-dom": "^17.0.2", @@ -12297,14 +12296,6 @@ "node": ">=16 || 14 >=14.17" } }, - "node_modules/moment": { - "version": "2.30.1", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz", - "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==", - "engines": { - "node": "*" - } - }, "node_modules/ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", diff --git a/package.json b/package.json index 94591e95f..6ba01e994 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "@types/styled-components": "^5.1.26", "@vitejs/plugin-react": "^4.3.1", "axios": "^1.7.3", - "dayjs": "^1.11.11", + "dayjs": "^1.11.13", "env-cmd": "^10.1.0", "eslint-config-react-app": "^7.0.1", "final-form": "^4.20.10", @@ -55,7 +55,6 @@ "lodash.debounce": "^4.0.8", "lodash.isempty": "^4.4.0", "lodash.merge": "^4.6.2", - "moment": "^2.29.4", "qs": "^6.13.0", "react": "^17.0.2", "react-dom": "^17.0.2", diff --git a/src/app/components/case/Documents/DocumentsTable/columns.tsx b/src/app/components/case/Documents/DocumentsTable/columns.tsx index 638f25502..40f03c5f2 100644 --- a/src/app/components/case/Documents/DocumentsTable/columns.tsx +++ b/src/app/components/case/Documents/DocumentsTable/columns.tsx @@ -1,4 +1,4 @@ -import moment from "moment" +import dayjs from "dayjs" import styled from "styled-components" import formatBytes from "../utils/formatBytes" import TableActions from "./TableActions/TableActions" @@ -42,7 +42,7 @@ const getColumns = (getDocuments: () => Promise, documentTypes?: Compon header: "Aangemaakt", dataIndex: "creatiedatum", minWidth: 100, - render: (text: any) => text ? moment(text).format("DD-MM-YYYY") : "-" + render: (text: any) => text ? dayjs(text).format("DD-MM-YYYY") : "-" }, { header: "Media type", dataIndex: "formaat", diff --git a/src/app/components/case/forms/ScheduleForm/ScheduleForm.tsx b/src/app/components/case/forms/ScheduleForm/ScheduleForm.tsx index c644c8466..69154a629 100644 --- a/src/app/components/case/forms/ScheduleForm/ScheduleForm.tsx +++ b/src/app/components/case/forms/ScheduleForm/ScheduleForm.tsx @@ -1,5 +1,5 @@ import { FormTitle } from "@amsterdam/asc-ui" -import moment from "moment" +import dayjs from "dayjs" import { useCase, useScheduleTypes, useScheduleCreate } from "app/state/rest" import WorkflowForm from "app/components/case/WorkflowForm/WorkflowForm" import scaffold from "./scaffold" @@ -22,7 +22,7 @@ const mapData = (data: ScheduleTypeFormData) => ({ week_segment: data.week_segment.id, day_segment: data.day_segment.id, priority: data.priority.id, - visit_from_datetime: data.visit_from_datetime ? moment(data.visit_from_datetime).format() : null + visit_from_datetime: data.visit_from_datetime ? dayjs(data.visit_from_datetime).format() : null }) const visitFromOptions: { id: number, name: string }[] = [{ diff --git a/src/app/components/case/forms/ScheduleForm/scaffold.tsx b/src/app/components/case/forms/ScheduleForm/scaffold.tsx index fae36ca46..0e54fafde 100644 --- a/src/app/components/case/forms/ScheduleForm/scaffold.tsx +++ b/src/app/components/case/forms/ScheduleForm/scaffold.tsx @@ -1,5 +1,5 @@ import { FormPositioner } from "@amsterdam/amsterdam-react-final-form" -import moment from "moment" +import dayjs from "dayjs" import { Fields } from "app/components/shared/Form/ScaffoldFields" import InfoButton from "app/components/shared/InfoHeading/InfoButton" import type { NavigateToFunction } from "app/routing/useNavigation" @@ -56,8 +56,8 @@ export default ( name: "visit_from_datetime", isRequired: true, validate: (value: string | undefined) => { - const now = moment() - const valueDate = moment(value) + const now = dayjs() + const valueDate = dayjs(value) const isInvalidDate = valueDate.isBefore(now, "day") // Date cannot be in the past. return isInvalidDate ? "Selecteer vandaag of een dag in de toekomst!" : false } diff --git a/src/app/components/cases/CasesFilter/scaffoldDate.ts b/src/app/components/cases/CasesFilter/scaffoldDate.ts index b86718644..3c8c7c468 100644 --- a/src/app/components/cases/CasesFilter/scaffoldDate.ts +++ b/src/app/components/cases/CasesFilter/scaffoldDate.ts @@ -1,14 +1,14 @@ -import moment from "moment" +import dayjs from "dayjs" import { FormPositioner } from "@amsterdam/amsterdam-react-final-form" import { Fields } from "app/components/shared/Form/ScaffoldFields" const DATE_FORMAT = "YYYY-MM-DD" const getOptions = () => { - const today = moment().format(DATE_FORMAT) - const yesterday = moment().subtract(1, "days").format(DATE_FORMAT) - const sevenDaysAgo = moment().subtract(7, "days").format(DATE_FORMAT) - const thirtyDaysAgo = moment().subtract(30, "days").format(DATE_FORMAT) + const today = dayjs().format(DATE_FORMAT) + const yesterday = dayjs().subtract(1, "days").format(DATE_FORMAT) + const sevenDaysAgo = dayjs().subtract(7, "days").format(DATE_FORMAT) + const thirtyDaysAgo = dayjs().subtract(30, "days").format(DATE_FORMAT) return { "": "Alle zaken", [today]: "Vandaag", diff --git a/src/app/components/shared/ConfirmScaffoldForm/utils/createValuesObject.tsx b/src/app/components/shared/ConfirmScaffoldForm/utils/createValuesObject.tsx index 5443d50bc..a5c5c69cd 100644 --- a/src/app/components/shared/ConfirmScaffoldForm/utils/createValuesObject.tsx +++ b/src/app/components/shared/ConfirmScaffoldForm/utils/createValuesObject.tsx @@ -1,4 +1,4 @@ -import moment from "moment" +import dayjs from "dayjs" import ArrayFieldList from "../components/ArrayFieldList" import type { RequestBody, NamedFields } from "../ConfirmScaffoldFields" import { Field } from "../../Form/ScaffoldField" @@ -26,7 +26,7 @@ const mapField = (field: Field, key: string, data: T) => const typeResult: Record = data["type_result"] as {} return Object.values(typeResult) } else if (type === "DateField") { - return typeof v === "string" ? moment(v).format("DD-MM-YYYY") : v + return typeof v === "string" ? dayjs(v).format("DD-MM-YYYY") : v } else { return v } diff --git a/src/app/state/rest/addresses.ts b/src/app/state/rest/addresses.ts index 3599ca559..ee7c35148 100644 --- a/src/app/state/rest/addresses.ts +++ b/src/app/state/rest/addresses.ts @@ -1,6 +1,6 @@ import qs from "qs" -import moment from "moment" +import dayjs from "dayjs" import type { Options } from "./" import { useErrorHandler, useSuppressErrorHandler } from "./hooks/utils/errorHandler" import { makeApiUrl } from "./hooks/utils/apiUrl" @@ -39,7 +39,7 @@ export const usePermitsPowerBrowser = (bagId: string) => { export const useMeldingen = (bagId: string) => { const queryString = qs.stringify({ - start_date: moment().subtract(1, "years").startOf("year").format() + start_date: dayjs().subtract(1, "years").startOf("year").format() }, { addQueryPrefix: true })