@finos/legend-application-studio 28.18.43 → 28.18.45

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

@@ -25,19 +25,14 @@ import {
   PanelFormBooleanField,
   PanelFormValidatedTextField,
   TimesIcon,
-  CustomSelectorInput,
-  PencilIcon,
-  ErrorIcon,
   clsx,
   PlusIcon,
 } from '@finos/legend-art';
 import {
-  DeploymentOwner,
   Profile,
   StereotypeExplicitReference,
   type StereotypeReference,
   type TaggedValue,
-  UserList,
   generateFunctionPrettyName,
   stub_Profile,
   stub_Stereotype,
@@ -50,9 +45,6 @@ import { useApplicationStore } from '@finos/legend-application';
 import { useEditorStore } from '../../EditorStoreProvider.js';
 import {
   HostedServiceFunctionActivatorEditorState,
-  OWNERSHIP_OPTIONS,
-  type HostedServiceOwnerOption,
-  MINIMUM_HOSTED_SERVICE_OWNERS,
   ACTIVATOR_EDITOR_TAB,
 } from '../../../../stores/editor/editor-state/element-editor-state/function-activator/HostedServiceFunctionActivatorEditorState.js';
 import {
@@ -61,16 +53,11 @@ import {
   hostedService_setPattern,
   hostedService_removePatternParameter,
   hostedService_setStoreModel,
-  hostedService_setGenerateLineage,
-  activator_setDeploymentOwner,
-  activator_updateUserOwnership,
-  activator_deleteValueFromUserOwnership,
-  activator_addUserOwner,
 } from '../../../../stores/graph-modifier/DSL_FunctionActivator_GraphModifierHelper.js';
-import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
-import { LEGEND_STUDIO_TEST_ID } from '../../../../__lib__/LegendStudioTesting.js';
-import { debounce, prettyCONSTName } from '@finos/legend-shared';
+import { useCallback, useEffect, useRef, useState } from 'react';
+import { prettyCONSTName } from '@finos/legend-shared';
 import { flowResult } from 'mobx';
+import { ActivatorOwnershipForm } from './ActivatorFormComponents.js';
 import {
   annotatedElement_addStereotype,
   annotatedElement_addTaggedValue,
@@ -92,8 +79,6 @@ import {
   StereotypeSelector,
 } from '../uml-editor/StereotypeSelector.js';
 
-type UserOption = { label: string; value: string };
-
 export const HostedServiceFunctionActivatorEditor = observer(() => {
   const editorStore = useEditorStore();
   const applicationStore = useApplicationStore();
@@ -197,7 +182,6 @@ export const HostedServiceFunctionActivatorEditor = observer(() => {
       editorState.setSelectedTab(tab);
 
   const activator = editorState.activator;
-  const ownership = activator.ownership;
   const visitFunction = (): void =>
     editorState.editorStore.graphEditorMode.openElement(
       activator.function.value,
@@ -225,10 +209,6 @@ export const HostedServiceFunctionActivatorEditor = observer(() => {
     hostedService_setStoreModel(activator, !activator.storeModel);
   };
 
-  const toggleGenerateLineage = (): void => {
-    hostedService_setGenerateLineage(activator, !activator.generateLineage);
-  };
-
   const toggleAutoActivateUpdates = (): void => {
     hostedService_setAutoActivateUpdates(
       activator,
@@ -243,127 +223,6 @@ export const HostedServiceFunctionActivatorEditor = observer(() => {
       : undefined;
   };
 
-  //Ownership
-  const [showOwnerEditInput, setShowOwnerEditInput] = useState<
-    boolean | number
-  >(false);
-  const [ownerInputValue, setOwnerInputValue] = useState<string>('');
-  const [searchText, setSearchText] = useState('');
-  const [userOptions, setUserOptions] = useState<UserOption[]>([]);
-  const [isLoadingUsers, setIsLoadingUsers] = useState<boolean>(false);
-  const [ownerInputs, setOwnerInputs] = useState<string[]>([]);
-  const showAddOwnerInput = (): void => setShowOwnerEditInput(true);
-
-  const onOwnershipChange = (
-    val: HostedServiceOwnerOption | undefined,
-  ): void => {
-    if (val) {
-      editorState.setSelectedOwnership(val);
-    }
-  };
-
-  const updateDeploymentIdentifier: React.ChangeEventHandler<
-    HTMLInputElement
-  > = (event) => {
-    if (!isReadOnly && ownership instanceof DeploymentOwner) {
-      activator_setDeploymentOwner(ownership, event.target.value);
-    }
-  };
-
-  const changeUserOwnerInputValue: React.ChangeEventHandler<
-    HTMLInputElement
-  > = (event) => setOwnerInputValue(event.target.value);
-
-  const updateUser =
-    (idx: number): (() => void) =>
-    (): void => {
-      if (
-        ownerInputValue &&
-        ownership instanceof UserList &&
-        !ownership.users.includes(ownerInputValue)
-      ) {
-        activator_updateUserOwnership(ownership, ownerInputValue, idx);
-      }
-    };
-
-  const showEditOwnerInput =
-    (value: string, idx: number): (() => void) =>
-    (): void => {
-      setOwnerInputValue(value);
-      setShowOwnerEditInput(idx);
-    };
-
-  const hideAddOrEditOwnerInput = (): void => {
-    setShowOwnerEditInput(false);
-    setOwnerInputValue('');
-  };
-
-  const deleteUser =
-    (idx: number): (() => void) =>
-    (): void => {
-      if (!isReadOnly && ownership instanceof UserList) {
-        activator_deleteValueFromUserOwnership(ownership, idx);
-        if (
-          typeof showOwnerEditInput === 'number' &&
-          showOwnerEditInput > idx
-        ) {
-          setShowOwnerEditInput(showOwnerEditInput - 1);
-        }
-      }
-    };
-
-  const debouncedSearchUsers = useMemo(
-    () =>
-      debounce((input: string): void => {
-        setIsLoadingUsers(true);
-        flowResult(editorState.searchUsers(input))
-          .then((users) =>
-            setUserOptions(
-              users.map((u) => ({
-                value: u.userId,
-                label: u.userId,
-              })),
-            ),
-          )
-          .then(() => setIsLoadingUsers(false))
-          .catch(editorState.editorStore.applicationStore.alertUnhandledError);
-      }, 500),
-    [editorState],
-  );
-
-  const onSearchTextChange = (value: string): void => {
-    if (value !== searchText) {
-      setSearchText(value);
-      debouncedSearchUsers.cancel();
-      if (value.length >= 3) {
-        debouncedSearchUsers(value);
-      } else if (value.length === 0) {
-        setUserOptions([]);
-        setIsLoadingUsers(false);
-      }
-    }
-  };
-
-  const onUserOptionChange = (options: UserOption[]): void => {
-    setOwnerInputs(options.map((op) => op.label));
-    setUserOptions([]);
-    debouncedSearchUsers.cancel();
-    setIsLoadingUsers(false);
-  };
-
-  const addUser = (): void => {
-    ownerInputs.forEach((value) => {
-      if (
-        value &&
-        ownership instanceof UserList &&
-        !ownership.users.includes(value)
-      ) {
-        activator_addUserOwner(ownership, value);
-      }
-    });
-    hideAddOrEditOwnerInput();
-  };
-
   //Pattern
   const patternRef = useRef<HTMLInputElement>(null);
   const [pattern, setPattern] = useState(activator.pattern);
@@ -583,214 +442,11 @@ export const HostedServiceFunctionActivatorEditor = observer(() => {
                 />
               </PanelForm>
               <PanelForm>
-                <PanelFormBooleanField
+                <ActivatorOwnershipForm
+                  activator={activator}
                   isReadOnly={isReadOnly}
-                  value={activator.generateLineage}
-                  name="Generate Lineage"
-                  prompt="Generate Lineage (slower)"
-                  update={toggleGenerateLineage}
                 />
               </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
-                        service.
-                      </div>
-                      <CustomSelectorInput
-                        options={OWNERSHIP_OPTIONS}
-                        onChange={onOwnershipChange}
-                        value={editorState.selectedOwnership}
-                        darkMode={
-                          !applicationStore.layoutService
-                            .TEMPORARY__isLightColorThemeEnabled
-                        }
-                      />
-                    </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={ownership.id}
-                            onChange={updateDeploymentIdentifier}
-                          />
-                        </div>
-                      </div>
-                    )}
-                    {ownership instanceof UserList && (
-                      <div className="panel__content__form__section">
-                        <div>
-                          <div className="panel__content__form__section__header__label">
-                            Users :
-                          </div>
-                          <div className="panel__content__form__section__list">
-                            <div
-                              className="panel__content__form__section__list__items"
-                              data-testid={
-                                LEGEND_STUDIO_TEST_ID.PANEL_CONTENT_FORM_SECTION_LIST_ITEMS
-                              }
-                            >
-                              {ownership.users.map((value, idx) => (
-                                <div
-                                  key={value}
-                                  className={
-                                    showOwnerEditInput === idx
-                                      ? 'panel__content__form__section__list__new-item'
-                                      : 'panel__content__form__section__list__item'
-                                  }
-                                >
-                                  {showOwnerEditInput === idx ? (
-                                    <>
-                                      <input
-                                        className="panel__content__form__section__input panel__content__form__section__list__new-item__input"
-                                        spellCheck={false}
-                                        disabled={isReadOnly}
-                                        value={ownerInputValue}
-                                        onChange={changeUserOwnerInputValue}
-                                      />
-                                      <div className="panel__content__form__section__list__new-item__actions">
-                                        <button
-                                          className="panel__content__form__section__list__new-item__add-btn btn btn--dark"
-                                          disabled={
-                                            isReadOnly ||
-                                            ownership.users.includes(
-                                              ownerInputValue,
-                                            )
-                                          }
-                                          onClick={updateUser(idx)}
-                                          tabIndex={-1}
-                                        >
-                                          Save
-                                        </button>
-                                        <button
-                                          className="panel__content__form__section__list__new-item__cancel-btn btn btn--dark"
-                                          disabled={isReadOnly}
-                                          onClick={hideAddOrEditOwnerInput}
-                                          tabIndex={-1}
-                                        >
-                                          Cancel
-                                        </button>
-                                      </div>
-                                    </>
-                                  ) : (
-                                    <>
-                                      <div className="panel__content__form__section__list__item__value">
-                                        {value}
-                                      </div>
-                                      <div className="panel__content__form__section__list__item__actions">
-                                        <button
-                                          className="panel__content__form__section__list__item__edit-btn"
-                                          disabled={isReadOnly}
-                                          onClick={showEditOwnerInput(
-                                            value,
-                                            idx,
-                                          )}
-                                          tabIndex={-1}
-                                        >
-                                          <PencilIcon />
-                                        </button>
-                                        <button
-                                          className="panel__content__form__section__list__item__remove-btn"
-                                          disabled={isReadOnly}
-                                          onClick={deleteUser(idx)}
-                                          tabIndex={-1}
-                                        >
-                                          <TimesIcon />
-                                        </button>
-                                      </div>
-                                    </>
-                                  )}
-                                </div>
-                              ))}
-                              {showOwnerEditInput === true && (
-                                <div className="panel__content__form__section__list__new-item">
-                                  <CustomSelectorInput
-                                    className="service-editor__owner__selector"
-                                    placeholder="Enter an owner..."
-                                    inputValue={searchText}
-                                    options={userOptions}
-                                    allowCreating={true}
-                                    isLoading={isLoadingUsers}
-                                    disabled={isReadOnly}
-                                    darkMode={
-                                      !applicationStore.layoutService
-                                        .TEMPORARY__isLightColorThemeEnabled
-                                    }
-                                    onInputChange={onSearchTextChange}
-                                    onChange={onUserOptionChange}
-                                    isMulti={true}
-                                  />
-                                  <div className="panel__content__form__section__list__new-item__actions">
-                                    <button
-                                      className="panel__content__form__section__list__new-item__add-btn btn btn--dark service-editor__owner__action"
-                                      disabled={
-                                        isReadOnly ||
-                                        ownerInputs.some((i) =>
-                                          ownership.users.includes(i),
-                                        )
-                                      }
-                                      onClick={addUser}
-                                      tabIndex={-1}
-                                    >
-                                      Save
-                                    </button>
-                                    <button
-                                      className="panel__content__form__section__list__new-item__cancel-btn btn btn--dark service-editor__owner__action"
-                                      disabled={isReadOnly}
-                                      onClick={hideAddOrEditOwnerInput}
-                                      tabIndex={-1}
-                                    >
-                                      Cancel
-                                    </button>
-                                  </div>
-                                </div>
-                              )}
-                            </div>
-                            {ownership.users.length <
-                              MINIMUM_HOSTED_SERVICE_OWNERS &&
-                              showOwnerEditInput !== true && (
-                                <div
-                                  className="service-editor__owner__validation"
-                                  title={`${MINIMUM_HOSTED_SERVICE_OWNERS} owners required`}
-                                >
-                                  <ErrorIcon />
-                                  <div className="service-editor__owner__validation-label">
-                                    Service requires at least{' '}
-                                    {MINIMUM_HOSTED_SERVICE_OWNERS} owners
-                                  </div>
-                                </div>
-                              )}
-                            {showOwnerEditInput !== true && (
-                              <div className="panel__content__form__section__list__new-item__add">
-                                <button
-                                  className="panel__content__form__section__list__new-item__add-btn btn btn--dark"
-                                  disabled={isReadOnly}
-                                  onClick={showAddOwnerInput}
-                                  tabIndex={-1}
-                                  title="Add owner"
-                                >
-                                  Add Value
-                                </button>
-                              </div>
-                            )}
-                          </div>
-                        </div>
-                      </div>
-                    )}
-                  </div>
-                }
-              </PanelForm>
             </div>
           )}
           {selectedTab === ACTIVATOR_EDITOR_TAB.TAGGED_VALUES && (

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/FunctionEditorState.ts

@@ -54,6 +54,7 @@ import {
   observe_ValueSpecification,
   generateFunctionPrettyName,
   RawVariableExpression,
+  type FunctionActivator,
 } from '@finos/legend-graph';
 import {
   ExecutionPlanState,
@@ -74,6 +75,7 @@ export enum FUNCTION_EDITOR_TAB {
   TAGGED_VALUES = 'TAGGED_VALUES',
   STEREOTYPES = 'STEREOTYPES',
   TEST_SUITES = 'TEST_SUITES',
+  LAMBDAS = 'LAMBDAS',
 }
 
 export class FunctionDefinitionEditorState extends LambdaEditorState {
@@ -314,6 +316,15 @@ export class FunctionEditorState extends ElementEditorState {
     );
   }
 
+  get activators(): FunctionActivator[] {
+    const allActivators =
+      this.editorStore.graphManagerState.graph.functionActivators;
+    return allActivators.filter(
+      (activator: FunctionActivator) =>
+        activator.function.value === this.element,
+    );
+  }
+
   setSelectedTab(tab: FUNCTION_EDITOR_TAB): void {
     this.selectedTab = tab;
   }

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

@@ -33,9 +33,13 @@ 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';
+import {
+  ActionAlertActionType,
+  ActionAlertType,
+} from '@finos/legend-application';
 
 //Ownership
-enum HostedServiceOwnershipType {
+export enum HostedServiceOwnershipType {
   DEPLOYMENT_OWNERSHIP = 'deploymentOwnership',
   USERLIST_OWNERSHIP = 'userListOwnership',
 }
@@ -48,10 +52,6 @@ export const OWNERSHIP_OPTIONS = [
     label: DeploymentOwnershipLabel,
     value: HostedServiceOwnershipType.DEPLOYMENT_OWNERSHIP,
   },
-  {
-    label: UserlistOwnershipLabel,
-    value: HostedServiceOwnershipType.USERLIST_OWNERSHIP,
-  },
 ];
 
 export enum ACTIVATOR_EDITOR_TAB {
@@ -182,13 +182,40 @@ export class HostedServiceFunctionActivatorEditorState extends ElementEditorStat
   *deployToSandbox(): GeneratorFn<void> {
     this.deployState.inProgress();
     try {
-      yield this.editorStore.graphManagerState.graphManager.publishFunctionActivatorToSandbox(
-        this.activator,
-        new InMemoryGraphData(this.editorStore.graphManagerState.graph),
-      );
-      this.editorStore.applicationStore.notificationService.notifySuccess(
-        'Hosted Service Function Activator has been deployed successfully',
-      );
+      yield this.editorStore.graphManagerState.graphManager
+        .publishFunctionActivatorToSandbox(
+          this.activator,
+          new InMemoryGraphData(this.editorStore.graphManagerState.graph),
+        )
+        .then((response) =>
+          this.editorStore.applicationStore.alertService.setActionAlertInfo({
+            message: `Hosted Service Function Activator has been deployed successfully`,
+            prompt: response.deploymentLocation
+              ? 'You can now launch and monitor the operation of your function activator'
+              : undefined,
+            type: ActionAlertType.STANDARD,
+            actions: [
+              ...(response.deploymentLocation !== undefined
+                ? [
+                    {
+                      label: 'Launch Service',
+                      type: ActionAlertActionType.PROCEED,
+                      handler: (): void => {
+                        this.editorStore.applicationStore.navigationService.navigator.visitAddress(
+                          response.deploymentLocation ?? '',
+                        );
+                      },
+                      default: true,
+                    },
+                  ]
+                : []),
+              {
+                label: 'Close',
+                type: ActionAlertActionType.PROCEED_WITH_CAUTION,
+              },
+            ],
+          }),
+        );
     } catch (error) {
       assertErrorThrown(error);
       this.editorStore.applicationStore.notificationService.notifyError(error);

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",