Use default selected datacontext when joining with an existing dataco…

…ntext.
concord-consortium · Sep 15, 2024 · dee2ff7 · dee2ff7
1 parent 78fffcb
commit dee2ff7
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 deletions.
diff --git a/src/App.tsx b/src/App.tsx
@@ -83,7 +83,7 @@ export default class App extends Component {
     const setState = (state: Partial<IState>) => this.setState(state);
     const handleJoinShareIdChange = (event: ChangeEvent<HTMLInputElement>) => this.handleJoinShareIdChange(event);
     const handleDataLabelChange = (event: ChangeEvent<HTMLInputElement>) => this.handleDataLabelChange(event);
-    const joinShare = () => this.joinShare();
+    const joinShare = (dataContextName?: string) => this.joinShare(dataContextName);
     const handleDataContextChange = (event: ChangeEvent<HTMLSelectElement>) => this.handleDataContextChange(event);
     const initiateShare = (selectedContext?: string) => {
       if (selectedContext) {
@@ -381,10 +381,10 @@ export default class App extends Component {
     }
   };
 
-  joinShare = async () => {
+  joinShare = async (dataContextName?: string) => {
     await this.updatePersonalDataLabelAndKey();
-    const {joinShareId: shareId, personalDataKey, personalDataLabel, selectedDataContext,
-      joinAndMergeTable } = this.state;
+    const {joinShareId: shareId, personalDataKey, personalDataLabel, joinAndMergeTable } = this.state;
+    const selectedDataContext = dataContextName ?? this.state.selectedDataContext
 
     this.setState({ isInProcessOfSharing: true });
     try {

diff --git a/src/ui-pages/join-and-merge-table.tsx b/src/ui-pages/join-and-merge-table.tsx
@@ -13,7 +13,7 @@ interface JoinAndMergeTableProps {
   handleDataContextChange: (event: React.ChangeEvent<HTMLSelectElement>) => void;
   handleJoinShareIdChange: (event: React.ChangeEvent<HTMLInputElement>) => void;
   handleDataLabelChange: (event: React.ChangeEvent<HTMLInputElement>) => void;
-  joinShare: () => void;
+  joinShare: (dataContextName?: string) => void;
   updateState: (state: Partial<IState>) => void;
 }
 
@@ -26,13 +26,13 @@ export const JoinAndMergeTable = (props: JoinAndMergeTableProps) => {
       <div className="select-stack">
         <div>{SELECT_TABLE_TO_MERGE}</div>
         {availableContextOptions.length > 0
-            ? <select value={selectedContextOption} onChange={handleDataContextChange}>
-                {availableContextOptions}
-              </select>
-            : <div className="warning">
-                {NO_TABLES_TO_MERGE}
-              </div>
-          }
+          ? <select value={selectedContextOption} onChange={handleDataContextChange}>
+              {availableContextOptions}
+            </select>
+          : <div className="warning">
+              {NO_TABLES_TO_MERGE}
+            </div>
+        }
       </div>
       <div className="input-stack">
         <div>{PROVIDE_NAME_OR_LABEL}</div>
@@ -51,7 +51,9 @@ export const JoinAndMergeTable = (props: JoinAndMergeTableProps) => {
         </button>
         <button
           disabled={!selectedContextOption || !joinShareId || (!personalDataLabel && !lastPersonalDataLabel)}
-          onClick={joinShare}>{BEGIN_COLLABORATION}
+          onClick={() => joinShare(selectedContextOption)}
+        >
+            {BEGIN_COLLABORATION}
         </button>
       </div>
     </div>