Merge branch 'dev' into fix/refresh-token

Author: Mnickii

.github/policies/resourceManagement.yml

@@ -89,7 +89,6 @@ configuration:
           - isOpen
           - not:
               and:
-                - isAssignedToSomeone
                 - isLabeled
       then:
         - addLabel:
@@ -98,7 +97,17 @@ configuration:
       - payloadType: Issues
       - and:
           - isOpen
-          - isAssignedToSomeone
+          - isLabeled
+          - not:
+              and:
+                - isAssignedToSomeone
+      then:
+        - addLabel:
+            label: 'Triaged-Unassigned'
+    - if:
+      - payloadType: Issues
+      - and:
+          - isOpen
           - isLabeled
       then:
         - removeLabel:

src/app/services/actions/autocomplete-action-creators.spec.ts

@@ -47,7 +47,8 @@ const mockState: ApplicationState = {
   samples: {
     queries: [],
     pending: false,
-    error: null
+    error: null,
+    hasAutoSelectedDefault: false
   },
   scopes: {
     pending: { isSpecificPermissions: false, isFullPermissions: false },
@@ -123,7 +124,8 @@ store.getState = () => ({
   samples: {
     queries: [],
     pending: false,
-    error: null
+    error: null,
+    hasAutoSelectedDefault: false
   }
 })
 

src/app/services/actions/permissions-action-creator.spec.ts

@@ -68,7 +68,8 @@ const mockState: ApplicationState = {
   samples: {
     queries: [],
     pending: false,
-    error: null
+    error: null,
+    hasAutoSelectedDefault: false
   },
   scopes: {
     pending: { isSpecificPermissions: false, isFullPermissions: false },

src/app/services/actions/resource-explorer-action-creators.spec.ts

@@ -43,7 +43,8 @@ const mockState: ApplicationState = {
   samples: {
     queries: [],
     pending: false,
-    error: null
+    error: null,
+    hasAutoSelectedDefault: false
   },
   permissionGrants: {
     permissions: [],

src/app/services/slices/samples.slice.ts

@@ -9,12 +9,14 @@ interface SamplesState {
   queries: ISampleQuery[];
   pending: boolean;
   error: object | null | string;
+  hasAutoSelectedDefault: boolean;
 }
 
 const initialState: SamplesState = {
   queries: [],
   pending: false,
-  error: null
+  error: null,
+  hasAutoSelectedDefault: false
 };
 
 export const fetchSamples = createAsyncThunk<ISampleQuery[], void, { rejectValue: ISampleQuery[] }>(
@@ -52,7 +54,11 @@ export const fetchSamples = createAsyncThunk<ISampleQuery[], void, { rejectValue
 const samplesSlice = createSlice({
   name: 'samples',
   initialState,
-  reducers: {},
+  reducers: {
+    setHasAutoSelectedDefault: (state, action) => {
+      state.hasAutoSelectedDefault = action.payload;
+    }
+  },
   extraReducers: (builder) => {
     builder
       .addCase(fetchSamples.pending, (state) => {
@@ -73,4 +79,5 @@ const samplesSlice = createSlice({
   }
 });
 
+export const { setHasAutoSelectedDefault } = samplesSlice.actions;
 export default samplesSlice.reducer;

src/app/views/layout/LayoutStyles.tsx

@@ -4,20 +4,20 @@ export const SIDEBAR_SIZE_CSS_VAR = '--sidebar-size';
 
 export const useLayoutResizeStyles = makeResetStyles({
   [SIDEBAR_SIZE_CSS_VAR]: '23%'
-})
+});
 
 export const useLayoutStyles = makeStyles({
   container: {
     display: 'flex',
     flexDirection: 'column',
-    padding: tokens.spacingHorizontalS,
-    height: 'clamp(100vh, auto, 200vh)',
-    overflow: 'hidden'
+    height: '100vh',
+    overflow: 'hidden',
+    padding: tokens.spacingHorizontalS
   },
   content: {
     display: 'flex',
     flex: 1,
-    overflowY: 'hidden',
+    overflow: 'hidden',
     minWidth: 0
   },
   sidebar: {
@@ -43,36 +43,27 @@ export const useLayoutStyles = makeStyles({
     flex: 1,
     display: 'flex',
     flexDirection: 'column',
-    minWidth: '300px',
-    minHeight: 'calc(100vh - 98px)',
-    overflow: 'hidden'
+    overflow: 'hidden',
+    minWidth: 0,
+    minHeight: 0
   },
   requestResponseArea: {
-    flex: '1 1 auto',
+    flex: 1,
     display: 'flex',
     flexDirection: 'column',
-    height: '60vh',
-    minHeight: '550px',
-    overflow: 'hidden'
+    minHeight: 0,
+    overflowY: 'auto',
+    overflowX: 'hidden'
   },
-  responseArea: {
-    flex: '1 1 auto',
-    display: 'flex',
-    flexDirection: 'column',
-    minHeight: '300px',
-    height: 'auto',
-    maxHeight: '100%',
+  requestArea: {
+    flex: 1,
+    minHeight: '200px',
     overflow: 'auto',
     borderRadius: tokens.borderRadiusMedium,
     padding: tokens.spacingHorizontalS
   },
-  requestArea: {
-    flex: '1 1 40%',
-    display: 'flex',
-    flexDirection: 'column',
-    minHeight: '200px',
-    height:'auto',
-    maxHeight: '40%',
+  responseArea: {
+    flex: 1,
     overflow: 'auto',
     borderRadius: tokens.borderRadiusMedium,
     padding: tokens.spacingHorizontalS

src/app/views/query-runner/request/Request.tsx

@@ -38,14 +38,15 @@ interface IRequestProps {
 
 const useStyles = makeStyles({
   container: {
-    height: '-webkit-fill-available',
     display: 'flex',
-    flexDirection: 'column'
+    flexDirection: 'column',
+    width: '100%',
+    height: '100%',
+    overflow: 'hidden'
   },
   tabContainer: {
     display: 'flex',
-    flexShrink: 0,
-    overflowX: 'hidden'
+    flexShrink: 0
   },
   tabList: {
     padding: '5px 5px'
@@ -60,7 +61,7 @@ const useStyles = makeStyles({
     marginTop: tokens.spacingHorizontalS,
     backgroundColor: tokens.colorNeutralBackground1,
     minHeight: '0',
-    overflow: 'auto'
+    overflow: 'hidden'
   },
   menuButton: {
     alignSelf: 'center'

src/app/views/sidebar/sample-queries/SampleQueries.styles.ts

@@ -14,7 +14,6 @@ export const useStyles = makeStyles({
     maxWidth: '50px'
   },
   disabled: {
-    backgroundColor: tokens.colorSubtleBackgroundHover,
     '&:hover': {
       cursor: 'not-allowed'
     }

src/app/views/sidebar/sample-queries/SampleQueries.tsx

@@ -358,29 +358,33 @@ const Samples: React.FC<SamplesProps> = ({ queries, groups, searchValue }) => {
   const styles = useStyles();
   const [openItems, setOpenItems] = React.useState<Set<TreeItemValue>>(new Set());
   const [selectedQueryKey, setSelectedQueryKey] = useState<string | null>(null);
-  const [hasAutoSelected, setHasAutoSelected] = useState(false);
+  const hasAutoSelectedGlobally = useAppSelector(state => state.samples.hasAutoSelectedDefault) ?? false;
+  const [hasAutoSelected, setHasAutoSelected] = useState(hasAutoSelectedGlobally);
   const mobileScreen = useAppSelector((state) => state.sidebarProperties.mobileScreen);
 
   useEffect(() => {
     if (!searchValue && queries.length === 0) {
       dispatch(fetchSamples());
     } else {
       setSampleQueries(queries);
-      if (!mobileScreen && !hasAutoSelected && queries.length > 0) {
-        const defaultSample = queries.find(q =>
-          q.method === 'GET' && q.humanName.toLowerCase().includes('my profile')
-        );
-
-        if (defaultSample) {
-          const defaultKey = defaultSample.id ?? `${defaultSample.method}-${defaultSample.requestUrl}`;
-          setSelectedQueryKey(defaultKey);
-          sampleQueryItemSelected(defaultSample);
-          setHasAutoSelected(true);
-        }
-      }
     }
   }, [queries]);
 
+  useEffect(() => {
+    if (!mobileScreen && !hasAutoSelected && queries.length > 0) {
+      const defaultSample = queries.find(q =>
+        q.method === 'GET' && q.humanName.toLowerCase().includes('my profile')
+      );
+
+      if (defaultSample) {
+        const defaultKey = defaultSample.id ?? `${defaultSample.method}-${defaultSample.requestUrl}`;
+        setSelectedQueryKey(defaultKey);
+        sampleQueryItemSelected(defaultSample);
+        setHasAutoSelected(true);
+        dispatch({ type: 'samples/setHasAutoSelectedDefault', payload: true });
+      }
+    }
+  }, [mobileScreen, queries, hasAutoSelected, dispatch]);
   useEffect(() => {
     if (groups && groups.length > 0) {
       setOpenItems(prev => {