@elice/material-external 1.230915.0 → 1.231006.0

package/cjs/components/material-external/MaterialExternal.d.ts

@@ -2,6 +2,8 @@ import React from 'react';
 export interface MaterialExternalProps {
     className?: string;
     materialExternalId: number;
+    /** studentId. only tutoring mode */
+    userId?: number;
     locale?: string;
 }
 declare const MaterialExternal: React.FC<MaterialExternalProps>;

package/cjs/components/material-external/MaterialExternal.js

@@ -4,11 +4,9 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var React = require('react');
 var reactIntl = require('react-intl');
-var apiClient = require('@elice/api-client');
-var materialSharedUtils = require('@elice/material-shared-utils');
-var types = require('@elice/types');
 var classnames = require('classnames');
 var locales = require('./locales.js');
+var MaterialExternalAdminContent = require('./MaterialExternalAdminContent.js');
 var MaterialExternalContent = require('./MaterialExternalContent.js');
 var MaterialExternal_styled = require('./MaterialExternal.styled.js');
 
@@ -19,31 +17,22 @@ var classnames__default = /*#__PURE__*/_interopDefaultLegacy(classnames);
 
 var MaterialExternal = function MaterialExternal(_ref) {
   var materialExternalId = _ref.materialExternalId,
+    userId = _ref.userId,
     className = _ref.className,
     _ref$locale = _ref.locale,
     locale = _ref$locale === void 0 ? 'en' : _ref$locale;
   var prefixCls = 'em-material-external';
-  var _useMaterialFetch = materialSharedUtils.useMaterialFetch(types.enums.LectureMaterialType.External, React__default["default"].useCallback(function (signal) {
-      return apiClient.getOrgMaterialExternalGet({
-        materialExternalId: materialExternalId
-      }, {
-        signal: signal
-      });
-    }, [materialExternalId]), apiClient.config.init),
-    materialExternal = _useMaterialFetch.materialExternal,
-    materialExternalStatus = _useMaterialFetch.status;
-  //
-  //
-  //
   return React__default["default"].createElement(MaterialExternal_styled.StyledExternalWrap, {
     className: classnames__default["default"](prefixCls, className)
   }, React__default["default"].createElement(reactIntl.IntlProvider, {
     locale: locale,
     defaultLocale: "en",
     messages: locale in locales ? locales[locale] : locales.en
-  }, React__default["default"].createElement(MaterialExternalContent["default"], {
-    materialExternal: materialExternal,
-    externalGetStatus: materialExternalStatus
+  }, userId ? React__default["default"].createElement(MaterialExternalAdminContent["default"], {
+    materialExternalId: materialExternalId,
+    userId: userId
+  }) : React__default["default"].createElement(MaterialExternalContent["default"], {
+    materialExternalId: materialExternalId
   })));
 };
 

package/cjs/components/material-external/MaterialExternalAdminContent.d.ts

@@ -0,0 +1,7 @@
+import React from 'react';
+export interface MaterialExternalContentProps {
+    materialExternalId: number;
+    userId: number;
+}
+declare const MaterialExternalContent: React.FC<MaterialExternalContentProps>;
+export default MaterialExternalContent;

package/cjs/components/material-external/MaterialExternalAdminContent.js

@@ -0,0 +1,59 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var _rollupPluginBabelHelpers = require('../../_virtual/_rollupPluginBabelHelpers.js');
+var React = require('react');
+var reactIntl = require('react-intl');
+var apiClient = require('@elice/api-client');
+var blocks = require('@elice/blocks');
+var MaterialExternalIframe = require('./MaterialExternalIframe.js');
+
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
+
+var MaterialExternalContent = function MaterialExternalContent(_ref) {
+  var materialExternalId = _ref.materialExternalId,
+    userId = _ref.userId;
+  var _React$useState = React__default["default"].useState(''),
+    _React$useState2 = _rollupPluginBabelHelpers.slicedToArray(_React$useState, 2),
+    externalUrl = _React$useState2[0],
+    setExternalUrl = _React$useState2[1];
+  var _React$useState3 = React__default["default"].useState('idle'),
+    _React$useState4 = _rollupPluginBabelHelpers.slicedToArray(_React$useState3, 2),
+    externalGetStatus = _React$useState4[0],
+    setExternalGetStatus = _React$useState4[1];
+  React__default["default"].useEffect(function () {
+    if (materialExternalId && userId) {
+      setExternalGetStatus('pending');
+      apiClient.getOrgMaterialExternalTutorExternalUrlGet({
+        materialExternalId: materialExternalId,
+        userId: userId
+      }).then(function (value) {
+        setExternalUrl(value.externalUrl);
+        setExternalGetStatus('resolved');
+      }).catch(function () {
+        return setExternalGetStatus('rejected');
+      });
+    }
+  }, [materialExternalId, userId]);
+  if (externalGetStatus === 'pending') {
+    return React__default["default"].createElement(blocks.Spinner, null);
+  }
+  if (externalGetStatus === 'rejected' || !externalUrl) {
+    return React__default["default"].createElement(blocks.Text, {
+      role: "white"
+    }, React__default["default"].createElement(reactIntl.FormattedMessage, {
+      id: "external.status.rejected"
+    }));
+  }
+  return React__default["default"].createElement(MaterialExternalIframe["default"], {
+    materialExternal: {
+      title: 'External Admin',
+      externalUrl: externalUrl
+    }
+  });
+};
+
+exports["default"] = MaterialExternalContent;

package/cjs/components/material-external/MaterialExternalContent.d.ts

@@ -1,9 +1,6 @@
 import React from 'react';
-import type { APIStatus } from '@elice/material-shared-types';
-import type { GetOrgMaterialExternalGetResponses } from '@elice/types';
 export interface MaterialExternalContentProps {
-    externalGetStatus: APIStatus;
-    materialExternal: null | GetOrgMaterialExternalGetResponses['materialExternal'];
+    materialExternalId: number;
 }
 declare const MaterialExternalContent: React.FC<MaterialExternalContentProps>;
 export default MaterialExternalContent;

package/cjs/components/material-external/MaterialExternalContent.js

@@ -4,7 +4,9 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var React = require('react');
 var reactIntl = require('react-intl');
+var apiClient = require('@elice/api-client');
 var blocks = require('@elice/blocks');
+var materialSharedUtils = require('@elice/material-shared-utils');
 var types = require('@elice/types');
 var MaterialExternalIframe = require('./MaterialExternalIframe.js');
 var MaterialExternalNewWindow = require('./MaterialExternalNewWindow.js');
@@ -15,8 +17,16 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 
 var MaterialExternalContent = function MaterialExternalContent(_ref) {
-  var externalGetStatus = _ref.externalGetStatus,
-    materialExternal = _ref.materialExternal;
+  var materialExternalId = _ref.materialExternalId;
+  var _useMaterialFetch = materialSharedUtils.useMaterialFetch(types.enums.LectureMaterialType.External, React__default["default"].useCallback(function (signal) {
+      return apiClient.getOrgMaterialExternalGet({
+        materialExternalId: materialExternalId
+      }, {
+        signal: signal
+      });
+    }, [materialExternalId]), apiClient.config.init),
+    materialExternal = _useMaterialFetch.materialExternal,
+    externalGetStatus = _useMaterialFetch.status;
   if (externalGetStatus === 'pending') {
     return React__default["default"].createElement(blocks.Spinner, null);
   }

package/cjs/components/material-external/MaterialExternalIframe.d.ts

@@ -1,4 +1,6 @@
 import React from 'react';
 import type { GetOrgMaterialExternalGetResponses } from '@elice/types/es/typings/apis/orgMaterialExternal';
-declare const MaterialExternalIframe: React.FC<GetOrgMaterialExternalGetResponses>;
+declare const MaterialExternalIframe: React.FC<{
+    materialExternal: Pick<GetOrgMaterialExternalGetResponses['materialExternal'], 'title' | 'externalUrl'>;
+}>;
 export default MaterialExternalIframe;

package/es/components/material-external/MaterialExternal.d.ts

@@ -2,6 +2,8 @@ import React from 'react';
 export interface MaterialExternalProps {
     className?: string;
     materialExternalId: number;
+    /** studentId. only tutoring mode */
+    userId?: number;
     locale?: string;
 }
 declare const MaterialExternal: React.FC<MaterialExternalProps>;

package/es/components/material-external/MaterialExternal.js

@@ -1,41 +1,30 @@
 import React from 'react';
 import { IntlProvider } from 'react-intl';
-import { getOrgMaterialExternalGet, config } from '@elice/api-client';
-import { useMaterialFetch } from '@elice/material-shared-utils';
-import { enums } from '@elice/types';
 import classnames from 'classnames';
 import * as locales from './locales.js';
 import { en } from './locales.js';
-import MaterialExternalContent from './MaterialExternalContent.js';
+import MaterialExternalContent from './MaterialExternalAdminContent.js';
+import MaterialExternalContent$1 from './MaterialExternalContent.js';
 import { StyledExternalWrap } from './MaterialExternal.styled.js';
 
 var MaterialExternal = function MaterialExternal(_ref) {
   var materialExternalId = _ref.materialExternalId,
+    userId = _ref.userId,
     className = _ref.className,
     _ref$locale = _ref.locale,
     locale = _ref$locale === void 0 ? 'en' : _ref$locale;
   var prefixCls = 'em-material-external';
-  var _useMaterialFetch = useMaterialFetch(enums.LectureMaterialType.External, React.useCallback(function (signal) {
-      return getOrgMaterialExternalGet({
-        materialExternalId: materialExternalId
-      }, {
-        signal: signal
-      });
-    }, [materialExternalId]), config.init),
-    materialExternal = _useMaterialFetch.materialExternal,
-    materialExternalStatus = _useMaterialFetch.status;
-  //
-  //
-  //
   return React.createElement(StyledExternalWrap, {
     className: classnames(prefixCls, className)
   }, React.createElement(IntlProvider, {
     locale: locale,
     defaultLocale: "en",
     messages: locale in locales ? locales[locale] : en
-  }, React.createElement(MaterialExternalContent, {
-    materialExternal: materialExternal,
-    externalGetStatus: materialExternalStatus
+  }, userId ? React.createElement(MaterialExternalContent, {
+    materialExternalId: materialExternalId,
+    userId: userId
+  }) : React.createElement(MaterialExternalContent$1, {
+    materialExternalId: materialExternalId
   })));
 };
 

package/es/components/material-external/MaterialExternalAdminContent.d.ts

@@ -0,0 +1,7 @@
+import React from 'react';
+export interface MaterialExternalContentProps {
+    materialExternalId: number;
+    userId: number;
+}
+declare const MaterialExternalContent: React.FC<MaterialExternalContentProps>;
+export default MaterialExternalContent;

package/es/components/material-external/MaterialExternalAdminContent.js

@@ -0,0 +1,51 @@
+import { slicedToArray as _slicedToArray } from '../../_virtual/_rollupPluginBabelHelpers.js';
+import React from 'react';
+import { FormattedMessage } from 'react-intl';
+import { getOrgMaterialExternalTutorExternalUrlGet } from '@elice/api-client';
+import { Spinner, Text } from '@elice/blocks';
+import MaterialExternalIframe from './MaterialExternalIframe.js';
+
+var MaterialExternalContent = function MaterialExternalContent(_ref) {
+  var materialExternalId = _ref.materialExternalId,
+    userId = _ref.userId;
+  var _React$useState = React.useState(''),
+    _React$useState2 = _slicedToArray(_React$useState, 2),
+    externalUrl = _React$useState2[0],
+    setExternalUrl = _React$useState2[1];
+  var _React$useState3 = React.useState('idle'),
+    _React$useState4 = _slicedToArray(_React$useState3, 2),
+    externalGetStatus = _React$useState4[0],
+    setExternalGetStatus = _React$useState4[1];
+  React.useEffect(function () {
+    if (materialExternalId && userId) {
+      setExternalGetStatus('pending');
+      getOrgMaterialExternalTutorExternalUrlGet({
+        materialExternalId: materialExternalId,
+        userId: userId
+      }).then(function (value) {
+        setExternalUrl(value.externalUrl);
+        setExternalGetStatus('resolved');
+      }).catch(function () {
+        return setExternalGetStatus('rejected');
+      });
+    }
+  }, [materialExternalId, userId]);
+  if (externalGetStatus === 'pending') {
+    return React.createElement(Spinner, null);
+  }
+  if (externalGetStatus === 'rejected' || !externalUrl) {
+    return React.createElement(Text, {
+      role: "white"
+    }, React.createElement(FormattedMessage, {
+      id: "external.status.rejected"
+    }));
+  }
+  return React.createElement(MaterialExternalIframe, {
+    materialExternal: {
+      title: 'External Admin',
+      externalUrl: externalUrl
+    }
+  });
+};
+
+export { MaterialExternalContent as default };

package/es/components/material-external/MaterialExternalContent.d.ts

@@ -1,9 +1,6 @@
 import React from 'react';
-import type { APIStatus } from '@elice/material-shared-types';
-import type { GetOrgMaterialExternalGetResponses } from '@elice/types';
 export interface MaterialExternalContentProps {
-    externalGetStatus: APIStatus;
-    materialExternal: null | GetOrgMaterialExternalGetResponses['materialExternal'];
+    materialExternalId: number;
 }
 declare const MaterialExternalContent: React.FC<MaterialExternalContentProps>;
 export default MaterialExternalContent;

package/es/components/material-external/MaterialExternalContent.js

@@ -1,14 +1,24 @@
 import React from 'react';
 import { FormattedMessage } from 'react-intl';
+import { getOrgMaterialExternalGet, config } from '@elice/api-client';
 import { Spinner, Text } from '@elice/blocks';
+import { useMaterialFetch } from '@elice/material-shared-utils';
 import { enums } from '@elice/types';
 import MaterialExternalIframe from './MaterialExternalIframe.js';
 import MaterialExternalNewWindow from './MaterialExternalNewWindow.js';
 import MaterialExternalRedirect from './MaterialExternalRedirect.js';
 
 var MaterialExternalContent = function MaterialExternalContent(_ref) {
-  var externalGetStatus = _ref.externalGetStatus,
-    materialExternal = _ref.materialExternal;
+  var materialExternalId = _ref.materialExternalId;
+  var _useMaterialFetch = useMaterialFetch(enums.LectureMaterialType.External, React.useCallback(function (signal) {
+      return getOrgMaterialExternalGet({
+        materialExternalId: materialExternalId
+      }, {
+        signal: signal
+      });
+    }, [materialExternalId]), config.init),
+    materialExternal = _useMaterialFetch.materialExternal,
+    externalGetStatus = _useMaterialFetch.status;
   if (externalGetStatus === 'pending') {
     return React.createElement(Spinner, null);
   }

package/es/components/material-external/MaterialExternalIframe.d.ts

@@ -1,4 +1,6 @@
 import React from 'react';
 import type { GetOrgMaterialExternalGetResponses } from '@elice/types/es/typings/apis/orgMaterialExternal';
-declare const MaterialExternalIframe: React.FC<GetOrgMaterialExternalGetResponses>;
+declare const MaterialExternalIframe: React.FC<{
+    materialExternal: Pick<GetOrgMaterialExternalGetResponses['materialExternal'], 'title' | 'externalUrl'>;
+}>;
 export default MaterialExternalIframe;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elice/material-external",
-  "version": "1.230915.0",
+  "version": "1.231006.0",
   "description": "User view and editing components of Elice material external",
   "repository": "https://git.elicer.io/elice/frontend/library/elice-material",
   "license": "UNLICENSED",
@@ -43,14 +43,14 @@
     "tslib": "^2.6.1"
   },
   "devDependencies": {
-    "@elice/api-client": "^1.230815.0",
+    "@elice/api-client": "^1.230926.0",
     "@elice/blocks": "^1.230816.0",
     "@elice/design-tokens": "^1.220803.0",
     "@elice/icons": "^1.230814.0",
     "@elice/icons-legacy": "npm:@elice/icons@0.230814.0",
     "@elice/markdown": "^1.220815.0",
-    "@elice/material-shared-types": "1.230915.0",
-    "@elice/material-shared-utils": "1.230915.0",
+    "@elice/material-shared-types": "1.231006.0",
+    "@elice/material-shared-utils": "1.231006.0",
     "@elice/types": "^1.230815.0",
     "@types/classnames": "^2.3.1",
     "@types/react": "~17.0.9",
@@ -60,5 +60,5 @@
     "react-use": "^17.2.4",
     "styled-components": "^5.3.0"
   },
-  "gitHead": "93bc5e05279bbb32c51cad07d5a5a27d8e418482"
+  "gitHead": "5295ff666ff5753acefb617a1921cfc4a39d0a3e"
 }