backend/app/models/post.rb

@@ -226,12 +226,14 @@ class Post < ApplicationRecord
   end
 
   def self.sanitised_svg_bytes(bytes)
+    parse_options =
+        Nokogiri::XML::ParseOptions::STRICT |
+        Nokogiri::XML::ParseOptions::NONET
     document = Nokogiri::XML(
         bytes,
         nil,
         nil,
-        Nokogiri::XML::ParseOptions::STRICT
+        parse_options)
-        | Nokogiri::XML::ParseOptions::NONET)
     root = document.root
     raise MiniMagick::Error, 'SVG が不正です．' if root == nil || root.name != 'svg'
     raise MiniMagick::Error, 'SVG が不正です．' if document.internal_subset != nil

frontend/src/pages/posts/PostImportReviewPage.tsx

@@ -427,7 +427,8 @@ const PostImportReviewPage: FC<Props> = ({ user }) => {
 	: { duration: .2, ease: 'easeOut' as const }
 
   const [session, setSession] = useState<PostImportSession | null> (null)
-  const [loading, setLoading] = useState (false)
+  const [metadataLoading, setMetadataLoading] = useState (false)
+  const [submitting, setSubmitting] = useState (false)
   const [loadingRow, setLoadingRow] = useState<number | null> (null)
   const [editingRow, setEditingRow] = useState<PostImportRow | null> (null)
   const [showExistingRows, setShowExistingRows] = useState (false)
@@ -490,7 +491,10 @@ const PostImportReviewPage: FC<Props> = ({ user }) => {
       }
 
     const refreshRows = async (baseSession: PostImportSession) => {
-      setLoading (true)
+      if (active)
+	setMetadataLoading (true)
+      try
+      {
         let nextIndex = 0
         const previewErrors = new Map<number, Record<string, string[]>> ()
         let workingRows = [...(sessionRef.current ?? baseSession).rows]
@@ -569,10 +573,7 @@ const PostImportReviewPage: FC<Props> = ({ user }) => {
         await Promise.all (
             Array.from ({ length: Math.min (4, baseSession.rows.length) }, () => worker ()))
         if (!(active) || previewSequenceRef.current !== previewSequence)
-        {
-          setLoading (false)
           return
-        }
 
         const nextRows = applyDuplicateUrlErrors (workingRows.map (row => {
           const rowErrors = previewErrors.get (row.sourceRow)
@@ -584,7 +585,12 @@ const PostImportReviewPage: FC<Props> = ({ user }) => {
               status: 'error' as const }
         }))
         await persistSession (buildSession (nextRows))
-      setLoading (false)
+      }
+      finally
+      {
+        if (active)
+	  setMetadataLoading (false)
+      }
     }
 
     const hydrate = async () => {
@@ -643,7 +649,7 @@ const PostImportReviewPage: FC<Props> = ({ user }) => {
       : rows
   const existingRows = sortedRows.filter (row => isExistingSkipRow (row))
   const reviewRows = sortedRows.filter (row => !(isExistingSkipRow (row)))
-  const busy = loading || loadingRow != null
+  const busy = metadataLoading || submitting || loadingRow != null
   const canSubmit =
       rows.every (row => isCompletedReviewRow (row))
       || processableImportRows (rows).length > 0
@@ -856,7 +862,7 @@ const PostImportReviewPage: FC<Props> = ({ user }) => {
 	return
       }
 
-    setLoading (true)
+    setSubmitting (true)
     try
     {
       const processingRows = processableImportRows (currentSession.rows)
@@ -887,7 +893,7 @@ const PostImportReviewPage: FC<Props> = ({ user }) => {
     }
     finally
     {
-      setLoading (false)
+      setSubmitting (false)
     }
   }
 
@@ -968,26 +974,29 @@ const PostImportReviewPage: FC<Props> = ({ user }) => {
 	</MainArea>
 
 	<PostImportFooter
-	    loading={busy}
+	    metadataLoading={metadataLoading}
+	    submitting={submitting}
 	    canSubmit={canSubmit}
 	    creatableCount={counts.creatable}
 	    manualSkippedCount={counts.manualSkipped}
 	    existingSkippedCount={counts.existingSkipped}
 	    pendingOrErrorCount={counts.pendingOrError}
-	    onBack={() => navigate (-1)}
+	    onBack={() => navigate ('/posts/new')}
 	    onSubmit={() => submit ()}/>
       </>)
 }
 
 const PostImportFooter = (
-    { loading,
+    { metadataLoading,
+      submitting,
       canSubmit,
       creatableCount,
       manualSkippedCount,
       existingSkippedCount,
       pendingOrErrorCount,
       onBack,
-      onSubmit }: { loading:              boolean
+      onSubmit }: { metadataLoading:      boolean
+		    submitting:           boolean
 		    canSubmit:            boolean
 		    creatableCount:       number
 		    manualSkippedCount:   number
@@ -1008,13 +1017,17 @@ const PostImportFooter = (
 	  <span>登録不可／未処理 {pendingOrErrorCount}件</span>
 	</div>
 	<div className="flex flex-col gap-2 sm:flex-row">
-	  <Button type="button" variant="outline" onClick={onBack} disabled={loading}>
+	  <Button
+	      type="button"
+	      variant="outline"
+	      onClick={onBack}
+	      disabled={submitting}>
 	    URL リスト入力へ戻る
 	  </Button>
 	  <Button
 	      type="button"
 	      onClick={onSubmit}
-	      disabled={loading || !(canSubmit)}>
+	      disabled={metadataLoading || submitting || !(canSubmit)}>
 	    {creatableCount > 1 ? '一括追加' : '追加'}
 	  </Button>
 	</div>