Skip to content

Commit 4291774

Browse files
authored
Merge pull request #789 from mathuo/788-sonar-fixes
chore: adjust sonar parameters
2 parents c502542 + cf68913 commit 4291774

File tree

5 files changed

+13
-18
lines changed

5 files changed

+13
-18
lines changed

.github/workflows/main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- run: npm run build
2828
- run: npm run test:cov
2929
- name: SonarCloud Scan
30-
uses: SonarSource/sonarcloud-github-action@master
30+
uses: sonarsource/sonarqube-scan-action@v4.1.0
3131
env:
3232
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
3333
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

packages/dockview-core/src/dockview/dockviewComponent.ts

+7-6
Original file line numberDiff line numberDiff line change
@@ -767,15 +767,16 @@ export class DockviewComponent
767767

768768
let returnedGroup: DockviewGroupPanel | undefined;
769769

770+
const isValidReferenceGroup =
771+
isGroupAddedToDom &&
772+
referenceGroup &&
773+
this.getPanel(referenceGroup.id);
774+
770775
const value = {
771776
window: _window,
772777
popoutGroup: group,
773-
referenceGroup: !isGroupAddedToDom
774-
? undefined
775-
: referenceGroup
776-
? this.getPanel(referenceGroup.id)
777-
? referenceGroup.id
778-
: undefined
778+
referenceGroup: isValidReferenceGroup
779+
? referenceGroup.id
779780
: undefined,
780781
disposable: {
781782
dispose: () => {

packages/dockview-core/src/gridview/baseComponentGridview.ts

+1-7
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
import { Emitter, Event, AsapEvent } from '../events';
2-
import {
3-
getGridLocation,
4-
Gridview,
5-
IGridView,
6-
MaximizedViewChanged,
7-
} from './gridview';
2+
import { getGridLocation, Gridview, IGridView } from './gridview';
83
import { Position } from '../dnd/droptarget';
94
import { Disposable, IDisposable, IValueDisposable } from '../lifecycle';
105
import { sequentialNumberGenerator } from '../math';
@@ -13,7 +8,6 @@ import { IPanel } from '../panel/types';
138
import { MovementOptions2 } from '../dockview/options';
149
import { Resizable } from '../resizable';
1510
import { Classnames } from '../dom';
16-
import { IGridviewComponent } from './gridviewComponent';
1711

1812
const nextLayoutId = sequentialNumberGenerator();
1913

packages/dockview-core/src/popoutWindow.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ export class PopoutWindow extends CompositeDisposable {
160160
resolve(container);
161161
} catch (err) {
162162
// only except this is the DOM isn't setup. e.g. in a in correctly configured test
163-
reject(err);
163+
reject(err as Error);
164164
}
165165
});
166166
});

sonar-project.properties

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
sonar.projectKey=mathuo_dockview
22
sonar.organization=dockview
33

4-
sonar.inclusions=packages/dockview/src/**/*,packages/dockview-core/src/**/*,packages/dockview-vue/src/**/*
5-
sonar.exclusions=packages/dockview/src/__tests__/**,packages/dockview-core/src/__tests__/**,packages/dockview-vue/src/__tests__/**
6-
sonar.tests=packages/dockview/src/__tests__,packages/dockview-core/src/__tests__,packages/dockview-vue/src/__tests__
4+
sonar.inclusions=packages/dockview/src/**/*,packages/dockview-core/src/**/*,packages/dockview-vue/src/**/*,packages/dockview-react/src/**/*
5+
sonar.exclusions=packages/dockview/docs/**/*,packages/dockview/src/__tests__/**/*,packages/dockview-core/src/__tests__/**/*,packages/dockview-vue/src/__tests__/**/*,packages/dockview-react/src/__tests__/**/*
6+
sonar.tests=packages/dockview/src/__tests__,packages/dockview-core/src/__tests__,packages/dockview-vue/src/__tests__,packages/dockview-react/src/__tests__
77

88
sonar.testExecutionReportPaths=test-report.xml
99
sonar.javascript.lcov.reportPaths=coverage/lcov.info

0 commit comments

Comments
 (0)