Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions src/custom/Helpers/Dimension/index.tsx

This file was deleted.

2 changes: 1 addition & 1 deletion src/custom/ResourceDetailFormatters/index.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { useResourceCleanData } from 'hooks/data';
import { KeyValueInRow, NumberStateFormatter } from './Component';
import { OperatorDataFormatter } from './Details';
import {
Expand All @@ -14,7 +15,6 @@ import {
TableDataFormatter,
TextWithLinkFormatter
} from './Formatter';
import { useResourceCleanData } from './useResourceCleanData';
import { convertToReadableUnit, extractPodVolumnTables, splitCamelCaseString } from './utils';

export {
Expand Down
2 changes: 1 addition & 1 deletion src/custom/TeamTable/TeamTableConfiguration.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/* eslint-disable @typescript-eslint/no-explicit-any */
import { useWindowDimensions } from 'hooks/ui';
import { MUIDataTableColumn, MUIDataTableMeta } from 'mui-datatables';
import { useState } from 'react';
import { DeleteIcon, EditIcon } from '../../icons';
Expand All @@ -7,7 +8,6 @@ import { CHARCOAL, useTheme } from '../../theme';
import { CustomTooltip } from '../CustomTooltip';
import { FormatId } from '../FormatId';
import { ConditionalTooltip } from '../Helpers/CondtionalTooltip';
import { useWindowDimensions } from '../Helpers/Dimension';
import { ColView, updateVisibleColumns } from '../Helpers/ResponsiveColumns/responsive-coulmns.tsx';
import { IconWrapper } from '../ResponsiveDataTable';
import { TooltipIcon } from '../TooltipIconButton';
Expand Down
2 changes: 1 addition & 1 deletion src/custom/UsersTable/UsersTable.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/* eslint-disable @typescript-eslint/no-explicit-any */
import { Theme } from '@mui/material';
import { useWindowDimensions } from 'hooks/ui';
import { MUIDataTableColumn, MUIDataTableMeta } from 'mui-datatables';
import { useRef, useState } from 'react';
import { Box, Tooltip } from '../../base';
Expand All @@ -8,7 +9,6 @@ import Github from '../../icons/Github/GithubIcon';
import Google from '../../icons/Google/GoogleIcon';
import LogoutIcon from '../../icons/Logout/LogOutIcon';
import { CHARCOAL, SistentThemeProviderWithoutBaseLine } from '../../theme';
import { useWindowDimensions } from '../Helpers/Dimension';
import {
ColView,
updateVisibleColumns
Expand Down
4 changes: 2 additions & 2 deletions src/custom/Workspaces/DesignTable.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
/* eslint-disable @typescript-eslint/no-explicit-any */
import { useWindowDimensions } from 'hooks/ui';
import { useDesignAssignment } from 'hooks/workspaces';
import _ from 'lodash';
import React, { useEffect, useRef, useState } from 'react';
import { Box } from '../../base';
Expand All @@ -12,13 +14,11 @@ import {
} from '../CatalogDesignTable';
import { Pattern } from '../CustomCatalog/CustomCard';
import { CustomColumnVisibilityControl } from '../CustomColumnVisibilityControl';
import { useWindowDimensions } from '../Helpers/Dimension';
import { updateVisibleColumns } from '../Helpers/ResponsiveColumns/responsive-coulmns.tsx/responsive-column';
import PromptComponent from '../Prompt';
import SearchBar from '../SearchBar';
import { VIEW_VISIBILITY } from '../VisibilityChipMenu/VisibilityChipMenu';
import AssignmentModal from './AssignmentModal';
import useDesignAssignment from './hooks/useDesignAssignment';
import { L5EditIcon, TableHeader } from './styles';
export interface DesignTableProps {
workspaceId: string;
Expand Down
4 changes: 2 additions & 2 deletions src/custom/Workspaces/EnvironmentTable.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
/* eslint-disable @typescript-eslint/no-explicit-any */
import ExpandMoreIcon from '@mui/icons-material/ExpandMore';
import { useWindowDimensions } from 'hooks/ui';
import { useEnvironmentAssignment } from 'hooks/workspaces';
import { MUIDataTableColumn, MUIDataTableMeta } from 'mui-datatables';
import React, { useState } from 'react';
import { Accordion, AccordionDetails, AccordionSummary, Typography } from '../../base';
Expand All @@ -8,7 +10,6 @@ import { useTheme } from '../../theme';
import { CustomColumnVisibilityControl } from '../CustomColumnVisibilityControl';
import { CustomTooltip } from '../CustomTooltip';
import { ConditionalTooltip } from '../Helpers/CondtionalTooltip';
import { useWindowDimensions } from '../Helpers/Dimension';
import {
ColView,
updateVisibleColumns
Expand All @@ -17,7 +18,6 @@ import ResponsiveDataTable, { IconWrapper } from '../ResponsiveDataTable';
import SearchBar from '../SearchBar';
import { TooltipIcon } from '../TooltipIconButton';
import AssignmentModal from './AssignmentModal';
import useEnvironmentAssignment from './hooks/useEnvironmentAssignment';
import {
CellStyle,
CustomBodyRenderStyle,
Expand Down
2 changes: 1 addition & 1 deletion src/custom/Workspaces/WorkspaceTeamsTable.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/* eslint-disable @typescript-eslint/no-explicit-any */
import AddIcon from '@mui/icons-material/Add';
import { useTeamAssignment } from 'hooks/workspaces';
import { useState } from 'react';
import { Button } from '../../base';
import { TeamsIcon } from '../../icons';
Expand All @@ -9,7 +10,6 @@ import SearchBar from '../SearchBar';
import { TeamTableConfiguration } from '../TeamTable';
import TeamTable from '../TeamTable/TeamTable';
import AssignmentModal from './AssignmentModal';
import useTeamAssignment from './hooks/useTeamAssignment';
import { TableHeader, TableRightActionHeader } from './styles';

export interface TeamsTableProps {
Expand Down
6 changes: 3 additions & 3 deletions src/custom/Workspaces/WorkspaceViewsTable.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
/* eslint-disable @typescript-eslint/no-explicit-any */
import { Lock, Public } from '@mui/icons-material';
import RemoveCircleIcon from '@mui/icons-material/RemoveCircle';
import { useWindowDimensions } from 'hooks/ui';
import { useViewsAssignment } from 'hooks/workspaces';
import { MUIDataTableColumn, MUIDataTableMeta } from 'mui-datatables';
import React, { useState } from 'react';
import { Box } from '../../base';
Expand All @@ -12,7 +14,6 @@ import { CustomColumnVisibilityControl } from '../CustomColumnVisibilityControl'
import { CustomTooltip } from '../CustomTooltip';
import { ErrorBoundary } from '../ErrorBoundary';
import { ConditionalTooltip } from '../Helpers/CondtionalTooltip';
import { useWindowDimensions } from '../Helpers/Dimension';
import {
ColView,
updateVisibleColumns
Expand All @@ -23,7 +24,6 @@ import { TooltipIcon } from '../TooltipIconButton';
import { UserTableAvatarInfo } from '../UsersTable';
import VisibilityChipMenu, { VIEW_VISIBILITY } from '../VisibilityChipMenu/VisibilityChipMenu';
import AssignmentModal from './AssignmentModal';
import useViewAssignment from './hooks/useViewsAssignment';
import { CellStyle, CustomBodyRenderStyle, L5EditIcon, TableHeader } from './styles';

interface ViewsTableProps {
Expand Down Expand Up @@ -270,7 +270,7 @@ const WorkspaceViewsTable: React.FC<ViewsTableProps> = ({
}
];

const viewAssignment = useViewAssignment({
const viewAssignment = useViewsAssignment({
workspaceId,
useGetViewsOfWorkspaceQuery,
useUnassignViewFromWorkspaceMutation,
Expand Down
14 changes: 8 additions & 6 deletions src/custom/Workspaces/index.ts
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
import {
useDesignAssignment,
useEnvironmentAssignment,
useTeamAssignment,
useViewsAssignment
} from 'hooks/workspaces';
import AssignmentModal from './AssignmentModal';
import DesignTable from './DesignTable';
import EnvironmentTable from './EnvironmentTable';
import { L5DeleteIcon, L5EditIcon } from './styles';
import WorkspaceCard from './WorkspaceCard';
import WorkspaceContentMoveModal from './WorkspaceContentMoveModal';
import WorkspaceEnvironmentSelection from './WorkspaceEnvironmentSelection';
import WorkspaceRecentActivityModal from './WorkspaceRecentActivityModal';
import WorkspaceTeamsTable from './WorkspaceTeamsTable';
import WorkspaceViewsTable from './WorkspaceViewsTable';
import useDesignAssignment from './hooks/useDesignAssignment';
import useEnvironmentAssignment from './hooks/useEnvironmentAssignment';
import useTeamAssignment from './hooks/useTeamAssignment';
import useViewAssignment from './hooks/useViewsAssignment';
import { L5DeleteIcon, L5EditIcon } from './styles';

export {
AssignmentModal,
Expand All @@ -22,7 +24,7 @@ export {
useDesignAssignment,
useEnvironmentAssignment,
useTeamAssignment,
useViewAssignment,
useViewsAssignment,
WorkspaceCard,
WorkspaceContentMoveModal,
WorkspaceEnvironmentSelection,
Expand Down
2 changes: 1 addition & 1 deletion src/custom/index.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { useWindowDimensions } from '../hooks/ui';
import { ActionButton } from './ActionButton';
import { BBChart } from './BBChart';
import { BookmarkNotification } from './BookmarkNotification';
Expand Down Expand Up @@ -31,7 +32,6 @@ import {
import { FeedbackButton } from './Feedback';
import { FlipCard, FlipCardProps } from './FlipCard';
import { FormatId } from './FormatId';
import { useWindowDimensions } from './Helpers/Dimension';
import { useNotificationHandler } from './Helpers/Notification';
import { ColView, updateVisibleColumns } from './Helpers/ResponsiveColumns/responsive-coulmns.tsx';
import { LearningCard } from './LearningCard';
Expand Down
1 change: 1 addition & 0 deletions src/hooks/data/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { default as useResourceCleanData } from './useResourceCleanData';
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
/* eslint-disable @typescript-eslint/no-explicit-any */
import _ from 'lodash';
import moment from 'moment';
import { GetResourceCleanDataProps, NumberState } from './types';
import {
GetResourceCleanDataProps,
NumberState
} from '../../custom/ResourceDetailFormatters/types';

export const useResourceCleanData = () => {
const useResourceCleanData = () => {
const structureNumberStates = (parsedStatus: any, parsedSpec: any): NumberState[] => {
const numberStates: NumberState[] = [];

Expand Down Expand Up @@ -182,3 +185,5 @@ export const useResourceCleanData = () => {

return { getResourceCleanData, structureNumberStates, getAge, getStatus, joinwithEqual };
};

export default useResourceCleanData;
3 changes: 3 additions & 0 deletions src/hooks/index.ts
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
export * from './data';
export * from './ui';
export * from './useRoomActivity';
export * from './workspaces';
1 change: 1 addition & 0 deletions src/hooks/ui/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { default as useWindowDimensions } from './useWindowDImensions';
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ function getWindowDimensions(): WindowDimensions {
*
* @returns {WindowDimensions} { width, height }
*/
export function useWindowDimensions(): WindowDimensions {
function useWindowDimensions(): WindowDimensions {
const [windowDimensions, setWindowDimensions] = React.useState(getWindowDimensions());

React.useEffect(() => {
Expand Down Expand Up @@ -47,6 +47,8 @@ export function useWindowDimensions(): WindowDimensions {
return windowDimensions;
}

export default useWindowDimensions;

/**
* Represents the width and height of the window.
*/
Expand Down
4 changes: 4 additions & 0 deletions src/hooks/workspaces/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
export { default as useDesignAssignment } from './useDesignAssignment';
export { default as useEnvironmentAssignment } from './useEnvironmentAssignment';
export { default as useTeamAssignment } from './useTeamAssignment';
export { default as useViewsAssignment } from './useViewsAssignment';
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/* eslint-disable @typescript-eslint/no-explicit-any */
import { useEffect, useState } from 'react';
import { Pattern } from '../../CustomCatalog/CustomCard';
import { withDefaultPageArgs } from '../../PerformersSection/PerformersSection';
import { AssignmentHookResult } from '../types';
import { Pattern } from '../../custom/CustomCatalog/CustomCard';
import { withDefaultPageArgs } from '../../custom/PerformersSection/PerformersSection';
import { AssignmentHookResult } from '../../custom/Workspaces/types';

interface AddedAndRemovedDesigns {
addedDesignsIds: string[];
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* eslint-disable @typescript-eslint/no-explicit-any */
import { useEffect, useState } from 'react';
import { withDefaultPageArgs } from '../../PerformersSection/PerformersSection';
import { AssignmentHookResult, Environment } from '../types';
import { withDefaultPageArgs } from '../../custom/PerformersSection/PerformersSection';
import { AssignmentHookResult, Environment } from '../../custom/Workspaces/types';

interface UseEnvironmentAssignmentProps {
workspaceId: string;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* eslint-disable @typescript-eslint/no-explicit-any */
import { useEffect, useState } from 'react';
import { withDefaultPageArgs } from '../../PerformersSection/PerformersSection';
import { AssignmentHookResult, Team } from '../types';
import { withDefaultPageArgs } from '../../custom/PerformersSection/PerformersSection';
import { AssignmentHookResult, Team } from '../../custom/Workspaces/types';

interface UseTeamAssignmentProps {
workspaceId: string;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/* eslint-disable @typescript-eslint/no-explicit-any */
import { useEffect, useState } from 'react';
import { Pattern } from '../../CustomCatalog/CustomCard';
import { withDefaultPageArgs } from '../../PerformersSection/PerformersSection';
import { AssignmentHookResult } from '../types';
import { Pattern } from '../../custom/CustomCatalog/CustomCard';
import { withDefaultPageArgs } from '../../custom/PerformersSection/PerformersSection';
import { AssignmentHookResult } from '../../custom/Workspaces/types';

interface AddedAndRemovedViews {
addedviewsIds: string[];
Expand Down
6 changes: 6 additions & 0 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,12 @@
"resolveJsonModule": true,
"allowSyntheticDefaultImports": true,
"importHelpers": true,
"baseUrl": ".",
"paths": {
"@/src/*": ["src/*"],
"@/site/*": ["site/*"],
"hooks/*": ["src/hooks/*"]
}
},
"include": [
"."
Expand Down