fix: default scheduled changes (#5141)

Flagsmith · Feb 26, 2025 · c7533a8 · c7533a8
1 parent 7b4a1a5
commit c7533a8
Show file tree

Hide file tree

Showing 9 changed files with 418 additions and 391 deletions.
diff --git a/frontend/common/types/responses.ts b/frontend/common/types/responses.ts
@@ -4,13 +4,10 @@ export type EdgePagedResponse<T> = PagedResponse<T> & {
   last_evaluated_key?: string
   pages?: (string | undefined)[]
 }
-export type Approval =
-  | {
-      user: number
-    }
-  | {
-      group: number
-    }
+export type Approval = {
+  user?: number
+  group?: number
+}
 export type PagedResponse<T> = {
   count?: number
   next?: string

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -111,7 +111,7 @@
     "react": "16.14.0",
     "react-async-script": "1.2.0",
     "react-click-outside": "3.0.1",
-    "react-datepicker": "6.2.0",
+    "react-datepicker": "^8.1.0",
     "react-device-detect": "1.9.9",
     "react-diff-viewer-continued": "^3.3.1",
     "react-dom": "16.14.0",

diff --git a/frontend/web/components/AdminAPIKeys.js b/frontend/web/components/AdminAPIKeys.js
@@ -273,7 +273,7 @@ export class CreateAPIKey extends PureComponent {
                 <DateSelect
                   onChange={(e) => {
                     this.setState({
-                      expiry_date: e.toISOString(),
+                      expiry_date: e?.toISOString(),
                     })
                   }}
                   selected={expiry_date ? moment(expiry_date)._d : null}

diff --git a/frontend/web/components/DateSelect.js → frontend/web/components/DateSelect.tsx b/frontend/web/components/DateSelect.js → frontend/web/components/DateSelect.tsx
@@ -1,15 +1,39 @@
-import DatePicker from 'react-datepicker'
+import DatePicker, { DatePickerProps } from 'react-datepicker'
 import Icon from './Icon'
-import { useState } from 'react'
+import { useState, FC } from 'react'
+
+export interface DateSelectProps
+  extends Pick<DatePickerProps, 'dateFormat' | 'selected'> {
+  value?: DatePickerProps['value']
+  className?: string
+  isValid?: boolean
+  onChange?: (
+    date: Date | null,
+    event?: React.MouseEvent<HTMLElement> | React.KeyboardEvent<HTMLElement>,
+  ) => void
+}
+
+const DateSelect: FC<DateSelectProps> = ({
+  className,
+  dateFormat,
+  isValid,
+  onChange,
+  selected,
+  value,
+}) => {
+  const [isMonthPicker, setIsMonthPicker] = useState(false)
+  const [isYearPicker, setIsYearPicker] = useState(false)
+  const [touched, setTouched] = useState(false)
+  const [isOpen, setIsOpen] = useState(false)
 
-const DateSelect = ({ dateFormat, onChange, onSelect, selected, value }) => {
-  const [isMonthPicker, setMonthPicker] = useState(false)
-  const [isYearPicker, setYearPicker] = useState(false)
-  const [isOpen, setOpen] = useState(false)
   return (
     <Flex style={{ position: 'relative' }}>
       <DatePicker
+        className={`input-lg ${className} ${
+          !isValid && touched ? 'invalid' : ''
+        }`}
         dateFormat={dateFormat}
+        onFocus={() => setTouched(true)}
         renderCustomHeader={({
           date,
           decreaseMonth,
@@ -32,9 +56,9 @@ const DateSelect = ({ dateFormat, onChange, onSelect, selected, value }) => {
             </span>
             <div
               onClick={() => {
-                setMonthPicker(true)
+                setIsMonthPicker(true)
                 if (isMonthPicker) {
-                  setYearPicker(true)
+                  setIsYearPicker(true)
                 }
               }}
               className='react-datepicker-header-title'
@@ -64,25 +88,33 @@ const DateSelect = ({ dateFormat, onChange, onSelect, selected, value }) => {
           </Row>
         )}
         minDate={new Date()}
-        onChange={(date, e) => {
-          if (date < new Date()) {
-            setMonthPicker(false)
-            setYearPicker(false)
-            onChange(new Date())
-          } else {
-            onChange(date)
-            if (!e) {
-              setOpen(false)
-            }
-            if (isMonthPicker) {
-              setMonthPicker(false)
-            }
-            if (isYearPicker) {
-              setYearPicker(false)
-            }
+        onChange={(date, e): DatePickerProps['onChange'] => {
+          if (date === null) {
+            setIsMonthPicker(false)
+            setIsYearPicker(false)
+            onChange?.(null)
+            return
+          }
+
+          const today = new Date()
+          if (date < today) {
+            setIsMonthPicker(false)
+            setIsYearPicker(false)
+            onChange?.(new Date())
+            return
+          }
+
+          onChange?.(date)
+          if (!e) {
+            setIsOpen(false)
+          }
+          if (isMonthPicker) {
+            setIsMonthPicker(false)
+          }
+          if (isYearPicker) {
+            setIsYearPicker(false)
           }
         }}
-        className='input-lg'
         formatWeekDay={(nameOfDay) => nameOfDay.substr(0, 1)}
         showTimeSelect={!isMonthPicker && !isYearPicker}
         showMonthYearPicker={isMonthPicker}
@@ -92,12 +124,12 @@ const DateSelect = ({ dateFormat, onChange, onSelect, selected, value }) => {
         selected={selected}
         value={value}
         timeFormat='HH:mm'
-        onInputClick={() => setOpen(true)}
+        onInputClick={() => setIsOpen(true)}
         onClickOutside={(e) => {
           if (e) {
-            setOpen(false)
-            setMonthPicker(false)
-            setYearPicker(false)
+            setIsOpen(false)
+            setIsMonthPicker(false)
+            setIsYearPicker(false)
           }
         }}
         open={isOpen}