Fixes after review

Author: jkopriva

package.json

@@ -17,7 +17,7 @@
         "test:all": "npm run generate-config && ENABLE_E2E_TESTS=true ENABLE_UI_TESTS=true playwright test",
         "test:report": "playwright show-report",
         "test:tssc": "npm run generate-config && ENABLE_E2E_TESTS=true ENABLE_UI_TESTS=false playwright test",
-        "test:import": "playwright test tests/templates/import-templates.test.ts"
+        "test:import": "npm run generate-config && ENABLE_E2E_TESTS=false ENABLE_UI_TESTS=false ENABLE_IMPORT_TESTS=true playwright test tests/templates/import_templates.test.ts"
     },
     "keywords": [
         "typescript",

playwright.config.ts

@@ -16,6 +16,7 @@ const DEFAULT_TIMEOUT = 2100000; // 35 minutes
 // Environment variable flags to control which tests run
 const ENABLE_E2E_TESTS = process.env.ENABLE_E2E_TESTS !== 'false'; // Default: true
 const ENABLE_UI_TESTS = process.env.ENABLE_UI_TESTS === 'true';    // Default: false
+const ENABLE_IMPORT_TESTS = process.env.ENABLE_IMPORT_TESTS === 'true'; // Default: false
 const DEFAULT_WORKERS = 6;
 
 let projectConfigs: ProjectConfig[] = [];
@@ -30,6 +31,7 @@ try {
 
   let e2eProjects: any[] = [];
   let uiProjects: any[] = [];
+  let importProjects: any[] = [];
   let authProjects: any[] = [];
 
   // Create e2e projects if enabled
@@ -72,10 +74,22 @@ try {
     }));
   }
 
+  // Create import template projects if enabled
+  if (ENABLE_IMPORT_TESTS) {
+    importProjects = projectConfigs.map(config => ({
+      name: `import-${config.name}`,
+      testMatch: 'tests/templates/**/*.test.ts',
+      use: {
+        testItem: config.testItem,
+      },
+    }));
+  }
+
   allProjects = [
     ...authProjects,
     ...e2eProjects,
-    ...uiProjects
+    ...uiProjects,
+    ...importProjects
   ];
 
 } catch (error) {

src/api/rhdh/developerhub.ts

@@ -212,7 +212,7 @@ export class DeveloperHub {
 
       // Delete all filtered entities
       const results = await Promise.all(
-        filteredEntities.map((entity: any) => this.unregisterComponentById(entity.metadata.uid))
+        filteredEntities.map((entity: any) => this.unregisterEntityByUid(entity.metadata.uid))
       );
 
       if (results.every(r => r === true)) {
@@ -228,24 +228,24 @@ export class DeveloperHub {
     }
   }
 
+
   /**
-   * Unregisters a component by its ID
-   * @param id The component ID to delete
+   * Unregisters an entity by its UID
+   * @param id The entity UID to delete
    * @returns Promise<boolean> - true if deletion was successful, false otherwise
    */
-  private async unregisterComponentById(id: string): Promise<boolean> {
+  private async unregisterEntityByUid(id: string): Promise<boolean> {
     try {
       const response = await this.axios.delete(`${this.url}/api/catalog/entities/by-uid/${id}`);
-
-      if (response.status === 204) {
-        console.log(`Component ID: ${id} deleted successfully`);
+      if (response.status >= 200 && response.status < 300) {
+        console.log(`Entity UID: ${id} deleted successfully (status ${response.status})`);
         return true;
       } else {
-        console.log(`Failed to delete component: ${response.status} ${response.statusText}`);
+        console.log(`Failed to delete entity UID ${id}: ${response.status} ${response.statusText}`);
         return false;
       }
     } catch (error) {
-      console.error(`Error deleting component with ID ${id}:`, error);
+      console.error(`Error deleting entity with UID ${id}:`, error);
       return false;
     }
   }

src/rhtap/core/integration/git/providers/github.ts

@@ -767,7 +767,6 @@ export class GithubProvider extends BaseGitProvider {
     try {
       // Get the contents of the folder
       const folderContents = await this.githubClient.repository.getContent(owner, repoName, folderPath, branch);
-      
       if (!Array.isArray(folderContents)) {
         throw new Error(`Path ${folderPath} is not a folder`);
       }

tests/templates/import-templates.test.ts renamed to tests/templates/import_templates.test.ts

@@ -106,19 +106,16 @@ test.describe.serial('Import Template Tests', () => {
     if (!component) {
       throw new Error('Component was not created successfully');
     }
-    
+
     const git = component.getGit() as GithubProvider;
     const componentName = component.getName();
-    
+
     // Delete .tekton folder
     await git.deleteFolderInRepository(git.getOrganization(), componentName, '.tekton');
-    
-    // Delete gitops folder
-    //await git.deleteFolderInRepository(git.getOrganization(), componentName, 'gitops');
-    
+
     // Delete catalog-info.yaml file
     await git.deleteFileInRepository(git.getOrganization(), componentName, 'catalog-info.yaml');
-    
+
     console.log(`Deleted .tekton, gitops folders and catalog-info.yaml from ${componentName}`);
   });
 
@@ -131,7 +128,8 @@ test.describe.serial('Import Template Tests', () => {
     const componentName = component.getName();
 
     // Delete entities from Developer Hub
-    await developerHub.deleteEntitiesBySelector(componentName);
+    const deleted = await developerHub.deleteEntitiesBySelector(componentName);
+    expect(deleted).toBeTruthy();
     console.log(`Deleted entities for ${componentName} from Developer Hub`);
   });
 
@@ -183,9 +181,9 @@ test.describe.serial('Import Template Tests', () => {
     }
 
     // Wait for ArgoCD application to be healthy
-    git = component.getGit();
+    git = importedComponent.getGit();
     const commitSha = await git.getGitOpsRepoCommitSha();
-    const cd = component.getCD();
+    const cd = importedComponent.getCD();
 
     // Wait for ArgoCD application to be healthy
     const result = await cd.waitUntilApplicationIsSynced(Environment.DEVELOPMENT, commitSha);