refactor(addons): Use configurableApiRoot property to show form inputs

Author: futa-ikeda

src/app/shared/components/addons/addon-setup-account-form/addon-setup-account-form.component.html

@@ -1,5 +1,15 @@
 <form [formGroup]="addonForm()" (ngSubmit)="handleSubmit()" class="flex flex-column gap-5">
   <p-card>
+    @if (hasConfigurableApiRoot()) {
+      <h2 class="mb-2">
+        {{ 'settings.addons.form.fields.hostUrl' | translate }}
+      </h2>
+      <p class="mb-2">
+        {{ 'settings.addons.form.fields.hostUrlDescription' | translate }}
+      </p>
+      <input class="mb-4" pInputText [formControlName]="formControls.HostUrl" />
+    }
+
     @if (isAccessSecretKeysFormat()) {
       <h2 class="mb-2">
         {{ 'settings.addons.form.fields.accessKey' | translate }}
@@ -23,13 +33,6 @@ <h2 class="mb-2">
     }
 
     @if (isDataverseApiTokenFormat()) {
-      <h2 class="mb-2">
-        {{ 'settings.addons.form.fields.hostUrl' | translate }}
-      </h2>
-      <p class="mb-2">
-        {{ 'settings.addons.form.fields.hostUrlDescription' | translate }}
-      </p>
-      <input class="mb-4" pInputText [formControlName]="formControls.HostUrl" />
       <h2 class="mb-2">
         {{ 'settings.addons.form.fields.apiToken' | translate }}
       </h2>
@@ -43,13 +46,6 @@ <h2 class="mb-2">
     }
 
     @if (isUsernamePasswordFormat()) {
-      <h2 class="mb-2">
-        {{ 'settings.addons.form.fields.hostUrl' | translate }}
-      </h2>
-      <p class="mb-2">
-        {{ 'settings.addons.form.fields.hostUrlDescription' | translate }}
-      </p>
-      <input class="mb-4" pInputText [formControlName]="formControls.HostUrl" />
       <h2 class="mb-2">
         {{ 'settings.addons.form.fields.username' | translate }}
       </h2>
@@ -71,13 +67,6 @@ <h2 class="mb-2">
     }
 
     @if (isRepoTokenFormat()) {
-      <h2 class="mb-2">
-        {{ 'settings.addons.form.fields.hostUrl' | translate }}
-      </h2>
-      <p class="mb-2">
-        {{ 'settings.addons.form.fields.hostUrlDescription' | translate }}
-      </p>
-      <input class="mb-4" pInputText [formControlName]="formControls.HostUrl" />
       <h2 class="mb-2">
         {{ 'settings.addons.form.fields.personalAccessToken' | translate }}
       </h2>

src/app/shared/components/addons/addon-setup-account-form/addon-setup-account-form.component.ts

@@ -62,6 +62,10 @@ export class AddonSetupAccountFormComponent {
     return format === CredentialsFormat.OAUTH2 || format === CredentialsFormat.OAUTH;
   });
 
+  readonly hasConfigurableApiRoot = computed(() => {
+    return this.addon().configurableApiRoot === true;
+  });
+
   handleSubmit(): void {
     if (!this.isFormValid) return;
 

src/app/shared/services/addons/addon-form.service.ts

@@ -26,23 +26,23 @@ export class AddonFormService {
     const formControls: Partial<AddonForm> = {
       [AddonFormControls.AccountName]: this.formBuilder.control<string>(addon.displayName || '', Validators.required),
     };
+    if (addon.configurableApiRoot) {
+      formControls[AddonFormControls.HostUrl] = this.formBuilder.control<string>('', Validators.required);
+    }
 
     switch (addon.credentialsFormat) {
       case CredentialsFormat.ACCESS_SECRET_KEYS:
         formControls[AddonFormControls.AccessKey] = this.formBuilder.control<string>('', Validators.required);
         formControls[AddonFormControls.SecretKey] = this.formBuilder.control<string>('', Validators.required);
         break;
       case CredentialsFormat.DATAVERSE_API_TOKEN:
-        formControls[AddonFormControls.HostUrl] = this.formBuilder.control<string>('', Validators.required);
         formControls[AddonFormControls.ApiToken] = this.formBuilder.control<string>('', Validators.required);
         break;
       case CredentialsFormat.USERNAME_PASSWORD:
-        formControls[AddonFormControls.HostUrl] = this.formBuilder.control<string>('', Validators.required);
         formControls[AddonFormControls.Username] = this.formBuilder.control<string>('', Validators.required);
         formControls[AddonFormControls.Password] = this.formBuilder.control<string>('', Validators.required);
         break;
       case CredentialsFormat.REPO_TOKEN:
-        formControls[AddonFormControls.HostUrl] = this.formBuilder.control<string>('', Validators.required);
         formControls[AddonFormControls.PersonalAccessToken] = this.formBuilder.control<string>('', Validators.required);
         break;
     }