#278: Fixes differences from new dev branch

Moves the whole sumCommits plugin into the respective category, adds the missing metadata field to properly display it again, fixes new way to fetch the users, adds missing type keyword for imports

Author: DominikKidery

binocular-frontend-new/src/plugins/pluginRegistry.ts

@@ -16,7 +16,7 @@ import type { BuildSettings } from './visualizationPlugins/builds/builds/src/set
 import type { TimeSpentSettings } from './visualizationPlugins/authorBehaviour/timeSpent/src/settings/settings.tsx';
 import type { ChangesSettings } from './visualizationPlugins/commits/changes/src/settings/settings.tsx';
 import type { MergeRequestsSettings } from './visualizationPlugins/issues/mergeRequests/src/settings/settings.tsx';
-import { SumSettings } from './visualizationPlugins/simpleVisualizationPlugin/src/settings/settings.tsx';
+import type { SumSettings } from './visualizationPlugins/simpleVisualizationPlugin/src/settings/settings.tsx';
 import Builds from './visualizationPlugins/builds/builds';
 import Changes from './visualizationPlugins/commits/changes/src/index.tsx';
 import Issues from './visualizationPlugins/issues/issues';
@@ -35,7 +35,7 @@ import CodeExpertise from './visualizationPlugins/expertise/codeExpertise';
 import RepositoryActivity from './visualizationPlugins/authorBehaviour/repositoryActivity';
 import Sprints from './visualizationPlugins/issues/sprints';
 import Burndown from './visualizationPlugins/issues/burndown';
-import SumCommits from './visualizationPlugins/sumCommits';
+import SumCommits from './visualizationPlugins/commits/sumCommits';
 
 // should currently work for commits, but fetching the data is still hardcoded to one or the other
 const changes = createVisualizationPlugin<ChangesSettings, DataPluginCommit>(Changes);

…onPlugins/sumCommits/assets/thumbnail.ai …s/commits/sumCommits/assets/thumbnail.aibinocular-frontend-new/src/plugins/visualizationPlugins/sumCommits/assets/thumbnail.ai renamed to binocular-frontend-new/src/plugins/visualizationPlugins/commits/sumCommits/assets/thumbnail.ai binocular-frontend-new/src/plugins/visualizationPlugins/sumCommits/assets/thumbnail.ai renamed to binocular-frontend-new/src/plugins/visualizationPlugins/commits/sumCommits/assets/thumbnail.ai

@@ -0,0 +1,41 @@
+import PreviewImage from '../assets/thumbnail.svg';
+import Settings, { type SettingsType } from './settings/settings.tsx';
+import type { VisualizationPlugin } from '../../../../interfaces/visualizationPlugin.ts';
+import { getSVGData } from './utilities/utilities.ts';
+import Reducer from '../../../simpleVisualizationPlugin/src/reducer';
+import Saga from './saga';
+import Help from './help/help.tsx';
+import { convertToChartData } from './utilities/dataConverter.ts';
+import type { DataPluginCommit } from '../../../../interfaces/dataPluginInterfaces/dataPluginCommits.ts';
+import { VisualizationPluginMetadataCategory } from '../../../../interfaces/visualizationPluginInterfaces/visualizationPluginMetadata';
+
+const SumCommits: VisualizationPlugin<SettingsType, DataPluginCommit> = {
+  name: 'SumCommits',
+  // ts-expect-error
+  chartComponent: undefined,
+  settingsComponent: Settings,
+  helpComponent: Help,
+  dataConverter: convertToChartData,
+  dataConnectionName: 'commits',
+  defaultSettings: { showMean: false, showOther: false },
+  export: {
+    getSVGData: getSVGData,
+  },
+  capabilities: {
+    popoutOnly: false,
+    export: true,
+  },
+  images: {
+    thumbnail: PreviewImage,
+  },
+  metadata: {
+    category: VisualizationPluginMetadataCategory.Commits,
+    recommended: false,
+    description: 'A bar chart which shows how manny commits each author has contributed over the time.',
+    compatibility: { binocularBackend: true, githubAPI: true, mockData: true, pouchDB: true, github: true, gitlab: true },
+  },
+  reducer: Reducer,
+  saga: Saga,
+};
+
+export default SumCommits;

…nPlugins/sumCommits/assets/thumbnail.svg …/commits/sumCommits/assets/thumbnail.svgbinocular-frontend-new/src/plugins/visualizationPlugins/sumCommits/assets/thumbnail.svg renamed to binocular-frontend-new/src/plugins/visualizationPlugins/commits/sumCommits/assets/thumbnail.svg binocular-frontend-new/src/plugins/visualizationPlugins/sumCommits/assets/thumbnail.svg renamed to binocular-frontend-new/src/plugins/visualizationPlugins/commits/sumCommits/assets/thumbnail.svg

