Просмотр исходного кода

remove eslint-disable react/no-danger lines

Yuki Takei 2 месяцев назад
Родитель
Сommit
63291b93da

+ 70 - 74
apps/app/src/client/components/Admin/Customize/CustomizeTitle.tsx

@@ -1,5 +1,5 @@
 import type { FC } from 'react';
 import type { FC } from 'react';
-import React, { useCallback, useEffect } from 'react';
+import { useCallback, useEffect } from 'react';
 import { useTranslation } from 'next-i18next';
 import { useTranslation } from 'next-i18next';
 import { useForm } from 'react-hook-form';
 import { useForm } from 'react-hook-form';
 import { Card, CardBody } from 'reactstrap';
 import { Card, CardBody } from 'reactstrap';
@@ -44,82 +44,78 @@ export const CustomizeTitle: FC = () => {
   );
   );
 
 
   return (
   return (
-    <React.Fragment>
-      <div className="row">
-        <div className="col-12">
-          <h2 className="admin-setting-header">
-            {t('admin:customize_settings.custom_title')}
-          </h2>
-        </div>
+    <div className="row">
+      <div className="col-12">
+        <h2 className="admin-setting-header">
+          {t('admin:customize_settings.custom_title')}
+        </h2>
+      </div>
+
+      <div className="col-12">
+        <Card className="card custom-card bg-body-tertiary mb-3">
+          <CardBody className="px-0 py-2">
+            <p
+              // biome-ignore lint/security/noDangerouslySetInnerHtml: trusted translation markup
+              dangerouslySetInnerHTML={{
+                __html: t('admin:customize_settings.custom_title_detail'),
+              }}
+            />
+            <ul>
+              <li>
+                <span
+                  // biome-ignore lint/security/noDangerouslySetInnerHtml: trusted translation markup
+                  dangerouslySetInnerHTML={{
+                    __html: t(
+                      'admin:customize_settings.custom_title_detail_placeholder1',
+                    ),
+                  }}
+                />
+              </li>
+              <li>
+                <span
+                  // biome-ignore lint/security/noDangerouslySetInnerHtml: trusted translation markup
+                  dangerouslySetInnerHTML={{
+                    __html: t(
+                      'admin:customize_settings.custom_title_detail_placeholder2',
+                    ),
+                  }}
+                />
+              </li>
+              <li>
+                <span
+                  // biome-ignore lint/security/noDangerouslySetInnerHtml: trusted translation markup
+                  dangerouslySetInnerHTML={{
+                    __html: t(
+                      'admin:customize_settings.custom_title_detail_placeholder3',
+                    ),
+                  }}
+                />
+              </li>
+            </ul>
+          </CardBody>
+        </Card>
+      </div>
 
 
+      {/* TODO i18n */}
+      <div className="form-text text-muted col-12 mb-3">
+        Default Value:{' '}
+        <code>
+          &#123;&#123;pagename&#125;&#125; - &#123;&#123;sitename&#125;&#125;
+        </code>
+        <br />
+        Default Output Example:{' '}
+        <code className="xml">
+          &lt;title&gt;Page name - My GROWI&lt;&#047;title&gt;
+        </code>
+      </div>
+      <form onSubmit={handleSubmit(onSubmit)}>
         <div className="col-12">
         <div className="col-12">
-          <Card className="card custom-card bg-body-tertiary mb-3">
-            <CardBody className="px-0 py-2">
-              {/* eslint-disable react/no-danger */}
-              <p
-                // biome-ignore lint/security/noDangerouslySetInnerHtml: trusted translation markup
-                dangerouslySetInnerHTML={{
-                  __html: t('admin:customize_settings.custom_title_detail'),
-                }}
-              />
-              <ul>
-                <li>
-                  <span
-                    // biome-ignore lint/security/noDangerouslySetInnerHtml: trusted translation markup
-                    dangerouslySetInnerHTML={{
-                      __html: t(
-                        'admin:customize_settings.custom_title_detail_placeholder1',
-                      ),
-                    }}
-                  />
-                </li>
-                <li>
-                  <span
-                    // biome-ignore lint/security/noDangerouslySetInnerHtml: trusted translation markup
-                    dangerouslySetInnerHTML={{
-                      __html: t(
-                        'admin:customize_settings.custom_title_detail_placeholder2',
-                      ),
-                    }}
-                  />
-                </li>
-                <li>
-                  <span
-                    // biome-ignore lint/security/noDangerouslySetInnerHtml: trusted translation markup
-                    dangerouslySetInnerHTML={{
-                      __html: t(
-                        'admin:customize_settings.custom_title_detail_placeholder3',
-                      ),
-                    }}
-                  />
-                </li>
-              </ul>
-              {/* eslint-enable react/no-danger */}
-            </CardBody>
-          </Card>
+          <input className="form-control" {...register('customizeTitle')} />
         </div>
         </div>
-
-        {/* TODO i18n */}
-        <div className="form-text text-muted col-12 mb-3">
-          Default Value:{' '}
-          <code>
-            &#123;&#123;pagename&#125;&#125; - &#123;&#123;sitename&#125;&#125;
-          </code>
-          <br />
-          Default Output Example:{' '}
-          <code className="xml">
-            &lt;title&gt;Page name - My GROWI&lt;&#047;title&gt;
-          </code>
+        <div className="col-12">
+          <AdminUpdateButtonRow type="submit" disabled={false} />
         </div>
         </div>
-        <form onSubmit={handleSubmit(onSubmit)}>
-          <div className="col-12">
-            <input className="form-control" {...register('customizeTitle')} />
-          </div>
-          <div className="col-12">
-            <AdminUpdateButtonRow type="submit" disabled={false} />
-          </div>
-        </form>
-      </div>
-    </React.Fragment>
+      </form>
+    </div>
   );
   );
 };
 };

