Merge pull request ceph#62845 from rhcs-dashboard/fix-path

Pegonzal · web-flow · commit b82dbed98f8c · 2025-04-24T17:26:18.000+02:00
mgr/dashboard: fix smb edit resources

Reviewed-by: Afreen Misbah &lt;afreen@ibm.com&gt;
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/app-routing.module.ts b/src/pybind/mgr/dashboard/frontend/src/app/app-routing.module.ts
@@ -454,8 +454,8 @@ const routes: Routes = [
             children: [
               { path: '', component: SmbClusterListComponent },
               {
-                path: 'clusters',
-                data: { breadcrumbs: 'Clusters' },
+                path: 'cluster',
+                data: { breadcrumbs: 'Cluster' },
                 children: [
                   { path: '', component: SmbClusterListComponent },
                   {
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/smb/smb-cluster-form/smb-cluster-form.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/smb/smb-cluster-form/smb-cluster-form.component.ts
@@ -34,8 +34,9 @@ import { SmbService } from '~/app/shared/api/smb.service';
 import { TaskWrapperService } from '~/app/shared/services/task-wrapper.service';
 import { SmbDomainSettingModalComponent } from '../smb-domain-setting-modal/smb-domain-setting-modal.component';
 import { CephServicePlacement } from '~/app/shared/models/service.interface';
-import { USERSGROUPS_URL } from '../smb-usersgroups-list/smb-usersgroups-list.component';
 import { UpperFirstPipe } from '~/app/shared/pipes/upper-first.pipe';
+import { CLUSTER_PATH } from '../smb-cluster-list/smb-cluster-list.component';
+import { USERSGROUPS_PATH } from '../smb-usersgroups-list/smb-usersgroups-list.component';
 
 @Component({
   selector: 'cd-smb-cluster-form',
@@ -82,7 +83,7 @@ export class SmbClusterFormComponent extends CdForm implements OnInit {
   ngOnInit() {
     this.action = this.actionLabels.CREATE;
     this.usersGroups$ = this.smbService.listUsersGroups();
-    if (this.router.url.startsWith(`/cephfs/smb/${URLVerbs.EDIT}`)) {
+    if (this.router.url.startsWith(`/${CLUSTER_PATH}/${URLVerbs.EDIT}`)) {
       this.isEdit = true;
     }
     this.smbService.modalData$.subscribe((data: DomainSettings) => {
@@ -297,18 +298,17 @@ export class SmbClusterFormComponent extends CdForm implements OnInit {
 
   handleTaskRequest(urlVerb: string) {
     const requestModel = this.buildRequest();
-    const BASE_URL = 'smb/cluster';
     const component = this;
     const cluster_id = this.smbForm.get('cluster_id').value;
 
     this.taskWrapperService
       .wrapTaskAroundCall({
-        task: new FinishedTask(`${BASE_URL}/${urlVerb}`, { cluster_id }),
+        task: new FinishedTask(`${CLUSTER_PATH}/${urlVerb}`, { cluster_id }),
         call: this.smbService.createCluster(requestModel)
       })
       .subscribe({
         complete: () => {
-          this.router.navigate([`cephfs/smb`]);
+          this.router.navigate([CLUSTER_PATH]);
         },
         error: () => {
           component.smbForm.setErrors({ cdSubmitButton: true });
@@ -439,7 +439,7 @@ export class SmbClusterFormComponent extends CdForm implements OnInit {
   }
 
   navigateCreateUsersGroups() {
-    this.router.navigate([`${USERSGROUPS_URL}/${URLVerbs.CREATE}`]);
+    this.router.navigate([`${USERSGROUPS_PATH}/${URLVerbs.CREATE}`]);
   }
 
   addCustomDns() {
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/smb/smb-cluster-list/smb-cluster-list.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/smb/smb-cluster-list/smb-cluster-list.component.ts
@@ -4,7 +4,7 @@ import { BehaviorSubject, Observable, of } from 'rxjs';
 
 import _ from 'lodash';
 
-import { ActionLabelsI18n } from '~/app/shared/constants/app.constants';
+import { ActionLabelsI18n, URLVerbs } from '~/app/shared/constants/app.constants';
 import { TableComponent } from '~/app/shared/datatable/table/table.component';
 import { CdTableAction } from '~/app/shared/models/cd-table-action';
 import { CdTableColumn } from '~/app/shared/models/cd-table-column';
@@ -24,12 +24,13 @@ import { DeleteConfirmationModalComponent } from '~/app/shared/components/delete
 import { TaskWrapperService } from '~/app/shared/services/task-wrapper.service';
 import { FinishedTask } from '~/app/shared/models/finished-task';
 
-const BASE_URL = 'cephfs/smb/clusters';
+export const CLUSTER_PATH = 'cephfs/smb/cluster';
+
 @Component({
   selector: 'cd-smb-cluster-list',
   templateUrl: './smb-cluster-list.component.html',
   styleUrls: ['./smb-cluster-list.component.scss'],
-  providers: [{ provide: URLBuilderService, useValue: new URLBuilderService(BASE_URL) }]
+  providers: [{ provide: URLBuilderService, useValue: new URLBuilderService(CLUSTER_PATH) }]
 })
 export class SmbClusterListComponent extends ListWithDetails implements OnInit {
   @ViewChild('table', { static: true })
@@ -87,7 +88,7 @@ export class SmbClusterListComponent extends ListWithDetails implements OnInit {
         permission: 'delete',
         icon: Icons.destroy,
         click: () => this.removeSMBClusterModal(),
-        name: this.actionLabels.REMOVE
+        name: this.actionLabels.DELETE
       }
     ];
 
@@ -116,10 +117,9 @@ export class SmbClusterListComponent extends ListWithDetails implements OnInit {
     this.modalService.show(DeleteConfirmationModalComponent, {
       itemDescription: $localize`Cluster`,
       itemNames: [cluster_id],
-      actionDescription: $localize`remove`,
       submitActionObservable: () =>
         this.taskWrapper.wrapTaskAroundCall({
-          task: new FinishedTask('smb/cluster/remove', {
+          task: new FinishedTask(`${CLUSTER_PATH}/${URLVerbs.DELETE}`, {
             cluster_id: cluster_id
           }),
           call: this.smbService.removeCluster(cluster_id)
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/smb/smb-domain-setting-modal/smb-domain-setting-modal.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/smb/smb-domain-setting-modal/smb-domain-setting-modal.component.ts
@@ -12,7 +12,7 @@ import { CdForm } from '~/app/shared/forms/cd-form';
 import { DomainSettings, JoinSource, SMBJoinAuth } from '../smb.model';
 import { Observable } from 'rxjs';
 import { Router } from '@angular/router';
-import { JOINAUTH_URL } from '../smb-join-auth-list/smb-join-auth-list.component';
+import { JOIN_AUTH_PATH } from '../smb-join-auth-list/smb-join-auth-list.component';
 
 @Component({
   selector: 'cd-smb-domain-setting-modal',
@@ -99,7 +99,7 @@ export class SmbDomainSettingModalComponent extends CdForm implements OnInit {
 
   navigateCreateJoinSource() {
     this.closeModal();
-    this.router.navigate([`${JOINAUTH_URL}/${URLVerbs.CREATE}`]);
+    this.router.navigate([`${JOIN_AUTH_PATH}/${URLVerbs.CREATE}`]);
   }
 
   removeJoinSource(index: number) {
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/smb/smb-join-auth-form/smb-join-auth-form.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/smb/smb-join-auth-form/smb-join-auth-form.component.spec.ts
@@ -73,7 +73,7 @@ describe('SmbJoinAuthFormComponent', () => {
 
     it('should get resource data and set form fields with it', () => {
       expect(getJoinAuth).toHaveBeenCalled();
-      expect(component.form.value).toEqual({
+      expect(component.form.getRawValue()).toEqual({
         authId: 'foo',
         username: 'user',
         password: 'pass',
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/smb/smb-join-auth-form/smb-join-auth-form.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/smb/smb-join-auth-form/smb-join-auth-form.component.ts
@@ -11,7 +11,7 @@ import { FinishedTask } from '~/app/shared/models/finished-task';
 import { TaskWrapperService } from '~/app/shared/services/task-wrapper.service';
 import { JOIN_AUTH_RESOURCE, SMBCluster, SMBJoinAuth } from '../smb.model';
 import { Observable } from 'rxjs';
-import { JOINAUTH_URL } from '../smb-join-auth-list/smb-join-auth-list.component';
+import { JOIN_AUTH_PATH } from '../smb-join-auth-list/smb-join-auth-list.component';
 import { Location } from '@angular/common';
 
 @Component({
@@ -38,7 +38,7 @@ export class SmbJoinAuthFormComponent extends CdForm implements OnInit {
     private location: Location
   ) {
     super();
-    this.editing = this.router.url.startsWith(`${JOINAUTH_URL}/${URLVerbs.EDIT}`);
+    this.editing = this.router.url.startsWith(`/${JOIN_AUTH_PATH}/${URLVerbs.EDIT}`);
     this.resource = $localize`Active directory (AD) access resource`;
   }
 
@@ -49,6 +49,7 @@ export class SmbJoinAuthFormComponent extends CdForm implements OnInit {
 
     if (this.editing) {
       this.action = this.actionLabels.UPDATE;
+      this.form.get('authId').disable();
       let editingAuthId: string;
       this.route.params.subscribe((params: { authId: string }) => {
         editingAuthId = params.authId;
@@ -83,7 +84,6 @@ export class SmbJoinAuthFormComponent extends CdForm implements OnInit {
     const username = this.form.getValue('username');
     const password = this.form.getValue('password');
     const linkedToCluster = this.form.getValue('linkedToCluster');
-    const BASE_URL = 'smb/ad/';
 
     const joinAuth: SMBJoinAuth = {
       resource_type: JOIN_AUTH_RESOURCE,
@@ -93,7 +93,7 @@ export class SmbJoinAuthFormComponent extends CdForm implements OnInit {
     };
 
     const self = this;
-    let taskUrl = `${BASE_URL}${this.editing ? URLVerbs.EDIT : URLVerbs.CREATE}`;
+    let taskUrl = `${JOIN_AUTH_PATH}/${this.editing ? URLVerbs.EDIT : URLVerbs.CREATE}`;
     this.taskWrapperService
       .wrapTaskAroundCall({
         task: new FinishedTask(taskUrl, {
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/smb/smb-join-auth-list/smb-join-auth-list.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/smb/smb-join-auth-list/smb-join-auth-list.component.ts
@@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core';
 import { Observable, BehaviorSubject, of } from 'rxjs';
 import { switchMap, catchError } from 'rxjs/operators';
 import { SmbService } from '~/app/shared/api/smb.service';
-import { ActionLabelsI18n } from '~/app/shared/constants/app.constants';
+import { ActionLabelsI18n, URLVerbs } from '~/app/shared/constants/app.constants';
 import { CdTableAction } from '~/app/shared/models/cd-table-action';
 import { CdTableColumn } from '~/app/shared/models/cd-table-column';
 import { CdTableFetchDataContext } from '~/app/shared/models/cd-table-fetch-data-context';
@@ -18,13 +18,13 @@ import { ModalCdsService } from '~/app/shared/services/modal-cds.service';
 import { FinishedTask } from '~/app/shared/models/finished-task';
 import { TaskWrapperService } from '~/app/shared/services/task-wrapper.service';
 
-export const JOINAUTH_URL = '/cephfs/smb/active-directory';
+export const JOIN_AUTH_PATH = 'cephfs/smb/active-directory';
 
 @Component({
   selector: 'cd-smb-join-auth-list',
   templateUrl: './smb-join-auth-list.component.html',
   styleUrls: ['./smb-join-auth-list.component.scss'],
-  providers: [{ provide: URLBuilderService, useValue: new URLBuilderService(JOINAUTH_URL) }]
+  providers: [{ provide: URLBuilderService, useValue: new URLBuilderService(JOIN_AUTH_PATH) }]
 })
 export class SmbJoinAuthListComponent implements OnInit {
   columns: CdTableColumn[];
@@ -114,7 +114,7 @@ export class SmbJoinAuthListComponent implements OnInit {
       itemNames: [authId],
       submitActionObservable: () =>
         this.taskWrapper.wrapTaskAroundCall({
-          task: new FinishedTask('smb/ad/remove', {
+          task: new FinishedTask(`${JOIN_AUTH_PATH}/${URLVerbs.DELETE}`, {
             authId: authId
           }),
           call: this.smbService.deleteJoinAuth(authId)
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/smb/smb-share-form/smb-share-form.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/smb/smb-share-form/smb-share-form.component.ts
@@ -11,14 +11,7 @@ import { map } from 'rxjs/operators';
 import { ActionLabelsI18n, URLVerbs } from '~/app/shared/constants/app.constants';
 import { FinishedTask } from '~/app/shared/models/finished-task';
 
-import {
-  Filesystem,
-  PROVIDER,
-  SHARE_RESOURCE,
-  SHARE_URL,
-  ShareRequestModel,
-  SMBShare
-} from '../smb.model';
+import { Filesystem, PROVIDER, SHARE_RESOURCE, ShareRequestModel, SMBShare } from '../smb.model';
 import { CephfsSubvolumeGroup } from '~/app/shared/models/cephfs-subvolume-group.model';
 import { CephfsSubvolume } from '~/app/shared/models/cephfs-subvolume.model';
 
@@ -27,6 +20,8 @@ import { NfsService } from '~/app/shared/api/nfs.service';
 import { TaskWrapperService } from '~/app/shared/services/task-wrapper.service';
 import { CephfsSubvolumeGroupService } from '~/app/shared/api/cephfs-subvolume-group.service';
 import { CephfsSubvolumeService } from '~/app/shared/api/cephfs-subvolume.service';
+import { CLUSTER_PATH } from '../smb-cluster-list/smb-cluster-list.component';
+import { SHARE_PATH } from '../smb-share-list/smb-share-list.component';
 
 @Component({
   selector: 'cd-smb-share-form',
@@ -58,7 +53,7 @@ export class SmbShareFormComponent extends CdForm implements OnInit {
   ) {
     super();
     this.resource = $localize`Share`;
-    this.isEdit = this.router.url.startsWith(`${SHARE_URL}${URLVerbs.EDIT}`);
+    this.isEdit = this.router.url.startsWith(`/${SHARE_PATH}/${URLVerbs.EDIT}`);
     this.action = this.isEdit ? this.actionLabels.EDIT : this.actionLabels.CREATE;
   }
   ngOnInit() {
@@ -230,18 +225,17 @@ export class SmbShareFormComponent extends CdForm implements OnInit {
 
   handleTaskRequest(urlVerb: string) {
     const requestModel = this.buildRequest();
-    const BASE_URL = 'smb/share';
     const component = this;
     const share_id = this.smbShareForm.get('share_id').value;
 
     this.taskWrapperService
       .wrapTaskAroundCall({
-        task: new FinishedTask(`${BASE_URL}/${urlVerb}`, { share_id }),
+        task: new FinishedTask(`${SHARE_PATH}/${urlVerb}`, { share_id }),
         call: this.smbService.createShare(requestModel)
       })
       .subscribe({
         complete: () => {
-          this.router.navigate([`cephfs/smb`]);
+          this.router.navigate([CLUSTER_PATH]);
         },
         error: () => {
           component.smbShareForm.setErrors({ cdSubmitButton: true });
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/smb/smb-share-list/smb-share-list.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/smb/smb-share-list/smb-share-list.component.ts
@@ -6,7 +6,7 @@ import { CdTableAction } from '~/app/shared/models/cd-table-action';
 import { CdTableColumn } from '~/app/shared/models/cd-table-column';
 import { CdTableFetchDataContext } from '~/app/shared/models/cd-table-fetch-data-context';
 import { Permission } from '~/app/shared/models/permissions';
-import { SHARE_URL, SMBShare } from '../smb.model';
+import { SMBShare } from '../smb.model';
 import { SmbService } from '~/app/shared/api/smb.service';
 import { AuthStorageService } from '~/app/shared/services/auth-storage.service';
 import { CdTableSelection } from '~/app/shared/models/cd-table-selection';
@@ -19,6 +19,8 @@ import { ModalCdsService } from '~/app/shared/services/modal-cds.service';
 import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
 import { TaskWrapperService } from '~/app/shared/services/task-wrapper.service';
 
+export const SHARE_PATH = 'cephfs/smb/share';
+
 @Component({
   selector: 'cd-smb-share-list',
   templateUrl: './smb-share-list.component.html',
@@ -93,15 +95,15 @@ export class SmbShareListComponent implements OnInit {
         name: `${this.actionLabels.CREATE}`,
         permission: 'create',
         icon: Icons.add,
-        routerLink: () => ['/cephfs/smb/share/create', this.clusterId],
+        routerLink: () => [`/${SHARE_PATH}/${URLVerbs.CREATE}`, this.clusterId],
         canBePrimary: (selection: CdTableSelection) => !selection.hasSingleSelection
       },
       {
         name: this.actionLabels.EDIT,
         permission: 'update',
         icon: Icons.edit,
         routerLink: () => [
-          `${SHARE_URL}${URLVerbs.EDIT}`,
+          `/${SHARE_PATH}/${URLVerbs.EDIT}`,
           this.clusterId,
           this.selection.first().name
         ]
@@ -144,7 +146,7 @@ export class SmbShareListComponent implements OnInit {
       itemNames: [`Share: ${share_id} (${name}) from cluster: ${cluster_id}`],
       submitActionObservable: () =>
         this.taskWrapper.wrapTaskAroundCall({
-          task: new FinishedTask('smb/share/delete', {
+          task: new FinishedTask(`${SHARE_PATH}/${URLVerbs.DELETE}`, {
             share_id: share_id
           }),
           call: this.smbService.deleteShare(cluster_id, share_id)
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/smb/smb-tabs/smb-tabs.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/smb/smb-tabs/smb-tabs.component.html
@@ -4,10 +4,10 @@
   isNavigation="true"
   [cacheActive]="false">
   <cds-tab
-    heading="Clusters"
+    heading="Cluster"
     i18n-heading
-    [active]="activeTab === Tabs.clusters"
-    (selected)="onSelected(Tabs.clusters)">
+    [active]="activeTab === Tabs.cluster"
+    (selected)="onSelected(Tabs.cluster)">
   </cds-tab>
   <cds-tab
     heading="Active Directory"
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/smb/smb-tabs/smb-tabs.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/smb/smb-tabs/smb-tabs.component.spec.ts
@@ -24,7 +24,7 @@ describe('SmbTabsComponent', () => {
   it('should display the heading text in the tab', () => {
     const tabs = fixture.debugElement.queryAll(By.css('cds-tab'));
     expect(tabs.length).toBe(4);
-    expect(tabs[0].attributes['heading']).toBe('Clusters');
+    expect(tabs[0].attributes['heading']).toBe('Cluster');
     expect(tabs[1].attributes['heading']).toBe('Active Directory');
     expect(tabs[2].attributes['heading']).toBe('Standalone');
     expect(tabs[3].attributes['heading']).toBe('Overview');
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/smb/smb-tabs/smb-tabs.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/smb/smb-tabs/smb-tabs.component.ts
@@ -1,8 +1,10 @@
 import { Component, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
 
+const SMB_PATH = 'cephfs/smb';
+
 enum TABS {
-  clusters = 'clusters',
+  cluster = 'cluster',
   activeDirectory = 'active-directory',
   standalone = 'standalone',
   overview = 'overview'
@@ -15,18 +17,18 @@ enum TABS {
 })
 export class SmbTabsComponent implements OnInit {
   selectedTab: TABS;
-  activeTab: TABS = TABS.clusters;
+  activeTab: TABS = TABS.cluster;
 
   constructor(private router: Router) {}
 
   ngOnInit(): void {
     const currentPath = this.router.url;
-    this.activeTab = Object.values(TABS).find((tab) => currentPath.includes(tab)) || TABS.clusters;
+    this.activeTab = Object.values(TABS).find((tab) => currentPath.includes(tab)) || TABS.cluster;
   }
 
   onSelected(tab: TABS) {
     this.selectedTab = tab;
-    this.router.navigate([`/cephfs/smb/${tab}`]);
+    this.router.navigate([`${SMB_PATH}/${tab}`]);
   }
 
   public get Tabs(): typeof TABS {
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/smb/smb-usersgroups-form/smb-usersgroups-form.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/smb/smb-usersgroups-form/smb-usersgroups-form.component.spec.ts
@@ -86,7 +86,7 @@ describe('SmbUsersgroupsFormComponent', () => {
 
     it('should get resource data and set form fields with it', () => {
       expect(getUsersGroups).toHaveBeenCalled();
-      expect(component.form.value).toEqual({
+      expect(component.form.getRawValue()).toEqual({
         usersGroupsId: 'foo',
         users: [
           {
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/smb/smb-usersgroups-form/smb-usersgroups-form.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/smb/smb-usersgroups-form/smb-usersgroups-form.component.ts
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/smb/smb-usersgroups-list/smb-usersgroups-list.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/smb/smb-usersgroups-list/smb-usersgroups-list.component.ts
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/smb/smb.model.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/smb/smb.model.ts
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/task-message.service.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/task-message.service.ts

Original file line number	Diff line number	Diff line change
`@@ -454,8 +454,8 @@ const routes: Routes = [`
`454`	`454`	`children: [`
`455`	`455`	`{ path: '', component: SmbClusterListComponent },`
`456`	`456`	`{`
`457`		`- path: 'clusters',`
`458`		`- data: { breadcrumbs: 'Clusters' },`
	`457`	`+ path: 'cluster',`
	`458`	`+ data: { breadcrumbs: 'Cluster' },`
`459`	`459`	`children: [`
`460`	`460`	`{ path: '', component: SmbClusterListComponent },`
`461`	`461`	`{`