Merge pull request #1396 from layer5io/chore/upgrade-schemas-v1.0.5-view-types

chore: upgrade @meshery/schemas to v1.0.5 and use View types

Author: leecalcote

package.json

@@ -47,7 +47,7 @@
     "@eslint/compat": "^2.0.3",
     "@eslint/eslintrc": "^3.3.5",
     "@eslint/js": "^9.0.0",
-    "@meshery/schemas": "^1.0.4",
+    "@meshery/schemas": "^1.0.5",
     "@mui/icons-material": "^7.3.9",
     "@reduxjs/toolkit": "^2.11.2",
     "@testing-library/dom": "^10.4.1",

src/custom/Workspaces/hooks/useViewsAssignment.tsx

@@ -1,9 +1,11 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import { useEffect, useState } from 'react';
-import { Pattern } from '../../CustomCatalog/CustomCard';
+import type { components } from '@meshery/schemas/constructs/v1beta1/view/View';
 import { withDefaultPageArgs } from '../../PerformersSection/PerformersSection';
 import { AssignmentHookResult } from '../types';
 
+type MesheryViewWithLocation = components['schemas']['MesheryViewWithLocation'];
+
 interface AddedAndRemovedViews {
   addedviewsIds: string[];
   removedviewsIds: string[];
@@ -23,16 +25,16 @@ const useViewAssignment = ({
   useAssignViewToWorkspaceMutation,
   useUnassignViewFromWorkspaceMutation,
   isViewsVisible
-}: useViewAssignmentProps): AssignmentHookResult<Pattern> => {
+}: useViewAssignmentProps): AssignmentHookResult<MesheryViewWithLocation> => {
   const [viewsPage, setviewsPage] = useState<number>(0);
-  const [viewsData, setviewsData] = useState<Pattern[]>([]);
+  const [viewsData, setviewsData] = useState<MesheryViewWithLocation[]>([]);
   const viewsPageSize = 25;
   const [viewsOfWorkspacePage, setviewsOfWorkspacePage] = useState<number>(0);
-  const [workspaceviewsData, setWorkspaceviewsData] = useState<Pattern[]>([]);
+  const [workspaceviewsData, setWorkspaceviewsData] = useState<MesheryViewWithLocation[]>([]);
   const [assignviewModal, setAssignviewModal] = useState<boolean>(false);
   const [skipviews, setSkipviews] = useState<boolean>(true);
   const [disableTransferButton, setDisableTransferButton] = useState<boolean>(true);
-  const [assignedviews, setAssignedviews] = useState<Pattern[]>([]);
+  const [assignedviews, setAssignedviews] = useState<MesheryViewWithLocation[]>([]);
 
   const { data: views } = useGetViewsOfWorkspaceQuery(
     withDefaultPageArgs({
@@ -61,13 +63,15 @@ const useViewAssignment = ({
   const [unassignviewFromWorkspace] = useUnassignViewFromWorkspaceMutation();
 
   useEffect(() => {
-    const viewsDataRtk = views?.views ? views.views : [];
-    setviewsData((prevData) => [...prevData, ...viewsDataRtk]);
+    const viewsDataRtk: MesheryViewWithLocation[] = views?.views ? views.views : [];
+    const viewsWithId = viewsDataRtk.filter((view) => typeof view.id === 'string');
+    setviewsData((prevData) => [...prevData, ...viewsWithId]);
   }, [views]);
 
   useEffect(() => {
-    const viewsOfWorkspaceDataRtk = viewsOfWorkspace?.views ? viewsOfWorkspace.views : [];
-    setWorkspaceviewsData((prevData) => [...prevData, ...viewsOfWorkspaceDataRtk]);
+    const viewsOfWorkspaceDataRtk: MesheryViewWithLocation[] = viewsOfWorkspace?.views ? viewsOfWorkspace.views : [];
+    const viewsWithId = viewsOfWorkspaceDataRtk.filter((view) => typeof view.id === 'string');
+    setWorkspaceviewsData((prevData) => [...prevData, ...viewsWithId]);
   }, [viewsOfWorkspace]);
 
   const handleAssignviewModal = (e?: React.MouseEvent): void => {
@@ -96,17 +100,17 @@ const useViewAssignment = ({
     }
   };
 
-  const getAddedAndRemovedviews = (allAssignedviews: Pattern[]): AddedAndRemovedViews => {
-    const originalviewsIds = workspaceviewsData.map((view) => view.id);
-    const updatedviewsIds = allAssignedviews.map((view) => view.id);
+  const getAddedAndRemovedviews = (allAssignedviews: MesheryViewWithLocation[]): AddedAndRemovedViews => {
+    const originalviewsIds = workspaceviewsData.map((view) => view.id).filter((id): id is string => typeof id === 'string');
+    const updatedviewsIds = allAssignedviews.map((view) => view.id).filter((id): id is string => typeof id === 'string');
 
     const addedviewsIds = updatedviewsIds.filter((id) => !originalviewsIds.includes(id));
     const removedviewsIds = originalviewsIds.filter((id) => !updatedviewsIds.includes(id));
 
     return { addedviewsIds, removedviewsIds };
   };
 
-  const isViewsActivityOccurred = (allViews: Pattern[]): boolean => {
+  const isViewsActivityOccurred = (allViews: MesheryViewWithLocation[]): boolean => {
     const { addedviewsIds, removedviewsIds } = getAddedAndRemovedviews(allViews);
     return addedviewsIds.length > 0 || removedviewsIds.length > 0;
   };
@@ -135,7 +139,7 @@ const useViewAssignment = ({
     handleAssignviewModalClose();
   };
 
-  const handleAssignviewsData = (updatedAssignedData: Pattern[]): void => {
+  const handleAssignviewsData = (updatedAssignedData: MesheryViewWithLocation[]): void => {
     const { addedviewsIds, removedviewsIds } = getAddedAndRemovedviews(updatedAssignedData);
     setDisableTransferButton(!(addedviewsIds.length > 0 || removedviewsIds.length > 0));
     setAssignedviews(updatedAssignedData);