From db044cc2604ccb052f0432762189b7773b7662fb Mon Sep 17 00:00:00 2001 From: mostafa abdo Date: Tue, 5 Oct 2021 19:33:10 -0500 Subject: [PATCH 1/5] add dropdown and group proxies to categorizations --- .../categorization-submit.component.html | 137 +++++++++--------- .../categorization-submit.component.scss | 3 + .../categorization-submit.component.ts | 28 ++-- 3 files changed, 92 insertions(+), 76 deletions(-) diff --git a/src/domainManagementUI/src/app/components/categorization/tabs/categorization-submit/categorization-submit.component.html b/src/domainManagementUI/src/app/components/categorization/tabs/categorization-submit/categorization-submit.component.html index 289f4030..81ab4b85 100644 --- a/src/domainManagementUI/src/app/components/categorization/tabs/categorization-submit/categorization-submit.component.html +++ b/src/domainManagementUI/src/app/components/categorization/tabs/categorization-submit/categorization-submit.component.html @@ -4,76 +4,81 @@

Proxy Categorization - Domains To Submit

categorization service(s). Select the categorize button to link to the proxy categorization website to allow you to select a category for a domain. -
- - - - Domain - {{ row.domain_name }} - - - - - Proxy Source - {{ row.proxy }} - +
+ + + + {{ domain.domain_name }} + + + + + + + + Proxy Source + {{ row.proxy }} + - - - Status - {{ row.status }} - + + + Status + {{ row.status }} + - - - Preferred Category - {{ row.category }} - + + + Preferred Category + {{ row.category }} + - - - Date Requested - - {{ - row.updated | date: "MM/dd/yy" - }} - {{ - row.created | date: "MM/dd/yy" - }} - - + + + Date Requested + + {{ + row.updated | date: "MM/dd/yy" + }} + {{ + row.created | date: "MM/dd/yy" + }} + + - - - Categorize - - - - + + + + - - - - + + + + +
diff --git a/src/domainManagementUI/src/app/components/categorization/tabs/categorization-submit/categorization-submit.component.scss b/src/domainManagementUI/src/app/components/categorization/tabs/categorization-submit/categorization-submit.component.scss index e69de29b..61a50cbc 100644 --- a/src/domainManagementUI/src/app/components/categorization/tabs/categorization-submit/categorization-submit.component.scss +++ b/src/domainManagementUI/src/app/components/categorization/tabs/categorization-submit/categorization-submit.component.scss @@ -0,0 +1,3 @@ +.domain-button { + margin-right: 20px; +} diff --git a/src/domainManagementUI/src/app/components/categorization/tabs/categorization-submit/categorization-submit.component.ts b/src/domainManagementUI/src/app/components/categorization/tabs/categorization-submit/categorization-submit.component.ts index bebbb144..97494093 100644 --- a/src/domainManagementUI/src/app/components/categorization/tabs/categorization-submit/categorization-submit.component.ts +++ b/src/domainManagementUI/src/app/components/categorization/tabs/categorization-submit/categorization-submit.component.ts @@ -18,14 +18,8 @@ import { CategorizationTabService } from 'src/app/services/tab-services/categori }) export class CategorizationSubmitComponent { categoryData = []; - displayedColumns = [ - 'domain', - 'proxy', - 'status', - 'category', - 'updated', - 'categorize', - ]; + domainData = []; + displayedColumns = ['proxy', 'status', 'category', 'updated', 'categorize']; categoryList: MatTableDataSource = new MatTableDataSource(); @ViewChild(MatSort) sort: MatSort; @@ -51,8 +45,22 @@ export class CategorizationSubmitComponent { (success) => { if (Array.isArray(success)) { this.categoryData = success as Array; - this.categoryList = new MatTableDataSource(success); - this.categoryList.sort = this.sort; + this.categoryData.forEach((i) => { + let found = this.domainData.some( + (el) => el.domain_name === i.domain_name + ); + if (!found) { + this.domainData.push({ + domain_name: i.domain_name, + domain_id: i.domain_id, + categories: new MatTableDataSource( + this.categoryData.filter( + (x) => x.domain_name == i.domain_name + ) + ), + }); + } + }); } else { this.alertsSvc.alert('No domains for proxy submission.'); } From f675d6ce31af1e9c1e8c8c7b37862debb302c1a9 Mon Sep 17 00:00:00 2001 From: mostafa abdo Date: Tue, 5 Oct 2021 21:05:26 -0500 Subject: [PATCH 2/5] add reject service for cat requests --- .../categorization-submit.component.html | 7 ++++- .../categorization-submit.component.scss | 5 ++++ .../categorization-submit.component.ts | 30 +++++++++++++++++++ .../src/app/services/category.service.ts | 5 ++++ .../categorization-tabs.service.ts | 4 +++ 5 files changed, 50 insertions(+), 1 deletion(-) diff --git a/src/domainManagementUI/src/app/components/categorization/tabs/categorization-submit/categorization-submit.component.html b/src/domainManagementUI/src/app/components/categorization/tabs/categorization-submit/categorization-submit.component.html index 81ab4b85..9d3edfe3 100644 --- a/src/domainManagementUI/src/app/components/categorization/tabs/categorization-submit/categorization-submit.component.html +++ b/src/domainManagementUI/src/app/components/categorization/tabs/categorization-submit/categorization-submit.component.html @@ -13,7 +13,12 @@

