fix: minor fixes

determined-ai · Mar 8, 2023 · c216ad3 · c216ad3
1 parent 735c93b
commit c216ad3
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/webui/react/src/components/ExperimentActionDropdown.tsx b/webui/react/src/components/ExperimentActionDropdown.tsx
@@ -74,7 +74,7 @@ const ExperimentActionDropdown: React.FC<Props> = ({
 
   const handleExperimentMove = useCallback(() => {
     openExperimentMove({
-      experimentIds: id ? [id] : undefined,
+      experimentIds: [id],
       sourceProjectId: experiment.projectId,
       sourceWorkspaceId: experiment.workspaceId,
     });

diff --git a/webui/react/src/hooks/useModal/Experiment/useModalExperimentMove.tsx b/webui/react/src/hooks/useModal/Experiment/useModalExperimentMove.tsx
@@ -32,7 +32,7 @@ interface Props {
 }
 
 export interface ShowModalProps {
-  experimentIds?: number[];
+  experimentIds: number[];
   initialModalProps?: ModalFuncProps;
   sourceProjectId?: number;
   sourceWorkspaceId?: number;
@@ -66,7 +66,7 @@ const useModalExperimentMove = ({ onClose }: Props): ModalHooks => {
 
   const { settings: projectSettings, updateSettings: updateProjectSettings } =
     useSettings<ExperimentListSettings>(experimentSettingsConfig);
-  const [experimentIds, setExperimentIds] = useState<number[]>();
+  const [experimentIds, setExperimentIds] = useState<number[]>([]);
   const { canMoveExperimentsTo } = usePermissions();
   const loadableWorkspaces = useWorkspaces({ archived: false });
   const workspaces = Loadable.map(loadableWorkspaces, (ws) =>
@@ -143,7 +143,7 @@ const useModalExperimentMove = ({ onClose }: Props): ModalHooks => {
     const values = await form.validateFields();
     const projId = values.projectId ?? 1;
 
-    if (!experimentIds?.length || !projectSettings.pinned || Loadable.isLoading(projects)) return;
+    if (!experimentIds?.length) return;
 
     const results = await Promise.allSettled(
       experimentIds.map((experimentId) => moveExperimentWithHandler(experimentId, projId)),
@@ -157,7 +157,8 @@ const useModalExperimentMove = ({ onClose }: Props): ModalHooks => {
         ? `Experiment ${experimentIds[0]}`
         : `${experimentIds.length} experiments`;
 
-    const destinationProjectName = projects.data.find((p) => p.id === projId)?.name ?? '';
+    const destinationProjectName =
+      Loadable.getOrElse([], projects).find((p) => p.id === projId)?.name ?? '';
 
     if (numFailures === 0) {
       notification.open({
@@ -227,15 +228,21 @@ const useModalExperimentMove = ({ onClose }: Props): ModalHooks => {
   );
 
   const modalOpen = useCallback(
-    ({ initialModalProps, experimentIds }: ShowModalProps = {}) => {
+    (
+      { initialModalProps, experimentIds, sourceWorkspaceId, sourceProjectId }: ShowModalProps = {
+        experimentIds: [],
+      },
+    ) => {
       setExperimentIds(experimentIds);
+      form.setFieldValue('projectId', sourceProjectId);
+      form.setFieldValue('workspaceId', sourceWorkspaceId);
 
       openOrUpdate({
         ...getModalProps(experimentIds),
         ...initialModalProps,
       });
     },
-    [getModalProps, openOrUpdate],
+    [form, getModalProps, openOrUpdate],
   );
 
   /**