fix(user): default to current company in user edit popup

Pass currentCompanyId to Popup so the form defaults to the
currently active company instead of always picking the first
item from companyList.

src/pages/user/Popup.tsx

@@ -29,6 +29,7 @@ export default (props: {
   action: NewAction;
   visible: boolean;
   roleList: API.RolesListItem[];
+  currentCompanyId: number | string;
   companyList: API.CompanyListItem[];
   dataSourceList: API.DataSourceListItem[];
   formValues: Partial<UserListItem | undefined>;
@@ -48,6 +49,7 @@ export default (props: {
     roleList,
     companyList,
     dataSourceList,
+    currentCompanyId,
   } = props;
 
   const dataSourceForm = (
@@ -165,7 +167,7 @@ export default (props: {
             }
           : {
               enabled: true,
-              companyId: companyList[0]?.id,
+              companyId: currentCompanyId || companyList[0]?.id,
             }
       }
       open={visible}

src/pages/user/index.tsx

@@ -412,6 +412,7 @@ const User: React.FC = () => {
         visible={visible}
         formValues={formValues}
         roleList={roleList}
+        currentCompanyId={companyType}
         companyList={companyList}
         dataSourceList={dataSourceList}
         onDone={handleDone}