@elice/material-assignment 1.231212.0 → 1.231228.0

package/es/components/material-assignment-admin/MaterialAssignmentAdminContentTa.js

@@ -1,9 +1,8 @@
-import { slicedToArray as _slicedToArray, asyncToGenerator as _asyncToGenerator, regeneratorRuntime as _regeneratorRuntime } from '../../_virtual/_rollupPluginBabelHelpers.js';
 import React from 'react';
 import { useForm, Controller } from 'react-hook-form';
 import { FormattedDate } from 'react-intl';
 import { config, getOrgUserGet, getOrgMaterialAssignmentGet, getOrgMaterialAssignmentSubmissionList, getOrgMaterialAssignmentGradeResultGet, getOrgMaterialAssignmentGradeList, postOrgMaterialAssignmentGradeEdit } from '@elice/api-client';
-import { Flex, Vspace, Notification, ProfileImage, Hspace, Text, Tooltip, Icon, InfoTable, Button, TableNext, Modal, Label, Input, Textarea } from '@elice/blocks';
+import { Notification, Flex, Vspace, ProfileImage, Hspace, Text, Tooltip, Icon, InfoTable, Button, TableNext, Modal, Label, Input, Textarea } from '@elice/blocks';
 import { base } from '@elice/design-tokens';
 import { eilStatusInfo } from '@elice/icons';
 import { useMaterialConfigApiClientUpdate } from '@elice/material-shared-utils';
@@ -11,13 +10,14 @@ import dayjs from 'dayjs';
 import MaterialAssignmentContainer from '../shared/MaterialAssignmentContainer.js';
 import { StyledMaterialAssignmentAdminHeader, StyledMaterialAssignmentAdminHeaderCell, StyledMaterialAssignmentAdminGradeWrapper } from './MaterialAssignmentAdmin.styled.js';
 
