From dc97319d759aabb2bf93086b26e930443405f042 Mon Sep 17 00:00:00 2001
From: "Collin M. Barrett" <collinbarrett@users.noreply.github.com>
Date: Sat, 29 Aug 2020 14:52:00 -0500
Subject: [PATCH] =?UTF-8?q?Revert=20"Revert=20"refactor(web):=20=E2=99=BB?=
 =?UTF-8?q?=F0=9F=9A=A7=20match=20dto=20interfaces=20with=20revised=20api/?=
 =?UTF-8?q?data=20model""?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 451ff31f171acce6887a7ff2ead03865c7c80ce3.
---
 .../listInfoDrawer/ListInfoDrawer.tsx         |  2 +-
 web/src/components/listsTable/ListDrawer.tsx  |  4 +-
 web/src/components/listsTable/ListsTable.tsx  | 14 +++----
 .../maintainerCloud/MaintainerCloud.tsx       |  4 +-
 .../components/maintainers/Maintainers.tsx    |  4 +-
 web/src/interfaces/Language.ts                |  3 +-
 web/src/interfaces/License.ts                 |  7 +++-
 web/src/interfaces/List.ts                    | 38 ++++++++++---------
 web/src/interfaces/Maintainer.ts              |  6 +--
 web/src/interfaces/Software.ts                |  6 ++-
 web/src/interfaces/Syntax.ts                  |  5 ++-
 web/src/interfaces/Tag.ts                     |  2 +-
 12 files changed, 52 insertions(+), 43 deletions(-)

