Merge pull request #320 from RaenonX-DL/dev

v2.15.0-beta.3 Release
RaenonX-DL · Oct 2, 2021 · 260d9ef · 260d9ef
2 parents e3f7573 + 5f9fe2a
commit 260d9ef
Show file tree

Hide file tree

Showing 24 changed files with 41 additions and 126 deletions.
diff --git a/src/api-def b/src/api-def
diff --git a/src/components/pages/gameData/unitInfo/lookup/in/landing.tsx b/src/components/pages/gameData/unitInfo/lookup/in/landing.tsx
@@ -23,7 +23,7 @@ export const UnitInfoLookupLanding = ({analyses}: Props) => {
           return unitInfo ? [{entry, unitInfo}] : [];
         })
         .map(({entry, unitInfo}) => (
-          <Col lg className="mt-2 mt-lg-0" key={unitInfo.id}>
+          <Col lg={4} className="mt-2 mt-lg-0 mb-0 mb-lg-2" key={unitInfo.id}>
             <UnitInfoEntry unitInfo={unitInfo} analysisMeta={entry} simplified/>
           </Col>
         ))}

diff --git a/src/components/pages/gameData/unitInfo/lookup/main.test.tsx b/src/components/pages/gameData/unitInfo/lookup/main.test.tsx
@@ -244,9 +244,9 @@ describe('Analysis lookup page', () => {
     userEvent.click(searchButton);
 
     expect(fnGetLookup).toHaveBeenCalledTimes(1);
-    await waitFor(() => expect(screen.getByText(translationEN.posts.analysis.error.noResult)).toBeInTheDocument());
+    await waitFor(() => expect(screen.getByText(translationEN.misc.noResult)).toBeInTheDocument());
     expect(fnScroll).toHaveBeenCalledTimes(2);
-    const errorText = screen.getByText(translationEN.posts.analysis.error.noResult);
+    const errorText = screen.getByText(translationEN.misc.noResult);
     expect(errorText).toHaveClass('text-danger');
     expect(errorText).toHaveClass('text-center');
   });

diff --git a/src/components/pages/gameData/unitInfo/lookup/out/main.tsx b/src/components/pages/gameData/unitInfo/lookup/out/main.tsx
@@ -31,7 +31,7 @@ export const UnitInfoLookupOutput = ({
   if (!unitInfoSorted.length) {
     return (
       <h5 className="text-danger text-center">
-        {t((t) => t.posts.analysis.error.noResult)}
+        {t((t) => t.misc.noResult)}
       </h5>
     );
   }

diff --git a/src/components/pages/posts/analysis/form/base.tsx b/src/components/pages/posts/analysis/form/base.tsx
@@ -46,8 +46,6 @@ export const AnalysisFormBase = <P extends AnalysisBody, R extends AnalysisEditR
         passives: await processText({text: payload.passives, lang}),
         normalAttacks: await processText({text: payload.normalAttacks, lang}),
         videos: await processText({text: payload.videos, lang}),
-        story: await processText({text: payload.story, lang}),
-        keywords: await processText({text: payload.keywords, lang}),
       })}
       {...props}
     />

diff --git a/src/components/pages/posts/analysis/form/bottom.tsx b/src/components/pages/posts/analysis/form/bottom.tsx
@@ -17,36 +17,14 @@ export const FormBottom = <P extends AnalysisBody>({formState, setPayload}: Form
   const {payload} = formState;
 
   return (
-    <>
-      <Row>
-        <Col>
-          <h5>{t((t) => t.posts.analysis.videos)}</h5>
-          <MarkdownInput
-            onChanged={(e) => setPayload('videos', e.target.value)}
-            rows={5} value={payload.videos}
-          />
-        </Col>
-      </Row>
-      <hr/>
-      <Row>
-        <Col>
-          <h5>{t((t) => t.posts.analysis.story)}</h5>
-          <MarkdownInput
-            onChanged={(e) => setPayload('story', e.target.value)}
-            rows={5} value={payload.story}
-          />
-        </Col>
-      </Row>
-      <hr/>
-      <Row>
-        <Col>
-          <h5>{t((t) => t.posts.analysis.keywords)}</h5>
-          <MarkdownInput
-            onChanged={(e) => setPayload('keywords', e.target.value)}
-            rows={5} value={payload.keywords}
-          />
-        </Col>
-      </Row>
-    </>
+    <Row>
+      <Col>
+        <h5>{t((t) => t.posts.analysis.videos)}</h5>
+        <MarkdownInput
+          onChanged={(e) => setPayload('videos', e.target.value)}
+          rows={5} value={payload.videos}
+        />
+      </Col>
+    </Row>
   );
 };
