Merge branch 'dev' into dependabot-upgrades

Author: Mnickii

.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-    ".": "10.5.0"
+    ".": "10.5.1"
 }

CHANGELOG.md

@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [10.5.1](https://github.com/microsoftgraph/microsoft-graph-explorer-v4/compare/v10.5.0...v10.5.1) (2025-01-16)
+
+
+### Bug Fixes
+
+* Rollback adaptive-expressions version ([#3523](https://github.com/microsoftgraph/microsoft-graph-explorer-v4/issues/3523)) ([89ecd8e](https://github.com/microsoftgraph/microsoft-graph-explorer-v4/commit/89ecd8ebfc048ecbeab9a113f1931e9935a8dec2))
+
 ## [10.5.0](https://github.com/microsoftgraph/microsoft-graph-explorer-v4/compare/v10.4.1...v10.5.0) (2024-12-02)
 
 

package-lock.json

@@ -1,6 +1,6 @@
 {
         "name": "graph-explorer-v2",
-        "version": "10.5.0",
+        "version": "10.5.1",
         "private": true,
         "dependencies": {
                 "@augloop/types-core": "file:packages/types-core-2.16.189.tgz",

package.json

@@ -2,7 +2,7 @@ sonar.projectKey=microsoftgraph_microsoft-graph-explorer-v4
 sonar.organization=microsoftgraph2
 sonar.projectName=microsoft-graph-explorer-v4
 // x-release-please-start-version
-sonar.projectVersion=10.5.0
+sonar.projectVersion=10.5.1
 // x-release-please-end
 sonar.host.url=https://sonarcloud.io
 

sonar-project.properties

@@ -19,6 +19,7 @@ import { useEffect, useState } from 'react';
 import { ResourcePath } from '../../../../../types/resources';
 import { setQueryResponseStatus } from '../../../../services/slices/query-status.slice';
 import { isGeneratedCollectionInCollection } from './upload-collection.util';
+import './api-collections.scss';
 
 export interface APICollection {
   version: string;
@@ -243,7 +244,7 @@ const APICollection: React.FC<PopupsComponent<APICollection>> = (props) => {
       )}
 
       {items && items.length > 0 ?
-        (<div style={{ height: '80vh' }}>
+        (<div>
           <Paths
             resources={items}
             columns={columns}
@@ -252,16 +253,13 @@ const APICollection: React.FC<PopupsComponent<APICollection>> = (props) => {
         ) :
         (
           <Label
-            style={{ display: 'flex', width: '100%',
-              height: '80vh',
-              justifyContent: 'center',
-              alignItems: 'center' }}>
+            className='label'>
             {translateMessage('Add queries in the API Explorer and History tab')}
           </Label>
         )}
       <DialogFooter
         styles={{
-          actionsRight: { bottom: 0, justifyContent: 'start' }
+          actionsRight: { bottom: 0, justifyContent: 'start', position: 'fixed', width: '100%', zIndex: 1  }
         }}>
         <PrimaryButton onClick={generateCollection} disabled={items.length === 0}>
           {translateMessage('Download postman collection')}

src/app/views/sidebar/resource-explorer/collection/APICollection.tsx

@@ -102,7 +102,7 @@ const CollectionPermissions: FC<PopupsComponent<null>> = (props) => {
           {translateMessage('Microsoft Graph permissions reference')}
         </Link>
       </MessageBar>
-      <div style={{ height: '80vh', overflowY: 'auto', overflowX: 'hidden' }}>
+      <div style={{ overflowY: 'auto', overflowX: 'hidden' }}>
         <DetailsList
           items={permissionsArray}
           columns={columns}
@@ -112,7 +112,7 @@ const CollectionPermissions: FC<PopupsComponent<null>> = (props) => {
       </div>
       {permissions &&
         <DialogFooter styles={{
-          actionsRight: { bottom: 0, justifyContent: 'start' }
+          actionsRight: { bottom: 0, justifyContent: 'start', position: 'fixed', width: '100%', zIndex: 1  }
         }}>
           <PrimaryButton onClick={downloadPermissions}>
             {translateMessage('Download permissions')}

src/app/views/sidebar/resource-explorer/collection/CollectionPermissions.tsx

@@ -36,7 +36,7 @@ const EditCollectionPanel: React.FC<EditCollectionPanelProps> = ({closePopup}) =
         <span style={{ fontWeight: 'bold' }}>{translateMessage('Delete all selected')}</span>
       </MessageBar>
       {items && items.length > 0 ? (
-        <div style={{ height: '80vh' }}>
+        <div>
           <Paths
             resources={items}
             columns={columns}
@@ -45,7 +45,7 @@ const EditCollectionPanel: React.FC<EditCollectionPanelProps> = ({closePopup}) =
           />
         </div>
       ) : (
-        <div style={{height: '80vh'}}>
+        <div>
           <Label
             style={{
               display: 'flex',
@@ -60,7 +60,7 @@ const EditCollectionPanel: React.FC<EditCollectionPanelProps> = ({closePopup}) =
       )}
       <DialogFooter
         styles={{
-          actionsRight: { bottom: 0, justifyContent: 'start' }
+          actionsRight: { bottom: 0, justifyContent: 'start', position: 'fixed', width: '100%', zIndex: 1 }
         }}>
         <PrimaryButton onClick={removeSelectedItems} disabled={selectedItems.length === 0}>
           {translateMessage('Delete all selected')}

src/app/views/sidebar/resource-explorer/collection/EditCollectionPanel.tsx

@@ -91,7 +91,7 @@ const EditScopePanel: React.FC<EditScopePanelProps> = ({ closePopup }) => {
           styles={{ dropdown: { width: 200 } }}
         />
       </div>
-      <div style={{ flex: 1, marginBottom: '1px',  maxHeight: '80vh' }}>
+      <div style={{ flex: 1, marginBottom: '1px'}}>
         <Paths
           resources={items.map(item => pendingChanges.find(change => change.key === item.key) || item)}
           columns={columns}
@@ -105,8 +105,10 @@ const EditScopePanel: React.FC<EditScopePanelProps> = ({ closePopup }) => {
           actionsRight: {
             display: 'flex',
             justifyContent: 'flex-start',
-            padding: '5px'
-          }
+            position: 'fixed',
+            width: '100%',
+            bottom: 0,
+            zIndex: 1}
         }}>
         <PrimaryButton onClick={saveAllScopes} disabled={pendingChanges.length === 0}>
           {translateMessage('Save all')}

src/app/views/sidebar/resource-explorer/collection/EditScopePanel.tsx

@@ -86,7 +86,7 @@ export default class Paths extends Component<IPathProps> {
   public render(): JSX.Element {
     const { resources, columns, isSelectable } = this.props;
     return (
-      <div style={{ height: '80vh', overflowY: 'auto', overflowX: 'hidden' }}>
+      <div style={{overflowY: 'auto', overflowX: 'hidden' }}>
         <DetailsList
           items={resources}
           columns={columns}