diff --git a/web/src/components/listInfoDrawer/ListInfoDrawer.tsx b/web/src/components/listInfoDrawer/ListInfoDrawer.tsx
index 9a80c9b4b..825b7200a 100644
--- a/web/src/components/listInfoDrawer/ListInfoDrawer.tsx
+++ b/web/src/components/listInfoDrawer/ListInfoDrawer.tsx
@@ -80,7 +80,7 @@ export const ListInfoDrawer = (props: RouteComponentProps & Props) => {
       {props.syntax && (
         <SyntaxTag
           name={props.syntax.name}
-          definitionUrl={props.syntax.definitionUrl}
+          definitionUrl={props.syntax.url}
           showLabel={true}
         />
       )}
diff --git a/web/src/components/listsTable/ListDrawer.tsx b/web/src/components/listsTable/ListDrawer.tsx
index 7c23b7074..0baac49b6 100644
--- a/web/src/components/listsTable/ListDrawer.tsx
+++ b/web/src/components/listsTable/ListDrawer.tsx
@@ -32,9 +32,9 @@ export const ListDrawer = (props: Props) => {
       <ListInfoDrawer
         list={list as List}
         languages={
-          list.languageIds &&
+          list.languageIso6391s &&
           props.languages.filter((l: Language) =>
-            list.languageIds.includes(l.id)
+            list.languageIso6391s.includes(l.id)
           )
         }
         license={
diff --git a/web/src/components/listsTable/ListsTable.tsx b/web/src/components/listsTable/ListsTable.tsx
index c1f9af73f..9625dac63 100644
--- a/web/src/components/listsTable/ListsTable.tsx
+++ b/web/src/components/listsTable/ListsTable.tsx
@@ -217,10 +217,7 @@ export const ListsTable = (props: RouteComponentProps & Props) => {
           render={(syntaxId: number) => {
             const syntax = syntaxes.find((s) => s.id === syntaxId);
             return syntax ? (
-              <SyntaxTag
-                name={syntax.name}
-                definitionUrl={syntax.definitionUrl}
-              />
+              <SyntaxTag name={syntax.name} definitionUrl={syntax.url} />
             ) : null;
           }}
         />
@@ -231,7 +228,7 @@ export const ListsTable = (props: RouteComponentProps & Props) => {
           key="Languages"
           dataIndex={nameof<List>("languageIds")}
           sorter={(a, b) =>
-            arraySorter(a.languageIds, b.languageIds, languages)
+            arraySorter(a.languageIso6391s, b.languageIso6391s, languages)
           }
           width={129}
           className={styles.nogrow}
@@ -242,7 +239,8 @@ export const ListsTable = (props: RouteComponentProps & Props) => {
                 {l.name}&nbsp; (
                 {
                   visibleLists.filter(
-                    (li) => li.languageIds && li.languageIds.includes(l.id)
+                    (li) =>
+                      li.languageIso6391s && li.languageIso6391s.includes(l.id)
                   ).length
                 }
                 )
@@ -251,7 +249,9 @@ export const ListsTable = (props: RouteComponentProps & Props) => {
             value: l.id.toString(),
           }))}
           onFilter={(value, record) =>
-            record.languageIds ? record.languageIds.includes(+value) : false
+            record.languageIso6391s
+              ? record.languageIso6391s.includes(+value)
+              : false
           }
           render={(languageIds: number[]) =>
             languageIds ? (
diff --git a/web/src/components/maintainerCloud/MaintainerCloud.tsx b/web/src/components/maintainerCloud/MaintainerCloud.tsx
index 155b92fe1..8974874da 100644
--- a/web/src/components/maintainerCloud/MaintainerCloud.tsx
+++ b/web/src/components/maintainerCloud/MaintainerCloud.tsx
@@ -12,10 +12,10 @@ export const MaintainerCloud = (props: Props) =>
   props.maintainers && props.maintainers.length ? (
     <div className={styles.grow}>
       {props.maintainers.map((m: Maintainer, i: number) =>
-        m.homeUrl ? (
+        m.url ? (
           <Tag key={i}>
             <a
-              href={m.homeUrl}
+              href={m.url}
               title={`View ${m.name}'s homepage.`}
               target="_blank"
               rel="noopener noreferrer"
diff --git a/web/src/components/maintainers/Maintainers.tsx b/web/src/components/maintainers/Maintainers.tsx
index ee51c764a..291d8ed0f 100644
--- a/web/src/components/maintainers/Maintainers.tsx
+++ b/web/src/components/maintainers/Maintainers.tsx
@@ -27,10 +27,10 @@ interface MaintainerComponentProps {
 
 const MaintainerComponent = (props: MaintainerComponentProps) => {
   let actions = [];
-  if (props.maintainer.homeUrl) {
+  if (props.maintainer.url) {
     actions.push(
       <a
-        href={props.maintainer.homeUrl}
+        href={props.maintainer.url}
         title={`View ${props.maintainer.name}'s homepage.`}
         target="_blank"
         rel="noopener noreferrer"
diff --git a/web/src/interfaces/Language.ts b/web/src/interfaces/Language.ts
index af4d69de7..f08db784b 100644
--- a/web/src/interfaces/Language.ts
+++ b/web/src/interfaces/Language.ts
@@ -1,6 +1,5 @@
 export interface Language {
-  id: number;
-  filterListIds: number[];
   iso6391: string;
   name: string;
+  filterListIds: number[];
 }
diff --git a/web/src/interfaces/License.ts b/web/src/interfaces/License.ts
index 841df2905..0335c8e4b 100644
--- a/web/src/interfaces/License.ts
+++ b/web/src/interfaces/License.ts
@@ -1,6 +1,9 @@
 export interface License {
   id: number;
-  descriptionUrl: string;
-  filterListIds: number[];
   name: string;
+  url: string;
+  permitsModification: boolean;
+  permitsDistribution: boolean;
+  permitsCommercialUse: boolean;
+  filterListIds: number[];
 }
diff --git a/web/src/interfaces/List.ts b/web/src/interfaces/List.ts
index 901184ab1..fe595812b 100644
--- a/web/src/interfaces/List.ts
+++ b/web/src/interfaces/List.ts
@@ -1,24 +1,28 @@
 export interface List {
   id: number;
-  chatUrl: string;
-  description: string;
-  descriptionSourceUrl: string;
-  donateUrl: string;
-  emailAddress: string;
-  forumUrl: string;
-  homeUrl: string;
-  issuesUrl: string;
-  languageIds: number[];
-  licenseId: number;
-  maintainerIds: number[];
   name: string;
-  policyUrl: string;
-  publishedDate: string;
-  submissionUrl: string;
-  syntaxId: number;
+  description: string;
+  licenseId: number;
+  syntaxIds: number[];
+  languageIso6391s: number[];
   tagIds: number[];
-  viewUrl: string;
-  viewUrlMirrors: string[];
+  // viewUrls: unknown[];
+  homeUrl: string;
+  onionUrl: string;
+  policyUrl: string;
+  submissionUrl: string;
+  issuesUrl: string;
+  forumUrl: string;
+  chatUrl: string;
+  emailAddress: string;
+  donateUrl: string;
+  maintainerIds: number[];
+  upstreamFilterListIds: number[];
+  forkFilterListIds: number[];
+  includedInFilterListIds: number[];
+  includesFilterListIds: number[];
+  dependencyFilterListIds: number[];
+  dependentFilterListIds: number[];
 
   // auto-generated by useLists hook
   slug: string;
diff --git a/web/src/interfaces/Maintainer.ts b/web/src/interfaces/Maintainer.ts
index aa3746832..bd2f319c0 100644
--- a/web/src/interfaces/Maintainer.ts
+++ b/web/src/interfaces/Maintainer.ts
@@ -1,8 +1,8 @@
 export interface Maintainer {
   id: number;
-  emailAddress: string;
-  filterListIds: number[];
-  homeUrl: string;
   name: string;
+  url: string;
+  emailAddress: string;
   twitterHandle: string;
+  filterListIds: number[];
 }
diff --git a/web/src/interfaces/Software.ts b/web/src/interfaces/Software.ts
index dd8d151ac..5a2b09fba 100644
--- a/web/src/interfaces/Software.ts
+++ b/web/src/interfaces/Software.ts
@@ -1,7 +1,9 @@
 export interface Software {
   id: number;
-  homeUrl: string;
-  isAbpSubscribable: boolean;
   name: string;
+  description: string;
+  homeUrl: string;
+  downloadUrl: string;
+  supportsAbpUrlScheme: boolean;
   syntaxIds: number[];
 }
diff --git a/web/src/interfaces/Syntax.ts b/web/src/interfaces/Syntax.ts
index 0873306d9..0457c34b0 100644
--- a/web/src/interfaces/Syntax.ts
+++ b/web/src/interfaces/Syntax.ts
@@ -1,7 +1,8 @@
 export interface Syntax {
   id: number;
-  definitionUrl: string;
-  filterListIds: number[];
   name: string;
+  description: string;
+  url: string;
+  filterListIds: number[];
   softwareIds: number[];
 }
diff --git a/web/src/interfaces/Tag.ts b/web/src/interfaces/Tag.ts
index 4141dd434..9cf1d5592 100644
--- a/web/src/interfaces/Tag.ts
+++ b/web/src/interfaces/Tag.ts
@@ -1,6 +1,6 @@
 export interface Tag {
   id: number;
+  name: string;
   description: string;
   filterListIds: number[];
-  name: string;
 }