@@ -1,5 +1,5 @@
-import { createSlice, PayloadAction } from '@reduxjs/toolkit';
-import { DataPluginCommit } from '../../../../interfaces/dataPluginInterfaces/dataPluginCommits.ts';
+import { createSlice, type PayloadAction } from '@reduxjs/toolkit';
+import type {DataPluginCommit} from '../../../../../interfaces/dataPluginInterfaces/dataPluginCommits.ts';
 
 export enum DataState {
   EMPTY,

…alizationPlugins/sumCommits/package.json …nPlugins/commits/sumCommits/package.jsonbinocular-frontend-new/src/plugins/visualizationPlugins/sumCommits/package.json renamed to binocular-frontend-new/src/plugins/visualizationPlugins/commits/sumCommits/package.json binocular-frontend-new/src/plugins/visualizationPlugins/sumCommits/package.json renamed to binocular-frontend-new/src/plugins/visualizationPlugins/commits/sumCommits/package.json

@@ -1,7 +1,7 @@
 import { put, takeEvery, fork, call, select, throttle } from 'redux-saga/effects';
-import { SumCommitsState, DataState, setCommits, setDataState, setDateRange } from '../reducer';
-import { DataPlugin } from '../../../../interfaces/dataPlugin.ts';
-import { DataPluginCommit } from '../../../../interfaces/dataPluginInterfaces/dataPluginCommits.ts';
+import { type SumCommitsState, DataState, setCommits, setDataState, setDateRange } from '../reducer';
+import type { DataPlugin } from '../../../../../interfaces/dataPlugin.ts';
+import type { DataPluginCommit } from '../../../../../interfaces/dataPluginInterfaces/dataPluginCommits.ts';
 
 export default function* (dataConnection: DataPlugin) {
   yield fork(() => watchRefresh(dataConnection));

…tionPlugins/sumCommits/src/help/help.tsx …ins/commits/sumCommits/src/help/help.tsxbinocular-frontend-new/src/plugins/visualizationPlugins/sumCommits/src/help/help.tsx renamed to binocular-frontend-new/src/plugins/visualizationPlugins/commits/sumCommits/src/help/help.tsx binocular-frontend-new/src/plugins/visualizationPlugins/sumCommits/src/help/help.tsx renamed to binocular-frontend-new/src/plugins/visualizationPlugins/commits/sumCommits/src/help/help.tsx

@@ -1,4 +1,6 @@
-import { useEffect, useState } from 'react';
+import { useEffect, useMemo, useState } from 'react';
+import type { RootState } from '../../../../../../redux';
+import { useSelector } from 'react-redux';
 
 export interface SettingsType {
   showMean: boolean;
@@ -9,13 +11,25 @@ export interface SettingsType {
 interface SettingsProps {
   settings: SettingsType;
   setSettings: (newSettings: SettingsType) => void;
-  users: string[];
 }
 
-function Settings({ settings, setSettings, users }: SettingsProps) {
+function Settings({ settings, setSettings }: SettingsProps) {
+  const authors = useSelector((s: RootState) => {
+    const id = s.authors.dataPluginId;
+
+    return id == null ? [] : (s.authors.authorLists[id] ?? []);
+  });
+
+  const users = useMemo(
+    () => authors.map((a) => a.displayName ?? a.user?.gitSignature ?? a.user?.name ?? a.user?.id).filter(Boolean) as string[],
+    [authors],
+  );
+
   const [selectedUsers, setSelectedUsers] = useState<string[]>([]);
 
-  useEffect(() => setSelectedUsers(users), [users]);
+  useEffect(() => {
+    setSelectedUsers(users);
+  }, [users]);
 
   const toggleUser = (user: string) => {
     if (selectedUsers.includes(user)) {
@@ -100,15 +114,15 @@ function Settings({ settings, setSettings, users }: SettingsProps) {
       </div>
 
       <button
-        className="btn btn-accent btn-sm"
+        className="btn btn-accent btn-sm mt-6"
         disabled={selectedUsers.length < 2}
         onClick={() => {
           combineUsers();
         }}>
         Combine
       </button>
 
-      <button className="btn btn-accent btn-sm" onClick={uncombineUsers} style={{ marginLeft: '0.5rem' }}>
+      <button className="btn btn-accent btn-sm mt-6" onClick={uncombineUsers} style={{ marginLeft: '0.5rem' }}>
         Uncombine
       </button>
     </>

binocular-frontend-new/src/plugins/visualizationPlugins/commits/sumCommits/src/index.tsx

@@ -1,10 +1,10 @@
 import moment from 'moment/moment';
 import chroma from 'chroma-js';
 import _ from 'lodash';
-import { DataPluginCommit } from '../../../../interfaces/dataPluginInterfaces/dataPluginCommits.ts';
-import { AuthorType } from '../../../../../types/data/authorType.ts';
-import { Properties } from '../../../simpleVisualizationPlugin/src/interfaces/properties.ts';
-import { SettingsType } from '../settings/settings.tsx';
+import type { DataPluginCommit } from '../../../../../interfaces/dataPluginInterfaces/dataPluginCommits.ts';
+import type { AuthorType } from '../../../../../../types/data/authorType.ts';
+import type { VisualizationPluginProperties } from '../../../../../interfaces/visualizationPluginInterfaces/visualizationPluginProperties.ts';
+import type { SettingsType } from '../settings/settings.tsx';
 
 interface BarChartData {
   user: string;
@@ -19,7 +19,7 @@ interface Palette {
 
 export function convertToChartData(
   commits: DataPluginCommit[],
-  props: Properties<SettingsType, DataPluginCommit>,
+  props: VisualizationPluginProperties<SettingsType, DataPluginCommit>,
 ): {
   chartData: BarChartData[];
   scale: number[];