-var MaterialAssignmentAdminContentTa = function MaterialAssignmentAdminContentTa(_ref) {
-  var materialAssignmentId = _ref.materialAssignmentId,
-    userId = _ref.userId,
-    adminUserId = _ref.adminUserId;
+const MaterialAssignmentAdminContentTa = ({
+  materialAssignmentId,
+  userId,
+  adminUserId
+}) => {
   var _a;
   // Form
-  var gradeEditFormMethods = useForm({
+  const gradeEditFormMethods = useForm({
     defaultValues: {
       score: 0,
       comment: ''
@@ -25,100 +25,67 @@ var MaterialAssignmentAdminContentTa = function MaterialAssignmentAdminContentTa
     mode: 'onChange'
   });
   // State related with component
-  var _React$useState = React.useState(false),
-    _React$useState2 = _slicedToArray(_React$useState, 2),
-    showGradeEditModal = _React$useState2[0],
-    setShowGradeEditModal = _React$useState2[1];
+  const [showGradeEditModal, setShowGradeEditModal] = React.useState(false);
   // State related with api
-  var _React$useState3 = React.useState(null),
-    _React$useState4 = _slicedToArray(_React$useState3, 2),
-    user = _React$useState4[0],
-    setUser = _React$useState4[1];
-  var _React$useState5 = React.useState(null),
-    _React$useState6 = _slicedToArray(_React$useState5, 2),
-    materialAssignment = _React$useState6[0],
-    setMaterialAssignment = _React$useState6[1];
-  var _React$useState7 = React.useState(null),
-    _React$useState8 = _slicedToArray(_React$useState7, 2),
-    userSubmission = _React$useState8[0],
-    setUserSubmission = _React$useState8[1];
-  var _React$useState9 = React.useState(null),
-    _React$useState10 = _slicedToArray(_React$useState9, 2),
-    gradeResult = _React$useState10[0],
-    setGradeResult = _React$useState10[1];
-  var _React$useState11 = React.useState(null),
-    _React$useState12 = _slicedToArray(_React$useState11, 2),
-    myGrade = _React$useState12[0],
-    setMyGrade = _React$useState12[1];
-  var isAssignmentClosed = dayjs().isAfter(dayjs(materialAssignment === null || materialAssignment === void 0 ? void 0 : materialAssignment.closeDatetime));
-  var isScoreFinalized = Boolean(materialAssignment === null || materialAssignment === void 0 ? void 0 : materialAssignment.scoreFinalizedDatetime);
-  var isUserSubmitted = Boolean(userSubmission);
+  const [user, setUser] = React.useState(null);
+  const [materialAssignment, setMaterialAssignment] = React.useState(null);
+  const [userSubmission, setUserSubmission] = React.useState(null);
+  const [gradeResult, setGradeResult] = React.useState(null);
+  const [myGrade, setMyGrade] = React.useState(null);
+  const isAssignmentClosed = dayjs().isAfter(dayjs(materialAssignment === null || materialAssignment === void 0 ? void 0 : materialAssignment.closeDatetime));
+  const isScoreFinalized = Boolean(materialAssignment === null || materialAssignment === void 0 ? void 0 : materialAssignment.scoreFinalizedDatetime);
+  const isUserSubmitted = Boolean(userSubmission);
   // API Status
-  var isReady = useMaterialConfigApiClientUpdate(config.init);
-  var _React$useState13 = React.useState('idle'),
-    _React$useState14 = _slicedToArray(_React$useState13, 2),
-    submissionListGetStatus = _React$useState14[0],
-    setSubmissionListGetStatus = _React$useState14[1];
-  var fetchUserGet = React.useCallback(function () {
+  const isReady = useMaterialConfigApiClientUpdate(config.init);
+  const [submissionListGetStatus, setSubmissionListGetStatus] = React.useState('idle');
+  const fetchUserGet = React.useCallback(() => {
     void getOrgUserGet({
-      userId: userId
-    }).then(function (res) {
-      return res.user;
-    }).then(setUser);
+      userId
+    }).then(res => res.user).then(setUser);
   }, [userId]);
-  var fetchMaterialAssignmentGet = React.useCallback(function () {
+  const fetchMaterialAssignmentGet = React.useCallback(() => {
     void getOrgMaterialAssignmentGet({
-      materialAssignmentId: materialAssignmentId
-    }).then(function (res) {
-      return res.materialAssignment;
-    }).then(setMaterialAssignment);
+      materialAssignmentId
+    }).then(res => res.materialAssignment).then(setMaterialAssignment);
   }, [materialAssignmentId]);
-  var fetchSubmissionList = React.useCallback(function () {
+  const fetchSubmissionList = React.useCallback(() => {
     setSubmissionListGetStatus('pending');
     void getOrgMaterialAssignmentSubmissionList({
-      materialAssignmentId: materialAssignmentId,
+      materialAssignmentId,
       offset: 0,
       count: 1,
       filterConditions: {
         isLast: true,
         userIds: [userId]
       }
-    }).then(function (res) {
-      return res.materialAssignmentSubmissions[0];
-    }).then(function (submission) {
+    }).then(res => res.materialAssignmentSubmissions[0]).then(submission => {
       setUserSubmission(submission !== null && submission !== void 0 ? submission : null);
       setSubmissionListGetStatus('resolved');
-    }).catch(function (err) {
+    }).catch(err => {
       console.error(err);
       setSubmissionListGetStatus('rejected');
     });
   }, [materialAssignmentId, userId]);
-  var fetchGradeResult = React.useCallback(function () {
+  const fetchGradeResult = React.useCallback(() => {
     void getOrgMaterialAssignmentGradeResultGet({
-      materialAssignmentId: materialAssignmentId,
-      userId: userId
-    }).then(function (res) {
-      return res.materialAssignmentGradeResult;
-    }).then(setGradeResult).catch(function () {
+      materialAssignmentId,
+      userId
+    }).then(res => res.materialAssignmentGradeResult).then(setGradeResult).catch(() => {
       setGradeResult(null);
     });
   }, [materialAssignmentId, userId]);
-  var fetchMyGrade = React.useCallback(function () {
+  const fetchMyGrade = React.useCallback(() => {
     void getOrgMaterialAssignmentGradeList({
-      materialAssignmentId: materialAssignmentId,
+      materialAssignmentId,
       offset: 0,
       count: 1,
       filterConditions: {
-        userId: userId,
+        userId,
         gradeUserId: adminUserId
       }
-    }).then(function (res) {
-      return res.materialAssignmentGrades[0];
-    }).then(function (grade) {
-      return setMyGrade(grade !== null && grade !== void 0 ? grade : null);
-    });
+    }).then(res => res.materialAssignmentGrades[0]).then(grade => setMyGrade(grade !== null && grade !== void 0 ? grade : null));
   }, [adminUserId, materialAssignmentId, userId]);
-  var handleGradeEditClick = function handleGradeEditClick() {
+  const handleGradeEditClick = () => {
     var _a, _b;
     setShowGradeEditModal(true);
     gradeEditFormMethods.reset({
@@ -126,47 +93,28 @@ var MaterialAssignmentAdminContentTa = function MaterialAssignmentAdminContentTa
       comment: (_b = myGrade === null || myGrade === void 0 ? void 0 : myGrade.comment) !== null && _b !== void 0 ? _b : ''
     });
   };
-  var handleGradeEditSubmit = gradeEditFormMethods.handleSubmit( /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref2) {
-      var score, comment;
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            score = _ref2.score, comment = _ref2.comment;
-            _context.prev = 1;
-            _context.next = 4;
-            return postOrgMaterialAssignmentGradeEdit({
-              materialAssignmentGradeId: myGrade === null || myGrade === void 0 ? void 0 : myGrade.id,
-              materialAssignmentId: materialAssignmentId,
-              userId: userId,
-              score: score,
-              comment: comment
-            });
-          case 4:
-            fetchMyGrade();
-            Notification.success('저장되었습니다');
-            _context.next = 12;
-            break;
-          case 8:
-            _context.prev = 8;
-            _context.t0 = _context["catch"](1);
-            console.error(_context.t0);
-            Notification.error('오류가 발생했습니다.');
-          case 12:
-            _context.prev = 12;
-            setShowGradeEditModal(false);
-            return _context.finish(12);
-          case 15:
-          case "end":
-            return _context.stop();
-        }
-      }, _callee, null, [[1, 8, 12, 15]]);
-    }));
-    return function (_x) {
-      return _ref3.apply(this, arguments);
-    };
-  }());
-  React.useEffect(function () {
+  const handleGradeEditSubmit = gradeEditFormMethods.handleSubmit(async ({
+    score,
+    comment
+  }) => {
+    try {
+      await postOrgMaterialAssignmentGradeEdit({
+        materialAssignmentGradeId: myGrade === null || myGrade === void 0 ? void 0 : myGrade.id,
+        materialAssignmentId,
+        userId,
+        score,
+        comment
+      });
+      fetchMyGrade();
+      Notification.success('저장되었습니다');
+    } catch (err) {
+      console.error(err);
+      Notification.error('오류가 발생했습니다.');
+    } finally {
+      setShowGradeEditModal(false);
+    }
+  });
+  React.useEffect(() => {
     if (!isReady) {
       return;
     }
@@ -176,7 +124,7 @@ var MaterialAssignmentAdminContentTa = function MaterialAssignmentAdminContentTa
     fetchSubmissionList();
     fetchMaterialAssignmentGet();
   }, [isReady, fetchUserGet, fetchMyGrade, fetchGradeResult, fetchSubmissionList, fetchMaterialAssignmentGet]);
-  var renderHeader = function renderHeader() {
+  const renderHeader = () => {
     var _a;
     return React.createElement(StyledMaterialAssignmentAdminHeader, {
       align: "center",
@@ -200,7 +148,7 @@ var MaterialAssignmentAdminContentTa = function MaterialAssignmentAdminContentTa
     }, "\uC810\uC218"), React.createElement(Text, {
       size: "small",
       role: "white"
-    }, (gradeResult === null || gradeResult === void 0 ? void 0 : gradeResult.score) && isScoreFinalized ? "".concat(gradeResult.score, "\uC810(\uACF5\uAC1C\uB428)") : '--')), React.createElement(StyledMaterialAssignmentAdminHeaderCell, null, React.createElement(Text, {
+    }, (gradeResult === null || gradeResult === void 0 ? void 0 : gradeResult.score) && isScoreFinalized ? `${gradeResult.score}점(공개됨)` : '--')), React.createElement(StyledMaterialAssignmentAdminHeaderCell, null, React.createElement(Text, {
       size: "tiny",
       role: "gray4"
     }, "\uC81C\uCD9C \uC77C\uC2DC"), React.createElement(Text, {
@@ -212,7 +160,7 @@ var MaterialAssignmentAdminContentTa = function MaterialAssignmentAdminContentTa
       timeStyle: "short"
     }) : '--')));
   };
-  var renderGradeResult = function renderGradeResult() {
+  const renderGradeResult = () => {
     return React.createElement(StyledMaterialAssignmentAdminGradeWrapper, {
       wrap: true,
       width: "100%",
@@ -224,7 +172,7 @@ var MaterialAssignmentAdminContentTa = function MaterialAssignmentAdminContentTa
       role: "navy1",
       size: "small",
       lineHeight: "1.375rem"
-    }, user ? "".concat(user.fullname, " \uB2D8\uC758 \uC810\uC218") : null), React.createElement(Hspace, {
+    }, user ? `${user.fullname} 님의 점수` : null), React.createElement(Hspace, {
       width: 0.25
     }), React.createElement(Tooltip, {
       useMaxWidth: true,
@@ -238,10 +186,10 @@ var MaterialAssignmentAdminContentTa = function MaterialAssignmentAdminContentTa
     }), React.createElement(Text, {
       bold: true,
       role: "white"
-    }, (gradeResult === null || gradeResult === void 0 ? void 0 : gradeResult.score) && isScoreFinalized ? "".concat(gradeResult.score, "\uC810(\uACF5\uAC1C\uB428)") : '--')));
+    }, (gradeResult === null || gradeResult === void 0 ? void 0 : gradeResult.score) && isScoreFinalized ? `${gradeResult.score}점(공개됨)` : '--')));
   };
