Store resource owner, fix #156

spraakbanken · Mar 18, 2024 · 422f472 · 422f472
1 parent 7188930
commit 422f472
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 3 deletions.
diff --git a/src/api/api.types.ts b/src/api/api.types.ts
@@ -1,4 +1,4 @@
-import type { ByLang } from "@/util.types";
+import type { ByLang, SweEng } from "@/util.types";
 import type { AxiosProgressEvent } from "axios";
 
 /** Properties common to most backend responses */
@@ -61,10 +61,19 @@ export type ResourceInfoOneData = ResourceInfo;
 
 /** Data about a resource and its job status */
 export type ResourceInfo = {
+  owner?: UserData;
   resource: ResourceData;
   job: CorpusStatus;
 };
 
+/** Data about a Mink user */
+export type UserData = {
+  id: string;
+  name: string;
+  email: string;
+  ui_language: SweEng;
+};
+
 /** Basic data about a resource */
 export type ResourceData = {
   type: ResourceType;

diff --git a/src/library/AdminResourcesView.vue b/src/library/AdminResourcesView.vue
@@ -81,7 +81,7 @@ async function load(resourceId: string) {
             <!-- Show a few selected details if loaded -->
             <div class="ml-4">
               <div v-if="'type' in resource" class="flex gap-4">
-                {{ $t(resource.type) }}
+                <span v-if="resource.owner">{{ resource.owner.name }}</span>
                 <span
                   v-if="
                     isCorpus(resource) &&

diff --git a/src/store/resource.store.ts b/src/store/resource.store.ts
@@ -14,6 +14,12 @@ import type { ConfigOptions } from "@/api/corpusConfig";
 export type Resource = {
   type: ResourceType;
   name: ByLang;
+  owner?: User;
+};
+
+export type User = {
+  name: string;
+  id: string;
 };
 
 export type Corpus = Resource & {
@@ -41,7 +47,7 @@ export const useResourceStore = defineStore("resource", () => {
   // current date (YYMMDD) if the state shape is changed, to make the browser
   // forget the old state. The actual number doesn't really matter, as long as
   // it's a new one.
-  const resourcesRef = useStorage("mink@230208.resources", {});
+  const resourcesRef = useStorage("mink@240318.resources", {});
   const resources: Record<string, {} | Resource> = reactive(resourcesRef.value);
 
   const corpora = computed<Record<string, Partial<Corpus>>>(() =>
@@ -83,6 +89,9 @@ export const useResourceStore = defineStore("resource", () => {
     const resource = {
       type: info.resource.type,
       name: info.resource.name,
+      owner: info.owner
+        ? { name: info.owner.name, id: info.owner.id }
+        : undefined,
     };
 
     if (isCorpus(resource)) {
@@ -91,6 +100,7 @@ export const useResourceStore = defineStore("resource", () => {
     }
 
     if (isMetadata(resource)) {
+      resource.owner = info.owner;
       resource.publicId = info.resource.public_id;
     }