fix after rebase

Author: chriswk

src/lib/features/feature-toggle/archive-feature-toggle-controller.ts

@@ -150,11 +150,23 @@ export default class ArchiveController extends Controller {
             true,
             extractUserIdFromUser(user),
         );
+
         this.openApiService.respondWithValidation(
             200,
             res,
             archivedFeaturesSchema.$id,
-            { version: 2, features: serializeDates(features) },
+            {
+                version: 2,
+                features: serializeDates(
+                    features.map((feature) => {
+                        return {
+                            ...feature,
+                            stale: feature.stale || false,
+                            archivedAt: feature.archivedAt!,
+                        };
+                    }),
+                ),
+            },
         );
     }
 

src/lib/features/feature-toggle/converters/feature-toggle-row-converter.ts

@@ -147,7 +147,7 @@ export class FeatureToggleRowConverter {
         feature.name = row.name;
         feature.description = row.description;
         feature.project = row.project;
-        feature.stale = row.stale;
+        feature.stale = row.stale || false;
         feature.type = row.type;
         feature.lastSeenAt = row.last_seen_at;
         feature.variants = row.variants || [];
@@ -176,13 +176,13 @@ export class FeatureToggleRowConverter {
         const result = rows.reduce((acc, r) => {
             let feature: PartialDeep<IFeatureToggleListItem> = acc[r.name] ?? {
                 strategies: [],
+                stale: r.stale || false,
             };
 
             feature = this.createBaseFeature(r, feature, featureQuery);
 
             feature.createdAt = r.created_at;
             feature.favorite = r.favorite;
-
             this.addLastSeenByEnvironment(feature, r);
 
             acc[r.name] = feature;

src/lib/features/feature-toggle/fakes/fake-feature-strategies-store.ts

@@ -205,7 +205,7 @@ export default class FakeFeatureStrategiesStore
             ...t,
             enabled: true,
             strategies: [],
-            description: t.description,
+            description: t.description || undefined,
             type: t.type || 'Release',
             stale: t.stale || false,
             variants: [],

src/lib/features/feature-toggle/feature-toggle-controller.ts

@@ -670,7 +670,7 @@ export default class ProjectFeaturesController extends Controller {
             201,
             res,
             featureSchema.$id,
-            serializeDates(created),
+            serializeDates({ ...created, stale: created.stale || false }),
         );
     }
 
@@ -693,7 +693,7 @@ export default class ProjectFeaturesController extends Controller {
             201,
             res,
             featureSchema.$id,
-            serializeDates(created),
+            serializeDates({ ...created, stale: created.stale || false }),
         );
     }
 
@@ -740,8 +740,13 @@ export default class ProjectFeaturesController extends Controller {
             environmentVariants: variantEnvironments === 'true',
             userId: user.id,
         });
-
-        res.status(200).json(serializeDates(this.maybeAnonymise(feature)));
+        const maybeAnonymized = this.maybeAnonymise(feature);
+        res.status(200).json(
+            serializeDates({
+                ...maybeAnonymized,
+                stale: maybeAnonymized.stale || false,
+            }),
+        );
     }
 
     async updateFeature(
@@ -771,7 +776,7 @@ export default class ProjectFeaturesController extends Controller {
             200,
             res,
             featureSchema.$id,
-            serializeDates(created),
+            serializeDates({ ...created, stale: created.stale || false }),
         );
     }
 
@@ -795,7 +800,7 @@ export default class ProjectFeaturesController extends Controller {
             200,
             res,
             featureSchema.$id,
-            serializeDates(updated),
+            serializeDates({ ...updated, stale: updated.stale || false }),
         );
     }
 

src/lib/features/feature-toggle/feature-toggle-service.ts

@@ -1189,7 +1189,7 @@ class FeatureToggleService {
                 type,
                 enabled,
                 project,
-                stale,
+                stale: stale || false,
                 strategies,
                 variants,
                 description,

src/lib/features/feature-toggle/feature-toggle-store.ts

@@ -309,7 +309,7 @@ export default class FeatureToggleStore implements IFeatureToggleStore {
 
         const result = await query;
         return result.map((row) => ({
-            type: row.type,
+            type: row.type!,
             count: Number(row.count),
         }));
     }
@@ -449,11 +449,11 @@ export default class FeatureToggleStore implements IFeatureToggleStore {
             description: row.description,
             type: row.type,
             project: row.project,
-            stale: row.stale,
+            stale: row.stale || false,
             createdAt: row.created_at,
             lastSeenAt: row.last_seen_at,
-            impressionData: row.impression_data,
-            archivedAt: row.archived_at,
+            impressionData: row.impression_data || false,
+            archivedAt: row.archived_at || undefined,
             archived: row.archived_at != null,
         };
     }

src/lib/features/frontend-api/global-frontend-api-cache.ts

@@ -154,7 +154,10 @@ export class GlobalFrontendApiCache extends EventEmitter {
             Object.fromEntries(
                 Object.entries(value).map(([innerKey, innerValue]) => [
                     innerKey,
-                    mapFeatureForClient(innerValue),
+                    mapFeatureForClient({
+                        ...innerValue,
+                        stale: innerValue.stale || false,
+                    }),
                 ]),
             ),
         ]);

src/lib/types/model.ts

@@ -63,9 +63,9 @@ export interface FeatureToggleDTO {
     name: string;
     description?: string | null;
     type?: string;
-    stale?: boolean | null;
+    stale?: boolean;
     archived?: boolean;
-    archivedAt?: Date | null;
+    archivedAt?: Date;
     createdAt?: Date;
     impressionData?: boolean;
     variants?: IVariant[];
@@ -91,7 +91,7 @@ export interface IFeatureToggleListItem extends FeatureToggle {
 
 export interface IFeatureToggleClient {
     name: string;
-    description: string | undefined;
+    description: string | undefined | null;
     type: string;
     project: string;
     stale: boolean;

src/test/e2e/helpers/test-helper.ts

@@ -145,7 +145,6 @@ function httpApis(
             const url = `${base}/api/admin/projects/${project}/features/${featureName}/environments/${envName}/strategies`;
             return request.post(url).send(postData).expect(expectStatusCode);
         },
-        // @ts-expect-error we don't care about description here
         createFeature: (
             feature: string | FeatureToggleDTO,
             project: string = DEFAULT_PROJECT,