-
-
- warning
- {{feeds.length}} {{feeds.length === 1 ? 'feed' : 'feeds'}} will also be deleted
-
-
The following feeds will be permanently deleted:
-
-
{{feed.title}}
+ @if (feeds?.length) {
+
+
+ warning
+ {{feeds.length}} {{feeds.length === 1 ? 'feed' : 'feeds'}} will also be deleted
+
+
The following feeds will be permanently deleted:
+
+ @for (feed of feeds; track feed.id) {
+
{{feed.title}}
+ }
+
-
+ }
-
-
+
+
diff --git a/web-app/src/app/admin/admin-feeds/admin-service/admin-service-delete/admin-service-delete.component.scss b/web-app/src/app/admin/admin-feeds/admin-service/admin-service-delete/admin-service-delete.component.scss
index f6a293c93..b25b9c0fe 100644
--- a/web-app/src/app/admin/admin-feeds/admin-service/admin-service-delete/admin-service-delete.component.scss
+++ b/web-app/src/app/admin/admin-feeds/admin-service/admin-service-delete/admin-service-delete.component.scss
@@ -37,6 +37,5 @@
}
.delete-button {
- --mat-button-filled-container-color: var(--mat-sys-error);
- --mat-button-filled-label-text-color: var(--mat-sys-on-error);
+ --mat-button-text-label-text-color: var(--mat-sys-error);
}
diff --git a/web-app/src/app/admin/admin-feeds/admin-service/admin-service-delete/admin-service-delete.component.spec.ts b/web-app/src/app/admin/admin-feeds/admin-service/admin-service-delete/admin-service-delete.component.spec.ts
index 63bda8774..feae28b06 100644
--- a/web-app/src/app/admin/admin-feeds/admin-service/admin-service-delete/admin-service-delete.component.spec.ts
+++ b/web-app/src/app/admin/admin-feeds/admin-service/admin-service-delete/admin-service-delete.component.spec.ts
@@ -30,12 +30,11 @@ describe('AdminServiceDeleteComponent', () => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
- imports: [MatDialogModule],
+ imports: [MatDialogModule, AdminServiceDeleteComponent],
providers: [
{ provide: MatDialogRef, useValue: {} },
{ provide: MAT_DIALOG_DATA, useValue: dialogData }
- ],
- declarations: [AdminServiceDeleteComponent]
+ ]
}).compileComponents();
}));
diff --git a/web-app/src/app/admin/admin-feeds/admin-service/admin-service-delete/admin-service-delete.component.ts b/web-app/src/app/admin/admin-feeds/admin-service/admin-service-delete/admin-service-delete.component.ts
index 194fe84f4..e4c1ed0c8 100644
--- a/web-app/src/app/admin/admin-feeds/admin-service/admin-service-delete/admin-service-delete.component.ts
+++ b/web-app/src/app/admin/admin-feeds/admin-service/admin-service-delete/admin-service-delete.component.ts
@@ -1,5 +1,8 @@
import { Component, Inject } from '@angular/core';
-import { MAT_DIALOG_DATA as MAT_DIALOG_DATA } from '@angular/material/dialog';
+import { MatButtonModule } from '@angular/material/button';
+import { MAT_DIALOG_DATA as MAT_DIALOG_DATA, MatDialogModule } from '@angular/material/dialog';
+import { MatIconModule } from '@angular/material/icon';
+import { A11yModule } from '@angular/cdk/a11y';
import { Service, Feed } from '@ngageoint/mage.web-core-lib/feed';
type ServiceWithFeeds = {
@@ -11,7 +14,13 @@ type ServiceWithFeeds = {
selector: 'app-admin-service-delete',
templateUrl: './admin-service-delete.component.html',
styleUrls: ['./admin-service-delete.component.scss'],
- standalone: false
+ standalone: true,
+ imports: [
+ MatDialogModule,
+ MatButtonModule,
+ MatIconModule,
+ A11yModule
+ ]
})
export class AdminServiceDeleteComponent {
diff --git a/web-app/src/app/admin/admin-feeds/admin-service/admin-service.component.ts b/web-app/src/app/admin/admin-feeds/admin-service/admin-service.component.ts
index 70af772ec..535c00b40 100644
--- a/web-app/src/app/admin/admin-feeds/admin-service/admin-service.component.ts
+++ b/web-app/src/app/admin/admin-feeds/admin-service/admin-service.component.ts
@@ -116,7 +116,6 @@ export class AdminServiceComponent implements OnInit, OnDestroy {
service: this.service,
feeds: this.feeds
},
- autoFocus: false,
disableClose: true
})
.afterClosed()
diff --git a/web-app/src/app/admin/admin-layers/delete-layer/delete-layer.component.scss b/web-app/src/app/admin/admin-layers/delete-layer/delete-layer.component.scss
index 3122d1dca..e8ef126d7 100644
--- a/web-app/src/app/admin/admin-layers/delete-layer/delete-layer.component.scss
+++ b/web-app/src/app/admin/admin-layers/delete-layer/delete-layer.component.scss
@@ -14,5 +14,5 @@ mat-dialog-actions {
}
.delete-button {
- color: var(--mat-sys-error);
+ --mat-button-text-label-text-color: var(--mat-sys-error);
}
diff --git a/web-app/src/app/admin/admin-teams/delete-team/delete-team.component.scss b/web-app/src/app/admin/admin-teams/delete-team/delete-team.component.scss
index 5fc7b834d..dd66afb80 100644
--- a/web-app/src/app/admin/admin-teams/delete-team/delete-team.component.scss
+++ b/web-app/src/app/admin/admin-teams/delete-team/delete-team.component.scss
@@ -42,5 +42,5 @@ mat-dialog-actions {
}
.delete-button {
- color: var(--mat-sys-error);
+ --mat-button-text-label-text-color: var(--mat-sys-error);
}
diff --git a/web-app/src/app/admin/admin.module.ts b/web-app/src/app/admin/admin.module.ts
index 96a0add83..43f1873c7 100644
--- a/web-app/src/app/admin/admin.module.ts
+++ b/web-app/src/app/admin/admin.module.ts
@@ -49,7 +49,6 @@ import { PluginModule } from './admin-plugins/plugins.module';
import { AdminAuthenticationComponent } from './admin-authentication/admin-authentication.component';
import { AdminAuthenticationSettingsComponent } from './admin-authentication/admin-authentication-settings.component';
import { AuthenticationCreateComponent } from './admin-authentication/admin-authentication-create/admin-authentication-create.component';
-import { AuthenticationDeleteComponent } from './admin-authentication/admin-authentication-delete/admin-authentication-delete.component';
import { ButtonPreviewComponent } from './admin-authentication/admin-authentication-create/button-preview/button-preview.component';
import { IconUploadComponent } from './admin-authentication/admin-authentication-create/icon-upload/icon-upload.component';
import { AdminAuthenticationOidcComponent } from './admin-authentication/admin-authentication-oidc/admin-authentication-oidc.component';
@@ -110,7 +109,6 @@ import { AccountLockComponent } from './admin-authentication/admin-authenticatio
AdminAuthenticationComponent,
AdminAuthenticationSettingsComponent,
AuthenticationCreateComponent,
- AuthenticationDeleteComponent,
ButtonPreviewComponent,
IconUploadComponent,
AdminAuthenticationOidcComponent,