@elice/material-exercise 1.230316.0 → 1.230328.0

package/cjs/components/material-exercise/context/recoil.d.ts

@@ -1,4 +1,5 @@
 import { ExercisePreviewDisplayMode, ExercisePreviewType } from './recoilTypes';
+import type { MonacoEditorApis } from "../../shared/monaco-editor";
 import type { ArduinoAgentConnectionStatus, ArduinoUploadProgressStatus } from "../../../typings/arduino";
 import type { AtomContainerSizeState, AtomExerciseRoomState, AtomExerciseState, AtomFileEditorCursorState, AtomLectureState, AtomMultilangEnvironmentJson, AtomMultilangEnvironmentState, AtomRunnerRoomConnectionInfoState, AtomRunnerRunTypeState, AtomRunnerStdioFilesState, AtomUserState, AtomVisibilityState, AtomWebSocketStateKey, AtomWebSocketStates } from './recoilTypes';
 /**
@@ -146,3 +147,7 @@ export declare const exerciseFileEditorCursorState: import("recoil").RecoilState
  *
  */
 export declare const exerciseFileEditorCursorSelectionValueState: import("recoil").RecoilState<string | null>;
+/**
+ *
+ */
+export declare const exerciseMonacoEditorApisState: import("recoil").RecoilState<MonacoEditorApis | null>;

package/cjs/components/material-exercise/context/recoil.js

@@ -622,6 +622,15 @@ const exerciseFileEditorCursorSelectionValueState = recoil.atom({
   key: `${KEY_PREFIX}/FileEditorCursorSelectionValue`,
   default: null
 });
+/**
+ *
+ */
+
+const exerciseMonacoEditorApisState = recoil.atom({
+  key: `${KEY_PREFIX}/MonacoEditorApisState`,
+  default: null,
+  dangerouslyAllowMutability: true
+});
 
 exports.exerciseActiveFilenameState = exerciseActiveFilenameState;
 exports.exerciseArduinoAgentConnectionState = exerciseArduinoAgentConnectionState;
@@ -638,6 +647,7 @@ exports.exerciseFileEditorCursorState = exerciseFileEditorCursorState;
 exports.exerciseFileTabsOpenedState = exerciseFileTabsOpenedState;
 exports.exerciseFileTreeOpenedState = exerciseFileTreeOpenedState;
 exports.exerciseLectureState = exerciseLectureState;
+exports.exerciseMonacoEditorApisState = exerciseMonacoEditorApisState;
 exports.exerciseMultilangEnvironmentState = exerciseMultilangEnvironmentState;
 exports.exerciseMultilangLanguagesState = exerciseMultilangLanguagesState;
 exports.exercisePreviewDisplayModeState = exercisePreviewDisplayModeState;

package/cjs/components/material-exercise/context/types.d.ts

@@ -64,7 +64,14 @@ export declare type MaterialExerciseCommonPropExerciseImageEmptyOptions = Exerci
 /**
  * On code help button click.
  */
-export declare type MaterialExerciseCommonPropOnCodeHelpRequest = (code: string, error?: CodeHelperError) => void;
+export declare type MaterialExerciseCommonPropOnCodeHelpRequest = (params: {
+    code: string;
+    error?: CodeHelperError;
+    payload?: any;
+    readme?: string;
+    instruction?: string;
+    openFileContent?: string;
+}) => void;
 /**
  * On default exercise room ID set.
  */

package/cjs/components/material-exercise/exercise-file-editor/ExerciseFileEditor.js

@@ -72,6 +72,13 @@ const ExerciseFileEditor = () => {
     exercise,
     exerciseRoom
   }));
+  const setExerciseMonacoEditorApisState = recoil.useSetRecoilState(recoil$1.exerciseMonacoEditorApisState);
+  React__default["default"].useEffect(() => {
+    if (editorApis.current) {
+      setExerciseMonacoEditorApisState(editorApis.current);
+    } // eslint-disable-next-line react-hooks/exhaustive-deps
+
+  }, [editorApis.current]);
   /**
    * Set value of current file.
    */

