Skip to content

Commit

Permalink
Merge branch 'release/2024.11.20'
Browse files Browse the repository at this point in the history
  • Loading branch information
srijan55 committed Nov 20, 2024
2 parents acf6aa7 + 79b03eb commit 664e366
Show file tree
Hide file tree
Showing 8 changed files with 41 additions and 12 deletions.
21 changes: 21 additions & 0 deletions .github/workflows/combine-prs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: Combine Dependabot PRs

on:
workflow_dispatch: # allows you to manually trigger the workflow

# The minimum permissions required to run this Action
permissions:
contents: write
pull-requests: write
checks: read

jobs:
combine-prs:
runs-on: ubuntu-latest

steps:
- name: combine-prs
id: combine-prs
uses: github/combine-prs@v5.1.0
with:
labels: combined-pr
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "pc-datacatalog",
"version": "2024.9.3",
"version": "2024.11.20",
"private": true,
"proxy": "http://api:7071/",
"dependencies": {
Expand Down
6 changes: 5 additions & 1 deletion src/components/DefaultBanner.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,11 @@ const DefaultBanner = ({ children }) => {
<div className="banner-item">{child}</div>
));

const banner = <div className="header-banner grid-content">{wrapped}</div>;
const banner = (
<div className="header-banner grid-content" id="generated-docs-content">
{wrapped}
</div>
);

return banner;
};
Expand Down
12 changes: 11 additions & 1 deletion src/components/Header/Header.Bar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ import {
logoLinkStyle,
productNameStyle,
} from "./styles";
import { Stack, Text } from "@fluentui/react";
import { Link, Stack, Text } from "@fluentui/react";
import { skipContentStyle } from "components/Header/styles";

export const HeaderBar: React.FC = () => {
return (
Expand All @@ -17,6 +18,15 @@ export const HeaderBar: React.FC = () => {
verticalAlign="center"
tokens={headerTokens}
>
<Link
className={skipContentStyle}
onClick={() => {
const urlWithoutHash = window.location.href.split("#")[0];
window.location.href = urlWithoutHash + "#generated-docs-content";
}}
>
Skip to content
</Link>
<a
className={logoLinkStyle}
href="https://www.microsoft.com"
Expand Down
8 changes: 0 additions & 8 deletions src/config/storageDatasets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -157,14 +157,6 @@ ooi-camhd:
thumbnailUrl: RE4KiKZ.jpg
keywords: [OOI, Video, Ocean, Pacific]

sentinel-1-slc:
title: Sentinel-1 SLC
category: SAR
short_description: Global synthetic aperture radar data for the last 90 days
infoUrl: https://aka.ms/ai4edata-sentinel-1-slc
thumbnailUrl: sentinel-1-sat.jpg
keywords: [Global, Sentinel, Satellite, ESA, SAR]

uk-met-20crds:
title: UK Met Office CSSP China 20CRDS
category: Climate/Weather
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ export const OpacityCmdButton: React.FC<LayerOptionsProps> = ({
title="Adjust layer opacity"
aria-label={`Set ${layer.collection?.title} ${layer.renderOption?.name} opacity`}
iconProps={{ iconName: "CircleHalfFull" }}
role="menuitem"
styles={
layer.layer.opacity === 100 ? cmdButtonStyles : activeCmdButtonStyles
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ const LegendCmdBar = ({
{btnVisible}
{btnOpacity}
<IconButton
role="menuitem"
aria-label={expand.title}
title={expand.title}
disabled={isExpandDisabled}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ export const CatalogSelector = () => {
return (
<>
<DefaultButton
ariaLabel="Select a dataset to visualize"
ariaLabel={buttonText}
title="Select a dataset to visualize"
text={buttonText}
onRenderText={renderText("GlobeLocation", buttonText)}
Expand Down

0 comments on commit 664e366

Please sign in to comment.