diff --git a/src/components/pages/posts/analysis/form/chara/edit.test.tsx b/src/components/pages/posts/analysis/form/chara/edit.test.tsx
@@ -46,8 +46,6 @@ describe('Character analysis edit form', () => {
             ],
             tipsBuilds: 'tb',
             videos: 'vid',
-            story: 'str',
-            keywords: 'kw',
           }}
         />
       ),

diff --git a/src/components/pages/posts/analysis/form/chara/edit.tsx b/src/components/pages/posts/analysis/form/chara/edit.tsx
@@ -30,8 +30,6 @@ export const AnalysisFormCharaEdit = ({analysis}: Props) => {
       skills: analysis.skills,
       tipsBuilds: analysis.tipsBuilds,
       videos: analysis.videos,
-      story: analysis.story,
-      keywords: analysis.keywords,
       editNote: '',
     },
     isIdAvailable: true,

diff --git a/src/components/pages/posts/analysis/form/chara/main.test.tsx b/src/components/pages/posts/analysis/form/chara/main.test.tsx
@@ -60,8 +60,6 @@ describe('Character analysis form', () => {
         ],
         tipsBuilds: 'tb',
         videos: 'vid',
-        keywords: 'kw',
-        story: 'str',
         editNote: '',
       },
     };
@@ -102,10 +100,6 @@ describe('Character analysis form', () => {
     typeInput(tipsBuilds, 'tipsBuilds', {clear: true, rerender});
     const videos = screen.getByText(formState.payload.videos, {selector: 'textarea'});
     typeInput(videos, 'videos', {clear: true, rerender});
-    const keywords = screen.getByText(formState.payload.keywords, {selector: 'textarea'});
-    typeInput(keywords, 'keywords', {clear: true, rerender});
-    const story = screen.getByText(formState.payload.story, {selector: 'textarea'});
-    typeInput(story, 'story', {clear: true, rerender});
     // endregion
 
     const editButton = screen.getByText(translationEN.posts.manage.edit);
@@ -125,8 +119,6 @@ describe('Character analysis form', () => {
       skills: formState.payload.skills,
       tipsBuilds: 'tipsBuilds',
       videos: 'videos',
-      keywords: 'keywords',
-      story: 'story',
       editNote: '',
     });
   });
@@ -214,8 +206,6 @@ describe('Character analysis form', () => {
       }],
       tipsBuilds: originalText,
       videos: originalText,
-      keywords: originalText,
-      story: originalText,
       editNote: originalText,
     };
 
@@ -252,8 +242,6 @@ describe('Character analysis form', () => {
       }],
       tipsBuilds: transformedText,
       videos: transformedText,
-      keywords: transformedText,
-      story: transformedText,
       editNote: originalText,
     });
   });

diff --git a/src/components/pages/posts/analysis/form/chara/new.test.tsx b/src/components/pages/posts/analysis/form/chara/new.test.tsx
@@ -70,6 +70,7 @@ describe('New character analysis form', () => {
               dragon: null,
             },
             quest: null,
+            misc: null,
           },
         },
       },
@@ -143,6 +144,7 @@ describe('New character analysis form', () => {
               dragon: null,
             },
             quest: null,
+            misc: null,
           },
         },
       },
@@ -182,12 +184,11 @@ describe('New character analysis form', () => {
                 skills: [],
                 tipsBuilds: 'tipsBuilds',
                 videos: 'videos',
-                keywords: 'keywords',
-                story: 'story',
               },
               dragon: null,
             },
             quest: null,
+            misc: null,
           },
         },
       },
@@ -219,6 +220,7 @@ describe('New character analysis form', () => {
               dragon: null,
             },
             quest: null,
+            misc: null,
           },
         },
       },

diff --git a/src/components/pages/posts/analysis/form/chara/utils.ts b/src/components/pages/posts/analysis/form/chara/utils.ts
@@ -19,7 +19,5 @@ export const generatePayload = (lang: SupportedLanguages, uid?: string): CharaAn
     ],
     tipsBuilds: '',
     videos: '',
-    story: '',
-    keywords: '',
   };
 };
diff --git a/src/components/pages/posts/analysis/form/dragon/edit.test.tsx b/src/components/pages/posts/analysis/form/dragon/edit.test.tsx
@@ -42,8 +42,6 @@ describe('Dragon analysis edit form', () => {
             suitableCharacters: 'sut',
             notes: 'not',
             videos: 'vid',
-            story: 'str',
-            keywords: 'kw',
           }}
         />
       ),

diff --git a/src/components/pages/posts/analysis/form/dragon/edit.tsx b/src/components/pages/posts/analysis/form/dragon/edit.tsx
@@ -32,8 +32,6 @@ export const AnalysisFormDragonEdit = ({analysis}: Props) => {
       suitableCharacters: analysis.suitableCharacters,
       notes: analysis.notes,
       videos: analysis.videos,
-      story: analysis.story,
-      keywords: analysis.keywords,
       editNote: '',
     },
     isIdAvailable: true,

diff --git a/src/components/pages/posts/analysis/form/dragon/utils.ts b/src/components/pages/posts/analysis/form/dragon/utils.ts
@@ -15,7 +15,5 @@ export const generatePayload = (lang: SupportedLanguages, uid?: string): DragonA
     notes: '',
     suitableCharacters: '',
     videos: '',
-    story: '',
-    keywords: '',
   };
 };
diff --git a/src/components/pages/posts/analysis/output/bottom.tsx b/src/components/pages/posts/analysis/output/bottom.tsx
@@ -32,34 +32,6 @@ export const SectionBottom = <R extends AnalysisGetResponse>({analysis}: Section
           </div>
         </>
       }
-      {
-        analysis.story &&
-        <>
-          <hr/>
-          <Row>
-            <Col>
-              <h4 className="mb-3">
-                {t((t) => t.posts.analysis.story)}
-              </h4>
-              <Markdown>{analysis.story}</Markdown>
-            </Col>
-          </Row>
-        </>
-      }
-      {
-        analysis.keywords &&
-        <>
-          <hr/>
-          <Row>
-            <Col>
-              <h4 className="mb-3">
-                {t((t) => t.posts.analysis.keywords)}
-              </h4>
-              <Markdown>{analysis.keywords}</Markdown>
-            </Col>
-          </Row>
-        </>
-      }
     </>
   );
 };
