diff --git a/frontend/.env.development b/frontend/.env.development index 0f72271a..a09d71bb 100644 --- a/frontend/.env.development +++ b/frontend/.env.development @@ -16,5 +16,4 @@ NEXT_PUBLIC_DEFAULT_STORE_CODE=test # Flags NEXT_PUBLIC_FLAG__PRODUCT_PAGE_ENABLED=true NEXT_PUBLIC_FLAG__STORE_HOME_PAGE_ENABLED=true -NEXT_PUBLIC_FLAG__TROUBLESHOOTING_COLLECTIONS_ENABLED=true NEXT_PUBLIC_FLAG__APP_ROUTER_PRODUCT_PAGE_ENABLED=true diff --git a/frontend/.env.production b/frontend/.env.production index 2fa17f3e..441cfab7 100644 --- a/frontend/.env.production +++ b/frontend/.env.production @@ -23,5 +23,3 @@ NEXT_PUBLIC_GTAG_ID=G-5ZXNWJ73GK NEXT_PUBLIC_ALGOLIA_PRODUCT_INDEX_NAME=dev_product_group_en NEXT_PUBLIC_DEFAULT_STORE_CODE=us NEXT_PUBLIC_POLYFILL_DOMAIN=https://www.ifixit.com -# flags -NEXT_PUBLIC_FLAG__TROUBLESHOOTING_COLLECTIONS_ENABLED=false diff --git a/frontend/.env.test b/frontend/.env.test index 6140e598..0825cc96 100644 --- a/frontend/.env.test +++ b/frontend/.env.test @@ -7,7 +7,6 @@ STRAPI_IMAGE_DOMAIN=ifixit-dev-strapi-uploads.s3.us-west-1.amazonaws.com NEXT_PUBLIC_ALGOLIA_PRODUCT_INDEX_NAME=dev_product_group_en NEXT_PUBLIC_DEFAULT_STORE_CODE=test NEXT_PUBLIC_FLAG__PRODUCT_PAGE_ENABLED=true -NEXT_PUBLIC_FLAG__TROUBLESHOOTING_COLLECTIONS_ENABLED=true NODE_OPTIONS="--dns-result-order ipv4first" NEXT_PUBLIC_DEV_API_AUTH_TOKEN= -NEXT_PUBLIC_FLAG__APP_ROUTER_PRODUCT_PAGE_ENABLED=true \ No newline at end of file +NEXT_PUBLIC_FLAG__APP_ROUTER_PRODUCT_PAGE_ENABLED=true diff --git a/frontend/app/(defaultLayout)/Troubleshooting/[device]/page.tsx b/frontend/app/(defaultLayout)/Troubleshooting/[device]/page.tsx index 7b46a5ed..d17dc847 100644 --- a/frontend/app/(defaultLayout)/Troubleshooting/[device]/page.tsx +++ b/frontend/app/(defaultLayout)/Troubleshooting/[device]/page.tsx @@ -27,8 +27,6 @@ export type PageProps = { }; export default async function Page({ params, searchParams }: PageProps) { - ensureFlag(); - const pageProps = await getPageProps({ params, searchParams, @@ -37,12 +35,6 @@ export default async function Page({ params, searchParams }: PageProps) { return ; } -function ensureFlag() { - if (!flags.TROUBLESHOOTING_COLLECTIONS_ENABLED) { - notFound(); - } -} - async function getPageProps({ params, searchParams: _searchParams, @@ -93,9 +85,7 @@ export async function generateMetadata({ alternates: { canonical: canonicalUrl, }, - robots: flags.TROUBLESHOOTING_COLLECTIONS_ENABLED - ? RestrictRobots.ALLOW_ALL - : RestrictRobots.RESTRICT_ALL, + robots: RestrictRobots.RESTRICT_ALL, title: metaTitle, description: metaDescription, openGraph: { diff --git a/frontend/config/flags.ts b/frontend/config/flags.ts index c77576d6..264de34a 100644 --- a/frontend/config/flags.ts +++ b/frontend/config/flags.ts @@ -3,9 +3,6 @@ export const flags = { process.env.NEXT_PUBLIC_FLAG__PRODUCT_PAGE_ENABLED === 'true', STORE_HOME_PAGE_ENABLED: process.env.NEXT_PUBLIC_FLAG__STORE_HOME_PAGE_ENABLED === 'true', - TROUBLESHOOTING_COLLECTIONS_ENABLED: - process.env.NEXT_PUBLIC_FLAG__TROUBLESHOOTING_COLLECTIONS_ENABLED === - 'true', APP_ROUTER_PRODUCT_PAGE_ENABLED: process.env.NEXT_PUBLIC_FLAG__APP_ROUTER_PRODUCT_PAGE_ENABLED === 'true', };