Merge branch 'develop'

Author: billy clark

Makefile

@@ -74,6 +74,10 @@ next-dev: build
 build-next:
 	docker compose build next-proxy next-app
 
+.PHONY: build-base-php
+build-base-php:
+	docker build -t sillsdev/web-languageforge:base-php -f docker/base-php/Dockerfile .
+
 .PHONY: clean
 clean:
 	docker compose down

next-app/src/lib/stats/Stat.svelte

@@ -1,11 +1,16 @@
 <script>
+    import { goto } from '$app/navigation'
+
 	export let title
 	export let value
 	export let icon = undefined
+	export let href = undefined
+
+	const clicked = () => href ? goto(href) : {}
 </script>
 
 <!-- https://daisyui.com/components/stat/ -->
-<div class='stat place-items-center'>
+<div class='stat place-items-center' class:href on:click={ clicked }>
 	<dt class=stat-title>{ title }</dt>
 	<dd class='stat-value text-primary'>{ value }</dd>
 
@@ -15,3 +20,9 @@
 		</div>
 	{/if}
 </div>
+
+<style>
+	.href {
+		cursor: pointer;
+	}
+</style>

next-app/src/routes/projects/[project_code]/+page.svelte

@@ -22,28 +22,32 @@
 	$: stats = [
 		{
 			title: 'Users',
-			value: Number(project.num_users).toLocaleString(),
+			value: project.num_users,
 			icon: PeopleIcon,
 		},
 		{
 			title: 'Entries',
-			value: Number(project.num_entries).toLocaleString(),
+			value: project.num_entries,
 			icon: NotesIcon,
+			url: `/app/lexicon/${ project.id }`,
 		},
 		{
 			title: 'Entries with audio',
-			value: Number(project.num_entries_with_audio).toLocaleString(),
+			value: project.num_entries_with_audio,
 			icon: VoiceIcon,
+			url: `/app/lexicon/${ project.id }#!/editor/entry/000000?filterBy=Audio`,
 		},
 		{
 			title: 'Entries with pictures',
-			value: Number(project.num_entries_with_pictures).toLocaleString(),
+			value: project.num_entries_with_pictures,
 			icon: ImagesIcon,
+			url: `/app/lexicon/${ project.id }#!/editor/entry/000000?filterBy=Pictures`,
 		},
 		{
 			title: 'Unresolved comments',
-			value: Number(project.num_unresolved_comments).toLocaleString(),
+			value: project.num_unresolved_comments,
 			icon: MessageAlertIcon,
+			url: `/app/lexicon/${ project.id }#!/editor/entry/000000?filterBy=Comments`,
 		},
 	]
 
@@ -67,8 +71,8 @@
 </PageHeader>
 
 <Stats class=max-w-full>
-	{#each stats as { title, value, icon }}
-		<Stats.Stat { title } { value } { icon } />
+	{#each stats as { title, value, icon, url }}
+		<Stats.Stat { title } value={ Number(value).toLocaleString() } { icon } href={ value && url } />
 	{/each}
 </Stats>
 

next-app/src/routes/projects/[project_code]/meta/+server.ts

@@ -1,13 +1,9 @@
 import { sf } from '$lib/fetch/server'
 
 export async function get({ project_code, cookie }) {
-	const [
-		{ id, projectName: name, users },
-		{ entries, comments }
-	] = await Promise.all([
-		sf({ name: 'project_read_by_code', args: [ project_code ], cookie }),
-		sf({ name: 'lex_stats_all', args: [ project_code ], cookie }),
-	])
+	const { id, projectName: name, users } = await sf({ name: 'set_project', args: [ project_code ], cookie })
+
+	const { entries, comments } = await sf({ name: 'lex_stats', cookie })
 
 	const entries_with_picture = entries.filter(has_picture)
 	const entries_with_audio = entries.filter(has_audio)

src/Api/Model/Shared/Dto/RightsHelper.php

@@ -134,7 +134,7 @@ public function userCanAccessMethod($methodName)
 
             case "message_send":
             case "project_read":
-            case "project_read_by_code":
+            case "set_project":
             case "project_settings":
             case "project_updateSettings":
             case "project_readSettings":
@@ -234,7 +234,6 @@ public function userCanAccessMethod($methodName)
             case "lex_dbeDtoFull":
             case "lex_dbeDtoUpdatesOnly":
             case "lex_stats":
-            case "lex_stats_all":
                 return $this->userHasProjectRight(Domain::ENTRIES + Operation::VIEW);
 
             // case 'lex_entry_read':

src/Api/Service/Sf.php

@@ -491,13 +491,20 @@ public function project_read($id)
         return ProjectCommands::readProject($id);
     }
 
-    public function project_read_by_code($projectCode)
+    public function set_project($projectCode)
     {
         $projectModel = ProjectModel::getByProjectCode($projectCode);
+        $projectId = $projectModel->id->asString();
         $user = new UserModel($this->userId);
-        if ($user->isMemberOfProject($projectModel->id->asString())) {
-            return $this->project_read($projectModel->id->asString());
+
+        if ($user->isMemberOfProject($projectId)) {
+            $this->app["session"]->set("projectId", $projectId);
+
+            $projectModel->id = $projectId;
+
+            return $projectModel;
         }
+
         throw new UserUnauthorizedException("User $this->userId is not a member of project $projectCode");
     }
 
@@ -555,28 +562,16 @@ public function lex_projectDto()
         return LexProjectDto::encode($this->projectId);
     }
 
-    public function lex_stats($projectCode)
+    public function lex_stats()
     {
-        $projectModel = ProjectModel::getByProjectCode($projectCode);
-        $user = new UserModel($this->userId);
-
-        if ($user->isMemberOfProject($projectModel->id->asString())) {
-            return LexDbeDto::encode($projectModel->id->asString(), $this->userId);
-        }
-
-        throw new UserUnauthorizedException("User $this->userId is not a member of project $projectCode");
-    }
-
-    public function lex_stats_all($projectCode)
-    {
-        $projectModel = ProjectModel::getByProjectCode($projectCode);
+        $projectModel = ProjectModel::getById($this->projectId);
         $user = new UserModel($this->userId);
 
-        if ($user->isMemberOfProject($projectModel->id->asString())) {
+        if ($user->isMemberOfProject($this->projectId)) {
             return LexDbeDto::encode($projectModel->id->asString(), $this->userId, 1);
         }
 
-        throw new UserUnauthorizedException("User $this->userId is not a member of project $projectCode");
+        throw new UserUnauthorizedException("User $this->userId is not a member of project $projectModel->projectCode");
     }
 
     public function lex_dbeDtoFull($browserId, $offset)
@@ -833,6 +828,7 @@ private static function isAnonymousMethod($methodName)
             "user_calculate_username",
             "check_unique_identity",
             "session_getSessionData",
+            "set_project",
         ];
         return in_array($methodName, $methods);
     }

src/angular-app/bellows/apps/projects/projects-app.component.html

@@ -50,8 +50,6 @@
                         <div class="col-md-4">
                             <a data-ng-show="$ctrl.isInProject(project)" data-ng-href="/app/lexicon/{{project.id}}">
                                 <span class="larger-text">{{project.projectName}}</span></a>
-                            <a data-ng-show="$ctrl.isInProject(project)" data-ng-href="/projects/{{project.projectCode}}">
-                                <span>(Dashboard)</span></a>
                             <span data-ng-show="!$ctrl.isInProject(project)" class="larger-text">{{project.projectName}}</span>
                             <small class="text-muted"> {{project.projectCode}}</small>
                         </div>