fix(editor): fix "after back to UserCenter from ElementAssemble->select contribute from market->enter AssembleSpace, canvas size and selected ui controls are reset" bug

Author: yyc-git

defaults/meta3d-commonlib/lib/bs/.bsdeps

@@ -18,4 +18,4 @@ src\log	0x1.a5a64897c2f18p+30
 src\copy	0x1.a5a64897c0e59p+30
 src\contract	0x1.a5a64897bfdf9p+30
 ===
-D:\Github\Meta3D\node_modules\rescript\win32\rescript.exe	0x1.a6afc512ab821p+30
+D:\Github\Meta3D\node_modules\rescript\win32\rescript.exe	0x1.a6b00216aeb1dp+30

defaults/meta3d-commonlib/lib/bs/.compiler.log

@@ -1,2 +1,2 @@
-#Start(32910227)
-#Done(32910235)
+#Start(36813540)
+#Done(36813546)

doc/1.3.1.org

@@ -1685,9 +1685,14 @@ TODO skill data
           # store in s/b_value
 
 
-TODO not error alert
-
-TODO fix: ui miss?
+# TODO feat: add continue assemble button
+# TODO fix button handler: enter assemble 
+TODO fix back to UserCenter
+  TODO fix: canvas size miss
+  TODO fix: ui reset
+  TODO fix: new ui control should update
+    should reset all except element store
+  TODO fix: should keep app name
 
 
 
@@ -1742,6 +1747,9 @@ unitmod
 
 # *** TODO add editor ui
 
+* TODO run element: not error alert while already show error message
+
+
 
 * TODO update
 

platform/frontend/src/external_layer/ui/app/assemble_space/components/AssembleSpace.res

