Merge pull request #4308 from weseek/fix/7469-bug-on-by-default

GW-7469 デフォルトでonになってしまっているBugを修正

packages/app/src/client/services/EditorContainer.js

@@ -205,8 +205,13 @@ export default class EditorContainer extends Container {
    */
   async retrieveEditorSettings() {
     const { data } = await this.appContainer.apiv3Get('/personal-setting/editor-settings');
-    const isTextlintEnabled = data?.textlintSettings?.isTextlintEnabled;
-    const textlintRules = data?.textlintSettings?.textlintRules;
+
+    if (data?.textlintSettings == null) {
+      return;
+    }
+
+    const { isTextlintEnabled = false, textlintRules = [] } = data.textlintSettings;
+
     this.setState({
       isTextlintEnabled,
       textlintRules,

packages/app/src/components/PageEditor/CodeMirrorEditor.jsx

@@ -986,7 +986,7 @@ export default class CodeMirrorEditor extends AbstractEditor {
 CodeMirrorEditor.propTypes = Object.assign({
   editorOptions: PropTypes.object.isRequired,
   isTextlintEnabled: PropTypes.bool,
-  lintRules: PropTypes.array,
+  textlintRules: PropTypes.array,
   emojiStrategy: PropTypes.object,
   lineNumbers: PropTypes.bool,
   onMarkdownHelpButtonClicked: PropTypes.func,

packages/app/src/server/models/editor-settings.ts

@@ -24,7 +24,7 @@ export interface EditorSettingsDocument extends IEditorSettings, Document {}
 export type EditorSettingsModel = Model<EditorSettingsDocument>
 
 const textlintSettingsSchema = new Schema<ITextlintSettings>({
-  isTextlintEnabled: { type: Boolean, default: true },
+  isTextlintEnabled: { type: Boolean, default: false },
   textlintRules: {
     type: [
       { name: { type: String }, options: { type: Object }, isEnabled: { type: Boolean } },