make lock admin work on the survey admin page

compendium_v2/routes/api.py

@@ -13,6 +13,7 @@ from compendium_v2.routes.policy import routes as policy
 from compendium_v2.routes.survey import routes as survey
 from compendium_v2.routes.user import routes as user_routes
 from compendium_v2.routes.nren import routes as nren_routes
+from compendium_v2.routes.response import routes as response_routes
 
 routes = Blueprint('compendium-v2-api', __name__)
 routes.register_blueprint(budget_routes, url_prefix='/budget')
@@ -25,6 +26,7 @@ routes.register_blueprint(policy, url_prefix='/policy')
 routes.register_blueprint(survey, url_prefix='/survey')
 routes.register_blueprint(user_routes, url_prefix='/user')
 routes.register_blueprint(nren_routes, url_prefix='/nren')
+routes.register_blueprint(response_routes, url_prefix='/response')
 
 logger = logging.getLogger(__name__)
 

compendium_v2/routes/survey.py

@@ -73,12 +73,21 @@ def list_surveys() -> Any:
         status: str
         responses: List[Dict[str, str]]
 
+    def make_lock_description(locked_user):
+        if locked_user:
+            return f"Locked by: {locked_user.fullname} ({locked_user.email})"
+        return ""
+
     entries: List[SurveyDict] = [
         {
             "year": entry.year,
             "status": entry.status.value,
             "responses": [
-                {"nren": r.nren.name, "status": r.status.value}
+                {
+                    "nren": r.nren.name,
+                    "status": r.status.value,
+                    "lock_description": make_lock_description(r.locked_by_user)
+                }
                 for r in sorted(entry.responses, key=response_key)
             ]
         }
@@ -92,7 +101,7 @@ def list_surveys() -> Any:
             continue
         nrens_with_responses = set([r["nren"] for r in entry["responses"]])
         for nren_name in sorted(nren_names.difference(nrens_with_responses), key=str.lower):
-            entry["responses"].append({"nren": nren_name, "status": "not started"})
+            entry["responses"].append({"nren": nren_name, "status": "not started", "lock_description": ""})
 
     return entries
 

survey-frontend/src/App.tsx

@@ -19,7 +19,7 @@ function App(): ReactElement {
                         <Route path="survey/admin/users" element={<UserManagementComponent />} />
                         <Route path="survey/admin/inspect/:year" element={<SurveyContainerComponent loadFrom={'/api/response/inspect/'} />} />
                         <Route path="survey/admin/try/:year" element={<SurveyContainerComponent loadFrom={'/api/response/try/'} />} />
-                        <Route path="survey/respond/:year/:nren" element={<SurveyContainerComponent loadFrom={'/api/response/load/'} saveTo={'/api/response/save/'} />} />
+                        <Route path="survey/response/:year/:nren" element={<SurveyContainerComponent loadFrom={'/api/response/load/'} saveTo={'/api/response/save/'} />} />
                         <Route path="*" element={<Landing />} />
                     </Routes>
                 </UserProvider>

survey-frontend/src/SurveyContainerComponent.tsx

@@ -155,7 +155,7 @@ function SurveyContainerComponent({ loadFrom, saveTo = '' }) {
                 removeEventListener("pagehide", pageHideListener);
                 break;
             case 'startEdit': {
-                const response = await fetch('/api/survey/lock/' + year + '/' + nren, {method: "POST"});
+                const response = await fetch('/api/response/lock/' + year + '/' + nren, {method: "POST"});
                 const json = await response.json();
                 console.log(json);
                 lockUUID.current = json.lock_uuid;

survey-frontend/src/SurveyManagementComponent.tsx

@@ -19,6 +19,7 @@ async function fetchSurveys(): Promise<Survey[]> {
 interface Response {
     nren: string
     status: string
+    lock_description: string
 }
 
 interface Survey {
@@ -50,7 +51,14 @@ function SurveyManagementComponent() {
         });
     }
 
-    const newSurveyAllowed = surveys.every(s => s.status == 'published');
+    async function removeLock(year, nrenName) {
+        await fetch('/api/response/unlock/' + year + '/' + nrenName, { method: 'POST' });
+        fetchSurveys().then((surveyList) => {
+            setSurveys(surveyList);
+        });
+    }
+
+    const newSurveyAllowed = surveys.length > 0 && surveys.every(s => s.status == 'published');
 
     const navigate = useNavigate();
 
@@ -96,14 +104,16 @@ function SurveyManagementComponent() {
                                         <tr key={response.nren}>
                                             <td>{response.nren}</td>
                                             <td>{response.status}</td>
-                                            <td>locked by</td>
+                                            <td>{response.lock_description}</td>
                                             <td>
-                                                <Button onClick={() => navigate(`/survey/respond/${survey.year}/${response.nren}`)} style={{ pointerEvents: 'auto' }}
+                                                <Button onClick={() => navigate(`/survey/response/${survey.year}/${response.nren}`)} style={{ pointerEvents: 'auto' }}
                                                     title="Open the responses of the NREN.">
                                                     open
                                                 </Button>
-
-                                                remove lock (only available when locked)
+                                                <Button onClick={() => removeLock(survey.year, response.nren)} disabled={response.lock_description == ''} style={{ pointerEvents: 'auto' }}
+                                                    title="Remove the lock from the survey so that another person can open the survey for editing. WARNING: The person that currently has the lock will not be abe to save their changes anymore once someone else starts editing!">
+                                                    remove lock
+                                                </Button>
                                             </td>
                                         </tr>
                                     ))}