Tidy

Author: imnasnainaec

Backend.Tests/Mocks/WordRepositoryMock.cs

@@ -137,15 +137,12 @@ public Task<int> CountFrontierWordsWithDomain(string projectId, string domainId,
             var count = 0;
             foreach (var word in _frontier.Where(w => w.ProjectId == projectId))
             {
-                foreach (var sense in word.Senses)
+                if (word.Senses.Any(s => s.SemanticDomains.Any(sd => sd.Id == domainId)))
                 {
-                    if (sense.SemanticDomains.Any(sd => sd.Id == domainId))
+                    count++;
+                    if (maxCount is not null && count >= maxCount)
                     {
-                        count++;
-                        if (maxCount.HasValue && count >= maxCount.Value)
-                        {
-                            return Task.FromResult(maxCount.Value);
-                        }
+                        return Task.FromResult(maxCount.Value);
                     }
                 }
             }

Backend/Services/StatisticsService.cs

@@ -398,7 +398,7 @@ public async Task<double> GetDomainProgressProportion(string projectId, string d
                 return 0.0;
             }
 
-            double count = 0.0;
+            var count = 0.0;
             foreach (var dom in domainAndDescendants)
             {
                 if (await _wordRepo.CountFrontierWordsWithDomain(projectId, dom.Id, 1) > 0)

src/backend/index.ts

@@ -689,16 +689,16 @@ export async function getProgressEstimationLineChartRoot(
   return response.data ?? undefined;
 }
 
-export async function getDomainWordCount(domainId: string): Promise<number> {
-  const response = await statisticsApi.getDomainWordCount(
+export async function getDomainProgress(domainId: string): Promise<number> {
+  const response = await statisticsApi.getDomainProgressProportion(
     { projectId: LocalStorage.getProjectId(), domainId },
     defaultOptions()
   );
   return response.data;
 }
 
-export async function getDomainProgress(domainId: string): Promise<number> {
-  const response = await statisticsApi.getDomainProgressProportion(
+export async function getDomainWordCount(domainId: string): Promise<number> {
+  const response = await statisticsApi.getDomainWordCount(
     { projectId: LocalStorage.getProjectId(), domainId },
     defaultOptions()
   );

src/components/TreeView/TreeDepiction/CurrentRow.tsx

@@ -32,6 +32,7 @@ export default function CurrentRow(props: TreeRowProps): ReactElement {
 
 function CurrentTile(props: TreeRowProps): ReactElement {
   const { animate, currentDomain } = props;
+
   const [senseCount, setSenseCount] = useState<number | undefined>();
   const { t } = useTranslation();
 

src/components/TreeView/TreeDepiction/DomainTileButton.tsx

@@ -84,14 +84,15 @@ export default function DomainTileButton(
   props: DomainTileButtonProps
 ): ReactElement {
   const { onClick, direction, ...domainTileProps } = props;
-  const [progress, setProgress] = useState<number | undefined>();
+
+  const [progress, setProgress] = useState<number>(0);
   const theme = useTheme();
 
   const shouldShowProgress = direction !== Direction.Up;
 
   useEffect(() => {
     if (shouldShowProgress) {
-      setProgress(undefined);
+      setProgress(0);
       getDomainProgress(props.domain.id)
         .then(setProgress)
         .catch(() => {}); // Silently fail
@@ -123,11 +124,10 @@ export default function DomainTileButton(
             sx={{
               backgroundColor: theme.palette.primary.main,
               borderBottomLeftRadius: theme.shape.borderRadius,
-              borderBottomRightRadius:
-                progress === 1 ? theme.shape.borderRadius : 0,
+              borderBottomRightRadius: progress * theme.shape.borderRadius,
               height: "100%",
-              transition: "width 1s ease-in-out",
-              width: `${(progress ?? 0) * 100}%`,
+              transition: "width .75s ease-in-out",
+              width: `${progress * 100}%`,
             }}
           />
         </Box>