refactor: better typing of IntegrationKindByCategory

homarr-labs · Aug 15, 2024 · 3c4e977 · 3c4e977
1 parent 1ee663f
commit 3c4e977
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/packages/definitions/src/integration.ts b/packages/definitions/src/integration.ts
@@ -128,20 +128,19 @@ export const getAllSecretKindOptions = (
 
 export const integrationKinds = objectKeys(integrationDefs);
 
-type CategoryFilterType<Condition extends IntegrationCategory> = {
-  [Key in keyof typeof integrationDefs]: Condition extends (typeof integrationDefs)[Key]["category"][number]
+export type IntegrationKindByCategory<TCategory extends IntegrationCategory> = {
+  [Key in keyof typeof integrationDefs]: TCategory extends (typeof integrationDefs)[Key]["category"][number]
     ? Key
     : never;
-};
-
-export type IntegrationKindByCategory<Condition extends IntegrationCategory> =
-  CategoryFilterType<Condition>[keyof typeof integrationDefs];
+}[keyof typeof integrationDefs] extends infer U
+  //Needed to simplify the type when using it
+  ? U
+  : never;
 
 export const getIntegrationKindsByCategory = <TCategory extends IntegrationCategory>(category: TCategory) => {
-  const keys = objectKeys(integrationDefs).filter((integration) =>
+  return integrationKinds.filter((integration) =>
     integrationDefs[integration].category.some((defCategory) => defCategory === category),
-  );
-  return keys as IntegrationKindByCategory<TCategory>[];
+  ) as IntegrationKindByCategory<TCategory>[];
 };
 
 export type IntegrationSecretKind = (typeof integrationSecretKinds)[number];

diff --git a/packages/widgets/src/downloads/component.tsx b/packages/widgets/src/downloads/component.tsx
@@ -137,7 +137,7 @@ export default function DownloadClientsWidget({
         //Use cyclical update to invalidate data older than 30 seconds from unresponsive integrations
         const invalidIndexes = currentItems
           //Don't update already invalid data (new Date (0))
-          .filter(({ timestamp }) => dayjs().diff(timestamp) > invalidateTime && timestamp !== new Date(0))
+          .filter(({ timestamp }) => dayjs().diff(timestamp) > invalidateTime && timestamp > new Date(0))
           .map(({ integration }) => integration.id);
         currentItemsHandlers.applyWhere(
           ({ integration }) => invalidIndexes.includes(integration.id),