-  var renderSubmissionInfo = function renderSubmissionInfo() {
-    var statusText = function () {
+  const renderSubmissionInfo = () => {
+    const statusText = (() => {
       if (submissionListGetStatus === 'pending') {
         return null;
       }
@@ -271,13 +219,13 @@ var MaterialAssignmentAdminContentTa = function MaterialAssignmentAdminContentTa
             size: "small"
           }, "\uBBF8\uC81C\uCD9C");
       }
-    }();
-    var submissionAttachment = function () {
+    })();
+    const submissionAttachment = (() => {
       if (!userSubmission) {
         return '--';
       }
       if (userSubmission.assignmentFileUrl) {
-        var assignmentFilename = decodeURIComponent(userSubmission.assignmentFileUrl && new URL(userSubmission.assignmentFileUrl).pathname.split('/').pop() || '');
+        const assignmentFilename = decodeURIComponent(userSubmission.assignmentFileUrl && new URL(userSubmission.assignmentFileUrl).pathname.split('/').pop() || '');
         return React.createElement("a", {
           href: userSubmission.assignmentFileUrl,
           download: assignmentFilename,
@@ -302,7 +250,7 @@ var MaterialAssignmentAdminContentTa = function MaterialAssignmentAdminContentTa
           size: "small"
         }, userSubmission.assignmentUrl));
       }
-    }();
+    })();
     return React.createElement(InfoTable, {
       dark: true
     }, React.createElement("tbody", null, React.createElement("tr", null, React.createElement("td", null, "\uC0C1\uD0DC"), React.createElement("td", null, statusText)), React.createElement("tr", null, React.createElement("td", null, "\uACFC\uC81C \uC81C\uCD9C \uAE30\uD55C"), React.createElement("td", null, React.createElement(FormattedDate, {
@@ -315,9 +263,9 @@ var MaterialAssignmentAdminContentTa = function MaterialAssignmentAdminContentTa
       timeStyle: "short"
     }) : '--')), React.createElement("tr", null, React.createElement("td", null, "\uC5C5\uB85C\uB4DC\uB41C \uACFC\uC81C"), React.createElement("td", null, submissionAttachment))));
   };
