fix: Fix flags and html parsing

211-Connect · Oct 1, 2024 · c81f4a6 · c81f4a6
1 parent 3fa62a7
commit c81f4a6
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 22 deletions.
diff --git a/src/features/favorites/components/favorite.tsx b/src/features/favorites/components/favorite.tsx
@@ -3,7 +3,6 @@ import { ReferralButton } from '@/shared/components/referral-button';
 import {
  Card,
  CardContent,
- CardDescription,
  CardFooter,
  CardHeader,
  CardTitle,

diff --git a/src/shared/context/flags-context.ts b/src/shared/context/flags-context.ts
@@ -11,17 +11,6 @@ export type Flags = {
  requireUserLocation: boolean;
 };
 
-const defaultContext: Flags = {
- showResourceCategories: true,
- showResourceLastAssuredDate: true,
- showHomePageTour: true,
- showResourceAttribution: true,
- showSearchAndResourceServiceName: true,
- showSuggestionListTaxonomyBadge: true,
- showUseMyLocationButtonOnDesktop: true,
- requireUserLocation: false,
-};
-
-const flagsContext = createContext<Flags>(defaultContext);
+const flagsContext = createContext<Flags>(null);
 
 export { flagsContext };
diff --git a/src/shared/lib/parse-html.tsx b/src/shared/lib/parse-html.tsx
@@ -2,8 +2,10 @@ import parse from 'html-react-parser';
 
 export function parseHtml(
  html: string,
- config?: { parseLineBreaks?: boolean }
+ config?: { parseLineBreaks?: boolean },
 ) {
+ if (!(html && typeof html === 'string')) return false;
+
  if (config?.parseLineBreaks) {
  html = html.replace(/\n/g, '<br />');
  }

diff --git a/src/shared/lib/server-utils.ts b/src/shared/lib/server-utils.ts
@@ -4,6 +4,7 @@ import { GetServerSidePropsContext } from 'next';
 import { Flags } from '../context/flags-context';
 import { stringToBooleanOrUndefined } from './utils';
 import _ from 'lodash';
+import { shake } from 'radash';
 
 let config = undefined;
 export async function serverSideAppConfig() {
@@ -71,14 +72,17 @@ export async function serverSideFlags() {
  try {
  await fs.stat(path.resolve('./.norse/flags.json'));
  rawData = await fs.readFile(path.resolve('./.norse/flags.json'));
- flags = _.merge(
- {},
- JSON.parse(rawData.toString()),
- defaultFlags,
- (objValue, srcValue) => {
- return objValue !== undefined ? objValue : srcValue;
- },
- );
+ flags = _.omitBy(
+ _.merge(
+ {},
+ JSON.parse(rawData.toString()),
+ defaultFlags,
+ (objValue, srcValue) => {
+ return objValue !== undefined ? objValue : srcValue;
+ },
+ ),
+ (value) => value == null,
+ ) as Flags;
  } catch (_err) {
  // file doesn't exist OR issue parsing JSON. Save a default flags object
  flags = defaultFlags;