Skip to content

Commit

Permalink
bumping backstage libraries
Browse files Browse the repository at this point in the history
Signed-off-by: Phil Gore <[email protected]>
  • Loading branch information
Erog38 authored and satrox28 committed Mar 7, 2022
1 parent de140df commit 5800bc5
Show file tree
Hide file tree
Showing 3 changed files with 12,807 additions and 16 deletions.
20 changes: 10 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@
"clean": "backstage-cli clean"
},
"dependencies": {
"@backstage/core-components": "^0.8.5",
"@backstage/core-plugin-api": "^0.6.0",
"@backstage/plugin-catalog-react": "^0.6.12",
"@backstage/core-components": "^0.9.0",
"@backstage/core-plugin-api": "^0.8.0",
"@backstage/plugin-catalog-react": "^0.8.1",
"@backstage/theme": "^0.2.14",
"@material-ui/core": "^4.12.2",
"@material-ui/icons": "^4.9.1",
Expand All @@ -42,15 +42,15 @@
"react-use": "^17.2.4"
},
"peerDependencies": {
"react": "^16.13.1 || ^17.0.0",
"react-dom": "^16.13.1 || ^17.0.0"
},
"react": "^16.13.1 || ^17.0.0",
"react-dom": "^16.13.1 || ^17.0.0"
},
"devDependencies": {
"@backstage/cli": "^0.13.0",
"@backstage/core-app-api": "^0.5.0",
"@backstage/plugin-catalog-react": "^0.6.12",
"@backstage/cli": "^0.15.1",
"@backstage/core-app-api": "^0.6.0",
"@backstage/plugin-catalog-react": "^0.8.1",
"@backstage/dev-utils": "^0.2.18",
"@backstage/test-utils": "^0.2.3",
"@backstage/test-utils": "^0.3.0",
"@testing-library/jest-dom": "^5.12.0",
"@testing-library/react": "^12.1.2",
"@testing-library/user-event": "^13.1.8",
Expand Down
12 changes: 6 additions & 6 deletions src/components/gitlabAppData.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ import { useEntity } from '@backstage/plugin-catalog-react';
import { useApi } from '@backstage/core-plugin-api';
import { scmIntegrationsApiRef } from '@backstage/integration-react';
import {
parseLocationReference,
LOCATION_ANNOTATION,
SOURCE_LOCATION_ANNOTATION,
parseLocationRef,
ANNOTATION_LOCATION,
ANNOTATION_SOURCE_LOCATION,
} from '@backstage/catalog-model';

export const GITLAB_ANNOTATION_PROJECT_ID = 'gitlab.com/project-id';
Expand All @@ -37,13 +37,13 @@ export const useEntityGitlabScmIntegration = () => {
return defaultGitlabIntegration;
}

let location = entity.metadata.annotations?.[SOURCE_LOCATION_ANNOTATION];
let location = entity.metadata.annotations?.[ANNOTATION_SOURCE_LOCATION];

if (!location) {
location = entity.metadata.annotations?.[LOCATION_ANNOTATION];
location = entity.metadata.annotations?.[ANNOTATION_LOCATION];
}

const { target } = parseLocationReference(location || '');
const { target } = parseLocationRef(location || '');

const scm = integrations.gitlab.byUrl(target);
if (scm) {
Expand Down
Loading

0 comments on commit 5800bc5

Please sign in to comment.