@@ -9,8 +9,15 @@ type view =
   | Package
 
 module Method = {
-  let resetWhenEnter = dispatch => {
-    dispatch(AssembleSpaceStoreType.ResetWhenEnter)
+  let resetWhenEnter = ( dispatch,dispatchForElementAssembleStore, isFromEnter, isFromEdit ) => {
+    ( isFromEnter || isFromEdit ) ? 
+    dispatch(AssembleSpaceStoreType.ResetWhenEnterFromEnter)
+    :
+    { dispatch(AssembleSpaceStoreType.ResetWhenEnter) 
+  dispatchForElementAssembleStore(
+    ElementAssembleStoreType.SetCanvasData(({width: 0, height: 0}: Meta3dType.Index.canvasData)),
+  )
+    }
   }
 
   let _merge = (mergedCustoms, customs) => {
@@ -24,6 +31,14 @@ module Method = {
 
 
 
+
+
+
+
+
+
+
+
 now just remove duplicate one, but need handle more:
 
 
@@ -35,6 +50,22 @@ now just remove duplicate one, but need handle more:
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -48,6 +79,14 @@ compare equal(first length, then all)?{
 
 
 
+
+
+
+
+
+
+
+
 use local input
 
 
@@ -56,6 +95,14 @@ use local input
 
 
 
+
+
+
+
+
+
+
+
 } :{
 
 
@@ -64,6 +111,14 @@ use local input
 
 
 
+
+
+
+
+
+
+
+
 remain one custom input;
 
 
@@ -72,6 +127,14 @@ remain one custom input;
 
 
 
+
+
+
+
+
+
+
+
 rename another custom input's name to add post fix:"_copy";
 
 
@@ -80,6 +143,14 @@ rename another custom input's name to add post fix:"_copy";
 
 
 
+
+
+
+
+
+
+
+
 }
 
 
@@ -88,6 +159,14 @@ rename another custom input's name to add post fix:"_copy";
 
 
 
+
+
+
+
+
+
+
+
  */
     Meta3dCommonlib.ArraySt.removeDuplicateItemsWithBuildKeyFunc((. {name}: CommonType.custom) => {
       name
@@ -124,6 +203,14 @@ rename another custom input's name to add post fix:"_copy";
 
 
 
+
+
+
+
+
+
+
+
 now just replace add duplicate one, but need handle more
 
 
@@ -132,6 +219,14 @@ now just replace add duplicate one, but need handle more
 
 
 
+
+
+
+
+
+
+
+
 */
     customs
     ->Meta3dCommonlib.ListSt.filter((custom: CommonType.custom) => {
@@ -159,6 +254,14 @@ now just replace add duplicate one, but need handle more
 
 
 
+
+
+
+
+
+
+
+
 now just replace add duplicate one, but need handle more
 
 
@@ -167,6 +270,14 @@ now just replace add duplicate one, but need handle more
 
 
 
+
+
+
+
+
+
+
+
 */
     customs
     ->Meta3dCommonlib.ListSt.filter((custom: CommonType.custom) => {
@@ -304,8 +415,7 @@ now just replace add duplicate one, but need handle more
         {protocol, displayName, children}: BackendCloudbaseType.uiControl,
       ) => {
         switch selectedUIControls->Meta3dCommonlib.ArraySt.find(((selectedUIControl, _)) => {
-          selectedUIControl.data.contributePackageData.protocol.name == protocol.name 
-          &&
+          selectedUIControl.data.contributePackageData.protocol.name == protocol.name &&
             Meta3d.Semver.gte(
               Meta3d.Semver.minVersion(
                 selectedUIControl.data.contributePackageData.protocol.version,
@@ -483,7 +593,7 @@ now just replace add duplicate one, but need handle more
     // let mergedCustomInputs = _mergeCustoms(selectedElementsFromMarket)
 
     dispatchForElementAssembleStore(
-      ElementAssembleStoreType.Import(
+      ElementAssembleStoreType.ImportWhenEmpty(
         selectedUIControls,
         _generateSelectedUIControlInspectorData(mergedUIControls, selectedUIControls),
         // mergedCustomInputs,
@@ -513,6 +623,8 @@ let make = (
   ~selectedContributesFromMarket: selectedContributesFromMarket,
   ~selectedElementsFromMarket: selectedElementsFromMarket,
   ~assembleSpaceNavTarget: React.ref<Js.Nullable.t<'a>>,
+  ~isFromEnter: bool,
+  ~isFromEdit: bool,
 ) => {
   let dispatch = service.react.useDispatch()
   let dispatchForAppStore = service.app.useDispatch()
@@ -533,7 +645,7 @@ let make = (
   let (openHelpDrawer, setOpenHelpDrawer) = service.react.useState(_ => false)
 
   service.react.useEffectOnce(() => {
-    Method.resetWhenEnter(dispatch)
+    Method.resetWhenEnter(dispatch, dispatchForElementAssembleStore, isFromEnter, isFromEdit)
 
     MessageUtils.showCatchedErrorMessage(() => {
       let (customInputs, customActions) =

platform/frontend/src/external_layer/ui/app/assemble_space/components/element_assemble/store/ElementAssembleStore.res

@@ -486,7 +486,7 @@ let reducer = (state, action) => {
       data => {
         ...data,
         input: inputNameOpt->Meta3dCommonlib.OptionSt.map((inputName): input => {
-          inputName: inputName,
+          inputName,
           inputParams: params,
         }),
       },
@@ -565,12 +565,19 @@ let reducer = (state, action) => {
   //       },
   //     },
   //   }
-  | Import(selectedUIControls, selectedUIControlInspectorData) => {
-      ...state,
+  | ImportWhenEmpty(
       selectedUIControls,
       selectedUIControlInspectorData,
-      // isImportElement: true,
-    }
+    ) => state.selectedUIControls->Meta3dCommonlib.ListSt.length > 0
+      ? {
+          state
+        }
+      : {
+          ...state,
+          selectedUIControls,
+          selectedUIControlInspectorData,
+          // isImportElement: true, }
+        }
   // | ImportElementCustom(customInputs) => {
   //     ...state,
   //     customInputs,

platform/frontend/src/external_layer/ui/app/assemble_space/store/AssembleSpaceStore.res

@@ -17,6 +17,17 @@ let reducer = (state, action) => {
         PackageAssembleStoreType.ResetWhenEnter,
       ),
     }
+  | ResetWhenEnterFromEnter => {
+      ...state,
+      apAssembleState: ApAssembleStore.reducer(
+        state.apAssembleState,
+        ApAssembleStoreType.ResetWhenEnter,
+      ),
+      packageAssembleState: PackageAssembleStore.reducer(
+        state.packageAssembleState,
+        PackageAssembleStoreType.ResetWhenEnter,
+      ),
+    }
   | ResetWhenSwitch => {
       ...state,
       apAssembleState: ApAssembleStore.reducer(

platform/frontend/src/external_layer/ui/app/assemble_space/utils/AssembleSpaceUtils.res

@@ -1,5 +1,5 @@
-let resetWhenLeave = dispatchForElementAssembleStore => {
-  dispatchForElementAssembleStore(
-    ElementAssembleStoreType.SetCanvasData(({width: 0, height: 0}: Meta3dType.Index.canvasData)),
-  )
-}
+// let resetWhenLeave = dispatchForElementAssembleStore => {
+//   dispatchForElementAssembleStore(
+//     ElementAssembleStoreType.SetCanvasData(({width: 0, height: 0}: Meta3dType.Index.canvasData)),
+//   )
+// }