Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge release-9.x to develop #895

Closed
wants to merge 52 commits into from
Closed

Conversation

synqotik
Copy link
Contributor

@synqotik synqotik commented Oct 3, 2023

Fix some merge issues when merging release-9.x to develop (retain 10.0.0 version in a few files). I can't push directly to develop so need this PR.

External References

dependabot bot and others added 30 commits August 7, 2023 18:34
Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.22.9 to 7.22.10.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.22.10/packages/babel-core)

---
updated-dependencies:
- dependency-name: "@babel/core"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [sass](https://github.com/sass/dart-sass) from 1.64.1 to 1.65.1.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](sass/dart-sass@1.64.1...1.65.1)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 18.17.1 to 18.17.5.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [prettier](https://github.com/prettier/prettier) from 3.0.0 to 3.0.2.
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md)
- [Commits](prettier/prettier@3.0.0...3.0.2)

---
updated-dependencies:
- dependency-name: prettier
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
…ce-query

OPG-461: Include nodeid in ipinterface query results
…9.x/babel/core-7.22.10

build(deps-dev): bump @babel/core from 7.22.9 to 7.22.10
…9.x/types/node-18.17.5

build(deps-dev): bump @types/node from 18.17.1 to 18.17.5
…9.x/sass-1.65.1

build(deps-dev): bump sass from 1.64.1 to 1.65.1
…9.x/prettier-3.0.2

build(deps-dev): bump prettier from 3.0.0 to 3.0.2
OPG-460: Add SNMP Primary ifindex and Primary IP Address to node table
…tra-characters

