Merge branch 'main' into i201

# Conflicts:
#	src/Components/Event/useEditForm.ts

Author: Aloento

src/Components/Event/EventEditor.tsx

@@ -20,7 +20,7 @@ import { useEditForm } from "./useEditForm";
  *
  * @author Aloento
  * @since 1.0.0
- * @version 0.2.0
+ * @version 0.2.1
  */
 export function EventEditor({ Event }: { Event: Models.IEvent }) {
   const { State, Actions, Validation, OnSubmit, Loading } = useEditForm(Event);
@@ -47,15 +47,6 @@ export function EventEditor({ Event }: { Event: Models.IEvent }) {
           e.preventDefault();
           OnSubmit().then(() => setFalse());
         }}>
-        <ScaleTextField
-          placeholder="Please give the title of event"
-          required
-          label="Title"
-          value={State.title}
-          onScale-input={(e) => Actions.setTitle(e.target.value as string)}
-          invalid={!!Validation.title}
-          helperText={Validation.title}
-        />
 
         <ScaleDropdownSelect
           label="Type"
@@ -71,6 +62,16 @@ export function EventEditor({ Event }: { Event: Models.IEvent }) {
             </ScaleDropdownSelectItem>)}
         </ScaleDropdownSelect>
 
+        <ScaleTextField
+          placeholder="Please give the title of event"
+          required
+          label="Title"
+          value={State.title}
+          onScale-input={(e) => Actions.setTitle(e.target.value as string)}
+          invalid={!!Validation.title}
+          helperText={Validation.title}
+        />
+
         <ScaleDropdownSelect
           label="Status"
           value={State.status}
@@ -98,7 +99,7 @@ export function EventEditor({ Event }: { Event: Models.IEvent }) {
         <ScaleTextField
           type="datetime-local"
           label="(Plan) End CET"
-          disabled={!(!IsIncident(State.type) || !IsOpenStatus(State.status))}
+          disabled={!(!IsIncident(State.type) || (State.status && !IsOpenStatus(State.status)))}
           value={State.end ? dayjs(State.end).format(Dic.Picker) : null}
           onScale-input={(e) => Actions.setEnd(new Date(e.target.value as string))}
           invalid={!!Validation.end}

src/Components/Event/useEditForm.ts

@@ -23,7 +23,7 @@ import { EventStatus, EventType, GetEventImpact, GetStatusString, IsIncident, Is
  *
  * @author Aloento
  * @since 1.0.0
- * @version 0.2.0
+ * @version 0.2.1
  */
 export function useEditForm(event: Models.IEvent) {
   const [title, _setTitle] = useState(event.Title);
@@ -60,12 +60,8 @@ export function useEditForm(event: Models.IEvent) {
       return false;
     }
 
-    if (!IsIncident(type) && IsIncident(value)) {
-      _setStatus(EventStatus.Detected);
-    }
-
-    if (IsIncident(type) && !IsIncident(value)) {
-      _setStatus(EventStatus.Planned);
+    if (type !== value) {
+      _setStatus(undefined);
     }
 
     _setType(value);
@@ -95,7 +91,7 @@ export function useEditForm(event: Models.IEvent) {
     return !err;
   }
 
-  const [status, _setStatus] = useState(event.Status);
+  const [status, _setStatus] = useState<EventStatus | undefined>();
   const [valStatus, setValStatus] = useState<string>();
   function setStatus(value = status) {
     if (!value) {
@@ -156,7 +152,7 @@ export function useEditForm(event: Models.IEvent) {
   function setUpdateAt(value = updateAt) {
     let err: boolean = false;
 
-    if (value && value < start) {
+    if (IsIncident(type) && value && value < start) {
       setValUpdateAt("Update Date cannot be earlier than Start Date.");
       err = true;
     }
@@ -184,7 +180,7 @@ export function useEditForm(event: Models.IEvent) {
 
     const body: Record<string, any> = {
       title,
-      status: GetStatusString(status),
+      status: GetStatusString(status!),
       impact: GetEventImpact(type),
       message: update,
       update_date: updateAt.toISOString(),
@@ -230,15 +226,15 @@ export function useEditForm(event: Models.IEvent) {
       const updatedEvent = { ...DB.Events[eventIndex] };
       updatedEvent.Title = title;
       updatedEvent.Type = type;
-      updatedEvent.Status = status;
+      updatedEvent.Status = status!;
       updatedEvent.Start = start;
       updatedEvent.End = end;
 
       const newHistory: Models.IHistory = {
         Id: Math.max(...Array.from(updatedEvent.Histories).map(h => h.Id), 0) + 1,
         Message: update,
         Created: updateAt,
-        Status: status,
+        Status: status!,
         Event: updatedEvent
       };
       updatedEvent.Histories.add(newHistory);

src/Components/New/NewForm.tsx

@@ -36,15 +36,6 @@ export function NewForm() {
         OnSubmit();
       }}
     >
-      <ScaleTextField
-        placeholder="Please give the title of event"
-        required
-        label="Title"
-        value={State.title}
-        onScale-input={(e) => Actions.setTitle(e.target.value as string)}
-        invalid={!!Validation.title}
-        helperText={Validation.title}
-      />
 
       <ScaleDropdownSelect
         label="Type"
@@ -59,6 +50,16 @@ export function NewForm() {
           </ScaleDropdownSelectItem>)}
       </ScaleDropdownSelect>
 
+      <ScaleTextField
+        placeholder="Please give the title of event"
+        required
+        label="Title"
+        value={State.title}
+        onScale-input={(e) => Actions.setTitle(e.target.value as string)}
+        invalid={!!Validation.title}
+        helperText={Validation.title}
+      />
+
       <ScaleTextarea
         placeholder="If there is any known information, please write it down here."
         resize="vertical"