@finos/legend-application-studio 28.18.42 → 28.18.44

package/src/components/editor/editor-group/function-activator/SnowflakeAppFunctionActivatorEditor.tsx

@@ -34,7 +34,6 @@ import {
   generateFunctionPrettyName,
   RelationalDatabaseConnection,
   DatabaseType,
-  DeploymentOwner,
   SnowflakePermissionScheme,
 } from '@finos/legend-graph';
 import { observer } from 'mobx-react-lite';
@@ -42,12 +41,12 @@ import { useApplicationStore } from '@finos/legend-application';
 import { useEditorStore } from '../../EditorStoreProvider.js';
 import { SnowflakeAppFunctionActivatorEdtiorState } from '../../../../stores/editor/editor-state/element-editor-state/function-activator/SnowflakeAppFunctionActivatorEditorState.js';
 import { flowResult } from 'mobx';
-import { useRef, useState } from 'react';
+import { useRef } from 'react';
 import {
   type RelationalDatabaseConnectionOption,
   buildRelationalDatabaseConnectionOption,
 } from '../connection-editor/RelationalDatabaseConnectionEditor.js';
-import { activator_setDeploymentOwner } from '../../../../stores/graph-modifier/DSL_FunctionActivator_GraphModifierHelper.js';
+import { ActivatorOwnershipForm } from './ActivatorFormComponents.js';
 
 export const SnowflakeAppFunctionActivatorEditor = observer(() => {
   const editorStore = useEditorStore();
@@ -57,7 +56,7 @@ export const SnowflakeAppFunctionActivatorEditor = observer(() => {
   );
   const isReadOnly = editorState.isReadOnly;
   const activator = editorState.activator;
-  const ownership = activator.ownership;
+
   const connectionSelectorRef = useRef<SelectComponent>(null);
   const connectionFilterOption = createFilter({
     ignoreCase: true,
@@ -140,17 +139,6 @@ export const SnowflakeAppFunctionActivatorEditor = observer(() => {
     );
   };
 
-  //Ownership
-  const [ownerInputValue, setOwner] = useState<string>(activator.ownership.id);
-  const updateDeploymentIdentifier: React.ChangeEventHandler<
-    HTMLInputElement
-  > = (event) => {
-    if (!isReadOnly) {
-      setOwner(event.target.value);
-      activator_setDeploymentOwner(ownership, event.target.value);
-    }
-  };
-
   return (
     <div className="snowflake-app-function-activator-editor">
       <Panel>
@@ -330,33 +318,10 @@ export const SnowflakeAppFunctionActivatorEditor = observer(() => {
             </div>
           </PanelForm>
           <PanelForm>
-            <div>
-              <div className="panel__content__form__section">
-                <div className="panel__content__form__section__header__label">
-                  Ownership
-                </div>
-                <div className="panel__content__form__section__header__prompt">
-                  The ownership model you want to use to control your snowflake
-                  app.
-                </div>
-              </div>
-              {ownership instanceof DeploymentOwner && (
-                <div className="panel__content__form__section">
-                  <div>
-                    <div className="panel__content__form__section__header__label">
-                      Deployment Identifier :
-                    </div>
-                    <input
-                      className="panel__content__form__section__input"
-                      spellCheck={false}
-                      disabled={isReadOnly}
-                      value={ownerInputValue}
-                      onChange={updateDeploymentIdentifier}
-                    />
-                  </div>
-                </div>
-              )}
-            </div>
+            <ActivatorOwnershipForm
+              activator={activator}
+              isReadOnly={isReadOnly}
+            />
           </PanelForm>
         </PanelContent>
       </Panel>

package/src/stores/editor/editor-state/element-editor-state/function-activator/HostedServiceFunctionActivatorEditorState.ts

@@ -28,14 +28,14 @@ import {
   guaranteeType,
   type PlainObject,
 } from '@finos/legend-shared';
-import { makeObservable, action, flow, computed } from 'mobx';
+import { makeObservable, action, flow, computed, observable } from 'mobx';
 import type { EditorStore } from '../../../EditorStore.js';
 import { ElementEditorState } from '../ElementEditorState.js';
 import { activator_setOwnership } from '../../../../graph-modifier/DSL_FunctionActivator_GraphModifierHelper.js';
 import { User } from '@finos/legend-server-sdlc';
 
 //Ownership
-enum HostedServiceOwnershipType {
+export enum HostedServiceOwnershipType {
   DEPLOYMENT_OWNERSHIP = 'deploymentOwnership',
   USERLIST_OWNERSHIP = 'userListOwnership',
 }
@@ -48,12 +48,14 @@ export const OWNERSHIP_OPTIONS = [
     label: DeploymentOwnershipLabel,
     value: HostedServiceOwnershipType.DEPLOYMENT_OWNERSHIP,
   },
-  {
-    label: UserlistOwnershipLabel,
-    value: HostedServiceOwnershipType.USERLIST_OWNERSHIP,
-  },
 ];
 
+export enum ACTIVATOR_EDITOR_TAB {
+  DEFINITION = 'DEFINITION',
+  TAGGED_VALUES = 'TAGGED_VALUES',
+  STEREOTYPES = 'STEREOTYPES',
+}
+
 export type HostedServiceOwnerOption = {
   label: string;
   value: string;
@@ -63,6 +65,8 @@ export class HostedServiceFunctionActivatorEditorState extends ElementEditorStat
   readonly validateState = ActionState.create();
   readonly deployState = ActionState.create();
 
+  selectedTab: ACTIVATOR_EDITOR_TAB;
+
   constructor(editorStore: EditorStore, element: HostedService) {
     super(editorStore, element);
 
@@ -74,11 +78,18 @@ export class HostedServiceFunctionActivatorEditorState extends ElementEditorStat
       setSelectedOwnership: action,
       selectedOwnership: computed,
       storeModel: action,
-      generateLineage: action,
       validate: flow,
       deployToSandbox: flow,
       searchUsers: flow,
+      selectedTab: observable,
+      setSelectedTab: action,
     });
+
+    this.selectedTab = ACTIVATOR_EDITOR_TAB.DEFINITION;
+  }
+
+  setSelectedTab(tab: ACTIVATOR_EDITOR_TAB): void {
+    this.selectedTab = tab;
   }
 
   get activator(): HostedService {
@@ -103,10 +114,6 @@ export class HostedServiceFunctionActivatorEditorState extends ElementEditorStat
     this.activator.storeModel = val;
   }
 
-  generateLineage(val: boolean): void {
-    this.activator.generateLineage = val;
-  }
-
   get selectedOwnership(): HostedServiceOwnerOption | undefined {
     const ownership = this.activator.ownership;
     if (ownership instanceof DeploymentOwner) {

package/tsconfig.json

@@ -254,6 +254,7 @@
     "./src/components/editor/editor-group/external-format-editor/DSL_ExternalFormat_NewSchemaSetDriver.tsx",
     "./src/components/editor/editor-group/external-format-editor/DSL_ExternalFormat_SchemaSetElementEditor.tsx",
     "./src/components/editor/editor-group/external-format-editor/DSL_ExternalFormat_SchemaSetModelGenerationEditor.tsx",
+    "./src/components/editor/editor-group/function-activator/ActivatorFormComponents.tsx",
     "./src/components/editor/editor-group/function-activator/FunctionEditor.tsx",
     "./src/components/editor/editor-group/function-activator/HostedServiceFunctionActivatorEditor.tsx",
     "./src/components/editor/editor-group/function-activator/INTERNAL__UnknownFunctionActivatorEdtior.tsx",