diff --git a/src/components/pages/posts/analysis/output/chara.test.tsx b/src/components/pages/posts/analysis/output/chara.test.tsx
@@ -38,8 +38,6 @@ describe('Analysis output (Character)', () => {
     ],
     tipsBuilds: 'bld',
     videos: 'vid',
-    story: 'str',
-    keywords: 'kw',
     viewCount: 777,
     editNotes: [
       {
@@ -81,8 +79,6 @@ describe('Analysis output (Character)', () => {
     expect(screen.getByText('tip')).toBeInTheDocument();
     expect(screen.getByText('bld')).toBeInTheDocument();
     expect(screen.getByText('vid')).toBeInTheDocument();
-    expect(screen.getByText('str')).toBeInTheDocument();
-    expect(screen.getByText('kw')).toBeInTheDocument();
     expect(screen.getByText(/777/)).toBeInTheDocument();
     expect(screen.getByText(/edn/)).toBeInTheDocument();
     expect(screen.queryByText(new RegExp(`${altLangTips}`, 'g'))).not.toBeInTheDocument();
@@ -109,8 +105,6 @@ describe('Analysis output (Character)', () => {
     expect(screen.getByText('tip')).toBeInTheDocument();
     expect(screen.getByText('bld')).toBeInTheDocument();
     expect(screen.getByText('vid')).toBeInTheDocument();
-    expect(screen.getByText('str')).toBeInTheDocument();
-    expect(screen.getByText('kw')).toBeInTheDocument();
     expect(screen.getByText(/777/)).toBeInTheDocument();
     expect(screen.getByText(/edn/)).toBeInTheDocument();
     expect(screen.getByText(new RegExp(`${altLangTips}`, 'g'))).toBeInTheDocument();
@@ -153,8 +147,6 @@ describe('Analysis output (Character)', () => {
     expect(screen.getByText('tip')).toBeInTheDocument();
     expect(screen.getByText('bld')).toBeInTheDocument();
     expect(screen.getByText('vid')).toBeInTheDocument();
-    expect(screen.getByText('str')).toBeInTheDocument();
-    expect(screen.getByText('kw')).toBeInTheDocument();
     expect(screen.getByText(/777/)).toBeInTheDocument();
     expect(screen.queryByText(/edn/)).not.toBeInTheDocument();
     expect(screen.queryByText(new RegExp(`${altLangTips}`, 'g'))).not.toBeInTheDocument();
@@ -187,8 +179,6 @@ describe('Analysis output (Character)', () => {
     expect(screen.getByText('tip')).toBeInTheDocument();
     expect(screen.getByText('bld')).toBeInTheDocument();
     expect(screen.getByText('vid')).toBeInTheDocument();
-    expect(screen.getByText('str')).toBeInTheDocument();
-    expect(screen.getByText('kw')).toBeInTheDocument();
     expect(screen.getByText(/777/)).toBeInTheDocument();
     expect(screen.getByText(/edn/)).toBeInTheDocument();
     expect(screen.queryByText(new RegExp(`${altLangTips}`, 'g'))).not.toBeInTheDocument();

diff --git a/src/components/pages/posts/analysis/output/dragon.test.tsx b/src/components/pages/posts/analysis/output/dragon.test.tsx
@@ -31,8 +31,6 @@ describe('Analysis output (Dragon)', () => {
     suitableCharacters: 'suc',
     ultimate: 'ult',
     videos: 'vid',
-    story: 'str',
-    keywords: 'kw',
     viewCount: 777,
     editNotes: [
       {
@@ -69,8 +67,6 @@ describe('Analysis output (Dragon)', () => {
     expect(screen.getByText('suc')).toBeInTheDocument();
     expect(screen.getByText('ult')).toBeInTheDocument();
     expect(screen.getByText('vid')).toBeInTheDocument();
-    expect(screen.getByText('str')).toBeInTheDocument();
-    expect(screen.getByText('kw')).toBeInTheDocument();
     expect(screen.getByText(/777/)).toBeInTheDocument();
     expect(screen.getByText(/edn/)).toBeInTheDocument();
     expect(screen.queryByText(new RegExp(`${altLangTips}`, 'g'))).not.toBeInTheDocument();
@@ -94,8 +90,6 @@ describe('Analysis output (Dragon)', () => {
     expect(screen.getByText('suc')).toBeInTheDocument();
     expect(screen.getByText('ult')).toBeInTheDocument();
     expect(screen.getByText('vid')).toBeInTheDocument();
-    expect(screen.getByText('str')).toBeInTheDocument();
-    expect(screen.getByText('kw')).toBeInTheDocument();
     expect(screen.getByText(/777/)).toBeInTheDocument();
     expect(screen.getByText(/edn/)).toBeInTheDocument();
     expect(screen.queryByText(new RegExp(`${altLangTips}`, 'g'))).toBeInTheDocument();
@@ -135,8 +129,6 @@ describe('Analysis output (Dragon)', () => {
     expect(screen.getByText('suc')).toBeInTheDocument();
     expect(screen.getByText('ult')).toBeInTheDocument();
     expect(screen.getByText('vid')).toBeInTheDocument();
-    expect(screen.getByText('str')).toBeInTheDocument();
-    expect(screen.getByText('kw')).toBeInTheDocument();
     expect(screen.getByText(/777/)).toBeInTheDocument();
     expect(screen.queryByText(/edn/)).not.toBeInTheDocument();
     expect(screen.queryByText(new RegExp(`${altLangTips}`, 'g'))).not.toBeInTheDocument();
@@ -157,8 +149,6 @@ describe('Analysis output (Dragon)', () => {
     expect(screen.getByText('suc')).toBeInTheDocument();
     expect(screen.getByText('ult')).toBeInTheDocument();
     expect(screen.getByText('vid')).toBeInTheDocument();
-    expect(screen.getByText('str')).toBeInTheDocument();
-    expect(screen.getByText('kw')).toBeInTheDocument();
     expect(screen.getByText(/777/)).toBeInTheDocument();
     expect(screen.getByText(/edn/)).toBeInTheDocument();
     expect(screen.queryByText(new RegExp(`${altLangTips}`, 'g'))).not.toBeInTheDocument();

diff --git a/src/components/pages/tier/main.test.tsx b/src/components/pages/tier/main.test.tsx
@@ -103,4 +103,17 @@ describe('Tier list page', () => {
     expect(screen.getByText('B')).toBeInTheDocument();
     expect(screen.getByText('C')).toBeInTheDocument();
   });
+
+  it('shows no result on not found', async () => {
+    renderReact(() => <TierList/>);
+
+    const searchInput = await screen.findByPlaceholderText(translationEN.misc.searchKeyword);
+    userEvent.type(searchInput, 'test');
+
+    const searchButton = await screen.findByText(translationEN.misc.search, {selector: 'button:enabled'});
+    userEvent.click(searchButton);
+
+    // Partial text of the tier note tips
+    expect(await screen.findByText(translationEN.misc.noResult)).toBeInTheDocument();
+  });
 });
diff --git a/src/components/pages/tier/out/main.tsx b/src/components/pages/tier/out/main.tsx
@@ -48,7 +48,11 @@ export const TierListOutput = ({inputData, tierData, prioritizedUnitInfo, otherU
             keyPointsData={keyPointsData}
           />
       }
-      {(entryPackHasTierNote.length || entryPackNoTierNote.length) && <AdsTierResultsEnd/>}
+      {
+        (entryPackHasTierNote.length > 0 || entryPackNoTierNote.length > 0) ?
+          <AdsTierResultsEnd/> :
+          <>{t((t) => t.misc.noResult)}</>
+      }
     </>
   );
 };
+0 −2		api/post/analysis/elements.ts
+374 −135		package-lock.json
+4 −4		package.json