+ 23 - 27
apps/app/src/client/components/Admin/ImportData/GrowiArchive/ImportCollectionConfigurationModal.jsx

@@ -1,5 +1,3 @@
-/* eslint-disable react/no-danger */
-
 import React from 'react';
 import React from 'react';
 import { useTranslation } from 'next-i18next';
 import { useTranslation } from 'next-i18next';
 import PropTypes from 'prop-types';
 import PropTypes from 'prop-types';
@@ -199,32 +197,30 @@ class ImportCollectionConfigurationModal extends React.Component {
 
 
     /* eslint-disable react/no-unescaped-entities */
     /* eslint-disable react/no-unescaped-entities */
     return (
     return (
-      <>
-        <div className="form-check form-check-warning">
-          <input
-            id="cbOpt1"
-            type="checkbox"
-            className="form-check-input"
-            checked={option.isOverwriteAuthorWithCurrentUser || false} // add ' || false' to avoid uncontrolled input warning
-            onChange={() =>
-              this.changeHandler({
-                isOverwriteAuthorWithCurrentUser:
-                  !option.isOverwriteAuthorWithCurrentUser,
-              })
-            }
+      <div className="form-check form-check-warning">
+        <input
+          id="cbOpt1"
+          type="checkbox"
+          className="form-check-input"
+          checked={option.isOverwriteAuthorWithCurrentUser || false} // add ' || false' to avoid uncontrolled input warning
+          onChange={() =>
+            this.changeHandler({
+              isOverwriteAuthorWithCurrentUser:
+                !option.isOverwriteAuthorWithCurrentUser,
+            })
+          }
+        />
+        <label htmlFor="cbOpt1" className="form-label form-check-label">
+          {t(`${translationBase}.overwrite_author.label`)}
+          <p
+            className="form-text text-muted mt-0"
+            // biome-ignore lint/security/noDangerouslySetInnerHtml: translation contains HTML markup
+            dangerouslySetInnerHTML={{
+              __html: t(`${translationBase}.overwrite_author.desc`),
+            }}
           />
           />
-          <label htmlFor="cbOpt1" className="form-label form-check-label">
-            {t(`${translationBase}.overwrite_author.label`)}
-            <p
-              className="form-text text-muted mt-0"
-              // biome-ignore lint/security/noDangerouslySetInnerHtml: translation contains HTML markup
-              dangerouslySetInnerHTML={{
-                __html: t(`${translationBase}.overwrite_author.desc`),
-              }}
-            />
-          </label>
-        </div>
-      </>
+        </label>
+      </div>
     );
     );
     /* eslint-enable react/no-unescaped-entities */
     /* eslint-enable react/no-unescaped-entities */
   }
   }

+ 0 - 1
apps/app/src/client/components/Admin/MarkdownSetting/IndentForm.tsx

