Merge pull request #275 from ThePhisch/feature-270-show_error_in_stre…

…amedtable Feature 270 show error in streamedtable
rucio · Aug 4, 2023 · 08fc9e6 · 08fc9e6
2 parents 4af6973 + 85498de
commit 08fc9e6
Show file tree

Hide file tree

Showing 64 changed files with 541 additions and 371 deletions.
diff --git a/src/app/did/list/page.tsx b/src/app/did/list/page.tsx
@@ -6,7 +6,7 @@ import { DIDMetaViewModel, DIDViewModel } from "@/lib/infrastructure/data/view-m
 import useComDOM from "@/lib/infrastructure/hooks/useComDOM";
 import { HTTPRequest, prepareRequestArgs } from "@/lib/sdk/http";
 import { useEffect, useState } from "react";
-import { createDIDMeta } from "test/fixtures/table-fixtures";
+import { fixtureDIDMetaViewModel } from "test/fixtures/table-fixtures";
 
 export default function Page() {
     const [didMetaQueryResponse, setDIDMetaQueryResponse] = useState<DIDMetaViewModel>({} as DIDMetaViewModel)
@@ -59,7 +59,7 @@ export default function Page() {
         true
     )
     useEffect(() => {
-        setDIDMetaQueryResponse({ status: 'success', ...createDIDMeta() })
+        setDIDMetaQueryResponse(fixtureDIDMetaViewModel())
     }, [])
     useEffect(() => {
         const setRequest = async () => {

diff --git a/src/app/did/page.tsx b/src/app/did/page.tsx
diff --git a/src/app/did/page/[scope]/[name]/page.tsx b/src/app/did/page/[scope]/[name]/page.tsx
@@ -1,30 +1,28 @@
 'use client';
 import { PageDID as PageDIDStory } from '@/component-library/Pages/DID/PageDID';
-import { DIDMeta } from "@/lib/core/entity/rucio";
-import { FilereplicaState, FilereplicaStateD } from '@/lib/infrastructure/data/view-model/page-did';
 import useComDOM from "@/lib/infrastructure/hooks/useComDOM";
 import { useEffect, useState } from "react";
-import { createDIDDatasetReplicas, createDIDMeta, createDIDRules, mockUseComDOM } from 'test/fixtures/table-fixtures';
-import { DID } from '@/lib/core/entity/rucio';
+import { fixtureDIDDatasetReplicasViewModel, fixtureDIDMetaViewModel, fixtureDIDRulesViewModel, mockUseComDOM, fixtureDIDKeyValuePairsViewModel } from 'test/fixtures/table-fixtures';
 import { HTTPRequest } from "@/lib/sdk/http";
+import { DIDMetaViewModel, DIDViewModel, FilereplicaStateDViewModel, FilereplicaStateViewModel } from '@/lib/infrastructure/data/view-model/did';
 
 export default function Page({ params }: { params: { scope: string, name: string } }) {
-    const [didMeta, setDIDMeta] = useState<DIDMeta>({} as DIDMeta)
+    const [didMeta, setDIDMeta] = useState<DIDMetaViewModel>({} as DIDMetaViewModel)
     const [fromDidList, setFromDidList] = useState<string>("yosearch")
     useEffect(() => {
-        setDIDMeta({ ...createDIDMeta(), name: params.name, scope: params.scope, } as DIDMeta)
+        setDIDMeta(fixtureDIDMetaViewModel())
     }, [])
 
-    const didParentsComDOM = useComDOM<DID>(
+    const didParentsComDOM = useComDOM<DIDViewModel>(
         'page-did-parents-query', [], false, Infinity, 200, true
     )
-    const didContentsComDOM = useComDOM<DID>(
+    const didContentsComDOM = useComDOM<DIDViewModel>(
         'page-did-contents-query', [], false, Infinity, 200, true
     )
-    const didFileReplicasComDOM = useComDOM<FilereplicaState>(
+    const didFileReplicasComDOM = useComDOM<FilereplicaStateViewModel>(
         'page-did-filereplicas-query', [], false, Infinity, 200, true
     )
-    const didFileReplicasDComDOM = useComDOM<FilereplicaStateD>(
+    const didFileReplicasDComDOM = useComDOM<FilereplicaStateDViewModel>(
         'page-did-filereplicas-d-query', [], false, Infinity, 200, true
     )
     useEffect(() => {
@@ -68,17 +66,9 @@ export default function Page({ params }: { params: { scope: string, name: string
         }
         setRequests()
     }, [])
-    const didMetadataComDOM = mockUseComDOM([
-        { key: "bernd", value: "das brot" },
-        { key: "kika", value: "der sender" },
-        { key: "kikaninchen", value: "das tier" },
-        { key: "my birthday", value: (new Date(2021, 3)).toISOString() },
-        { key: "am_i_anton", value: false },
-        { key: "R1-tastefactor", value: 3.142 },
-        { key: "hello", value: null },
-    ])
-    const didRulesComDOM = mockUseComDOM(Array.from({ length: 100 }, (_, i) => createDIDRules()))
-    const didDatasetReplicasComDOM = mockUseComDOM(Array.from({ length: 100 }, (_, i) => createDIDDatasetReplicas()))
+    const didMetadataComDOM = mockUseComDOM(Array.from({ length: 100 }, (_, i) => fixtureDIDKeyValuePairsViewModel()))
+    const didRulesComDOM = mockUseComDOM(Array.from({ length: 100 }, (_, i) => fixtureDIDRulesViewModel()))
+    const didDatasetReplicasComDOM = mockUseComDOM(Array.from({ length: 100 }, (_, i) => fixtureDIDDatasetReplicasViewModel()))
     return (
         <PageDIDStory
             didMeta={didMeta}

diff --git a/src/app/rse/list/page.tsx b/src/app/rse/list/page.tsx
@@ -1,10 +1,10 @@
 'use client';
 import { ListRSE as ListRSEStory } from "@/component-library/Pages/RSE/ListRSE";
-import { mockUseComDOM, createRSE } from "test/fixtures/table-fixtures";
+import { mockUseComDOM, fixtureRSEViewModel } from "test/fixtures/table-fixtures";
 export default function Page() {
     return (
         <ListRSEStory
-            comdom={mockUseComDOM(Array.from({ length: 100 }, () => createRSE()))} // replace with ViewModel
+            comdom={mockUseComDOM(Array.from({ length: 100 }, () => fixtureRSEViewModel()))} // replace with ViewModel
         />
     )
 }

diff --git a/src/app/rse/page/[id]/page.tsx b/src/app/rse/page/[id]/page.tsx
@@ -1,15 +1,15 @@
 'use client';
 import { PageRSE as PageRSEStory } from "@/component-library/Pages/RSE/PageRSE";
 import { RSEBlockState } from "@/lib/core/entity/rucio";
-import { createRSE, mockUseComDOM } from "test/fixtures/table-fixtures";
-import { createRSEProtocol, createRSEAttribute } from "test/fixtures/table-fixtures";
+import { fixtureRSEViewModel, mockUseComDOM } from "test/fixtures/table-fixtures";
+import { fixtureRSEProtocolViewModel, fixtureRSEAttributeViewModel } from "test/fixtures/table-fixtures";
 export default function Page({ params }: { params: { id: string } }) {
     return (
         <PageRSEStory
-            rse={{ ...createRSE(), id: params.id }}
+            rse={{ ...fixtureRSEViewModel(), id: params.id }}
             rseblockstate={7 as RSEBlockState}
-            protocolscomdom={mockUseComDOM(Array.from({ length: 20 }, (_, i) => createRSEProtocol()))}
-            attributescomdom={mockUseComDOM(Array.from({ length: 20 }, (_, i) => createRSEAttribute()))}
+            protocolscomdom={mockUseComDOM(Array.from({ length: 20 }, (_, i) => fixtureRSEProtocolViewModel()))}
+            attributescomdom={mockUseComDOM(Array.from({ length: 20 }, (_, i) => fixtureRSEAttributeViewModel()))}
         />
     )
 }
diff --git a/src/app/rule/create/page.tsx b/src/app/rule/create/page.tsx
@@ -1,7 +1,7 @@
 'use client';
 import { CreateRule as CreateRuleStory } from "@/component-library/Pages/Rule/CreateRule";
-import { RSEAccountUsageLimit } from "@/lib/core/entity/rucio";
-import { DIDLong } from "@/lib/core/entity/rucio"
+import { RSEAccountUsageLimitViewModel } from "@/lib/infrastructure/data/view-model/rse";
+import { DIDLongViewModel } from "@/lib/infrastructure/data/view-model/did";
 import {
     CreateRuleQuery,
     TypedDIDValidationQuery, TypedDIDValidationResponse,
@@ -36,7 +36,7 @@ export default function CreateRule() {
     }
 
 
-    const DIDSearchComDOM = useComDOM<DIDLong>(
+    const DIDSearchComDOM = useComDOM<DIDLongViewModel>(
         'create-rule-page-did-query',
         [],
         false,
@@ -45,7 +45,7 @@ export default function CreateRule() {
         true
     )
 
-    const RSEComDOM = useComDOM<RSEAccountUsageLimit>(
+    const RSEComDOM = useComDOM<RSEAccountUsageLimitViewModel>(
         'create-rule-page-rse-query',
         [],
         false,

diff --git a/src/app/rule/page/[id]/page.tsx b/src/app/rule/page/[id]/page.tsx
@@ -1,23 +1,23 @@
 'use client';
-import { PageRule as PageRuleStory, RulePageLockEntry } from "@/component-library/Pages/Rule/PageRule";
-import { RuleMeta } from "@/lib/core/entity/rucio";
-import { createRuleMeta } from "test/fixtures/table-fixtures";
+import { PageRule as PageRuleStory } from "@/component-library/Pages/Rule/PageRule";
+import { fixtureRuleMetaViewModel } from "test/fixtures/table-fixtures";
 import { useState, useEffect } from "react";
 import useComDOM from "@/lib/infrastructure/hooks/useComDOM";
 import { HTTPRequest } from "@/lib/sdk/http";
+import { RuleMetaViewModel, RulePageLockEntryViewModel } from "@/lib/infrastructure/data/view-model/rule";
 
 export default function PageRule({ params }: { params: { id: string } }) {
-    const comDOM = useComDOM<RulePageLockEntry>(
+    const comDOM = useComDOM<RulePageLockEntryViewModel>(
         "rule-page-lock-query",
         [],
         false,
         Infinity,
         50,
         true
     )
-    const [meta, setMeta] = useState<RuleMeta>({} as RuleMeta)
+    const [meta, setMeta] = useState<RuleMetaViewModel>({} as RuleMetaViewModel)
     useEffect(() => {
-        setMeta({...createRuleMeta(), id: params.id})
+        setMeta({...fixtureRuleMetaViewModel(), id: params.id})
     }, [])
     useEffect(() => {
         const runQuery = async () => {

diff --git a/src/app/subscription/list/[account]/page.tsx b/src/app/subscription/list/[account]/page.tsx
@@ -1,12 +1,11 @@
 'use client';
-import { SubscriptionRuleStates } from "@/lib/core/entity/rucio";
 import { ListSubscription as ListSubscriptionStory } from "@/component-library/Pages/Subscriptions/ListSubscription";
 import { Component, useEffect, useState } from "react";
-import { createSubscriptionRuleStates } from "test/fixtures/table-fixtures";
 import useComDOM from "@/lib/infrastructure/hooks/useComDOM";
+import { SubscriptionRuleStatesViewModel } from "@/lib/infrastructure/data/view-model/subscriptions";
 
 export default function ListSubscription({ params }: { params: { account: string }}) {
-    const ComDOM = useComDOM<SubscriptionRuleStates>(
+    const ComDOM = useComDOM<SubscriptionRuleStatesViewModel>(
         "subscription-rule-states-query",
         [],
         false,

diff --git a/src/app/subscription/list/page.tsx b/src/app/subscription/list/page.tsx
@@ -1,12 +1,11 @@
 'use client';
-import { SubscriptionRuleStates } from "@/lib/core/entity/rucio";
 import { ListSubscription as ListSubscriptionStory } from "@/component-library/Pages/Subscriptions/ListSubscription";
 import { Component, useEffect, useState } from "react";
-import { createSubscriptionRuleStates } from "test/fixtures/table-fixtures";
 import useComDOM from "@/lib/infrastructure/hooks/useComDOM";
+import { SubscriptionRuleStatesViewModel } from "@/lib/infrastructure/data/view-model/subscriptions";
 
 export default function ListSubscription({ params }: { params: { account: string }}) {
-    const ComDOM = useComDOM<SubscriptionRuleStates>(
+    const ComDOM = useComDOM<SubscriptionRuleStatesViewModel>(
         "subscription-rule-states-query",
         [],
         false,

diff --git a/src/component-library/Pages/DID/DIDMetaView.stories.tsx b/src/component-library/Pages/DID/DIDMetaView.stories.tsx
@@ -1,6 +1,6 @@
 import { StoryFn, Meta } from "@storybook/react";
 import { DIDMetaView as DM } from "./DIDMetaView";
-import { createDIDMeta } from "test/fixtures/table-fixtures";
+import { fixtureDIDMetaViewModel } from "test/fixtures/table-fixtures";
 
 export default {
     title: "Components/Pages/DID",
@@ -10,6 +10,6 @@ export default {
 const Template: StoryFn<typeof DM> = (args) => <DM {...args} />;
 export const DIDMetaView = Template.bind({});
 DIDMetaView.args = {
-    data: {status: "success", ...createDIDMeta()},
+    data: fixtureDIDMetaViewModel(),
     show: true,
 }
diff --git a/src/component-library/Pages/DID/ListDID.stories.tsx b/src/component-library/Pages/DID/ListDID.stories.tsx
@@ -1,6 +1,6 @@
 import { StoryFn, Meta } from '@storybook/react';
 import { ListDID as LD } from './ListDID';
-import { createDIDMeta, createDID, mockUseComDOM } from 'test/fixtures/table-fixtures';
+import { fixtureDIDMetaViewModel, fixtureDIDViewModel, mockUseComDOM } from 'test/fixtures/table-fixtures';
 
 export default {
     title: 'Components/Pages/DID',
@@ -11,7 +11,7 @@ const Template: StoryFn<typeof LD> = (args) => <LD {...args} />;
 
 export const ListDID = Template.bind({});
 ListDID.args = {
-    comdom: mockUseComDOM(Array.from({length: 100}, () => createDID())),
+    comdom: mockUseComDOM(Array.from({length: 100}, () => fixtureDIDViewModel())),
     didMetaQuery: (scope: string, name: string) => { },
-    didMetaQueryResponse: {status: "success", ...createDIDMeta()}
+    didMetaQueryResponse: fixtureDIDMetaViewModel()
 }
diff --git a/src/component-library/Pages/DID/ListDIDTable.stories.tsx b/src/component-library/Pages/DID/ListDIDTable.stories.tsx
@@ -1,6 +1,6 @@
 import { StoryFn, Meta } from "@storybook/react";
 import { ListDIDTable as L } from "./ListDIDTable";
-import { createDID, mockUseComDOM } from "test/fixtures/table-fixtures";
+import { fixtureDIDViewModel, mockUseComDOM } from "test/fixtures/table-fixtures";
 import { DID } from "@/lib/core/entity/rucio";
 
 export default {
@@ -12,6 +12,6 @@ const Template: StoryFn<typeof L> = (args) => <L {...args} />;
 
 export const ListDIDTable = Template.bind({});
 ListDIDTable.args = {
-    comdom: mockUseComDOM(Array.from({length: 100}, () => createDID())),
+    comdom: mockUseComDOM(Array.from({length: 100}, () => fixtureDIDViewModel())),
     selectionFunc: (data: DID[]) => {console.info("ListDIDTable", data)}
 };
diff --git a/src/component-library/Pages/DID/PageDID.stories.tsx b/src/component-library/Pages/DID/PageDID.stories.tsx
@@ -1,7 +1,7 @@
 import { StoryFn, Meta } from "@storybook/react";
 import { PageDID as PD } from "./PageDID";
 
-import { createDIDMeta, mockUseComDOM, createDIDRules, createDID, createDIDDatasetReplicas, createFileReplicaState, createFileReplicaStateD } from "test/fixtures/table-fixtures";
+import { fixtureDIDMetaViewModel, mockUseComDOM, fixtureDIDRulesViewModel, fixtureDIDViewModel, fixtureDIDDatasetReplicasViewModel, fixtureFilereplicaStateViewModel, fixtureFilereplicaStateDViewModel, fixtureDIDKeyValuePairsViewModel } from "test/fixtures/table-fixtures";
 
 export default {
     title: "Components/Pages/DID",
@@ -11,25 +11,17 @@ export default {
 const Template: StoryFn<typeof PD> = (args) => <PD {...args} />;
 export const PageDID = Template.bind({});
 PageDID.args = {
-    didMeta: createDIDMeta(),
+    didMeta: fixtureDIDMetaViewModel(),
     fromDidList: "yosearch",
     // Parent DIDs [FILE]
-    didParentsComDOM: mockUseComDOM(Array.from({length: 100}, (_, i) => createDID())),
+    didParentsComDOM: mockUseComDOM(Array.from({length: 100}, (_, i) => fixtureDIDViewModel())),
     // DID Metadata
-    didMetadataComDOM: mockUseComDOM([
-        { key: "bernd", value: "das brot" },
-        { key: "kika", value: "der sender" },
-        { key: "kikaninchen", value: "das tier" },
-        { key: "my birthday", value: (new Date(2021, 3)).toISOString() },
-        { key: "am_i_anton", value: false },
-        { key: "R1-tastefactor", value: 3.142 },
-        { key: "hello", value: null },
-    ]),
+    didMetadataComDOM: mockUseComDOM(Array.from({ length: 100 }, (_, i) => fixtureDIDKeyValuePairsViewModel())),
     // Filereplicas
-    didFileReplicasComDOM: mockUseComDOM(Array.from({ length: 100 }, (_, i) => createFileReplicaState())),
-    didFileReplicasDComDOM: mockUseComDOM(Array.from({ length: 100 }, (_, i) => createFileReplicaStateD())),
-    didRulesComDOM: mockUseComDOM(Array.from({ length: 100 }, (_, i) => createDIDRules())),
+    didFileReplicasComDOM: mockUseComDOM(Array.from({ length: 100 }, (_, i) => fixtureFilereplicaStateViewModel())),
+    didFileReplicasDComDOM: mockUseComDOM(Array.from({ length: 100 }, (_, i) => fixtureFilereplicaStateDViewModel())),
+    didRulesComDOM: mockUseComDOM(Array.from({ length: 100 }, (_, i) => fixtureDIDRulesViewModel())),
     // Contents
-    didContentsComDOM: mockUseComDOM(Array.from({ length: 100 }, (_, i) => createDID())),
-    didDatasetReplicasComDOM: mockUseComDOM(Array.from({ length: 100 }, (_, i) => createDIDDatasetReplicas()))
+    didContentsComDOM: mockUseComDOM(Array.from({ length: 100 }, (_, i) => fixtureDIDViewModel())),
+    didDatasetReplicasComDOM: mockUseComDOM(Array.from({ length: 100 }, (_, i) => fixtureDIDDatasetReplicasViewModel()))
 }