-  var renderGrade = function renderGrade() {
-    var isGradeEditDisabled = !isAssignmentClosed || !isUserSubmitted || isScoreFinalized;
-    var tooltipTitle = function () {
+  const renderGrade = () => {
+    const isGradeEditDisabled = !isAssignmentClosed || !isUserSubmitted || isScoreFinalized;
+    const tooltipTitle = (() => {
       switch (true) {
         case isScoreFinalized:
           return '공개 이후 채점이 불가합니다.';
@@ -326,7 +274,7 @@ var MaterialAssignmentAdminContentTa = function MaterialAssignmentAdminContentTa
         case !isUserSubmitted:
           return '미제출인 경우 채점할 수 없습니다.';
       }
-    }();
+    })();
     return React.createElement(Flex, {
       column: true,
       align: "center"
@@ -394,7 +342,7 @@ var MaterialAssignmentAdminContentTa = function MaterialAssignmentAdminContentTa
       }] : []
     }));
   };
-  var renderGradeEditModal = function renderGradeEditModal() {
+  const renderGradeEditModal = () => {
     if (!showGradeEditModal) {
       return null;
     }
@@ -411,11 +359,11 @@ var MaterialAssignmentAdminContentTa = function MaterialAssignmentAdminContentTa
         label: '취소',
         size: 'small',
         role: 'gray1',
-        onClick: function onClick() {
+        onClick: () => {
           setShowGradeEditModal(false);
         }
       }],
-      onHide: function onHide() {
+      onHide: () => {
         setShowGradeEditModal(false);
       }
     }, React.createElement(Label, {
@@ -434,16 +382,15 @@ var MaterialAssignmentAdminContentTa = function MaterialAssignmentAdminContentTa
         min: 0,
         max: 100
       },
-      render: function render(_ref4) {
-        var field = _ref4.field,
-          fieldState = _ref4.fieldState;
-        return React.createElement(Input, Object.assign({}, field, {
-          invalid: fieldState.invalid,
-          size: "small",
-          width: "xsmall",
-          type: "number"
-        }));
-      }
+      render: ({
+        field,
+        fieldState
+      }) => React.createElement(Input, Object.assign({}, field, {
+        invalid: fieldState.invalid,
+        size: "small",
+        width: "xsmall",
+        type: "number"
+      }))
     }), React.createElement(Hspace, {
       width: 0.5
     }), React.createElement(Text, {
@@ -466,15 +413,14 @@ var MaterialAssignmentAdminContentTa = function MaterialAssignmentAdminContentTa
       rules: {
         maxLength: 1000
       },
-      render: function render(_ref5) {
-        var field = _ref5.field;
-        return React.createElement(Textarea, {
-          value: field.value,
-          wordLimit: 1000,
-          rows: 8,
-          onChange: field.onChange
-        });
-      }
+      render: ({
+        field
+      }) => React.createElement(Textarea, {
+        value: field.value,
+        wordLimit: 1000,
+        rows: 8,
+        onChange: field.onChange
+      })
     }));
   };
   return React.createElement(React.Fragment, null, renderHeader(), React.createElement(Flex, {

package/es/components/shared/MaterialAssignmentContainer.js

@@ -3,18 +3,19 @@ import { Text } from '@elice/blocks';
 import { base } from '@elice/design-tokens';
 import styled from 'styled-components';
 
-var StyledMaterialAssignmentContainer = styled.div.withConfig({
+const StyledMaterialAssignmentContainer = styled.div.withConfig({
   componentId: "sc-sdhlog-0"
 })(["height:100%;width:100%;max-width:55rem;border-radius:0.5rem;overflow:hidden;"]);
-var StyledMaterialAssignmentContainerHeader = styled.div.withConfig({
+const StyledMaterialAssignmentContainerHeader = styled.div.withConfig({
   componentId: "sc-sdhlog-1"
 })(["padding:1rem 1.5rem;height:3.5rem;display:flex;align-items:center;background-color:", ";"], base.color.navy7);
-var StyledMaterialAssignmentContainerContent = styled.div.withConfig({
+const StyledMaterialAssignmentContainerContent = styled.div.withConfig({
   componentId: "sc-sdhlog-2"
 })(["padding:1.5rem;overflow-y:auto;height:calc(100% - 3.5rem);background-color:", ";"], base.color.navy8);
-var MaterialAssignmentContainer = function MaterialAssignmentContainer(_ref) {
-  var title = _ref.title,
-    children = _ref.children;
+const MaterialAssignmentContainer = ({
+  title,
+  children
+}) => {
   return React.createElement(StyledMaterialAssignmentContainer, null, React.createElement(StyledMaterialAssignmentContainerHeader, null, React.createElement(Text, {
     bold: true,
     role: "navy0",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elice/material-assignment",
-  "version": "1.231212.0",
+  "version": "1.231228.0",
   "description": "User view and editing components of Elice material assignment",
   "repository": "https://git.elicer.io/elice/frontend/library/elice-material",
   "license": "UNLICENSED",
@@ -18,9 +18,9 @@
     "start": "run-s watch",
     "prebuild": "run-s clean",
     "build": "run-p build:es build:cjs",
-    "build:es": "rollup -c ../../rollup.config.ts -f es",
-    "build:cjs": "rollup -c ../../rollup.config.ts -f cjs",
-    "watch": "rollup -c ../../rollup.config.ts -f es -w",
+    "build:es": "rollup -c ../../rollup.config.ts --configPlugin typescript -f es",
+    "build:cjs": "rollup -c ../../rollup.config.ts --configPlugin typescript -f cjs",
+    "watch": "rollup -c ../../rollup.config.ts --configPlugin typescript -f es -w",
     "lint": "eslint --ext .ts,.tsx ./src --max-warnings=0",
     "clean": "del-cli \"es/*\" \"cjs/*\" \"dist/*\""
   },
@@ -51,8 +51,8 @@
     "@elice/icons": "^1.230814.0",
     "@elice/icons-legacy": "npm:@elice/icons@0.230814.0",
     "@elice/markdown": "^1.220815.0",
-    "@elice/material-shared-types": "1.231212.0",
-    "@elice/material-shared-utils": "1.231212.0",
+    "@elice/material-shared-types": "1.231228.0",
+    "@elice/material-shared-utils": "1.231228.0",
     "@elice/types": "^1.230815.0",
     "@types/classnames": "^2.3.1",
     "@types/react": "~17.0.9",
@@ -62,5 +62,5 @@
     "react-use": "^17.2.4",
     "styled-components": "^5.3.0"
   },
-  "gitHead": "e0724fdcb32c9ad474bf14d58a37e1faea7589e7"
+  "gitHead": "98c3e4d64847cdbe7985f8fd95835bb01f1d53ca"
 }