Merge pull request #28 from code-kern-ai/config

JWittmeyer · web-flow · commit 2da420db363e · 2024-11-19T14:59:53.000+01:00
Remove refinery-config
diff --git a/pages/_app.tsx b/pages/_app.tsx
@@ -1,4 +1,3 @@
-import { UserManagerWrapper } from "@/util/UserManaged"
 import "../styles/tailwind.css"
 import '@/submodules/tailwind-config/global.css';
 import { theme, globalStyles, ThemeProps } from "@ory/themes"
@@ -24,9 +23,7 @@ function MyApp({ Component, pageProps }: AppProps) {
       <div data-testid="app-react">
         <ThemeProvider theme={theme}>
           <GlobalStyle />
-          <UserManagerWrapper>
-            <Component {...pageProps} />
-          </UserManagerWrapper>
+          <Component {...pageProps} />
           <ToastContainer />
         </ThemeProvider>
       </div>
diff --git a/pages/login.tsx b/pages/login.tsx
@@ -12,7 +12,6 @@ import { KernLogo } from "@/pkg/ui/Icons"
 import { DemoFlow } from "@/pkg/ui/DemoFlow"
 import { getValueIdentifier, getValuePassword } from "@/util/helper-functions"
 import ory from "@/pkg/sdk"
-import { MiscInfo } from "@/services/basic-fetch/misc"
 
 const Login: NextPage = () => {
   const [initialFlow, setInitialFlow] = useState<LoginFlow>();
@@ -75,21 +74,6 @@ const Login: NextPage = () => {
 
     const flowData: any = Object.assign({}, initialFlow);
 
-    let emailNode = flowData.ui.nodes.find((node: any) => node.meta?.label?.text == "E-Mail");
-    if (emailNode && MiscInfo.isDemo) {
-      emailNode.attributes.value = getValueIdentifier(selectedRole);
-    }
-
-    let passwordNode = flowData.ui.nodes.find((node: any) => node.meta?.label?.text == "Password");
-    if (passwordNode && MiscInfo.isDemo) {
-      passwordNode.attributes.value = getValuePassword(selectedRole);
-    }
-
-    let submitNode = flowData.ui.nodes.find((node: any) => node.meta?.label?.text == "Sign in");
-    if (submitNode && MiscInfo.isDemo) {
-      submitNode.meta.label.text = "Proceed"
-    }
-
     if (initialFlow.ui.nodes.some((node: any) => node.group === "totp")) {
       const totcData = JSON.parse(JSON.stringify(flowData));
       totcData.ui.nodes = totcData.ui.nodes.filter((node: any) => node.group == "totp" || node.group == "default");
@@ -120,11 +104,7 @@ const Login: NextPage = () => {
           window.location.href = initialFlow?.return_to
           return
         }
-        if (MiscInfo.isManaged) {
-          router.push("/cognition")
-        } else {
-          router.push("/refinery/projects")
-        }
+        router.push("/cognition")
 
       })
       .then(() => { })
@@ -149,60 +129,31 @@ const Login: NextPage = () => {
       <div className="app-container">
         <KernLogo />
         <div id="login">
-          <h2 className="title">{MiscInfo.isDemo ? 'Proceed with your selected role' : 'Sign in to your account'}</h2>
-          {!MiscInfo.isDemo ? (
-            <>{MiscInfo.isManaged ? (
-              <p className="text-paragraph">Or
-                <a className="link" data-testid="cta-link" href="/auth/registration"> Register account </a> -
-                no credit card required!
-              </p>
-            ) : (<>
-              <p className="text-paragraph">You don&apos;t have an account yet?
-                <a className="link" data-testid="cta-link" href="/auth/registration"> Sign up here (local)</a>
-              </p>
-            </>)}</>
-          ) : (<></>)}
+          <h2 className="title">Sign in to your account</h2>
+          <p className="text-paragraph">Or
+            <a className="link" data-testid="cta-link" href="/auth/registration"> Register account </a> -
+            no credit card required!
+          </p>
           <div className="ui-container">
-            {!MiscInfo.isDemo ? (
-              <div>
-                <Flow onSubmit={onSubmit} flow={changedFlow} only="password" />
-                {oidcFlow ?
-                  <>
-                    <div className="divider-outer"><span className="divider">Or</span></div>
-                    <Flow onSubmit={onSubmit} flow={oidcFlow} only="oidc" />
-                  </> : null}
-                {totpFlow ?
-                  <>
-                    <Flow onSubmit={onSubmit} flow={totpFlow} only="totp" />
-                  </> : null}
-              </div>) : (<>
-
-                <fieldset>
-                  <span className="typography-h3">
-                    Select role
-                    <span className="required-indicator">*</span>
-                    <select className="typography-h3 select" id="roles" value={selectedRole} onChange={(e: any) => { setSelectedRole(e.target.value); }}>
-                      <option value="engineer">Engineer</option>
-                      <option value="expert">Expert</option>
-                      <option value="annotator">Annotator</option>
-                    </select>
-                  </span>
-                </fieldset>
-                <p className="text-description" id="description">
-                  {selectedRole === 'engineer' ? 'Administers the project and works on programmatic tasks such as labeling automation or filter settings.' : selectedRole === 'expert' ? 'Working on reference manual labels, which can be used by the engineering team to estimate the data quality.' : 'Working on manual labels as if they were heuristics. They can be switched on/off by the engineering team, so that the engineers can in - or exclude them during weak supervision.'}
-                </p>
-                <p className="text-description" id="sub-description">
-                  {selectedRole === 'engineer' ? 'They have access to all features of the application, including the Python SDK.' : selectedRole === 'expert' ? 'They have access to the labeling view only.' : 'They have access to a task-minimized labeling view only. Engineers can revoke their access to the labeling view.'}
-                </p>
-                <DemoFlow onSubmit={onSubmit} flow={changedFlow} />
-              </>)}
+            <div>
+              <Flow onSubmit={onSubmit} flow={changedFlow} only="password" />
+              {oidcFlow ?
+                <>
+                  <div className="divider-outer"><span className="divider">Or</span></div>
+                  <Flow onSubmit={onSubmit} flow={oidcFlow} only="oidc" />
+                </> : null}
+              {totpFlow ?
+                <>
+                  <Flow onSubmit={onSubmit} flow={totpFlow} only="totp" />
+                </> : null}
+            </div>
           </div>
           <div className="link-container">
-            {!MiscInfo.isDemo ?
+            {
               !isAccLinkageRequested ?
                 <a className="link" data-testid="forgot-password" href="/auth/recovery">Forgot your password?</a>
                 : <a className="link" data-testid="back-to-login" href="/auth/login">Go back to login</a>
-              : null}
+            }
           </div>
         </div>
       </div >
diff --git a/pages/registration.tsx b/pages/registration.tsx
@@ -8,7 +8,6 @@ import { KernLogo } from "@/pkg/ui/Icons"
 import ory from "@/pkg/sdk"
 import { handleFlowError } from "@/pkg/errors"
 import { Flow } from "@/pkg"
-import { MiscInfo } from "@/services/basic-fetch/misc"
 import { prepareNodes } from "@/util/helper-functions"
 
 // Renders the registration page
@@ -107,7 +106,7 @@ const Registration: NextPage = () => {
       <div className="app-container">
         <KernLogo />
         <div id="signup">
-          <h2 className="title">{MiscInfo.isManaged ? 'Register account' : 'Sign up for a local account'}</h2>
+          <h2 className="title">Register account</h2>
           <div>
             <Flow onSubmit={onSubmit} flow={changedFlow} only="password" />
             {oidcFlow ?
diff --git a/pkg/ui/Node.tsx b/pkg/ui/Node.tsx
@@ -13,7 +13,6 @@ import { NodeInput } from "./NodeInput"
 import { NodeScript } from "./NodeScript"
 import { NodeText } from "./NodeText"
 import { FormDispatcher, ValueSetter } from "./helpers"
-import { MiscInfo } from "@/services/basic-fetch/misc"
 
 
 interface Props {
@@ -56,7 +55,7 @@ export const Node = ({
         node={node}
         disabled={disabled}
         attributes={node.attributes}
-        visible={!MiscInfo.isDemo}
+        visible={true}
       />
     )
   }
diff --git a/pkg/ui/NodeInputSubmit.tsx b/pkg/ui/NodeInputSubmit.tsx
@@ -2,7 +2,6 @@ import { getNodeLabel } from "@ory/integrations/ui"
 import { Button } from "@ory/themes"
 
 import { NodeInputProps } from "./helpers"
-import { MiscInfo } from "@/services/basic-fetch/misc";
 
 
 export function NodeInputSubmit<T>({
@@ -12,18 +11,11 @@ export function NodeInputSubmit<T>({
 }: NodeInputProps) {
   return (
     <>
-      {node.meta.label?.text == "Sign up" ? (<>
-        {MiscInfo.isManaged ? (<>
-          <div className="info-containter">
-            <span>Once you register for an account, we’ll set up an organization for you - this is a manual step, but it usually only takes minutes.</span>
-            <div>We’ll get back to you as soon as possible.</div>
-          </div>
-        </>) : (<>
-          <div className="info-containter">
-            <span>This sets up a single-user account on your local machine.</span>
-            <div> If you want to use a hosted version with GPU acceleration, multi-user capabilities and additional features, check out our hostings.</div>
-          </div></>)}
-      </>) : (<> </>)}
+      {node.meta.label?.text == "Sign up" ?
+        <div className="info-containter">
+          <span>Once you register for an account, we’ll set up an organization for you - this is a manual step, but it usually only takes minutes.</span>
+          <div>We’ll get back to you as soon as possible.</div>
+        </div> : <> </>}
 
       <Button
         name={attributes.name}
diff --git a/services/basic-fetch/misc.ts b/services/basic-fetch/misc.ts
diff --git a/submodules/javascript-functions b/submodules/javascript-functions
@@ -1 +1 @@
-Subproject commit a2479502cb59b9ed1f6fd5f5ce6fc084f22d270d
+Subproject commit 3bd200a34cc3531519d0b3e48fca5910a10b19e3
diff --git a/submodules/react-components b/submodules/react-components
@@ -1 +1 @@
-Subproject commit 42f1af8d2534bd1c82094fce4cc70d193344cfb8
+Subproject commit a90abdd0061491a2f17e089b441aade2afc4465d
diff --git a/util/UserManaged.tsx b/util/UserManaged.tsx
diff --git a/util/data-fetch.ts b/util/data-fetch.ts
@@ -3,15 +3,6 @@ import { FetchType, jsonFetchWrapper } from "@/submodules/javascript-functions/b
 const BACKEND_BASE_URI = '/refinery-gateway';
 export const organizationEndpoint = `${BACKEND_BASE_URI}/api/v1/organization`;
 
-export function getIsManaged(onResult: (result: any) => void) {
-    const url = `/is_managed`;
-    jsonFetchWrapper(url, FetchType.GET, onResult);
-}
-
-export function getIsDemo(onResult: (result: any) => void) {
-    const url = `/is_demo`;
-    jsonFetchWrapper(url, FetchType.GET, onResult);
-}
 
 export function getUserInfoExtended(onResult: (result: any) => void) {
     const finalUrl = `${organizationEndpoint}/get-user-info-extended`;

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,6 @@ import { NodeInput } from "./NodeInput"`
`13`	`13`	`import { NodeScript } from "./NodeScript"`
`14`	`14`	`import { NodeText } from "./NodeText"`
`15`	`15`	`import { FormDispatcher, ValueSetter } from "./helpers"`
`16`		`-import { MiscInfo } from "@/services/basic-fetch/misc"`
`17`	`16`
`18`	`17`
`19`	`18`	`interface Props {`
`@@ -56,7 +55,7 @@ export const Node = ({`
`56`	`55`	`node={node}`
`57`	`56`	`disabled={disabled}`
`58`	`57`	`attributes={node.attributes}`
`59`		`- visible={!MiscInfo.isDemo}`
	`58`	`+ visible={true}`
`60`	`59`	`/>`
`61`	`60`	`)`
`62`	`61`	`}`