diff --git a/.github/README.md b/.github/README.md index 64fa231db..c88bbeffb 100644 --- a/.github/README.md +++ b/.github/README.md @@ -82,7 +82,7 @@ Execute: ### Testing changes to the `Web` project 1. Execute `docker container ls` to find the `CONTAINER ID` of the `filterlists.web` container. -2. Execute `docker-compose up -d --build [CONTAINER ID]` replacing `[CONTAINER ID]` with the hash from step 1. +2. Execute `docker-compose up -d -V --build [CONTAINER ID]` replacing `[CONTAINER ID]` with the hash from step 1. ### Debugging diff --git a/src/FilterLists.Services/FilterList/MappingProfiles/FilterListDtoMappingProfile.cs b/src/FilterLists.Services/FilterList/MappingProfiles/FilterListDtoMappingProfile.cs index 11439e0cc..ce5b9f5c4 100644 --- a/src/FilterLists.Services/FilterList/MappingProfiles/FilterListDtoMappingProfile.cs +++ b/src/FilterLists.Services/FilterList/MappingProfiles/FilterListDtoMappingProfile.cs @@ -25,12 +25,12 @@ public FilterListDtoMappingProfile() => opt => opt.MapFrom(src => src.FilterListMaintainers .Select(ll => ll.MaintainerId))) - .ForMember(dest => dest.RuleCount, - opt => opt.MapFrom(src => - src.Snapshots - .Where(s => s.WasSuccessful) - .Select(s => (int?)s.SnapshotRules.Count) - .FirstOrDefault())) + //.ForMember(dest => dest.RuleCount, + // opt => opt.MapFrom(src => + // src.Snapshots + // .Where(s => s.WasSuccessful) + // .Select(s => (int?)s.SnapshotRules.Count) + // .FirstOrDefault())) .ForMember(dest => dest.SyntaxId, opt => opt.MapFrom(src => src.SyntaxId)) diff --git a/src/FilterLists.Services/FilterList/Models/FilterListDto.cs b/src/FilterLists.Services/FilterList/Models/FilterListDto.cs index a346f6f47..3318a6122 100644 --- a/src/FilterLists.Services/FilterList/Models/FilterListDto.cs +++ b/src/FilterLists.Services/FilterList/Models/FilterListDto.cs @@ -22,11 +22,11 @@ public class FilterListDto public string Name { get; set; } public string PolicyUrl { get; set; } public DateTime? PublishedDate { get; set; } - public int? RuleCount { get; set; } + //public int? RuleCount { get; set; } public string SubmissionUrl { get; set; } public int? SyntaxId { get; set; } public List TagIds { get; set; } - public DateTime? UpdatedDate { get; set; } + //public DateTime? UpdatedDate { get; set; } public string ViewUrl { get; set; } public List ViewUrlMirrors { get; set; } } diff --git a/src/FilterLists.Web/ClientApp/modules/home/Home.tsx b/src/FilterLists.Web/ClientApp/modules/home/Home.tsx index 1a723502d..06daee6a3 100644 --- a/src/FilterLists.Web/ClientApp/modules/home/Home.tsx +++ b/src/FilterLists.Web/ClientApp/modules/home/Home.tsx @@ -6,8 +6,8 @@ const columnVisibilityDefaults: IColumnVisibility[] = [ { column: "Software", visible: true }, { column: "Languages", visible: true }, { column: "Tags", visible: true }, - { column: "Updated", visible: false }, - { column: "Rules", visible: false }, + //{ column: "Updated", visible: false }, + //{ column: "Rules", visible: false }, { column: "License", visible: false }, { column: "Maintainers", visible: false }, { column: "Subscribe", visible: false } @@ -18,7 +18,7 @@ interface IProps { licenses: ILicense[]; lists: IList[]; maintainers: IMaintainer[]; - ruleCount: number; + //ruleCount: number; software: ISoftware[]; syntaxes: ISyntax[]; tags: ITag[]; @@ -60,7 +60,7 @@ export class Home extends React.Component { render() { return
- + {this.renderColumnVisibilityCheckboxes()}
; diff --git a/src/FilterLists.Web/ClientApp/modules/home/components/Oneliner.tsx b/src/FilterLists.Web/ClientApp/modules/home/components/Oneliner.tsx index e514a3b8a..5ad124110 100644 --- a/src/FilterLists.Web/ClientApp/modules/home/components/Oneliner.tsx +++ b/src/FilterLists.Web/ClientApp/modules/home/components/Oneliner.tsx @@ -2,14 +2,14 @@ interface IProps { listCount: number; - ruleCount: number; + //ruleCount: number; }; export const Oneliner = (props: IProps) => - props.listCount > 0 && props.ruleCount > 0 + props.listCount > 0/* && props.ruleCount > 0*/ ?

- The independent, comprehensive directory of {props.ruleCount.toLocaleString() - } unique rules across {props.listCount.toLocaleString() + The independent, comprehensive directory of {/*}{props.ruleCount.toLocaleString() + } unique rules across */}{props.listCount.toLocaleString() } filter and host lists for advertisements, trackers, malware, and annoyances.

:

diff --git a/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/IListDetails.ts b/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/IListDetails.ts index de8b56587..5b87aa51f 100644 --- a/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/IListDetails.ts +++ b/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/IListDetails.ts @@ -16,11 +16,11 @@ export interface IListDetails { name: string; policyUrl: string; publishedDate: string; - ruleCount: number; + //ruleCount: number; submissionUrl: string; syntax: ISyntax; tags: ITag[]; - updatedDate: string; + //updatedDate: string; viewUrl: string; viewUrlMirrors: string[]; }; \ No newline at end of file diff --git a/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/infoCard/InfoCard.tsx b/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/infoCard/InfoCard.tsx index da62dd1e9..9e8ba3ae2 100644 --- a/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/infoCard/InfoCard.tsx +++ b/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/infoCard/InfoCard.tsx @@ -19,11 +19,11 @@ interface IProps { license: ILicense; name: string; publishedDate: string; - ruleCount: number; + //ruleCount: number; software: ISoftware[]; syntax: ISyntax; tags: ITag[]; - updatedDate: string; + //updatedDate: string; }; export const InfoCard = (props: IProps) => @@ -42,12 +42,12 @@ export const InfoCard = (props: IProps) =>

    - {props.columnVisibility.filter((c: IColumnVisibility) => c.column === "Rules")[0].visible + {/*{props.columnVisibility.filter((c: IColumnVisibility) => c.column === "Rules")[0].visible ? null : } {props.columnVisibility.filter((c: IColumnVisibility) => c.column === "Updated")[0].visible ? null - : } + : }*/} {props.columnVisibility.filter((c: IColumnVisibility) => c.column === "License")[0].visible diff --git a/src/FilterLists.Web/ClientApp/modules/home/components/listsTable/ListsTable.tsx b/src/FilterLists.Web/ClientApp/modules/home/components/listsTable/ListsTable.tsx index 1e3adb526..859673237 100644 --- a/src/FilterLists.Web/ClientApp/modules/home/components/listsTable/ListsTable.tsx +++ b/src/FilterLists.Web/ClientApp/modules/home/components/listsTable/ListsTable.tsx @@ -10,11 +10,11 @@ import { License, Maintainers, Name, - RuleCount, + //RuleCount, Software, SubscribeButton, Tags, - UpdatedDate + //UpdatedDate } from "./columns"; import { IListDetails } from "../../components/detailsExpander"; import { DetailsExpander } from "../../components"; @@ -42,8 +42,8 @@ export const ListsTable = (props: IProps) => Software(props.columnVisibility, props.software), Languages(props.columnVisibility, props.languages), Tags(props.columnVisibility, props.tags), - UpdatedDate(props.columnVisibility), - RuleCount(props.columnVisibility), + //UpdatedDate(props.columnVisibility), + //RuleCount(props.columnVisibility), License(props.columnVisibility, props.licenses), Maintainers(props.columnVisibility, props.maintainers), SubscribeButton(props.columnVisibility), @@ -94,11 +94,11 @@ const mapListDetails = (props: ICreateListDtoProps): IListDetails => name: props.list.name, policyUrl: props.list.policyUrl, publishedDate: props.list.publishedDate, - ruleCount: props.list.ruleCount, + //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, + //updatedDate: props.list.updatedDate, viewUrl: props.list.viewUrl, viewUrlMirrors: props.list.viewUrlMirrors } as IListDetails); \ No newline at end of file diff --git a/src/FilterLists.Web/ClientApp/modules/home/interfaces/IList.ts b/src/FilterLists.Web/ClientApp/modules/home/interfaces/IList.ts index 1712cf617..1de1a8607 100644 --- a/src/FilterLists.Web/ClientApp/modules/home/interfaces/IList.ts +++ b/src/FilterLists.Web/ClientApp/modules/home/interfaces/IList.ts @@ -14,11 +14,11 @@ name: string; policyUrl: string; publishedDate: string; - ruleCount: number; + //ruleCount: number; submissionUrl: string; syntaxId: number; tagIds: number[]; - updatedDate: string; + //updatedDate: string; viewUrl: string; viewUrlMirrors: string[]; }; \ No newline at end of file