2022-02 Improvements

packages/nota-client/package.json

@@ -10,7 +10,7 @@
   "dependencies": {
     "i18next": "^20.3.2",
     "i18next-browser-languagedetector": "^6.1.2",
-    "i18next-http-backend": "^1.2.6",
+    "i18next-http-backend": "^1.3.2",
     "moment": "^2.24.0",
     "mousetrap": "1.6.5",
     "open-iconic": "^1.1.1",
@@ -24,7 +24,6 @@
     "react-router": "5.0.1",
     "react-router-bootstrap": "^0.25.0",
     "react-router-dom": "5.0.1",
-    "react-scripts": "^4.0.3",
     "react-tiny-virtual-list": "2.2.0",
     "react-vis": "^1.11.7",
     "redux": "4.0.1",
@@ -38,6 +37,7 @@
     "@testing-library/user-event": "^13.2.1",
     "@types/jest": "^27.0.1",
     "bootstrap": "^4.6",
+    "react-scripts": "^4.0.3",
     "redux-devtools": "3.5.0",
     "semantic-ui-css": "2.4.1"
   },

packages/nota-client/public/locales/en/translation.json

@@ -184,5 +184,10 @@
   "inactive-user": "Inactive/Deleted",
   "vis-not-found": "Visualization data not found",
   "task-assignment-default-items": "Assignment Size",
-  "task-assignment-default-order": "Assignment Order"
+  "task-assignment-default-order": "Assignment Order",
+  "task-manualUrl": "Manual Url",
+  "manual": "Manual",
+  "task-is-test-creation": "Task Items Limit (for test)",
+  "task-test-task-limit": "Task Items Limit",
+  "task-test-task-limit-items": "items"
 }

packages/nota-client/public/locales/ja/translation.json

@@ -184,5 +184,10 @@
   "inactive-user": "無効・削除済み",
   "vis-not-found": "表示するデータがありません",
   "task-assignment-default-items": "アサインサイズ",
-  "task-assignment-default-order": "アサイン順番"
+  "task-assignment-default-order": "アサイン順番",
+  "task-manualUrl": "マニュアルUrl",
+  "manual": "マニュアル",
+  "task-is-test-creation": "タスク作成件数上限 (試し用)",
+  "task-test-task-limit": "件数上限",
+  "task-test-task-limit-items": "件"
 }

packages/nota-client/src/components/DashboardProjectTask.js

@@ -15,6 +15,7 @@ import { persistTaskAssignment } from "../lib/api";
 import history from "../lib/history";
 import { Task, TaskAssignment } from "../lib/models";
 import DashboardProjectTaskAssignment from "./DashboardProjectTaskAssignment";