package/cjs/components/material-exercise/exercise-runner/ExerciseRunner.js

@@ -78,16 +78,26 @@ const ExerciseRunner = ({
   const setRunnerStdioFilesState = recoil.useSetRecoilState(recoil$1.exerciseRunnerStdioFilesState); // preview states
 
   const exercisePreviewType = recoil.useRecoilValue(recoil$1.exercisePreviewTypeState(materialExerciseId));
-  const exercisePreviewDisplayMode = recoil.useRecoilValue(recoil$1.exercisePreviewDisplayModeState); // websockets
+  const exercisePreviewDisplayMode = recoil.useRecoilValue(recoil$1.exercisePreviewDisplayModeState); // monaco editor value
+
+  const exerciseMonacoEditorApis = recoil.useRecoilValue(recoil$1.exerciseMonacoEditorApisState); // websockets
 
   const setRunnerRoomWebSocketState = recoil.useSetRecoilState(recoil$1.exerciseWebsocketQuery('runnerRoom'));
   const setStdioWebSocketState = recoil.useSetRecoilState(recoil$1.exerciseWebsocketQuery('stdio'));
 
   const handleAiHelpibotError = text => {
+    var _a, _b, _c;
+
     const error = runner.getProgrammingErrorResult(text);
 
     if (!!error && typeof onCodeHelpRequest === 'function') {
-      onCodeHelpRequest(error.errorCode, error);
+      onCodeHelpRequest({
+        code: error.errorCode,
+        error: error,
+        readme: (_a = exercise === null || exercise === void 0 ? void 0 : exercise.description) !== null && _a !== void 0 ? _a : '',
+        instruction: (_b = exercise === null || exercise === void 0 ? void 0 : exercise.instructionContent) !== null && _b !== void 0 ? _b : '',
+        openFileContent: (_c = exerciseMonacoEditorApis === null || exerciseMonacoEditorApis === void 0 ? void 0 : exerciseMonacoEditorApis.getValue()) !== null && _c !== void 0 ? _c : ''
+      });
     }
   };
 

package/cjs/components/material-exercise/exercise-runner/ExerciseRunnerControllerButtonGroup.js

@@ -70,7 +70,9 @@ const ExerciseRunnerControllerButtonGroup = () => {
 
   const isArduinoExercise = (exercise === null || exercise === void 0 ? void 0 : exercise.envType) === types.enums.ExerciseEnvType.Arduino;
   const arduinoUploadProgress = recoil.useRecoilValue(recoil$1.exerciseArduinoUploadProgressState);
-  const arduinoOpenedPortName = recoil.useRecoilValue(recoil$1.exerciseArduinoOpenedPortNameState); //
+  const arduinoOpenedPortName = recoil.useRecoilValue(recoil$1.exerciseArduinoOpenedPortNameState); // monaco editor apis
+
+  const exerciseMonacoEditorApis = recoil.useRecoilValue(recoil$1.exerciseMonacoEditorApisState); //
   // ========= ui states =========
   //
   // submit run
@@ -86,9 +88,7 @@ const ExerciseRunnerControllerButtonGroup = () => {
   const isCancelDisabled = isCancelHidden || isNotReady || isConnecting; // sync request
 
   const isSyncRequestHidden = !isRunning || !((_a = exercise === null || exercise === void 0 ? void 0 : exercise.readyExerciseImage) === null || _a === void 0 ? void 0 : _a.httpPort);
-  const isSyncRequestDisabled = isSyncRequestHidden || isNotReady || isConnecting; // code help
-
-  const isCodeHelpHidden = isRunning || isTestLecture && !isTestLectureCompleted; //
+  const isSyncRequestDisabled = isSyncRequestHidden || isNotReady || isConnecting; //
   //
   //
 
@@ -241,12 +241,21 @@ const ExerciseRunnerControllerButtonGroup = () => {
 
 
   const renderCodeHelpRequestButton = () => {
-    if (isCodeHelpHidden || !editorCursorSelectionValue || typeof onCodeHelpRequest !== 'function') {
+    if (isRunning || !editorCursorSelectionValue || typeof onCodeHelpRequest !== 'function') {
       return null;
     }
 
     return React__default["default"].createElement(ExerciseRunnerControllerCodeHelpRequestButton, {
-      onClick: () => onCodeHelpRequest(editorCursorSelectionValue)
+      onClick: () => {
+        var _a, _b, _c;
+
+        onCodeHelpRequest({
+          code: editorCursorSelectionValue,
+          readme: (_a = exercise === null || exercise === void 0 ? void 0 : exercise.description) !== null && _a !== void 0 ? _a : '',
+          instruction: (_b = exercise === null || exercise === void 0 ? void 0 : exercise.instructionContent) !== null && _b !== void 0 ? _b : '',
+          openFileContent: (_c = exerciseMonacoEditorApis === null || exerciseMonacoEditorApis === void 0 ? void 0 : exerciseMonacoEditorApis.getValue()) !== null && _c !== void 0 ? _c : ''
+        });
+      }
     });
   }; //
   //

package/es/components/material-exercise/context/recoil.d.ts

@@ -1,4 +1,5 @@
 import { ExercisePreviewDisplayMode, ExercisePreviewType } from './recoilTypes';
+import type { MonacoEditorApis } from "../../shared/monaco-editor";
 import type { ArduinoAgentConnectionStatus, ArduinoUploadProgressStatus } from "../../../typings/arduino";
 import type { AtomContainerSizeState, AtomExerciseRoomState, AtomExerciseState, AtomFileEditorCursorState, AtomLectureState, AtomMultilangEnvironmentJson, AtomMultilangEnvironmentState, AtomRunnerRoomConnectionInfoState, AtomRunnerRunTypeState, AtomRunnerStdioFilesState, AtomUserState, AtomVisibilityState, AtomWebSocketStateKey, AtomWebSocketStates } from './recoilTypes';
 /**
@@ -146,3 +147,7 @@ export declare const exerciseFileEditorCursorState: import("recoil").RecoilState
  *
  */
 export declare const exerciseFileEditorCursorSelectionValueState: import("recoil").RecoilState<string | null>;
+/**
+ *
+ */
+export declare const exerciseMonacoEditorApisState: import("recoil").RecoilState<MonacoEditorApis | null>;

package/es/components/material-exercise/context/recoil.js

@@ -614,5 +614,14 @@ const exerciseFileEditorCursorSelectionValueState = atom({
   key: `${KEY_PREFIX}/FileEditorCursorSelectionValue`,
   default: null
 });
+/**
+ *
+ */
+
+const exerciseMonacoEditorApisState = atom({
+  key: `${KEY_PREFIX}/MonacoEditorApisState`,
+  default: null,
+  dangerouslyAllowMutability: true
+});
 
-export { exerciseActiveFilenameState, exerciseArduinoAgentConnectionState, exerciseArduinoAgentModalState, exerciseArduinoOnSelectPortState, exerciseArduinoOpenedPortNameState, exerciseArduinoPortsState, exerciseArduinoPreferenceState, exerciseArduinoUploadProgressState, exerciseContainerSizeState, exerciseEditorPreferenceState, exerciseFileEditorCursorSelectionValueState, exerciseFileEditorCursorState, exerciseFileTabsOpenedState, exerciseFileTreeOpenedState, exerciseLectureState, exerciseMultilangEnvironmentState, exerciseMultilangLanguagesState, exercisePreviewDisplayModeState, exercisePreviewTypeState, exerciseRightpaneActiveState, exerciseRoomState, exerciseRunnerRoomConnectionInfoState, exerciseRunnerRunTypeState, exerciseRunnerRunningState, exerciseRunnerStdioFilesState, exerciseRunnerSubmittingState, exerciseRunnerWebSocketStatusQuery, exerciseState, exerciseUserState, exerciseWebsocketQuery, exerciseWebsocketStates };
+export { exerciseActiveFilenameState, exerciseArduinoAgentConnectionState, exerciseArduinoAgentModalState, exerciseArduinoOnSelectPortState, exerciseArduinoOpenedPortNameState, exerciseArduinoPortsState, exerciseArduinoPreferenceState, exerciseArduinoUploadProgressState, exerciseContainerSizeState, exerciseEditorPreferenceState, exerciseFileEditorCursorSelectionValueState, exerciseFileEditorCursorState, exerciseFileTabsOpenedState, exerciseFileTreeOpenedState, exerciseLectureState, exerciseMonacoEditorApisState, exerciseMultilangEnvironmentState, exerciseMultilangLanguagesState, exercisePreviewDisplayModeState, exercisePreviewTypeState, exerciseRightpaneActiveState, exerciseRoomState, exerciseRunnerRoomConnectionInfoState, exerciseRunnerRunTypeState, exerciseRunnerRunningState, exerciseRunnerStdioFilesState, exerciseRunnerSubmittingState, exerciseRunnerWebSocketStatusQuery, exerciseState, exerciseUserState, exerciseWebsocketQuery, exerciseWebsocketStates };

package/es/components/material-exercise/context/types.d.ts

@@ -64,7 +64,14 @@ export declare type MaterialExerciseCommonPropExerciseImageEmptyOptions = Exerci
 /**
  * On code help button click.
  */
-export declare type MaterialExerciseCommonPropOnCodeHelpRequest = (code: string, error?: CodeHelperError) => void;
+export declare type MaterialExerciseCommonPropOnCodeHelpRequest = (params: {
+    code: string;
+    error?: CodeHelperError;
+    payload?: any;
+    readme?: string;
+    instruction?: string;
+    openFileContent?: string;
+}) => void;
 /**
  * On default exercise room ID set.
  */

package/es/components/material-exercise/exercise-file-editor/ExerciseFileEditor.js

@@ -16,7 +16,7 @@ import 'monaco-editor/esm/vs/editor/editor.api';
 import '../../shared/monaco-editor/constants/monaco/preferences.js';
 import 'react-use';
 import 'socket.io-client';
-import { exerciseState, exerciseRoomState, exerciseLectureState, exerciseEditorPreferenceState, exerciseActiveFilenameState, exerciseWebsocketQuery, exerciseFileEditorCursorState, exerciseFileEditorCursorSelectionValueState } from '../context/recoil.js';
+import { exerciseState, exerciseRoomState, exerciseLectureState, exerciseEditorPreferenceState, exerciseActiveFilenameState, exerciseWebsocketQuery, exerciseFileEditorCursorState, exerciseFileEditorCursorSelectionValueState, exerciseMonacoEditorApisState } from '../context/recoil.js';
 import { ExerciseContext } from '../context/context.js';
 import '../context/recoilTypes.js';
 import { exerciseFileEditorContentChange$, exerciseFileEditorSaveAction$ } from '../context/subjects.js';
@@ -66,6 +66,13 @@ const ExerciseFileEditor = () => {
     exercise,
     exerciseRoom
   }));
+  const setExerciseMonacoEditorApisState = useSetRecoilState(exerciseMonacoEditorApisState);
+  React.useEffect(() => {
+    if (editorApis.current) {
+      setExerciseMonacoEditorApisState(editorApis.current);
+    } // eslint-disable-next-line react-hooks/exhaustive-deps
+
+  }, [editorApis.current]);
   /**
    * Set value of current file.
    */

package/es/components/material-exercise/exercise-runner/ExerciseRunner.js

@@ -10,7 +10,7 @@ import styled from 'styled-components';
 import XtermLazy from '../../shared/xterm/XtermLazy.js';
 import { MATERIAL_RESIZABLE_COMMON_PROPS } from '../../../constants/stylesheets.js';
 import { useArduino } from '../../../hooks/useArduino.js';
-import { exerciseState, exerciseEditorPreferenceState, exerciseRunnerSubmittingState, exerciseRunnerRunningState, exerciseRunnerRunTypeState, exerciseRunnerRoomConnectionInfoState, exerciseRunnerStdioFilesState, exercisePreviewTypeState, exercisePreviewDisplayModeState, exerciseWebsocketQuery, exerciseContainerSizeState } from '../context/recoil.js';
+import { exerciseState, exerciseEditorPreferenceState, exerciseRunnerSubmittingState, exerciseRunnerRunningState, exerciseRunnerRunTypeState, exerciseRunnerRoomConnectionInfoState, exerciseRunnerStdioFilesState, exercisePreviewTypeState, exercisePreviewDisplayModeState, exerciseMonacoEditorApisState, exerciseWebsocketQuery, exerciseContainerSizeState } from '../context/recoil.js';
 import { ExerciseContext } from '../context/context.js';
 import { ExercisePreviewType, ExercisePreviewDisplayMode } from '../context/recoilTypes.js';
 import { exerciseRunnerTextSend$ } from '../context/subjects.js';
@@ -71,16 +71,26 @@ const ExerciseRunner = ({
   const setRunnerStdioFilesState = useSetRecoilState(exerciseRunnerStdioFilesState); // preview states
 
   const exercisePreviewType = useRecoilValue(exercisePreviewTypeState(materialExerciseId));
-  const exercisePreviewDisplayMode = useRecoilValue(exercisePreviewDisplayModeState); // websockets
+  const exercisePreviewDisplayMode = useRecoilValue(exercisePreviewDisplayModeState); // monaco editor value
+
+  const exerciseMonacoEditorApis = useRecoilValue(exerciseMonacoEditorApisState); // websockets
 
   const setRunnerRoomWebSocketState = useSetRecoilState(exerciseWebsocketQuery('runnerRoom'));
   const setStdioWebSocketState = useSetRecoilState(exerciseWebsocketQuery('stdio'));
 
   const handleAiHelpibotError = text => {
+    var _a, _b, _c;
+
     const error = getProgrammingErrorResult(text);
 
     if (!!error && typeof onCodeHelpRequest === 'function') {
-      onCodeHelpRequest(error.errorCode, error);
+      onCodeHelpRequest({
+        code: error.errorCode,
+        error: error,
+        readme: (_a = exercise === null || exercise === void 0 ? void 0 : exercise.description) !== null && _a !== void 0 ? _a : '',
+        instruction: (_b = exercise === null || exercise === void 0 ? void 0 : exercise.instructionContent) !== null && _b !== void 0 ? _b : '',
+        openFileContent: (_c = exerciseMonacoEditorApis === null || exerciseMonacoEditorApis === void 0 ? void 0 : exerciseMonacoEditorApis.getValue()) !== null && _c !== void 0 ? _c : ''
+      });
     }
   };
 

package/es/components/material-exercise/exercise-runner/ExerciseRunnerControllerButtonGroup.js

@@ -7,7 +7,7 @@ import { useRecoilValue } from 'recoil';
 import styled from 'styled-components';
 import 'react-use';
 import 'socket.io-client';
-import { exerciseRunnerWebSocketStatusQuery, exerciseFileEditorCursorSelectionValueState, exerciseState, exerciseRunnerRunTypeState, exerciseLectureState, exerciseRunnerSubmittingState, exerciseRunnerRunningState, exerciseArduinoUploadProgressState, exerciseArduinoOpenedPortNameState } from '../context/recoil.js';
+import { exerciseRunnerWebSocketStatusQuery, exerciseFileEditorCursorSelectionValueState, exerciseState, exerciseRunnerRunTypeState, exerciseLectureState, exerciseRunnerSubmittingState, exerciseRunnerRunningState, exerciseArduinoUploadProgressState, exerciseArduinoOpenedPortNameState, exerciseMonacoEditorApisState } from '../context/recoil.js';
 import { ExerciseContext } from '../context/context.js';
 import '../context/recoilTypes.js';
 import { exerciseFileEditorSaveAction$ } from '../context/subjects.js';
@@ -63,7 +63,9 @@ const ExerciseRunnerControllerButtonGroup = () => {
 
   const isArduinoExercise = (exercise === null || exercise === void 0 ? void 0 : exercise.envType) === enums.ExerciseEnvType.Arduino;
   const arduinoUploadProgress = useRecoilValue(exerciseArduinoUploadProgressState);
-  const arduinoOpenedPortName = useRecoilValue(exerciseArduinoOpenedPortNameState); //
+  const arduinoOpenedPortName = useRecoilValue(exerciseArduinoOpenedPortNameState); // monaco editor apis
+
+  const exerciseMonacoEditorApis = useRecoilValue(exerciseMonacoEditorApisState); //
   // ========= ui states =========
   //
   // submit run
@@ -79,9 +81,7 @@ const ExerciseRunnerControllerButtonGroup = () => {
   const isCancelDisabled = isCancelHidden || isNotReady || isConnecting; // sync request
 
   const isSyncRequestHidden = !isRunning || !((_a = exercise === null || exercise === void 0 ? void 0 : exercise.readyExerciseImage) === null || _a === void 0 ? void 0 : _a.httpPort);
-  const isSyncRequestDisabled = isSyncRequestHidden || isNotReady || isConnecting; // code help
-
-  const isCodeHelpHidden = isRunning || isTestLecture && !isTestLectureCompleted; //
+  const isSyncRequestDisabled = isSyncRequestHidden || isNotReady || isConnecting; //
   //
   //
 
@@ -234,12 +234,21 @@ const ExerciseRunnerControllerButtonGroup = () => {
 
 
   const renderCodeHelpRequestButton = () => {
-    if (isCodeHelpHidden || !editorCursorSelectionValue || typeof onCodeHelpRequest !== 'function') {
+    if (isRunning || !editorCursorSelectionValue || typeof onCodeHelpRequest !== 'function') {
       return null;
     }
 
     return React.createElement(ExerciseRunnerControllerCodeHelpRequestButton, {
-      onClick: () => onCodeHelpRequest(editorCursorSelectionValue)
+      onClick: () => {
+        var _a, _b, _c;
+
+        onCodeHelpRequest({
+          code: editorCursorSelectionValue,
+          readme: (_a = exercise === null || exercise === void 0 ? void 0 : exercise.description) !== null && _a !== void 0 ? _a : '',
+          instruction: (_b = exercise === null || exercise === void 0 ? void 0 : exercise.instructionContent) !== null && _b !== void 0 ? _b : '',
+          openFileContent: (_c = exerciseMonacoEditorApis === null || exerciseMonacoEditorApis === void 0 ? void 0 : exerciseMonacoEditorApis.getValue()) !== null && _c !== void 0 ? _c : ''
+        });
+      }
     });
   }; //
   //

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elice/material-exercise",
-  "version": "1.230316.0",
+  "version": "1.230328.0",
   "description": "User view and editing components of Elice material exercise",
   "repository": "https://git.elicer.io/elice/frontend/library/elice-material",
   "license": "UNLICENSED",
@@ -79,8 +79,8 @@
     "@elice/design-tokens": "^1.220803.0",
     "@elice/icons": "^1.220803.0",
     "@elice/markdown": "^1.220803.0",
-    "@elice/material-shared-types": "1.230316.0",
-    "@elice/material-shared-utils": "1.230316.0",
+    "@elice/material-shared-types": "1.230328.0",
+    "@elice/material-shared-utils": "1.230328.0",
     "@elice/types": "^1.230306.0",
     "@elice/websocket": "^1.220803.0",
     "@types/classnames": "^2.3.1",
@@ -102,5 +102,5 @@
     "recoil": "^0.6.1",
     "styled-components": "^5.2.0"
   },
-  "gitHead": "afbe8701b9b8fc094459762caa92310c194929f1"
+  "gitHead": "c24abeffe609385031a77c725bf6e92e47e94b56"
 }