fix: FormEditorWidget to update property view correctly on selection

Author: remonaadite009

packages/form-client/src/browser/form-editor-widget.tsx

@@ -3,9 +3,10 @@
  ********************************************************************************/
 
 import { CrossModelWidget, CrossModelWidgetOptions } from '@crossmodel/core/lib/browser';
-import { NavigatableWidget, NavigatableWidgetOptions, StatefulWidget } from '@theia/core/lib/browser';
+import { Message, NavigatableWidget, NavigatableWidgetOptions, StatefulWidget } from '@theia/core/lib/browser';
 import { CommonCommands } from '@theia/core/lib/browser/common-frontend-contribution';
 import { CommandService } from '@theia/core/lib/common/command';
+import { SelectionService } from '@theia/core/lib/common/selection-service';
 import URI from '@theia/core/lib/common/uri';
 import { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
 
@@ -20,7 +21,10 @@ export class FormEditorWidget extends CrossModelWidget implements NavigatableWid
    @inject(CommandService)
    protected readonly commandService: CommandService;
 
-   protected override handleOpenRequest = undefined; // we do not need to support opening in editor, we are the editor
+   @inject(SelectionService)
+   protected readonly selectionService: SelectionService;
+
+   protected override handleOpenRequest = undefined;
 
    protected override getModelProviderProps(): any {
       const props = super.getModelProviderProps();
@@ -54,4 +58,9 @@ export class FormEditorWidget extends CrossModelWidget implements NavigatableWid
    restoreState(oldState: object | undefined): void {
       // nothing to restore
    }
+
+   protected override onActivateRequest(msg: Message): void {
+      super.onActivateRequest(msg);
+      this.selectionService.selection = { sourceUri: this.getResourceUri().toString() };
+   }
 }

packages/property-view/src/browser/model-property-widget.tsx

@@ -26,6 +26,16 @@ export class ModelPropertyWidget extends CrossModelWidget implements PropertyVie
    }
 
    async updatePropertyViewContent(propertyDataService?: PropertyDataService, selection?: GlspSelection | undefined): Promise<void> {
+      const selectionData = selection as any;
+      if (selectionData?.sourceUri && !GlspSelection.is(selection)) {
+         const uri = selectionData.sourceUri;
+         if (this.document?.uri.toString() !== uri) {
+            this.renderData = undefined;
+            await this.setModel(uri);
+         }
+         return;
+      }
+
       const activeWidget = getDiagramWidget(this.shell);
       if (activeWidget?.options.uri === this.document?.uri.toString() && this.document?.uri.toString() !== selection?.sourceUri) {
          // only react to selection of active widget
@@ -35,11 +45,11 @@ export class ModelPropertyWidget extends CrossModelWidget implements PropertyVie
          const renderData = (await propertyDataService.providePropertyData(selection)) as PropertiesRenderData | undefined;
          if (this.document?.uri.toString() !== renderData?.uri || !deepEqual(this.renderData, renderData)) {
             this.renderData = renderData;
-            this.setModel(renderData?.uri);
+            await this.setModel(renderData?.uri);
          }
       } else {
          this.renderData = undefined;
-         this.setModel();
+         await this.setModel();
       }
    }