When upstream, just using konveyor-forklift instead of ENV variable for default namespace

Signed-off-by: Jeff Puzzo <[email protected]>

Author: jpuzz0

packages/forklift-console-plugin/src/components/common/ProjectNameSelect.tsx

@@ -1,5 +1,5 @@
-import React from 'react';
-import { Namespace, useForkliftTranslation } from 'src/utils';
+import React, { FC, ReactNode } from 'react';
+import { useForkliftTranslation } from 'src/utils';
 
 import { FormGroupWithHelpText, TypeaheadSelect, TypeaheadSelectOption } from '@kubev2v/common';
 import {
@@ -15,10 +15,10 @@ interface ProjectNameSelectProps {
   options: TypeaheadSelectOption[];
   onSelect: (value: string) => void;
   isDisabled?: boolean;
-  popoverHelpContent?: React.ReactNode;
+  popoverHelpContent?: ReactNode;
 }
 
-export const ProjectNameSelect: React.FC<ProjectNameSelectProps> = ({
+export const ProjectNameSelect: FC<ProjectNameSelectProps> = ({
   value,
   options,
   isDisabled,
@@ -27,15 +27,6 @@ export const ProjectNameSelect: React.FC<ProjectNameSelectProps> = ({
 }) => {
   const { t } = useForkliftTranslation();
 
-  // Fallback to "default" when the initial value does not exist within options
-  React.useEffect(() => {
-    const hasOptionValue = options.find((option) => option.name === value);
-
-    if (!hasOptionValue) {
-      onSelect(Namespace.Default);
-    }
-  }, []);
-
   return (
     <FormGroupWithHelpText
       label={t('Project')}

packages/forklift-console-plugin/src/utils/namespaces.ts

@@ -2,15 +2,14 @@ import { Namespace } from './constants';
 import { isUpstream } from './env';
 
 /**
- * When using an upstream build, use the env default namespace
- * with a fallback of 'default', otherwise use 'openshift-mtv'.
+ * When using an upstream build use 'konveyor-forklift', otherwise 'openshift-mtv'.
  * @returns string
  */
 export const getDefaultNamespace = (): string => {
   const isUserUpstream = isUpstream();
 
   if (isUserUpstream) {
-    return process.env.DEFAULT_NAMESPACE || Namespace.Default;
+    return Namespace.KonveyorForklift;
   }
 
   return Namespace.OpenshiftMtv;