Proxy Categorization - Domains To Submit

- diff --git a/src/domainManagementUI/src/app/components/categorization/tabs/categorization-submit/categorization-submit.component.scss b/src/domainManagementUI/src/app/components/categorization/tabs/categorization-submit/categorization-submit.component.scss index 61a50cbc..3684d986 100644 --- a/src/domainManagementUI/src/app/components/categorization/tabs/categorization-submit/categorization-submit.component.scss +++ b/src/domainManagementUI/src/app/components/categorization/tabs/categorization-submit/categorization-submit.component.scss @@ -1,3 +1,8 @@ +mat-panel-title { + font-weight: bold; + margin-top: 5px; +} + .domain-button { margin-right: 20px; } diff --git a/src/domainManagementUI/src/app/components/categorization/tabs/categorization-submit/categorization-submit.component.ts b/src/domainManagementUI/src/app/components/categorization/tabs/categorization-submit/categorization-submit.component.ts index 97494093..5c3d21d6 100644 --- a/src/domainManagementUI/src/app/components/categorization/tabs/categorization-submit/categorization-submit.component.ts +++ b/src/domainManagementUI/src/app/components/categorization/tabs/categorization-submit/categorization-submit.component.ts @@ -10,6 +10,8 @@ import { CategoryService } from 'src/app/services/category.service'; import { ConfirmCategoryDialogComponent } from 'src/app/components/dialog-windows/confirm-categorize/confirm-categorize-dialog.component'; import { LayoutService } from 'src/app/services/layout.service'; import { CategorizationTabService } from 'src/app/services/tab-services/categorization-tabs.service'; +import { ConfirmDialogComponent } from 'src/app/components/dialog-windows/confirm/confirm-dialog.component'; +import { ConfirmDialogSettings } from 'src/app/models/confirmDialogSettings.model'; @Component({ selector: 'app-categorization-submit', @@ -103,4 +105,32 @@ export class CategorizationSubmitComponent { }); window.open(categorize_url, '_blank'); } + + reject(domain_id) { + const dialogSettings = new ConfirmDialogSettings(); + dialogSettings.itemConfirming = 'Confirm Proxy Requests Delete'; + dialogSettings.actionConfirming = `Are you sure you want to delete all proxies for this domain?`; + const dialogRef = this.dialog.open(ConfirmDialogComponent, { + data: dialogSettings, + }); + + dialogRef.afterClosed().subscribe((result) => { + this.categorizationTabSvc.deleteProxies(domain_id).subscribe( + (success) => { + this.alertsSvc.alert( + 'Proxy requests for this domain have been deleted.' + ); + const proxies = this.domainData.findIndex( + (obj) => obj.domain_id === domain_id + ); + this.domainData.splice(proxies, 1); + this.domainData = this.domainData; + }, + (failure) => { + console.log(failure); + this.alertsSvc.alert(`${failure.error.error}`); + } + ); + }); + } } diff --git a/src/domainManagementUI/src/app/services/category.service.ts b/src/domainManagementUI/src/app/services/category.service.ts index 73acc1d2..34a71d08 100644 --- a/src/domainManagementUI/src/app/services/category.service.ts +++ b/src/domainManagementUI/src/app/services/category.service.ts @@ -57,4 +57,9 @@ export class CategoryService { const url = `${this.settingsService.settings.apiUrl}/api/categorization/${id}/`; return this.http.put(url, data); } + + deleteProxyRequests(domainId: string) { + const url = `${this.settingsService.settings.apiUrl}/api/domain/${domainId}/categorize/`; + return this.http.delete(url); + } } diff --git a/src/domainManagementUI/src/app/services/tab-services/categorization-tabs.service.ts b/src/domainManagementUI/src/app/services/tab-services/categorization-tabs.service.ts index af017692..063ced65 100644 --- a/src/domainManagementUI/src/app/services/tab-services/categorization-tabs.service.ts +++ b/src/domainManagementUI/src/app/services/tab-services/categorization-tabs.service.ts @@ -40,4 +40,8 @@ export class CategorizationTabService { updateCategory(id: string, data: object) { return this.categorySvc.updateCategorization(id, data); } + + deleteProxies(domainId: string) { + return this.categorySvc.deleteProxyRequests(domainId); + } } From 1f1ca803ccc68d1f33b085e58abf940a0af2483e Mon Sep 17 00:00:00 2001 From: mostafa abdo Date: Tue, 5 Oct 2021 21:38:14 -0500 Subject: [PATCH 3/5] add toggle email button --- .../categorization-submit.component.html | 7 ++- .../categorization-submit.component.ts | 63 ++++++++++++++----- .../categorization-tabs.service.ts | 6 ++ 3 files changed, 59 insertions(+), 17 deletions(-) diff --git a/src/domainManagementUI/src/app/components/categorization/tabs/categorization-submit/categorization-submit.component.html b/src/domainManagementUI/src/app/components/categorization/tabs/categorization-submit/categorization-submit.component.html index 9d3edfe3..12bc4e53 100644 --- a/src/domainManagementUI/src/app/components/categorization/tabs/categorization-submit/categorization-submit.component.html +++ b/src/domainManagementUI/src/app/components/categorization/tabs/categorization-submit/categorization-submit.component.html @@ -10,7 +10,12 @@

Proxy Categorization - Domains To Submit

{{ domain.domain_name }} -