From 8cc3063df0b22d10e1247275bb6445ca0a3c0617 Mon Sep 17 00:00:00 2001 From: "Collin M. Barrett" Date: Tue, 8 Sep 2020 11:24:38 -0500 Subject: [PATCH] =?UTF-8?q?refactor(directory):=20=E2=99=BB=20rm=20'langua?= =?UTF-8?q?ge'=20prefix=20on=20list=20vm's=20languages?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Queries/GetListDetails.cs | 4 ++-- .../Queries/GetLists.cs | 7 +++---- .../components/listInfoDrawer/ListInfoDrawer.tsx | 2 +- web/src/components/listsTable/ListsTable.tsx | 14 +++++++------- web/src/interfaces/List.ts | 2 +- web/src/interfaces/ListDetails.ts | 2 +- 6 files changed, 15 insertions(+), 16 deletions(-) diff --git a/services/directory/src/FilterLists.Directory.Application/Queries/GetListDetails.cs b/services/directory/src/FilterLists.Directory.Application/Queries/GetListDetails.cs index 909611942..d4dc824c4 100644 --- a/services/directory/src/FilterLists.Directory.Application/Queries/GetListDetails.cs +++ b/services/directory/src/FilterLists.Directory.Application/Queries/GetListDetails.cs @@ -53,7 +53,7 @@ public ListViewModelProfile() .ForMember(fl => fl.SyntaxIds, o => o.MapFrom(fl => fl.FilterListSyntaxes.Select(fls => fls.SyntaxId).OrderBy(sid => sid))) - .ForMember(fl => fl.LanguageIso6391s, + .ForMember(fl => fl.Iso6391s, o => o.MapFrom(fl => fl.FilterListLanguages.Select(fls => fls.Iso6391).OrderBy(i => i))) .ForMember(fl => fl.TagIds, @@ -101,7 +101,7 @@ public class ListViewModel public string? Description { get; private set; } public int? LicenseId { get; private set; } public IEnumerable? SyntaxIds { get; private set; } - public IEnumerable? LanguageIso6391s { get; private set; } + public IEnumerable? Iso6391s { get; private set; } public IEnumerable? TagIds { get; private set; } public IEnumerable? ViewUrls { get; private set; } public Uri? HomeUrl { get; private set; } diff --git a/services/directory/src/FilterLists.Directory.Application/Queries/GetLists.cs b/services/directory/src/FilterLists.Directory.Application/Queries/GetLists.cs index 51186adba..edf70afbf 100644 --- a/services/directory/src/FilterLists.Directory.Application/Queries/GetLists.cs +++ b/services/directory/src/FilterLists.Directory.Application/Queries/GetLists.cs @@ -1,5 +1,4 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; using System.Threading; using System.Threading.Tasks; @@ -48,7 +47,7 @@ public ListViewModelProfile() .ForMember(fl => fl.SyntaxIds, o => o.MapFrom(fl => fl.FilterListSyntaxes.Select(fls => fls.SyntaxId).OrderBy(sid => sid))) - .ForMember(fl => fl.LanguageIso6391s, + .ForMember(fl => fl.Iso6391s, o => o.MapFrom(fl => fl.FilterListLanguages.Select(fls => fls.Iso6391).OrderBy(i => i))) .ForMember(fl => fl.TagIds, @@ -67,7 +66,7 @@ public class ListViewModel public string? Description { get; private set; } public int? LicenseId { get; private set; } public IEnumerable? SyntaxIds { get; private set; } - public IEnumerable? LanguageIso6391s { get; private set; } + public IEnumerable? Iso6391s { get; private set; } public IEnumerable? TagIds { get; private set; } public IEnumerable? MaintainerIds { get; private set; } } diff --git a/web/src/components/listInfoDrawer/ListInfoDrawer.tsx b/web/src/components/listInfoDrawer/ListInfoDrawer.tsx index 072595829..f9b9ae9bd 100644 --- a/web/src/components/listInfoDrawer/ListInfoDrawer.tsx +++ b/web/src/components/listInfoDrawer/ListInfoDrawer.tsx @@ -47,7 +47,7 @@ export const ListInfoDrawer = (props: RouteComponentProps & Props) => { const list = useListDetails(props.listId); const listLanguage = props.languages.filter((l) => - list?.languageIso6391s.includes(l.iso6391) + list?.iso6391s.includes(l.iso6391) ); const listTags = props.tags.filter((t) => list?.tagIds.includes(t.id)); const listLicense = props.licenses.find((l) => l.id === list?.id); diff --git a/web/src/components/listsTable/ListsTable.tsx b/web/src/components/listsTable/ListsTable.tsx index 44f106427..1dd121f29 100644 --- a/web/src/components/listsTable/ListsTable.tsx +++ b/web/src/components/listsTable/ListsTable.tsx @@ -227,11 +227,11 @@ export const ListsTable = (props: RouteComponentProps & Props) => { title="Languages" key="Languages" - dataIndex={nameof("languageIso6391s")} + dataIndex={nameof("iso6391s")} sorter={(a, b) => languageArraySorter( - a.languageIso6391s, - b.languageIso6391s, + a.iso6391s, + b.iso6391s, languages ) } @@ -245,8 +245,8 @@ export const ListsTable = (props: RouteComponentProps & Props) => { { visibleLists.filter( (li) => - li.languageIso6391s && - li.languageIso6391s.includes(l.iso6391) + li.iso6391s && + li.iso6391s.includes(l.iso6391) ).length } ) @@ -255,8 +255,8 @@ export const ListsTable = (props: RouteComponentProps & Props) => { value: l.iso6391.toString(), }))} onFilter={(value, record) => - record.languageIso6391s - ? record.languageIso6391s.includes(value as string) + record.iso6391s + ? record.iso6391s.includes(value as string) : false } render={(languageIds: string[]) => diff --git a/web/src/interfaces/List.ts b/web/src/interfaces/List.ts index 0055329e0..9ed6e1739 100644 --- a/web/src/interfaces/List.ts +++ b/web/src/interfaces/List.ts @@ -4,7 +4,7 @@ description: string; licenseId: number; syntaxIds: number[]; - languageIso6391s: string[]; + iso6391s: string[]; tagIds: number[]; maintainerIds: number[]; diff --git a/web/src/interfaces/ListDetails.ts b/web/src/interfaces/ListDetails.ts index fb06b5e3d..68b8717a4 100644 --- a/web/src/interfaces/ListDetails.ts +++ b/web/src/interfaces/ListDetails.ts @@ -4,7 +4,7 @@ description: string; licenseId: number; syntaxIds: number[]; - languageIso6391s: string[]; + iso6391s: string[]; tagIds: number[]; viewUrls: ViewUrl[]; homeUrl: string;