Moves the DKG logic to DKGStatusRow

Author: nkcr

web/frontend/src/mocks/handlers.ts

@@ -63,7 +63,7 @@ export const handlers = [
       ? {
           lastname: 'Bobster',
           firstname: 'Alice',
-          role: UserRole.Voter,
+          role: UserRole.Admin,
           sciper: userId,
         }
       : {};

web/frontend/src/pages/election/Show.tsx

@@ -9,7 +9,7 @@ import Modal from 'components/modal/Modal';
 import StatusTimeline from './components/StatusTimeline';
 import Loading from 'pages/Loading';
 import Action from './components/Action';
-import { NodeStatus } from 'types/node';
+import { InternalDKGInfo, NodeStatus } from 'types/node';
 import useGetResults from './components/utils/useGetResults';
 import UserIDTable from './components/UserIDTable';
 import DKGStatusTable from './components/DKGStatusTable';
@@ -42,7 +42,7 @@ const ElectionShow: FC = () => {
 
   const [nodeProxyAddresses, setNodeProxyAddresses] = useState<Map<string, string>>(new Map());
   const [nodeToSetup, setNodeToSetup] = useState<[string, string]>(null);
-  // The status of each node
+  // The status of each node. Key is the node's address.
   const [DKGStatuses, setDKGStatuses] = useState<Map<string, NodeStatus>>(new Map());
 
   const [nodeLoading, setNodeLoading] = useState<Map<string, boolean>>(null);
@@ -51,6 +51,25 @@ const ElectionShow: FC = () => {
   const ongoingItem = 'ongoingAction' + electionID;
   const nodeToSetupItem = 'nodeToSetup' + electionID;
 
+  const notifyDKGState = (node: string, info: InternalDKGInfo) => {
+    console.log('DKG node updated:', info);
+    switch (info.getStatus()) {
+      case NodeStatus.Failed:
+        console.log('DKG node failed');
+        setOngoingAction(OngoingAction.None);
+        break;
+      case NodeStatus.Setup:
+        setOngoingAction(OngoingAction.None);
+        setStatus(Status.Setup);
+        break;
+    }
+
+    const newDKGStatuses = new Map(DKGStatuses);
+    newDKGStatuses.set(node, info.getStatus());
+    setDKGStatuses(newDKGStatuses);
+    console.log('dkg statuses:', DKGStatuses);
+  };
+
   // Fetch result when available after a status change
   useEffect(() => {
     if (status === Status.ResultAvailable && isResultAvailable) {
@@ -76,6 +95,7 @@ const ElectionShow: FC = () => {
     const storedOngoingAction = JSON.parse(window.localStorage.getItem(ongoingItem));
 
     if (storedOngoingAction !== null) {
+      console.log('stored ongoing action:', storedOngoingAction);
       setOngoingAction(storedOngoingAction);
     }
 
@@ -141,14 +161,20 @@ const ElectionShow: FC = () => {
 
         // TODO: can be modified such that if the majority of the node are
         // initialized than the election status can still be set to initialized
-        if (statuses.includes(NodeStatus.NotInitialized)) return;
+        if (statuses.includes(NodeStatus.NotInitialized)) {
+          setOngoingAction(OngoingAction.None);
+          setStatus(Status.Initial);
+          return;
+        }
 
         if (statuses.includes(NodeStatus.Setup)) {
+          setOngoingAction(OngoingAction.None);
           setStatus(Status.Setup);
           return;
         }
 
         if (statuses.includes(NodeStatus.Unreachable)) return;
+        if (statuses.includes(NodeStatus.Failed)) return;
 
         setStatus(Status.Initialized);
 
@@ -220,8 +246,6 @@ const ElectionShow: FC = () => {
                   setOngoingAction={setOngoingAction}
                   nodeToSetup={nodeToSetup}
                   setNodeToSetup={setNodeToSetup}
-                  DKGStatuses={DKGStatuses}
-                  setDKGStatuses={setDKGStatuses}
                 />
               )}
             </div>
@@ -248,6 +272,9 @@ const ElectionShow: FC = () => {
                 setDKGStatuses={setDKGStatuses}
                 setTextModalError={setTextModalError}
                 setShowModalError={setShowModalError}
+                ongoingAction={ongoingAction}
+                notifyDKGState={notifyDKGState}
+                nodeToSetup={nodeToSetup}
               />
             </div>
           </div>

web/frontend/src/pages/election/components/Action.tsx

@@ -3,7 +3,6 @@ import PropTypes from 'prop-types';
 
 import { ID } from 'types/configuration';
 import { OngoingAction, Status } from 'types/election';
-import { NodeStatus } from 'types/node';
 import useChangeAction from './utils/useChangeAction';
 
 type ActionProps = {
@@ -19,8 +18,6 @@ type ActionProps = {
   setOngoingAction: (action: OngoingAction) => void;
   nodeToSetup: [string, string];
   setNodeToSetup: ([node, proxy]: [string, string]) => void;
-  DKGStatuses: Map<string, NodeStatus>;
-  setDKGStatuses: (dkgStatuses: Map<string, NodeStatus>) => void;
 };
 
 const Action: FC<ActionProps> = ({
@@ -36,8 +33,6 @@ const Action: FC<ActionProps> = ({
   setOngoingAction,
   nodeToSetup,
   setNodeToSetup,
-  DKGStatuses,
-  setDKGStatuses,
 }) => {
   const { getAction, modalClose, modalCancel, modalDelete, modalSetup } = useChangeAction(
     status,
@@ -51,9 +46,7 @@ const Action: FC<ActionProps> = ({
     ongoingAction,
     setOngoingAction,
     nodeToSetup,
-    setNodeToSetup,
-    DKGStatuses,
-    setDKGStatuses
+    setNodeToSetup
   );
 
   return (

web/frontend/src/pages/election/components/ChooseProxyModal.tsx

@@ -2,12 +2,10 @@ import { Dialog, Transition } from '@headlessui/react';
 import { CogIcon } from '@heroicons/react/outline';
 import { FC, Fragment, useRef } from 'react';
 import { useTranslation } from 'react-i18next';
-import { NodeStatus } from 'types/node';
 
 type ChooseProxyModalProps = {
   roster: string[];
   showModal: boolean;
-  DKGStatuses: Map<string, NodeStatus>;
   nodeProxyAddresses: Map<string, string>;
   nodeToSetup: [string, string];
   setNodeToSetup: (node: [string, string]) => void;
@@ -18,7 +16,6 @@ type ChooseProxyModalProps = {
 const ChooseProxyModal: FC<ChooseProxyModalProps> = ({
   roster,
   showModal,
-  DKGStatuses,
   nodeProxyAddresses,
   nodeToSetup,
   setNodeToSetup,
@@ -48,8 +45,7 @@ const ChooseProxyModal: FC<ChooseProxyModalProps> = ({
       nodeToSetup !== null &&
       roster.map((node, index) => {
         const proxy = nodeProxyAddresses.get(node);
-        const status = DKGStatuses.get(node);
-        const checkable = proxy !== '' && status === NodeStatus.Initialized;
+        const checkable = proxy !== '';
 
         return (
           <div className="flex items-center my-4 ml-4" key={node}>