Merge pull request #99 from bendera/feat/sync-recents

Feat/sync recents

Author: bendera

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 All notable changes to the "commit-message-editor" extension will be documented in this file.
 
+## [Unreleased]
+
+### Fixed
+
+- Snycronize repository selector instances.
+
 ## [0.24.2] - 2023-05-08
 
 ### Fixed

frontend/src/components/cme-form-view/cme-form-view.ts

@@ -11,13 +11,14 @@ import {
   closeTab,
   copyToSCMInputBox,
   updateTokenValues,
+  recentCommitsRequest,
 } from '../../store/actions';
 import {triggerInputboxRerender} from '../helpers';
 import '../cme-repo-selector';
 import FormBuilder from './FormBuilder';
 import TemplateCompiler from './TemplateCompiler';
 import {CodeEditor} from '../cme-code-editor/cme-code-editor';
-import { RepoSelector } from '../cme-repo-selector';
+import {RepoSelector} from '../cme-repo-selector';
 
 @customElement('cme-form-view')
 export class FormView extends connect(store)(LitElement) {
@@ -127,6 +128,10 @@ export class FormView extends connect(store)(LitElement) {
     this._updateTokenValues();
   }
 
+  private _handleRepositoryChange(ev: CustomEvent<string>) {
+    store.dispatch(recentCommitsRequest(ev.detail));
+  }
+
   private _handleSuccessButtonClick() {
     const compiler = new TemplateCompiler(
       this._dynamicTemplate,
@@ -223,7 +228,10 @@ export class FormView extends connect(store)(LitElement) {
           ${formElements}
         </vscode-form-container>
       </div>
-      <cme-repo-selector id="form-view-repo-selector"></cme-repo-selector>
+      <cme-repo-selector
+        id="form-view-repo-selector"
+        @cme-change=${this._handleRepositoryChange}
+      ></cme-repo-selector>
       <div class="buttons">
         <vscode-button
           id="success-button-form"

frontend/src/components/cme-repo-selector.ts

@@ -6,6 +6,7 @@ import '@bendera/vscode-webview-elements/dist/vscode-icon';
 import '@bendera/vscode-webview-elements/dist/vscode-single-select';
 import '@bendera/vscode-webview-elements/dist/vscode-option';
 import store, {RootState} from '../store/store';
+import {changeSelectedRepository} from '../store/actions';
 
 @customElement('cme-repo-selector')
 export class RepoSelector extends connect(store)(LitElement) {
@@ -43,13 +44,14 @@ export class RepoSelector extends connect(store)(LitElement) {
   private _handleChange(
     ev: CustomEvent<{selectedIndex: number; value: string}>
   ) {
-    this._selectedRepositoryPath = ev.detail.value;
-
+    const path = ev.detail.value;
     const changeEvent = new CustomEvent('cme-change', {
-      detail: ev.detail.value,
+      detail: path,
     });
 
+    this._selectedRepositoryPath = path;
     this.dispatchEvent(changeEvent);
+    store.dispatch(changeSelectedRepository(path));
   }
 
   static get styles(): CSSResult {
@@ -72,13 +74,13 @@ export class RepoSelector extends connect(store)(LitElement) {
     return html`<div class="repo-info">
       <vscode-icon name="repo"></vscode-icon>&nbsp;
       <b>Selected repository:</b>&nbsp;
-      <vscode-single-select @vsc-change=${this._handleChange}>
+      <vscode-single-select
+        @vsc-change=${this._handleChange}
+        .value=${this._selectedRepositoryPath}
+      >
         ${this._availableRepositories.map(
           (r) =>
-            html`<vscode-option
-              description=${r}
-              value=${r}
-              ?selected=${this._selectedRepositoryPath === r}
+            html`<vscode-option description=${r} value=${r}
               >${this._getNameFromPath(r)}</vscode-option
             >`
         )}

frontend/src/components/cme-text-view.ts

@@ -118,6 +118,10 @@ export class TextView extends connect(store)(LitElement) {
     store.dispatch(textareaValueChanged(ev.detail));
   }
 
+  private _handleRepositoryChange(ev: CustomEvent<string>) {
+    store.dispatch(recentCommitsRequest(ev.detail));
+  }
+
   stateChanged(state: RootState): void {
     const {config} = state;
     const {
@@ -267,7 +271,10 @@ export class TextView extends connect(store)(LitElement) {
         </p>
       </div>
       ${this._useMonospaceEditor ? monospaceEditor : inputbox}
-      <cme-repo-selector id="text-view-repo-selector"></cme-repo-selector>
+      <cme-repo-selector
+        id="text-view-repo-selector"
+        @cme-change=${this._handleRepositoryChange}
+      ></cme-repo-selector>
       <div class="buttons">
         <vscode-button @click="${this._handleSuccessButtonClick}"
           >${this._saveAndClose ? 'Save and close' : 'Save'}</vscode-button

frontend/src/store/actions.ts

@@ -10,6 +10,7 @@ export const CONFIRM_AMEND = 'CONFIRM_AMEND';
 export const COPY_TO_SCM_INPUT_BOX = 'COPY_TO_SCM_INPUT_BOX';
 export const REPOSITORY_INFO_RECEIVED = 'REPOSITORY_INFO_RECEIVED';
 export const UPDATE_TOKEN_VALUES = 'UPDATE_TOKEN_VALUES';
+export const CHANGE_SELECTED_REPOSITORY = 'CHANGE_SELECTED_REPOSITORY';
 
 export const IMPORT_CONFIG = 'IMPORT_CONFIG';
 export const SHAREABLE_CONFIG_CHANGED = 'SHAREABLE_CONFIG_CHANGED';
@@ -24,7 +25,9 @@ export const SHAREABLE_CONFIG_DYNAMIC_TEMPLATE_CHANGE =
 export const CHANGE_STATUS_MESSAGE = 'CHANGE_STATUS_MESSAGE';
 
 export const receiveConfig = createAction<ExtensionConfig>(RECEIVE_CONFIG);
-export const recentCommitsRequest = createAction(RECENT_COMMITS_REQUEST);
+export const recentCommitsRequest = createAction<string | undefined>(
+  RECENT_COMMITS_REQUEST
+);
 export const recentCommitsReceived = createAction<Commit[]>(
   RECENT_COMMITS_RECEIVED
 );
@@ -44,6 +47,9 @@ export const receiveRepositoryInfo = createAction<RepositoryInfo>(
 export const updateTokenValues = createAction<{[key: string]: string}>(
   UPDATE_TOKEN_VALUES
 );
+export const changeSelectedRepository = createAction<string>(
+  CHANGE_SELECTED_REPOSITORY
+);
 
 export const importConfig = createAction(IMPORT_CONFIG);
 export const shareableConfigChange = createAction<ShareableConfig>(

frontend/src/store/middlewares/postMessageDispatcher.ts

@@ -18,6 +18,7 @@ export const postMessageDispatcher: Middleware = (_) => (next) => (action) => {
     case RECENT_COMMITS_REQUEST:
       vscode.postMessage({
         command: 'requestRecentCommits',
+        payload: payload ? payload : '',
       });
       break;
     case CLOSE_TAB:

frontend/src/store/reducers.ts

@@ -15,6 +15,7 @@ import {
   TEXTAREA_VALUE_CHANGED,
   UPDATE_TOKEN_VALUES,
   CHANGE_STATUS_MESSAGE,
+  CHANGE_SELECTED_REPOSITORY,
 } from './actions';
 
 export const createInitialState = (): RootState => ({
@@ -94,6 +95,9 @@ export const rootReducer = createReducer(initialState, {
     const {payload} = action;
     state.tokenValues = payload;
   },
+  [CHANGE_SELECTED_REPOSITORY]: (state: RootState, action) => {
+    state.selectedRepositoryPath = action.payload as string;
+  },
   [SHAREABLE_CONFIG_CHANGED]: (state: RootState, action) => {
     const {payload} = action;
     const {staticTemplate = '', dynamicTemplate = '', tokens = []} = payload;

src/commands/EditorController.ts

@@ -131,7 +131,7 @@ export default class EditorController {
         this._ui?.sendConfig(cfg);
         break;
       case 'requestRecentCommits':
-        this._populateCommitList();
+        this._populateCommitList(payload as string);
         break;
       case 'confirmAmend':
         this._confirmAmend(payload);
@@ -144,9 +144,9 @@ export default class EditorController {
     }
   }
 
-  private _populateCommitList() {
+  private _populateCommitList(path = '') {
     this._git
-      .getRecentCommitMessages(10)
+      .getRecentCommitMessages(10, path)
       .then((commits) => {
         this._ui?.sendRecentCommits(commits);
       })

src/utils/GitService.ts

@@ -138,8 +138,17 @@ class GitService {
     return log;
   }
 
-  public async getRecentCommitMessages(limit: number = 32) {
-    const repo = this.getSelectedRepository();
+  public async getRecentCommitMessages(
+    limit: number = 32,
+    repositoryPath: string
+  ) {
+    let repo: Repository | undefined;
+
+    if (repositoryPath === '') {
+      repo = this.getSelectedRepository();
+    } else {
+      repo = this.getRepositoryByPath(repositoryPath);
+    }
 
     if (!repo) {
       return [];