fix: apply minor tweaks

kubeshop · Feb 7, 2024 · a6b745e · a6b745e
1 parent 7a0d729
commit a6b745e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/packages/synchronizer/src/handlers/apiHandler.ts b/packages/synchronizer/src/handlers/apiHandler.ts
@@ -403,7 +403,7 @@ export class ApiHandler {
   }
 
   async toggleSuppression(fingerprint: string, repoId: string, description: string, tokenInfo: TokenInfo) {
-    return this.queryApi<ApiSuppression>(toggleSuppressionMutation, tokenInfo, {fingerprint, repoId, description});
+    return this.queryApi<ApiSuppressionsData>(toggleSuppressionMutation, tokenInfo, {fingerprint, repoId, description});
   }
 
   generateDeepLink(path: string) {

diff --git a/packages/synchronizer/src/index.ts b/packages/synchronizer/src/index.ts
@@ -4,6 +4,7 @@ export * from './handlers/deviceFlowHandler.js';
 export * from './handlers/gitHandler.js';
 export * from './handlers/storageHandler.js';
 export * from './handlers/storageHandlerAuth.js';
+export * from './handlers/storageHandlerJsonCache.js'
 export * from './handlers/storageHandlerPolicy.js';
 
 export * from './models/user.js';

diff --git a/packages/synchronizer/src/utils/projectSynchronizer.ts b/packages/synchronizer/src/utils/projectSynchronizer.ts
@@ -106,9 +106,9 @@ export class ProjectSynchronizer extends EventEmitter {
     }
 
     const suppressionResult = await this._apiHandler.toggleSuppression(fingerprint, id, description, tokenInfo);
-    if (suppressionResult) {
+    if (suppressionResult?.data?.getSuppressions?.data?.length) {
         const existingSuppressions = await this.readSuppressions(repoData);
-        const allSuppressions = this.mergeSuppressions(existingSuppressions, [suppressionResult]);
+        const allSuppressions = this.mergeSuppressions(existingSuppressions, suppressionResult.data.getSuppressions.data);
         await this.storeSuppressions(allSuppressions, repoData);
 
         const cacheId = this.getCacheId(rootPath, projectSlug);
@@ -319,7 +319,8 @@ export class ProjectSynchronizer extends EventEmitter {
       suppressionsMap[suppression.id] = suppression;
     });
 
-    return Object.values(suppressionsMap);
+    return Object.values(suppressionsMap)
+      .filter(suppression => !(suppression.isDeleted || suppression.isRejected));
   }
 
   private async storeCacheMetadata(cacheMetadata: CacheMetadata, repoData: RepoRemoteInputData) {