diff --git a/mscr-ui/public/locales/en/common.json b/mscr-ui/public/locales/en/common.json index e3c300e11..823d68aef 100644 --- a/mscr-ui/public/locales/en/common.json +++ b/mscr-ui/public/locales/en/common.json @@ -456,17 +456,21 @@ }, "working-version": "", "workspace": { + "annotations": "Annotations", "crosswalks": "Crosswalks", "group": "Group workspaces", "label": "Name", + "mappings": "Mappings", "navigation": "Workspaces", "no-crosswalks": "There are no crosswalks to show yet", "no-schemas": "There are no schemas to show yet", "numberOfRevisions": "Revisions", + "ontologies": "Ontologies", "personal": "Personal workspace", "pid": "PID", "schemas": "Schemas", "state": "State", - "view": "View" + "view": "View", + "vocabularies": "Vocabularies" } } diff --git a/mscr-ui/public/locales/fi/common.json b/mscr-ui/public/locales/fi/common.json index f2e7c9d32..3d8cadbd0 100644 --- a/mscr-ui/public/locales/fi/common.json +++ b/mscr-ui/public/locales/fi/common.json @@ -456,17 +456,21 @@ }, "working-version": "", "workspace": { + "annotations": "", "crosswalks": "", "group": "", "label": "", + "mappings": "", "navigation": "", "no-crosswalks": "", "no-schemas": "", "numberOfRevisions": "", + "ontologies": "", "personal": "", "pid": "", "schemas": "", "state": "", - "view": "" + "view": "", + "vocabularies": "" } } diff --git a/mscr-ui/public/locales/sv/common.json b/mscr-ui/public/locales/sv/common.json index 030e17d58..181a0d06a 100644 --- a/mscr-ui/public/locales/sv/common.json +++ b/mscr-ui/public/locales/sv/common.json @@ -456,17 +456,21 @@ }, "working-version": "", "workspace": { + "annotations": "", "crosswalks": "", "group": "", "label": "", + "mappings": "", "navigation": "", "no-crosswalks": "", "no-schemas": "", "numberOfRevisions": "", + "ontologies": "", "personal": "", "pid": "", "schemas": "", "state": "", - "view": "" + "view": "", + "vocabularies": "" } } diff --git a/mscr-ui/src/common/components/mscr-search/mscr-search.slice.tsx b/mscr-ui/src/common/components/mscr-search/mscr-search.slice.tsx index 78e6a1c1f..411258a43 100644 --- a/mscr-ui/src/common/components/mscr-search/mscr-search.slice.tsx +++ b/mscr-ui/src/common/components/mscr-search/mscr-search.slice.tsx @@ -6,15 +6,26 @@ import { PaginatedQuery, } from '@app/common/interfaces/search.interface'; import { UrlState } from '@app/common/utils/hooks/use-url-state'; +import { + formatsRelatedToSubtype, + SubType, +} from '@app/common/interfaces/type.interface'; function createUrl( scope: string, - { type, pageSize, urlState, ownerOrg }: PaginatedQuery + { type, pageSize, urlState, ownerOrg, subType }: PaginatedQuery ) { const pageFrom = (urlState.page - 1) * pageSize; - return `/frontend/mscrSearch${scope}Content?query=&type=${type}${ - scope === 'Org' ? `&ownerOrg=${ownerOrg}` : '' - }&pageSize=${pageSize}&pageFrom=${pageFrom}`; + let url = `/frontend/mscrSearch${scope}Content?query=&type=${type}`; + if (scope == 'Org' && ownerOrg) { + url = `${url}&ownerOrg=${ownerOrg}`; + } + if (subType != SubType.Schema && subType != SubType.Crosswalk && subType) { + for (const format in formatsRelatedToSubtype[subType]) { + url = `${url}&format=${format}`; + } + } + return `${url}&pageSize=${pageSize}&pageFrom=${pageFrom}`; } function createSearchUrl(urlState: UrlState) { diff --git a/mscr-ui/src/common/components/schema-and-crosswalk-actionmenu/update-action-menu.tsx b/mscr-ui/src/common/components/schema-and-crosswalk-actionmenu/update-action-menu.tsx index 9ea03d854..9da58c7d8 100644 --- a/mscr-ui/src/common/components/schema-and-crosswalk-actionmenu/update-action-menu.tsx +++ b/mscr-ui/src/common/components/schema-and-crosswalk-actionmenu/update-action-menu.tsx @@ -6,9 +6,9 @@ import { import { State } from '@app/common/interfaces/state.interface'; import { SchemaWithVersionInfo } from '@app/common/interfaces/schema.interface'; import { CrosswalkWithVersionInfo } from '@app/common/interfaces/crosswalk.interface'; -import { Type } from '@app/common/interfaces/search.interface'; import { useStoreDispatch } from '@app/store'; import { Format } from '@app/common/interfaces/format.interface'; +import { Type } from '@app/common/interfaces/type.interface'; export function updateActionMenu( dispatch: ReturnType, diff --git a/mscr-ui/src/common/components/search-internal-resources/search-internal-resources.slice.ts b/mscr-ui/src/common/components/search-internal-resources/search-internal-resources.slice.ts index 9e21e3e1d..68878e80e 100644 --- a/mscr-ui/src/common/components/search-internal-resources/search-internal-resources.slice.ts +++ b/mscr-ui/src/common/components/search-internal-resources/search-internal-resources.slice.ts @@ -4,7 +4,7 @@ import { getDatamodelApiBaseQuery } from '@app/store/api-base-query'; import { Status } from '@app/common/interfaces/status.interface'; import { SearchInternalClasses } from '@app/common/interfaces/search-internal-classes.interface'; import { ResourceType } from '@app/common/interfaces/resource-type.interface'; -import { Type } from '@app/common/interfaces/type.interface'; +import { DatamodelType } from '@app/common/interfaces/type.interface'; export interface InternalResourcesSearchParams { query: string; @@ -16,7 +16,7 @@ export interface InternalResourcesSearchParams { sortLang?: string; pageSize?: number; pageFrom?: number; - limitToModelType?: Type; + limitToModelType?: DatamodelType; } function createUrl(obj: InternalResourcesSearchParams): string { diff --git a/mscr-ui/src/common/components/side-navigation/index.tsx b/mscr-ui/src/common/components/side-navigation/index.tsx index 7817ead00..200aa5e44 100644 --- a/mscr-ui/src/common/components/side-navigation/index.tsx +++ b/mscr-ui/src/common/components/side-navigation/index.tsx @@ -115,6 +115,34 @@ export default function SideNavigationPanel({ user }: { user?: MscrUser }) { } /> + handleNavigate(true)} + href={personalCrosswalksPath} + passHref + > + {t('workspace.mappings')} + + } + /> + handleNavigate(true)} + href={personalCrosswalksPath} + passHref + > + {t('workspace.annotations')} + + } + /> } /> + handleNavigate(true)} + href={personalSchemasPath} + passHref + > + {t('workspace.vocabularies')} + + } + /> + handleNavigate(true)} + href={personalSchemasPath} + passHref + > + {t('workspace.ontologies')} + + } + /> } /> + handleNavigate()} + href={'/' + group.id + '/crosswalks'} + passHref + > + {t('workspace.mappings')} + + } + /> + handleNavigate()} + href={'/' + group.id + '/crosswalks'} + passHref + > + {t('workspace.annotations')} + + } + /> } /> + handleNavigate()} + href={'/' + group.id + '/schemas'} + passHref + > + {t('workspace.vocabularies')} + + } + /> + handleNavigate()} + href={'/' + group.id + '/schemas'} + passHref + > + {t('workspace.ontologies')} + + } + /> ))} diff --git a/mscr-ui/src/common/components/tabmenu/index.tsx b/mscr-ui/src/common/components/tabmenu/index.tsx index 28b170c0f..18b1b4dc5 100644 --- a/mscr-ui/src/common/components/tabmenu/index.tsx +++ b/mscr-ui/src/common/components/tabmenu/index.tsx @@ -5,7 +5,6 @@ import { setSelectedTab, } from '@app/common/components/content-view/content-view.slice'; import { useTranslation } from 'next-i18next'; -import { Type } from '@app/common/interfaces/search.interface'; import { TabIndex, TabText, MscrTabs } from '@app/common/interfaces/tabmenu'; import { ReactNode } from 'react'; import { @@ -13,6 +12,7 @@ import { StyledTabs, } from '@app/common/components/tabmenu/tabmenu.styles'; import { setQuery } from '@app/common/components/data-type-registry-search/data-type-registry-search.slice'; +import { Type } from '@app/common/interfaces/type.interface'; interface TabPanel { tabIndex: TabIndex; diff --git a/mscr-ui/src/common/components/version-history/index.tsx b/mscr-ui/src/common/components/version-history/index.tsx index 32be1febd..94af23656 100644 --- a/mscr-ui/src/common/components/version-history/index.tsx +++ b/mscr-ui/src/common/components/version-history/index.tsx @@ -6,9 +6,9 @@ import { VersionHeading, VersionHistoryContainer, } from '@app/common/components/version-history/version-history.styles'; -import { Type } from '@app/common/interfaces/search.interface'; import { useRouter } from 'next/router'; import { State } from '@app/common/interfaces/state.interface'; +import { Type } from '@app/common/interfaces/type.interface'; interface RevisionRow { versionLabel: string; diff --git a/mscr-ui/src/common/interfaces/datamodel.interface.ts b/mscr-ui/src/common/interfaces/datamodel.interface.ts index 5aba9f505..1f90f4f43 100644 --- a/mscr-ui/src/common/interfaces/datamodel.interface.ts +++ b/mscr-ui/src/common/interfaces/datamodel.interface.ts @@ -1,5 +1,5 @@ import { Status } from './status.interface'; -import { Type } from './type.interface'; +import { DatamodelType } from './type.interface'; export interface DataModel { comment: { @@ -20,5 +20,5 @@ export interface DataModel { modified: string; prefix: string; status: Status; - type: Type; + type: DatamodelType; } diff --git a/mscr-ui/src/common/interfaces/search.interface.ts b/mscr-ui/src/common/interfaces/search.interface.ts index 3b7fb9eea..393a22b89 100644 --- a/mscr-ui/src/common/interfaces/search.interface.ts +++ b/mscr-ui/src/common/interfaces/search.interface.ts @@ -3,6 +3,7 @@ import { State } from '@app/common/interfaces/state.interface'; import { Format } from '@app/common/interfaces/format.interface'; import { ContentRevision } from '@app/common/interfaces/content-revision.interface'; import { UrlState } from '@app/common/utils/hooks/use-url-state'; +import { SubType, Type } from '@app/common/interfaces/type.interface'; export interface Label { [key: string]: string; @@ -13,11 +14,6 @@ export enum Visibility { Public = 'PUBLIC', } -export enum Type { - Crosswalk = 'CROSSWALK', - Schema = 'SCHEMA', -} - export interface ResultInfo { id: string; handle: string; @@ -42,6 +38,7 @@ export interface ResultInfo { export interface PaginatedQuery { query?: string; type?: Type; + subType?: SubType; ownerOrg?: string; pageSize: number; urlState: UrlState; diff --git a/mscr-ui/src/common/interfaces/type.interface.ts b/mscr-ui/src/common/interfaces/type.interface.ts index d6d2ef61f..5dfcef803 100644 --- a/mscr-ui/src/common/interfaces/type.interface.ts +++ b/mscr-ui/src/common/interfaces/type.interface.ts @@ -1 +1,27 @@ -export type Type = 'LIBRARY' | 'PROFILE'; +import { Format } from '@app/common/interfaces/format.interface'; + +export enum Type { + Crosswalk = 'CROSSWALK', + Schema = 'SCHEMA', +} + +export enum SubType { + Schema, + Vocabulary, + Ontology, + Crosswalk, + Mapping, + Annotation, +} + +export const formatsRelatedToSubtype = { + 0: [Format.Csv, Format.Xsd, Format.Jsonschema, Format.Shacl], + 1: [Format.Skosrdf, Format.Enum], + 2: [Format.Rdfs, Format.Owl], + 3: [Format.Csv, Format.Xsd, Format.Jsonschema, Format.Shacl], + 4: [Format.Skosrdf, Format.Rdfs, Format.Owl], + 5: [Format.Csv, Format.Xsd, Format.Jsonschema,] +}; + +// Leftover from codebase +export type DatamodelType = 'LIBRARY' | 'PROFILE'; diff --git a/mscr-ui/src/common/utils/hooks/use-initial-form.tsx b/mscr-ui/src/common/utils/hooks/use-initial-form.tsx index da537913d..1ff97cbaa 100644 --- a/mscr-ui/src/common/utils/hooks/use-initial-form.tsx +++ b/mscr-ui/src/common/utils/hooks/use-initial-form.tsx @@ -1,8 +1,8 @@ import { useTranslation } from 'next-i18next'; import { Format } from '@app/common/interfaces/format.interface'; import { State } from '@app/common/interfaces/state.interface'; -import { Type } from '@app/common/interfaces/search.interface'; import { LanguageBlockType } from 'yti-common-ui/components/form/language-selector'; +import { Type } from '@app/common/interfaces/type.interface'; export interface FormType { format: Format; diff --git a/mscr-ui/src/common/utils/translation-helpers.ts b/mscr-ui/src/common/utils/translation-helpers.ts index 8498b8150..63bfbe45e 100644 --- a/mscr-ui/src/common/utils/translation-helpers.ts +++ b/mscr-ui/src/common/utils/translation-helpers.ts @@ -1,9 +1,9 @@ import { TFunction } from 'next-i18next'; import { ResourceType } from '../interfaces/resource-type.interface'; -import { Type } from '../interfaces/type.interface'; +import { DatamodelType } from '../interfaces/type.interface'; import { NotificationKeys } from '@app/common/interfaces/notifications.interface'; -export function translateModelType(type: Type, t: TFunction) { +export function translateModelType(type: DatamodelType, t: TFunction) { switch (type) { case 'LIBRARY': return t('library'); diff --git a/mscr-ui/src/modules/crosswalk-editor/tabs/metadata-and-files/index.tsx b/mscr-ui/src/modules/crosswalk-editor/tabs/metadata-and-files/index.tsx index 949f42941..944af8b4b 100644 --- a/mscr-ui/src/modules/crosswalk-editor/tabs/metadata-and-files/index.tsx +++ b/mscr-ui/src/modules/crosswalk-editor/tabs/metadata-and-files/index.tsx @@ -1,8 +1,8 @@ import HasPermission from '@app/common/utils/has-permission'; import MetadataForm from '@app/modules/form/metadata-form'; -import { Type } from '@app/common/interfaces/search.interface'; import { CrosswalkWithVersionInfo } from '@app/common/interfaces/crosswalk.interface'; import MetadataFilesTable from '@app/common/components/metadata-files-table'; +import { Type } from '@app/common/interfaces/type.interface'; export default function MetadataAndFiles(props: { crosswalkData: CrosswalkWithVersionInfo; diff --git a/mscr-ui/src/modules/crosswalk-view/index.tsx b/mscr-ui/src/modules/crosswalk-view/index.tsx index 88112d40e..8ce26452a 100644 --- a/mscr-ui/src/modules/crosswalk-view/index.tsx +++ b/mscr-ui/src/modules/crosswalk-view/index.tsx @@ -14,7 +14,6 @@ import { import HasPermission from '@app/common/utils/has-permission'; import { useEffect, useState } from 'react'; import { updateActionMenu } from '@app/common/components/schema-and-crosswalk-actionmenu/update-action-menu'; -import { Type } from '@app/common/interfaces/search.interface'; import { State } from '@app/common/interfaces/state.interface'; import { setIsEditContentActive } from '@app/common/components/content-view/content-view.slice'; import { NotificationKeys } from '@app/common/interfaces/notifications.interface'; @@ -31,6 +30,7 @@ import { Format } from '@app/common/interfaces/format.interface'; import CrosswalkEditor from '@app/modules/crosswalk-editor'; import SpinnerOverlay from '@app/common/components/spinner-overlay'; import { SpinnerWrapper } from '@app/modules/crosswalk-view/crosswalk-view.styles'; +import { Type } from '@app/common/interfaces/type.interface'; export default function CrosswalkView({ crosswalkId }: { crosswalkId: string }) { const { t } = useTranslation('common'); diff --git a/mscr-ui/src/modules/form/generate-payload.tsx b/mscr-ui/src/modules/form/generate-payload.tsx index d6ce6d848..8f0b5182e 100644 --- a/mscr-ui/src/modules/form/generate-payload.tsx +++ b/mscr-ui/src/modules/form/generate-payload.tsx @@ -2,10 +2,11 @@ import { FormType } from '@app/common/utils/hooks/use-initial-form'; import { MscrUser } from '@app/common/interfaces/mscr-user.interface'; import { ModalType } from '@app/modules/form/index'; import { Organization } from '@app/common/interfaces/organizations.interface'; -import { Type, Visibility } from '@app/common/interfaces/search.interface'; +import { Visibility } from '@app/common/interfaces/search.interface'; import { State } from '@app/common/interfaces/state.interface'; import { Format } from '@app/common/interfaces/format.interface'; import { Metadata } from '@app/common/interfaces/metadata.interface'; +import { Type } from '@app/common/interfaces/type.interface'; export default function generatePayload( data: FormType, diff --git a/mscr-ui/src/modules/form/index.tsx b/mscr-ui/src/modules/form/index.tsx index 2230e0d3e..6b8d38e1f 100644 --- a/mscr-ui/src/modules/form/index.tsx +++ b/mscr-ui/src/modules/form/index.tsx @@ -37,7 +37,6 @@ import { mscrSearchApi } from '@app/common/components/mscr-search/mscr-search.sl import { useStoreDispatch } from '@app/store'; import SchemaFormFields from '@app/modules/form/schema-form/schema-form-fields'; import { Crosswalk } from '@app/common/interfaces/crosswalk.interface'; -import { Type } from '@app/common/interfaces/search.interface'; import { getLanguageVersion } from '@app/common/utils/get-language-version'; import { State } from '@app/common/interfaces/state.interface'; import { @@ -57,6 +56,7 @@ import { InputErrors, validateForm } from '@app/modules/form/validate-form'; import generatePayload from '@app/modules/form/generate-payload'; import { resetContentView } from '@app/common/components/content-view/content-view.slice'; import { CloseButton } from '@app/modules/form/form.styles'; +import { Type } from '@app/common/interfaces/type.interface'; export enum ModalType { RegisterNewFull = 'REGISTER_NEW_FULL', diff --git a/mscr-ui/src/modules/form/metadata-form/index.tsx b/mscr-ui/src/modules/form/metadata-form/index.tsx index 565422e12..138c3d194 100644 --- a/mscr-ui/src/modules/form/metadata-form/index.tsx +++ b/mscr-ui/src/modules/form/metadata-form/index.tsx @@ -18,7 +18,7 @@ import { import * as React from 'react'; import { useCallback, useEffect, useState } from 'react'; import { getLanguageVersion } from '@app/common/utils/get-language-version'; -import { Type, Visibility } from '@app/common/interfaces/search.interface'; +import { Visibility } from '@app/common/interfaces/search.interface'; import { State } from '@app/common/interfaces/state.interface'; import ConfirmModal from '@app/common/components/confirmation-modal'; import { useStoreDispatch } from '@app/store'; @@ -44,6 +44,7 @@ import { selectConfirmModalState, setConfirmModalState, } from '@app/common/components/actionmenu/actionmenu.slice'; +import { Type } from '@app/common/interfaces/type.interface'; interface MetadataFormProps { type: Type; diff --git a/mscr-ui/src/modules/form/metadata-form/metadata-stub.tsx b/mscr-ui/src/modules/form/metadata-form/metadata-stub.tsx index 4e1819d24..1d285ece3 100644 --- a/mscr-ui/src/modules/form/metadata-form/metadata-stub.tsx +++ b/mscr-ui/src/modules/form/metadata-form/metadata-stub.tsx @@ -9,12 +9,12 @@ import { MetadataRow, } from '@app/modules/form/metadata-form/metadata-form.styles'; import { Grid } from '@mui/material'; -import { Type } from '@app/common/interfaces/search.interface'; import { useRouter } from 'next/router'; import { useTranslation } from 'next-i18next'; import { getLanguageVersion } from '@app/common/utils/get-language-version'; import * as React from 'react'; import FormattedDate from 'yti-common-ui/components/formatted-date'; +import { Type } from '@app/common/interfaces/type.interface'; export default function MetadataStub({ metadata, diff --git a/mscr-ui/src/modules/form/validate-form.tsx b/mscr-ui/src/modules/form/validate-form.tsx index 5c24bd3b1..ed1658442 100644 --- a/mscr-ui/src/modules/form/validate-form.tsx +++ b/mscr-ui/src/modules/form/validate-form.tsx @@ -1,11 +1,11 @@ import { FormType } from '@app/common/utils/hooks/use-initial-form'; -import { Type } from '@app/common/interfaces/search.interface'; import { ModalType } from '@app/modules/form/index'; import { Format, formatsAvailableForCrosswalkRegistration, formatsAvailableForSchemaRegistration, } from '@app/common/interfaces/format.interface'; +import { Type } from '@app/common/interfaces/type.interface'; export interface InputErrors { languageAmount: boolean; diff --git a/mscr-ui/src/modules/schema-view/index.tsx b/mscr-ui/src/modules/schema-view/index.tsx index fb63b8697..10a653452 100644 --- a/mscr-ui/src/modules/schema-view/index.tsx +++ b/mscr-ui/src/modules/schema-view/index.tsx @@ -11,7 +11,6 @@ import { createTheme, ThemeProvider } from '@mui/material'; import VersionHistory from 'src/common/components/version-history'; import SchemaVisualization from '@app/modules/schema-view/schema-visualization'; import { State } from '@app/common/interfaces/state.interface'; -import { Type } from '@app/common/interfaces/search.interface'; import { Text } from 'suomifi-ui-components'; import HasPermission from '@app/common/utils/has-permission'; import { @@ -39,6 +38,7 @@ import { selectIsEditContentActive } from '@app/common/components/content-view/c import { useRouter } from 'next/router'; import SpinnerOverlay from '@app/common/components/spinner-overlay'; import { SpinnerWrapper } from '@app/modules/crosswalk-view/crosswalk-view.styles'; +import { Type } from '@app/common/interfaces/type.interface'; export default function SchemaView({ schemaId }: { schemaId: string }) { const { t } = useTranslation('common'); diff --git a/mscr-ui/src/modules/schema-view/metadata-and-files/index.tsx b/mscr-ui/src/modules/schema-view/metadata-and-files/index.tsx index b5c9c443d..bc5692780 100644 --- a/mscr-ui/src/modules/schema-view/metadata-and-files/index.tsx +++ b/mscr-ui/src/modules/schema-view/metadata-and-files/index.tsx @@ -1,7 +1,7 @@ import { SchemaWithVersionInfo } from '@app/common/interfaces/schema.interface'; import MetadataForm from '@app/modules/form/metadata-form'; -import { Type } from '@app/common/interfaces/search.interface'; import MetadataFilesTable from '@app/common/components/metadata-files-table'; +import { Type } from '@app/common/interfaces/type.interface'; export default function MetadataAndFiles({ schemaDetails, diff --git a/mscr-ui/src/modules/workspace/group-home/index.tsx b/mscr-ui/src/modules/workspace/group-home/index.tsx index 64469182b..64fb82ccd 100644 --- a/mscr-ui/src/modules/workspace/group-home/index.tsx +++ b/mscr-ui/src/modules/workspace/group-home/index.tsx @@ -1,4 +1,3 @@ -import { Type } from '@app/common/interfaces/search.interface'; import { useTranslation } from 'next-i18next'; import { useBreakpoints } from 'yti-common-ui/components/media-query'; import WorkspaceTable, { @@ -24,16 +23,19 @@ import Link from 'next/link'; import { SpinnerWrapper } from '@app/modules/crosswalk-view/crosswalk-view.styles'; import SpinnerOverlay from '@app/common/components/spinner-overlay'; import HasPermission from '@app/common/utils/has-permission'; +import { SubType, Type } from '@app/common/interfaces/type.interface'; interface GroupHomeProps { user: MscrUser; pid: string; contentType: Type; + subType?: SubType; } export default function GroupWorkspace({ user, pid, contentType, + subType }: GroupHomeProps) { const hasCreatePermission = HasPermission({ action: 'CREATE_CONTENT', @@ -55,6 +57,7 @@ export default function GroupWorkspace({ const [content, setContent] = useState(new Array()); const { data, isLoading } = useGetOrgContentQuery({ type: contentType, + subType, pageSize, urlState, ownerOrg: pid, diff --git a/mscr-ui/src/modules/workspace/personal-home/index.tsx b/mscr-ui/src/modules/workspace/personal-home/index.tsx index 27ffcd284..7e07e3030 100644 --- a/mscr-ui/src/modules/workspace/personal-home/index.tsx +++ b/mscr-ui/src/modules/workspace/personal-home/index.tsx @@ -1,4 +1,3 @@ -import { Type } from '@app/common/interfaces/search.interface'; import { useTranslation } from 'next-i18next'; import Title from 'yti-common-ui/components/title'; import { @@ -22,11 +21,14 @@ import FormModal, { ModalType } from '@app/modules/form'; import Link from 'next/link'; import { SpinnerWrapper } from '@app/modules/crosswalk-view/crosswalk-view.styles'; import SpinnerOverlay from '@app/common/components/spinner-overlay'; +import { SubType, Type } from '@app/common/interfaces/type.interface'; export default function PersonalWorkspace({ contentType, + subType }: { contentType: Type; + subType?: SubType; }) { const { t } = useTranslation('common'); const router = useRouter(); @@ -44,6 +46,7 @@ export default function PersonalWorkspace({ const [content, setContent] = useState(new Array()); const { data, isLoading } = useGetPersonalContentQuery({ type: contentType, + subType, pageSize, urlState, }); diff --git a/mscr-ui/src/modules/workspace/workspace-table/index.tsx b/mscr-ui/src/modules/workspace/workspace-table/index.tsx index ef36293a5..86090336b 100644 --- a/mscr-ui/src/modules/workspace/workspace-table/index.tsx +++ b/mscr-ui/src/modules/workspace/workspace-table/index.tsx @@ -1,7 +1,7 @@ import { useTranslation } from 'next-i18next'; -import { Type } from '@app/common/interfaces/search.interface'; import GenericTable from '@app/common/components/generic-table'; import { State } from '@app/common/interfaces/state.interface'; +import { Type } from '@app/common/interfaces/type.interface'; export interface ContentRow { label: string; diff --git a/mscr-ui/src/pages/[homepage]/crosswalks/index.tsx b/mscr-ui/src/pages/[homepage]/crosswalks/index.tsx index 4f8c3d64b..33216638e 100644 --- a/mscr-ui/src/pages/[homepage]/crosswalks/index.tsx +++ b/mscr-ui/src/pages/[homepage]/crosswalks/index.tsx @@ -10,7 +10,7 @@ import { useRouter } from 'next/router'; import PersonalWorkspace from 'src/modules/workspace/personal-home'; import GroupWorkspace from 'src/modules/workspace/group-home'; import { createCommonGetServerSideProps } from '@app/common/utils/create-getserversideprops'; -import { Type } from '@app/common/interfaces/search.interface'; +import { Type } from '@app/common/interfaces/type.interface'; interface CrosswalksPageProps extends CommonContextState { user: MscrUser; @@ -29,7 +29,7 @@ export default function CrosswalksPage(props: CrosswalksPageProps) { fakeableUsers={props.fakeableUsers} > diff --git a/mscr-ui/src/pages/[homepage]/schemas/index.tsx b/mscr-ui/src/pages/[homepage]/schemas/index.tsx index 0e8181371..7102a25a5 100644 --- a/mscr-ui/src/pages/[homepage]/schemas/index.tsx +++ b/mscr-ui/src/pages/[homepage]/schemas/index.tsx @@ -10,7 +10,7 @@ import { useRouter } from 'next/router'; import PersonalWorkspace from 'src/modules/workspace/personal-home'; import GroupWorkspace from 'src/modules/workspace/group-home'; import { createCommonGetServerSideProps } from '@app/common/utils/create-getserversideprops'; -import { Type } from '@app/common/interfaces/search.interface'; +import { Type } from '@app/common/interfaces/type.interface'; interface SchemasPageProps extends CommonContextState { user: MscrUser; @@ -29,7 +29,7 @@ export default function SchemasPage(props: SchemasPageProps) { fakeableUsers={props.fakeableUsers} >