OPG-448: Dashboard converter was outputting extra bracket
Bumps [@swc/jest](https://github.com/swc-project/jest) from 0.2.27 to 0.2.29.
- [Commits](swc-project/jest@v0.2.27...v0.2.29)

---
updated-dependencies:
- dependency-name: "@swc/jest"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [tslib](https://github.com/Microsoft/tslib) from 2.6.1 to 2.6.2.
- [Release notes](https://github.com/Microsoft/tslib/releases)
- [Commits](microsoft/tslib@v2.6.1...v2.6.2)

---
updated-dependencies:
- dependency-name: tslib
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [@testing-library/jest-dom](https://github.com/testing-library/jest-dom) from 5.17.0 to 6.1.2.
- [Release notes](https://github.com/testing-library/jest-dom/releases)
- [Changelog](https://github.com/testing-library/jest-dom/blob/main/CHANGELOG.md)
- [Commits](testing-library/jest-dom@v5.17.0...v6.1.2)

---
updated-dependencies:
- dependency-name: "@testing-library/jest-dom"
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 18.17.5 to 18.17.11.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
…9.x/swc/jest-0.2.29

build(deps-dev): bump @swc/jest from 0.2.27 to 0.2.29
…9.x/tslib-2.6.2

build(deps-dev): bump tslib from 2.6.1 to 2.6.2
…9.x/testing-library/jest-dom-6.1.2

build(deps-dev): bump @testing-library/jest-dom from 5.17.0 to 6.1.2
…9.x/types/node-18.17.11

build(deps-dev): bump @types/node from 18.17.5 to 18.17.11
Bumps [@grafana/eslint-config](https://github.com/grafana/eslint-config-grafana) from 6.0.0 to 6.0.1.
- [Commits](https://github.com/grafana/eslint-config-grafana/commits)

---
updated-dependencies:
- dependency-name: "@grafana/eslint-config"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [jest-environment-jsdom](https://github.com/jestjs/jest/tree/HEAD/packages/jest-environment-jsdom) from 29.6.2 to 29.6.4.
- [Release notes](https://github.com/jestjs/jest/releases)
- [Changelog](https://github.com/jestjs/jest/blob/main/CHANGELOG.md)
- [Commits](https://github.com/jestjs/jest/commits/v29.6.4/packages/jest-environment-jsdom)

---
updated-dependencies:
- dependency-name: jest-environment-jsdom
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [@types/jquery](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/jquery) from 3.5.16 to 3.5.18.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/jquery)

---
updated-dependencies:
- dependency-name: "@types/jquery"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
OPG-463: EntityDS retain limit of 0. Add relevant unit tests
Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.22.10 to 7.22.17.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.22.17/packages/babel-core)

---
updated-dependencies:
- dependency-name: "@babel/core"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Benjamin Reed and others added 22 commits September 12, 2023 10:12
…9.x/grafana/eslint-config-6.0.1

build(deps-dev): bump @grafana/eslint-config from 6.0.0 to 6.0.1
…9.x/jest-environment-jsdom-29.6.4

build(deps-dev): bump jest-environment-jsdom from 29.6.2 to 29.6.4
…9.x/types/jquery-3.5.18

build(deps-dev): bump @types/jquery from 3.5.16 to 3.5.18
…9.x/babel/core-7.22.17

build(deps-dev): bump @babel/core from 7.22.10 to 7.22.17
Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 18.17.11 to 18.17.15.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
…9.x/types/node-18.17.15

build(deps-dev): bump @types/node from 18.17.11 to 18.17.15
OPG-454: Allow Flows query with multi-valued withHost
Bumps [jest-environment-jsdom](https://github.com/jestjs/jest/tree/HEAD/packages/jest-environment-jsdom) from 29.6.4 to 29.7.0.
- [Release notes](https://github.com/jestjs/jest/releases)
- [Changelog](https://github.com/jestjs/jest/blob/main/CHANGELOG.md)
- [Commits](https://github.com/jestjs/jest/commits/v29.7.0/packages/jest-environment-jsdom)

---
updated-dependencies:
- dependency-name: jest-environment-jsdom
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [prettier](https://github.com/prettier/prettier) from 3.0.2 to 3.0.3.
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md)
- [Commits](prettier/prettier@3.0.2...3.0.3)

---
updated-dependencies:
- dependency-name: prettier
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [@testing-library/jest-dom](https://github.com/testing-library/jest-dom) from 6.1.2 to 6.1.3.
- [Release notes](https://github.com/testing-library/jest-dom/releases)
- [Changelog](https://github.com/testing-library/jest-dom/blob/main/CHANGELOG.md)
- [Commits](testing-library/jest-dom@v6.1.2...v6.1.3)

---
updated-dependencies:
- dependency-name: "@testing-library/jest-dom"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [which](https://github.com/npm/node-which) from 3.0.1 to 4.0.0.
- [Release notes](https://github.com/npm/node-which/releases)
- [Changelog](https://github.com/npm/node-which/blob/main/CHANGELOG.md)
- [Commits](npm/node-which@v3.0.1...v4.0.0)

---
updated-dependencies:
- dependency-name: which
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [sass](https://github.com/sass/dart-sass) from 1.65.1 to 1.66.1.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](sass/dart-sass@1.65.1...1.66.1)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
…9.x/jest-environment-jsdom-29.7.0

build(deps-dev): bump jest-environment-jsdom from 29.6.4 to 29.7.0
…9.x/prettier-3.0.3

build(deps-dev): bump prettier from 3.0.2 to 3.0.3
…9.x/testing-library/jest-dom-6.1.3

build(deps-dev): bump @testing-library/jest-dom from 6.1.2 to 6.1.3
…9.x/which-4.0.0

build(deps-dev): bump which from 3.0.1 to 4.0.0
…9.x/sass-1.66.1

build(deps-dev): bump sass from 1.65.1 to 1.66.1
OPG-464: Add nodeID to EntityDS SnmpInterfaces queries, IP nodeId column placement
@sonarqubecloud
Copy link

sonarqubecloud bot commented Oct 3, 2023

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 2 Code Smells

No Coverage information No Coverage information
0.2% 0.2% Duplication

}

export const capitalize = (value: string) => {
return value ? value.charAt(0).toUpperCase() + value.slice(1).toLowerCase() : ''
}

export const isInteger = (num: any) => {
return !isUndefined(num) && num !== null && ((parseInt(num, 10) + '') === (num + ''))
}

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This fn is used quite a bit. Is there something special here? Otherwise we might use javascript's Number.isInteger(val).

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point, I'll see if we can just use that, I'll update in the next PR.

Copy link

@mikewrosey mikewrosey left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@synqotik synqotik closed this Oct 4, 2023
@synqotik
Copy link
Contributor Author

synqotik commented Oct 4, 2023

Closing this as a duplicate since @mershad-manesh fixed this: 70227a4

@synqotik synqotik deleted the synqotik/merge-9x-to-develop branch October 4, 2023 21:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants