Skip to content

Commit

Permalink
Merge pull request #603 from etn-ccis/dev
Browse files Browse the repository at this point in the history
Publish 8.1.0
  • Loading branch information
JeffGreiner-eaton authored Mar 14, 2023
2 parents a2f3123 + 8821629 commit baee887
Show file tree
Hide file tree
Showing 18 changed files with 133 additions and 231 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
version: 2.1
orbs:
codecov: codecov/codecov@1.1.3
codecov: codecov/codecov@3.2.2
gh: circleci/[email protected]
browser-tools: circleci/[email protected]
jobs:
Expand Down Expand Up @@ -62,7 +62,7 @@ jobs:
at: .
- codecov/upload:
file: './coverage/lcov.info'
token: dc22e69d-e76e-4c9c-92a4-92432b1033d4
token: CODECOV_TOKEN

# Builds the Showcase md using @brightlayer-ui/angular-components persisted in /dist folder.
build_showcase:
Expand Down
5 changes: 3 additions & 2 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ updates:
- package-ecosystem: "npm"
directory: "/"
schedule:
interval: "weekly"
interval: "monthly"
day: "monday"
open-pull-requests-limit: 1
target-branch: "dev"
labels:
- "external-dependency"
- "external-dependency"
- 'brightlayer-ui'
3 changes: 3 additions & 0 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Add brightlayer-ui label to any root file changes on fork pull requests
brightlayer-ui:
- '*'
14 changes: 14 additions & 0 deletions .github/workflows/laberler.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: "Fork PR Labeler"
on:
- pull_request_target

jobs:
triage:
permissions:
contents: read
pull-requests: write
runs-on: ubuntu-latest
steps:
- uses: actions/labeler@v4
with:
repo-token: "${{ secrets.GITHUB_TOKEN }}"
7 changes: 4 additions & 3 deletions .github/workflows/pr-comment.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: 'Comment on PR'
on:
pull_request:
pull_request_target:
branches:
- master

Expand All @@ -12,8 +12,9 @@ jobs:
- name: Checkout
uses: actions/checkout@v3
- name: Comment PR
uses: thollander/actions-comment-pull-request@v1
uses: thollander/actions-comment-pull-request@v2
with:
message: 'Thank you for the master pull request. 👍 Please be sure this pull request is for the master branch. The master branch is used for items that are ready for publishing.
The dev branch is our working branch for all issues and enhancements. Please read our [Contributing Guidelines](https://github.com/etn-ccis/blui-doc-it/blob/master/src/docs/community/contributing-guideline.md) for more information.'
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
comment_tag: execution
12 changes: 9 additions & 3 deletions .github/workflows/pr-labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,18 @@ on:
pull_request:
types: [opened]

permissions:
contents: read

jobs:
pr-labeler:
if: '${{ github.event.pull_request.head.repo.full_name == github.repository }}'
permissions:
contents: read
pull-requests: write
runs-on: ubuntu-latest
steps:
- uses: TimonVS/pr-labeler-action@v3
- uses: TimonVS/pr-labeler-action@v4
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
configuration-path: .github/pr-labeler.yml
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
# Change Log

## v8.1.0 (March 14, 2023)

### Fixed

- Fixed Channel value issue with zero value in `<blui-channel-value>` ([#556](https://github.com/etn-ccis/blui-angular-component-library/issues/556)).
- Fixed Ability to use chevron and right component prop on the Info List Item at the same time in `<blui-info-list-item>` ([#418](https://github.com/etn-ccis/blui-angular-component-library/issues/418)).
- Fixed Ripple not disabled in NavItem `<blui-drawer-nav-item>` ([#468](https://github.com/etn-ccis/blui-angular-component-library/issues/468)).
- Fixed Toolbar Menu left icon should be vertically centered in `<blui-toolbar-menu>` ([#515](https://github.com/etn-ccis/blui-angular-component-library/issues/515)).
- Fixed Divider effect not working in `<blui-hero-banner>` ([#491](https://github.com/etn-ccis/blui-angular-component-library/issues/491)).
- Fixed Drawer footer should preserve its divider when the drawer collapses in `<blui-drawer-footer>` ([#484](https://github.com/etn-ccis/blui-angular-component-library/issues/484)).

## v8.0.1 (January 25, 2023)

### Added
Expand Down
2 changes: 1 addition & 1 deletion angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
],
"styles": [
"src/styles.scss",
"./node_modules/@brightlayer-ui/icons/iconfont/BrightlayerUIIcons.css",
"./node_modules/@brightlayer-ui/icons/BrightlayerUIIcons.css",
"node_modules/prismjs/themes/prism-tomorrow.css",
"node_modules/prismjs/plugins/line-highlight/prism-line-highlight.css",
"node_modules/prismjs/plugins/line-numbers/prism-line-numbers.css",
Expand Down
9 changes: 4 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@brightlayer-ui/angular-components",
"version": "8.0.1",
"version": "8.1.0",
"description": "Angular components for Brightlayer UI applications",
"main": "index.js",
"prettier": "@brightlayer-ui/prettier-config",
Expand Down Expand Up @@ -57,8 +57,8 @@
"doc": "src/docs/md"
},
"peerDependencies": {
"@angular/core": "^14.0.0",
"@angular/cdk": "^14.0.0",
"@angular/core": "^14.0.0",
"@angular/material": "^14.0.0"
},
"devDependencies": {
Expand All @@ -80,15 +80,14 @@
"@brightlayer-ui/angular-themes": "^8.0.0",
"@brightlayer-ui/colors": "^3.1.1",
"@brightlayer-ui/eslint-config": "^3.0.0",
"@brightlayer-ui/icons": "^1.10.0",
"@brightlayer-ui/icons": "^2.1.0",
"@brightlayer-ui/icons-svg": "^1.11.0",
"@brightlayer-ui/prettier-config": "^1.0.3",
"@types/jasmine": "~4.3.0",
"@types/jasminewd2": "~2.0.10",
"@types/node": "^18.11.9",
"@typescript-eslint/eslint-plugin": "^5.42.1",
"@typescript-eslint/parser": "^5.42.1",
"codecov": "^3.8.3",
"eslint": "^8.27.0",
"eslint-config-prettier": "^8.5.0",
"jasmine-core": "~4.5.0",
Expand All @@ -111,4 +110,4 @@
"yarn-audit-fix": "^9.3.7",
"zone.js": "~0.11.8"
}
}
}
7 changes: 7 additions & 0 deletions src/lib/core/channel-value/channel-value.component.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,13 @@ describe('ChannelValueComponent', () => {
void expect(value.innerText).toBe('Test Value');
});

it('should render 0 integer value', () => {
component.value = 0;
fixture.detectChanges();
const value = fixture.nativeElement.querySelector('.blui-channel-value-value');
void expect(value.innerText).toBe('0');
});

it('should render units to the left', () => {
component.value = 'Test Value';
component.units = 'hz';
Expand Down
7 changes: 5 additions & 2 deletions src/lib/core/channel-value/channel-value.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ export type UnitSpaceType = 'show' | 'hide' | 'auto';
{{ units }}
</div>
<div
*ngIf="value"
*ngIf="getValueAsString()"
class="blui-channel-value-value"
[class.blui-channel-value-remove-space]="unitSpace === 'hide'"
>
{{ value }}
{{ getValueAsString() }}
</div>
<div
*ngIf="units && !prefix"
Expand Down Expand Up @@ -81,4 +81,7 @@ export class ChannelValueComponent implements OnChanges {
? this.prefixUnitWhitelist.includes(this.units)
: this.suffixUnitWhitelist.includes(this.units);
}
getValueAsString(): string {
return String(this.value);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ export type ActiveItemBackgroundShape = 'round' | 'square';
class="blui-drawer-nav-item-content"
#navItem
matRipple
[matRippleDisabled]="!ripple ?? true"
[class.blui-drawer-nav-item-active]="selected"
[class.blui-drawer-nav-item-compact]="false"
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ import { DrawerStateManagerService, StateListener } from '../state-listener.comp
changeDetection: ChangeDetectionStrategy.OnPush,
encapsulation: ViewEncapsulation.None,
template: `
<mat-divider *ngIf="divider"></mat-divider>
<div
class="blui-drawer-footer-content"
[style.visibility]="hideContentOnCollapse ? (isOpen() ? 'visible' : 'hidden') : 'visible'"
>
<mat-divider *ngIf="divider"></mat-divider>
<ng-content></ng-content>
</div>
`,
Expand Down
1 change: 1 addition & 0 deletions src/lib/core/hero/hero-banner.component.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
.blui-hero-banner {
display: flex;
flex-direction: column;
}

.blui-hero-banner-content {
Expand Down
2 changes: 1 addition & 1 deletion src/lib/core/info-list-item/info-list-item.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ type DividerType = 'full' | 'partial' | undefined;
<div #right class="blui-info-list-item-right-content-wrapper">
<ng-content select="[blui-right-content]"></ng-content>
</div>
<mat-icon *ngIf="chevron && isEmpty(rightEl)" class="blui-chevron">chevron_right</mat-icon>
<mat-icon *ngIf="chevron" class="blui-chevron">chevron_right</mat-icon>
</div>
</mat-list-item>
<mat-divider
Expand Down
7 changes: 5 additions & 2 deletions src/lib/core/toolbar-menu/toolbar-menu.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,16 @@
align-items: center;
cursor: pointer;
}
.blui-toolbar-icon-wrapper {
display: flex;
align-items: center;
}
.blui-toolbar-menu-label {
line-height: 1rem;
line-height: inherit;
}
.blui-toolbar-icon-wrapper .mat-icon {
font-size: 1rem;
width: 1rem;
line-height: 1rem;
height: 1rem;
margin-right: 8px;
}
Expand Down
Loading

0 comments on commit baee887

Please sign in to comment.