@@ -1,4 +1,3 @@
-/* eslint-disable react/no-danger */
 import React, { useCallback } from 'react';
 import React, { useCallback } from 'react';
 import { useTranslation } from 'next-i18next';
 import { useTranslation } from 'next-i18next';
 import {
 import {

+ 0 - 1
apps/app/src/client/components/Admin/MarkdownSetting/LineBreakForm.jsx

@@ -1,4 +1,3 @@
-/* eslint-disable react/no-danger */
 import React from 'react';
 import React from 'react';
 import { useTranslation } from 'next-i18next';
 import { useTranslation } from 'next-i18next';
 import PropTypes from 'prop-types';
 import PropTypes from 'prop-types';

+ 0 - 1
apps/app/src/client/components/Admin/Security/GoogleSecuritySettingContents.tsx

@@ -1,4 +1,3 @@
-/* eslint-disable react/no-danger */
 import React, { useCallback, useEffect } from 'react';
 import React, { useCallback, useEffect } from 'react';
 import { pathUtils } from '@growi/core/dist/utils';
 import { pathUtils } from '@growi/core/dist/utils';
 import { useTranslation } from 'next-i18next';
 import { useTranslation } from 'next-i18next';

+ 0 - 2
apps/app/src/client/components/Admin/Security/LdapSecuritySettingContents.tsx

@@ -513,7 +513,6 @@ const LdapSecuritySettingContents = (props: Props) => {
               />
               />
               <p className="form-text text-muted">
               <p className="form-text text-muted">
                 <small>
                 <small>
-                  {/* eslint-disable react/no-danger */}
                   <span
                   <span
                     // biome-ignore lint/security/noDangerouslySetInnerHtml: trusted translation markup
                     // biome-ignore lint/security/noDangerouslySetInnerHtml: trusted translation markup
                     dangerouslySetInnerHTML={{
                     dangerouslySetInnerHTML={{
@@ -540,7 +539,6 @@ const LdapSecuritySettingContents = (props: Props) => {
                       ),
                       ),
                     }}
                     }}
                   />
                   />
-                  {/* eslint-enable react/no-danger */}
                 </small>
                 </small>
               </p>
               </p>
               <p className="form-text text-muted">
               <p className="form-text text-muted">

+ 0 - 1
apps/app/src/client/components/Admin/Security/SamlSecuritySettingContents.tsx

@@ -1,4 +1,3 @@
-/* eslint-disable react/no-danger */
 import React, { useCallback, useEffect, useState } from 'react';
 import React, { useCallback, useEffect, useState } from 'react';
 import { pathUtils } from '@growi/core/dist/utils';
 import { pathUtils } from '@growi/core/dist/utils';
 import { useTranslation } from 'next-i18next';
 import { useTranslation } from 'next-i18next';

+ 0 - 1
apps/app/src/client/components/Admin/Security/SecuritySetting/PageAccessRightsSettings.tsx

@@ -1,4 +1,3 @@
-/* eslint-disable react/no-danger */
 import type React from 'react';
 import type React from 'react';
 
 
 import type AdminGeneralSecurityContainer from '~/client/services/AdminGeneralSecurityContainer';
 import type AdminGeneralSecurityContainer from '~/client/services/AdminGeneralSecurityContainer';

+ 0 - 1
apps/app/src/client/components/Admin/Security/SecuritySetting/UserHomepageDeletionSettings.tsx

@@ -1,4 +1,3 @@
-/* eslint-disable react/no-danger */
 import type React from 'react';
 import type React from 'react';
 
 
 import type AdminGeneralSecurityContainer from '~/client/services/AdminGeneralSecurityContainer';
 import type AdminGeneralSecurityContainer from '~/client/services/AdminGeneralSecurityContainer';

+ 0 - 1
apps/app/src/client/components/PageHistory/RevisionDiff.tsx

@@ -138,7 +138,6 @@ export const RevisionDiff = (props: RevisioinDiffProps): JSX.Element => {
           </div>
           </div>
         </div>
         </div>
       </div>
       </div>
-      {/* eslint-disable-next-line react/no-danger */}
       <div
       <div
         className="revision-history-diff pb-1"
         className="revision-history-diff pb-1"
         // biome-ignore lint/security/noDangerouslySetInnerHtml: diff view is pre-sanitized HTML
         // biome-ignore lint/security/noDangerouslySetInnerHtml: diff view is pre-sanitized HTML