Loading...
;
+ ?
+ }
+ className="-striped -highlight" />
+ : Loading...
;
interface ICreateListDtoProps {
list: IList;
@@ -74,31 +81,31 @@ interface ICreateListDtoProps {
};
const mapListDetails = (props: ICreateListDtoProps): IListDetails =>
-({
- id: props.list.id,
- chatUrl: props.list.chatUrl,
- description: props.list.description,
- descriptionSourceUrl: props.list.descriptionSourceUrl,
- donateUrl: props.list.donateUrl,
- emailAddress: props.list.emailAddress,
- forumUrl: props.list.forumUrl,
- homeUrl: props.list.homeUrl,
- issuesUrl: props.list.issuesUrl,
- languages: props.list.languageIds
- ? props.languages.filter((l: ILanguage) => props.list.languageIds.indexOf(l.id) > -1)
- : undefined,
- license: props.licenses.filter((l: ILicense) => props.list.licenseId === l.id)[0],
- maintainers: props.list.maintainerIds
- ? props.maintainers.filter((m: IMaintainer) => props.list.maintainerIds.indexOf(m.id) > -1)
- : undefined,
- name: props.list.name,
- policyUrl: props.list.policyUrl,
- publishedDate: props.list.publishedDate,
- //ruleCount: props.list.ruleCount,
- submissionUrl: props.list.submissionUrl,
- syntax: props.syntaxes.filter((s: ISyntax) => props.list.syntaxId === s.id)[0],
- tags: props.list.tagIds ? props.tags.filter((t: ITag) => props.list.tagIds.indexOf(t.id) > -1) : undefined,
- //updatedDate: props.list.updatedDate,
- viewUrl: props.list.viewUrl,
- viewUrlMirrors: props.list.viewUrlMirrors
-} as IListDetails);
\ No newline at end of file
+ ({
+ id: props.list.id,
+ chatUrl: props.list.chatUrl,
+ description: props.list.description,
+ descriptionSourceUrl: props.list.descriptionSourceUrl,
+ donateUrl: props.list.donateUrl,
+ emailAddress: props.list.emailAddress,
+ forumUrl: props.list.forumUrl,
+ homeUrl: props.list.homeUrl,
+ issuesUrl: props.list.issuesUrl,
+ languages: props.list.languageIds
+ ? props.languages.filter((l: ILanguage) => props.list.languageIds.indexOf(l.id) > -1)
+ : undefined,
+ license: props.licenses.filter((l: ILicense) => props.list.licenseId === l.id)[0],
+ maintainers: props.list.maintainerIds
+ ? props.maintainers.filter((m: IMaintainer) => props.list.maintainerIds.indexOf(m.id) > -1)
+ : undefined,
+ name: props.list.name,
+ policyUrl: props.list.policyUrl,
+ publishedDate: props.list.publishedDate,
+ //ruleCount: props.list.ruleCount,
+ submissionUrl: props.list.submissionUrl,
+ syntax: props.syntaxes.filter((s: ISyntax) => props.list.syntaxId === s.id)[0],
+ tags: props.list.tagIds ? props.tags.filter((t: ITag) => props.list.tagIds.indexOf(t.id) > -1) : undefined,
+ //updatedDate: props.list.updatedDate,
+ viewUrl: props.list.viewUrl,
+ viewUrlMirrors: props.list.viewUrlMirrors
+ } as IListDetails);
\ No newline at end of file
diff --git a/src/web/src/modules/home/components/listsTable/columns/Languages.tsx b/src/web/src/modules/home/components/listsTable/columns/Languages.tsx
index 828b2fd54..a0ac54d34 100644
--- a/src/web/src/modules/home/components/listsTable/columns/Languages.tsx
+++ b/src/web/src/modules/home/components/listsTable/columns/Languages.tsx
@@ -1,6 +1,7 @@
import * as React from "react";
import { Column, Filter } from "react-table";
-import { IColumnVisibility, ILanguage } from "../../../interfaces";
+import { IColumnVisibility } from "../../../interfaces/IColumnVisibility";
+import { ILanguage } from "../../../interfaces/ILanguage";
export const Languages = (columnVisibility: IColumnVisibility[], languages: ILanguage[]) => {
const languagesSorted = languages.sort((a, b) => a.name.localeCompare(b.name));
@@ -9,7 +10,7 @@ export const Languages = (columnVisibility: IColumnVisibility[], languages: ILan
accessor: "languageIds",
filterable: true,
filterMethod: (f: Filter, r: any[]) => filterMethod(f, r),
- Filter: ({ onChange, filter }: any) => Filter({ onChange, filter }, languagesSorted),
+ Filter: ({ onChange, filter }: any) => filterLanguages({ onChange, filter }, languagesSorted),
sortMethod: (a: number[], b: number[]) => sortMethod(a, b, languagesSorted),
Cell: (c: any) => Cell(c.value, languagesSorted),
style: { whiteSpace: "inherit" },
@@ -21,23 +22,23 @@ export const Languages = (columnVisibility: IColumnVisibility[], languages: ILan
const filterMethod = (f: Filter, r: any[]): boolean => {
const listLanguageIds = r[f.id as any];
return f.value === "any" ||
- (listLanguageIds
- ? listLanguageIds.join(",").split(",").includes(f.value)
- : f.value === "none");
+ (listLanguageIds
+ ? listLanguageIds.join(",").split(",").includes(f.value)
+ : f.value === "none");
};
-const Filter = (props: any, languages: ILanguage[]) =>
+const filterLanguages = (props: any, languages: ILanguage[]) =>
;
const sortMethod = (a: number[], b: number[], languages: ILanguage[]) => {
@@ -58,14 +59,14 @@ const sortMethod = (a: number[], b: number[], languages: ILanguage[]) => {
const Cell = (languageIds: number[], languages: ILanguage[]) =>
languageIds
- ?
- {languageIds.map((id: number, i: number) => {
- const language = languages.filter((l: ILanguage) => l.id === id)[0];
- return
- {language.iso6391}
- ;
- })}
-
- : null;
\ No newline at end of file
+ ?
+ {languageIds.map((id: number, i: number) => {
+ const language = languages.filter((l: ILanguage) => l.id === id)[0];
+ return
+ {language.iso6391}
+ ;
+ })}
+
+ : null;
\ No newline at end of file
diff --git a/src/web/src/modules/home/components/listsTable/columns/License.tsx b/src/web/src/modules/home/components/listsTable/columns/License.tsx
index 359e1e777..84a221b35 100644
--- a/src/web/src/modules/home/components/listsTable/columns/License.tsx
+++ b/src/web/src/modules/home/components/listsTable/columns/License.tsx
@@ -1,19 +1,20 @@
import * as React from "react";
import { Column, Filter } from "react-table";
-import { IColumnVisibility, ILicense } from "../../../interfaces";
+import { IColumnVisibility } from "../../../interfaces/IColumnVisibility";
+import { ILicense } from "../../../interfaces/ILicense";
export const License = (columnVisibility: IColumnVisibility[], licenses: ILicense[]) =>
-({
- Header: License,
- accessor: "licenseId",
- filterable: true,
- filterMethod: (f: Filter, r: any[]) => filterMethod(f, r, licenses),
- Filter: ({ filter, onChange }: any) => Filter({ onChange, filter }, licenses),
- sortMethod: (a: number, b: number) => sortMethod(a, b, licenses),
- Cell: (c: any) => Cell(c.value, licenses),
- width: 75,
- show: columnVisibility.filter((c: IColumnVisibility) => c.column === "License")[0].visible
-} as Column);
+ ({
+ Header: License,
+ accessor: "licenseId",
+ filterable: true,
+ filterMethod: (f: Filter, r: any[]) => filterMethod(f, r, licenses),
+ Filter: ({ filter, onChange }: any) => filterLicenses({ onChange, filter }, licenses),
+ sortMethod: (a: number, b: number) => sortMethod(a, b, licenses),
+ Cell: (c: any) => Cell(c.value, licenses),
+ width: 75,
+ show: columnVisibility.filter((c: IColumnVisibility) => c.column === "License")[0].visible
+ } as Column);
const filterMethod = (f: Filter, r: any[], licenses: ILicense[]): boolean => {
const listLicenseId: number = r[f.id as any];
@@ -27,19 +28,19 @@ const filterMethod = (f: Filter, r: any[], licenses: ILicense[]): boolean => {
}
};
-const Filter = (props: any, licenses: ILicense[]) =>
+const filterLicenses = (props: any, licenses: ILicense[]) =>
;
const sortMethod = (a: number, b: number, licenses: ILicense[]) => {
@@ -59,10 +60,10 @@ const sortMethod = (a: number, b: number, licenses: ILicense[]) => {
const Cell = (licenseId: number, licenses: ILicense[]) => {
const license = licenses.filter((l: ILicense) => licenseId === l.id)[0];
return license
- ?
- : null;
+ ?
+ : null;
};
\ No newline at end of file
diff --git a/src/web/src/modules/home/components/listsTable/columns/Maintainers.tsx b/src/web/src/modules/home/components/listsTable/columns/Maintainers.tsx
index 2476f84e2..029e05318 100644
--- a/src/web/src/modules/home/components/listsTable/columns/Maintainers.tsx
+++ b/src/web/src/modules/home/components/listsTable/columns/Maintainers.tsx
@@ -1,31 +1,32 @@
import * as React from "react";
import { Column, Filter } from "react-table";
-import { IColumnVisibility, IMaintainer } from "../../../interfaces";
+import { IColumnVisibility } from "../../../interfaces/IColumnVisibility";
+import { IMaintainer } from "../../../interfaces/IMaintainer";
export const Maintainers = (columnVisibility: IColumnVisibility[], maintainers: IMaintainer[]) =>
-({
- Header: Maintainers,
- accessor: "maintainerIds",
- filterable: true,
- filterMethod: (f: Filter, r: any[]) => filterMethod(f, r, maintainers),
- Filter: ({ filter, onChange }: any) => Filter({ onChange, filter }, maintainers),
- sortMethod: (a: number[], b: number[]) => sortMethod(a, b, maintainers),
- Cell: (c: any) => Cell(c.value, maintainers),
- width: 140,
- show: columnVisibility.filter((c: IColumnVisibility) => c.column === "Maintainers")[0].visible
-} as Column);
+ ({
+ Header: Maintainers,
+ accessor: "maintainerIds",
+ filterable: true,
+ filterMethod: (f: Filter, r: any[]) => filterMethod(f, r, maintainers),
+ Filter: ({ filter, onChange }: any) => filterMaintainers({ onChange, filter }, maintainers),
+ sortMethod: (a: number[], b: number[]) => sortMethod(a, b, maintainers),
+ Cell: (c: any) => Cell(c.value, maintainers),
+ width: 140,
+ show: columnVisibility.filter((c: IColumnVisibility) => c.column === "Maintainers")[0].visible
+ } as Column);
const filterMethod = (f: Filter, r: any[], maintainers: IMaintainer[]): boolean => {
const listMaintainerIds: number[] = r[f.id as any];
return f.value === "any" ||
- (listMaintainerIds
- ? f.value === "none"
- ? false
- : listMaintainerIds.indexOf(maintainers.filter((m: IMaintainer) => m.id === parseInt(f.value))[0].id) > -1
- : f.value === "none");
+ (listMaintainerIds
+ ? f.value === "none"
+ ? false
+ : listMaintainerIds.indexOf(maintainers.filter((m: IMaintainer) => m.id === parseInt(f.value))[0].id) > -1
+ : f.value === "none");
};
-const Filter = (props: any, maintainers: IMaintainer[]) =>
+const filterMaintainers = (props: any, maintainers: IMaintainer[]) =>
;
const sortMethod = (a: number[], b: number[], maintainers: IMaintainer[]) => {
@@ -57,12 +58,12 @@ const sortMethod = (a: number[], b: number[], maintainers: IMaintainer[]) => {
const Cell = (maintainerIds: number[], maintainers: IMaintainer[]) =>
maintainerIds
- ?
- {maintainers.filter((m: IMaintainer) => maintainerIds.indexOf(m.id) > -1)
- .map((m: IMaintainer, i: number) => {
- return m.homeUrl
- ?
{m.name}
- :
{m.name};
- }).reduce(((prev: JSX.Element, curr: JSX.Element): any => [prev, ", ", curr]) as any)}
-
+ {maintainers.filter((m: IMaintainer) => maintainerIds.indexOf(m.id) > -1)
+ .map((m: IMaintainer, i: number) => {
+ return m.homeUrl
+ ?
{m.name}
+ :
{m.name};
+ }).reduce(((prev: JSX.Element, curr: JSX.Element): any => [prev, ", ", curr]) as any)}
+
- {software.filter((s: ISoftware) => s.syntaxIds.indexOf(listSyntaxId) > -1)
- .map((s: ISoftware, i: number) =>
- s.homeUrl
- ?
-
-
- :
)}
-
+ {software.filter((s: ISoftware) => s.syntaxIds.indexOf(listSyntaxId) > -1)
+ .map((s: ISoftware, i: number) =>
+ s.homeUrl
+ ?
+
+
+ :
)}
+
- {moment(updatedDate).isValid()
- ? moment(updatedDate).format("l")
- : null}
-
- : null;
\ No newline at end of file
+ ?
+ {moment(updatedDate).isValid()
+ ? moment(updatedDate).format("l")
+ : null}
+
+ : null;
\ No newline at end of file
diff --git a/src/web/src/modules/home/interfaces/index.ts b/src/web/src/modules/home/interfaces/index.ts
deleted file mode 100644
index 6a72c288c..000000000
--- a/src/web/src/modules/home/interfaces/index.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { IColumnVisibility } from "./IColumnVisibility";
-import { ILanguage } from "./ILanguage";
-import { ILicense } from "./ILicense";
-import { IList } from "./IList";
-import { IMaintainer } from "./IMaintainer";
-import { ISoftware } from "./ISoftware";
-import { ISyntax } from "./ISyntax";
-import { ITag } from "./ITag";
-
-export {
- IColumnVisibility,
- ILanguage,
- ILicense,
- IList,
- IMaintainer,
- ISoftware,
- ISyntax,
- ITag
- };
\ No newline at end of file
+
+