+import Icon from "./Icon";
 import Loading from "./Loading";
 
 const DashboardProjectTask = function({ project, task, reload }) {
@@ -79,6 +80,18 @@ const DashboardProjectTask = function({ project, task, reload }) {
               <h3>
                 {task.status === Task.STATUS.HIDDEN && `${t("task-hidden")}`}{" "}
                 {project.name} - {task.name}
+                {task.manualUrl && (
+                  <small>
+                    <a
+                      className="ml-3"
+                      href={task.manualUrl}
+                      target="_blank"
+                      rel="noreferrer"
+                    >
+                      {t("manual")} <Icon name="external-link" />
+                    </a>
+                  </small>
+                )}
               </h3>
             </Nav.Item>
             <Nav.Item>

packages/nota-client/src/components/admin/AdminProjectTask.js

@@ -17,6 +17,7 @@ import { fetchProjectAssignableUsers, fetchTask } from "../../lib/api";
 import { apiContainerFactory } from "../../lib/apiContainerFactory";
 import { Project, Task, TaskAssignment } from "../../lib/models";
 import { parseDate } from "../../lib/utils";
+import Icon from "../Icon";
 import Loading from "../Loading";
 import AdminProjectTaskAssignment from "./AdminProjectTaskAssignment";
 import AdminProjectTaskExport from "./AdminProjectTaskExport";
@@ -185,6 +186,23 @@ export function AdminProjectTask({ resource, project, loading, doGet }) {
                         </code>
                       </Col>
                     </Row>
+                    <Row>
+                      <Col className="col-3 text-right">
+                        {t("task-manualUrl")}
+                      </Col>
+                      <Col>
+                        <code>{task.manualUrl ?? ""}</code>{" "}
+                        {task.manualUrl && (
+                          <a
+                            href={task.manualUrl}
+                            target="_blank"
+                            rel="noreferrer"
+                          >
+                            <Icon name="external-link" />
+                          </a>
+                        )}
+                      </Col>
+                    </Row>
                     <Row>
                       <Col className="col-3 text-right">{t("progress")}</Col>
                       <Col className="d-flex flex-row align-items-center">
@@ -218,7 +236,7 @@ export function AdminProjectTask({ resource, project, loading, doGet }) {
                       </Col>
                     </Row>
                     <Row>
-                      <Col className="col-3 text-right">Status</Col>
+                      <Col className="col-3 text-right">{t("status")}</Col>
                       <Col>
                         <code>{t(Task.STATUS_TEXT[task.status])}</code>
                       </Col>

packages/nota-client/src/components/admin/AdminProjectTaskEdit.js

@@ -6,7 +6,7 @@ import { deleteTask, fetchTask, updateTask } from "../../lib/api";
 import { apiContainerFactory } from "../../lib/apiContainerFactory";
 import history from "../../lib/history";
 import { Task } from "../../lib/models";
-import useInputForm, { integer, string } from "../../lib/useInputForm";
+import useInputForm, { integer, string, url } from "../../lib/useInputForm";
 import Loading from "../Loading";
 
 function AdminProjectTaskEdit({ resource: task, project, loading }) {
@@ -33,7 +33,8 @@ function AdminProjectTaskEdit({ resource: task, project, loading }) {
           parseInt(values.assignmentDefaultItems),
           Task.MIN_ASSIGNMENT_SIZE
         ),
-        assignmentDefaultOrder: values.assignmentDefaultOrder
+        assignmentDefaultOrder: values.assignmentDefaultOrder,
+        manualUrl: values.manualUrl
       }
     });
 
@@ -55,6 +56,7 @@ function AdminProjectTaskEdit({ resource: task, project, loading }) {
   const formSchema = {
     name: string().required(),
     description: string().required(),
+    manualUrl: url(),
     status: integer().required(),
     assignmentDefaultItems: integer().required(),
     assignmentDefaultOrder: string().required()
@@ -67,6 +69,7 @@ function AdminProjectTaskEdit({ resource: task, project, loading }) {
   ] = useInputForm(saveTask, formSchema, {
     name: task ? task.name : "",
     description: task ? task.description : "",
+    manualUrl: task ? task.manualUrl : "",
     status: task ? task.status : "",
     assignmentDefaultItems:
       task && task.assignmentDefaultItems
@@ -137,6 +140,20 @@ function AdminProjectTaskEdit({ resource: task, project, loading }) {
                 {t("required-error", { field: t("task-description") })}
               </Form.Control.Feedback>
             </Form.Group>
+            <Form.Group>
+              <Form.Label>{t("task-manualUrl")}</Form.Label>
+              <Form.Control
+                type="url"
+                placeholder={t("task-manualUrl")}
+                name="manualUrl"
+                value={values.manualUrl}
+                onChange={handleChange}
+                isInvalid={touched.manualUrl && errors.manualUrl}
+              />
+              <Form.Control.Feedback type="invalid">
+                {t("required-error", { field: t("task-manualUrl") })}
+              </Form.Control.Feedback>
+            </Form.Group>
             <Form.Group>
               <Form.Label>{t("task-assignment-default-items")}</Form.Label>
               <Form.Control