Fix: Ensure collections are initiated in store (#2627)

microsoftgraph · Jun 16, 2023 · a0a75ca · a0a75ca
1 parent 8a6c1f1
commit a0a75ca
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/src/app/views/sidebar/resource-explorer/ResourceExplorer.tsx b/src/app/views/sidebar/resource-explorer/ResourceExplorer.tsx
@@ -38,7 +38,7 @@ const UnstyledResourceExplorer = (props: any) => {
 
   const dispatch: AppDispatch = useDispatch();
   const classes = classNames(props);
-  const selectedLinks = collections ? collections.find(k => k.isDefault)!.paths : [];
+  const selectedLinks = collections && collections.length > 0 ? collections.find(k => k.isDefault)!.paths : [];
   const versions: any[] = [
     { key: 'v1.0', text: 'v1.0' },
     { key: 'beta', text: 'beta' }

diff --git a/src/app/views/sidebar/resource-explorer/collection/PreviewCollection.tsx b/src/app/views/sidebar/resource-explorer/collection/PreviewCollection.tsx
@@ -23,7 +23,7 @@ const PathsReview: React.FC<PopupsComponent<IPathsReview>> = (props) => {
   const { collections } = useAppSelector(
     (state) => state
   );
-  const items = collections ? collections.find(k => k.isDefault)!.paths : [];
+  const items = collections && collections.length > 0 ? collections.find(k => k.isDefault)!.paths : [];
   const [selectedItems, setSelectedItems] = useState<IResourceLink[]>([]);
 
   const columns = [

diff --git a/src/app/views/sidebar/resource-explorer/command-options/CommandOptions.tsx b/src/app/views/sidebar/resource-explorer/command-options/CommandOptions.tsx
@@ -24,7 +24,7 @@ const CommandOptions = (props: ICommandOptions) => {
   const theme = getTheme();
 
   const { collections } = useAppSelector((state) => state);
-  const paths = collections ? collections.find(k => k.isDefault)!.paths : [];
+  const paths = collections && collections.length > 0 ? collections.find(k => k.isDefault)!.paths : [];
 
   const itemStyles = resourceExplorerStyles(theme).itemStyles;
   const commandStyles = resourceExplorerStyles(theme).commandBarStyles;

diff --git a/src/store/index.ts b/src/store/index.ts
@@ -39,7 +39,8 @@ const initialState: any = {
     sampleHeaders: [],
     selectedVersion: 'v1.0'
   },
-  termsOfUse: true
+  termsOfUse: true,
+  collections: []
 };
 
 export const store = createStore(