Skip to content

Commit

Permalink
Merge branch 'main' into feat/search-config-remote-component
Browse files Browse the repository at this point in the history
  • Loading branch information
markuczy committed Aug 20, 2024
2 parents 82e9f28 + 3e06fc2 commit 63fc40c
Show file tree
Hide file tree
Showing 22 changed files with 1,323 additions and 1,324 deletions.
35 changes: 35 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,38 @@
## [5.4.0](https://github.com/onecx/onecx-portal-ui-libs/compare/v5.3.2...v5.4.0) (2024-08-19)

### Features

* added function for check if url exists ([0e09d20](https://github.com/onecx/onecx-portal-ui-libs/commit/0e09d20d9326ede9f2b7330a73f439658ec302b7))

### Bug Fixes

* add length getter to DynamicLocaleId ([#393](https://github.com/onecx/onecx-portal-ui-libs/issues/393)) ([d4b373d](https://github.com/onecx/onecx-portal-ui-libs/commit/d4b373d5c9597bbbdd613b6608b09eae196acd70))
* fix search header layout ([#410](https://github.com/onecx/onecx-portal-ui-libs/issues/410)) ([23f7d2b](https://github.com/onecx/onecx-portal-ui-libs/commit/23f7d2b7951add1b0dace421577412f0bcdf95d1))
* remove unnecessary page header button padding ([#408](https://github.com/onecx/onecx-portal-ui-libs/issues/408)) ([e93dc11](https://github.com/onecx/onecx-portal-ui-libs/commit/e93dc11538e5eda78a94438ba39d1331506cf49f))

### Chores

* **deps-dev:** bump @storybook/addon-a11y from 8.2.6 to 8.2.8 ([#388](https://github.com/onecx/onecx-portal-ui-libs/issues/388)) ([b34bc6d](https://github.com/onecx/onecx-portal-ui-libs/commit/b34bc6d9d05214232217c28f2e0f30e9ded8a196))
* **deps-dev:** bump @storybook/addon-essentials from 8.2.7 to 8.2.8 ([#381](https://github.com/onecx/onecx-portal-ui-libs/issues/381)) ([fea8fa4](https://github.com/onecx/onecx-portal-ui-libs/commit/fea8fa4d9c5c1e2ac5a06bafabd31507f1a9af19))
* **deps-dev:** bump @storybook/angular from 8.2.6 to 8.2.8 ([#384](https://github.com/onecx/onecx-portal-ui-libs/issues/384)) ([8d719f2](https://github.com/onecx/onecx-portal-ui-libs/commit/8d719f2c2fff5e4da0930ba3fabac8c6dde3e7b8))
* **deps-dev:** bump @storybook/angular from 8.2.8 to 8.2.9 ([#397](https://github.com/onecx/onecx-portal-ui-libs/issues/397)) ([49cfb8a](https://github.com/onecx/onecx-portal-ui-libs/commit/49cfb8a1e23f6e9fe0b18513b5e9ee86b3ca82ca))
* **deps-dev:** bump @storybook/core-server from 8.2.7 to 8.2.8 ([#389](https://github.com/onecx/onecx-portal-ui-libs/issues/389)) ([8168b64](https://github.com/onecx/onecx-portal-ui-libs/commit/8168b64c5a72434126abcfb54007c746c8fcd68b))
* **deps-dev:** bump @swc/core from 1.6.13 to 1.7.6 ([#373](https://github.com/onecx/onecx-portal-ui-libs/issues/373)) ([39abfb6](https://github.com/onecx/onecx-portal-ui-libs/commit/39abfb624a150b2f42cd0eaea268e6d9cd8d6ed7))
* **deps-dev:** bump @swc/core from 1.7.6 to 1.7.10 ([#398](https://github.com/onecx/onecx-portal-ui-libs/issues/398)) ([c7ce3f8](https://github.com/onecx/onecx-portal-ui-libs/commit/c7ce3f8d409b44f2144f59c3b85a004c3e23fb72))
* **deps-dev:** bump @types/node from 22.1.0 to 22.4.0 ([#407](https://github.com/onecx/onecx-portal-ui-libs/issues/407)) ([5553278](https://github.com/onecx/onecx-portal-ui-libs/commit/55532787240a686dae876dad3d16ff811738987e))
* **deps-dev:** bump jest-preset-angular from 14.1.1 to 14.2.2 ([#387](https://github.com/onecx/onecx-portal-ui-libs/issues/387)) ([0d5705b](https://github.com/onecx/onecx-portal-ui-libs/commit/0d5705be68f4441bd7426abc49ffd71d595d4993))
* **deps-dev:** bump ng-packagr from 18.1.0 to 18.2.0 ([#403](https://github.com/onecx/onecx-portal-ui-libs/issues/403)) ([02b6bcf](https://github.com/onecx/onecx-portal-ui-libs/commit/02b6bcf34d378ab2e774531d82c5ec9b2199bcdc))
* **deps-dev:** bump postcss from 8.4.40 to 8.4.41 ([#372](https://github.com/onecx/onecx-portal-ui-libs/issues/372)) ([1357858](https://github.com/onecx/onecx-portal-ui-libs/commit/1357858d0e586257a892565d9396212ca1ddeb90))
* **deps-dev:** bump postcss-preset-env from 10.0.0 to 10.0.1 ([#404](https://github.com/onecx/onecx-portal-ui-libs/issues/404)) ([2a1bd3a](https://github.com/onecx/onecx-portal-ui-libs/commit/2a1bd3a9ad60e3fc456e5428c93a8dc8e0f40f95))
* **deps-dev:** bump postcss-preset-env from 9.5.16 to 10.0.0 ([#385](https://github.com/onecx/onecx-portal-ui-libs/issues/385)) ([79827d3](https://github.com/onecx/onecx-portal-ui-libs/commit/79827d3ffef3edab2945f88dbf5e0c900d7ad6a7))
* **deps-dev:** bump the angular group with 3 updates ([#396](https://github.com/onecx/onecx-portal-ui-libs/issues/396)) ([dda43c1](https://github.com/onecx/onecx-portal-ui-libs/commit/dda43c12f8105e83ffad05a09e3559a613073006))
* **deps-dev:** bump ts-jest from 29.2.3 to 29.2.4 ([#383](https://github.com/onecx/onecx-portal-ui-libs/issues/383)) ([7c44fb8](https://github.com/onecx/onecx-portal-ui-libs/commit/7c44fb869603553b77ac099e53b00ad4829b249e))
* **deps:** bump axios from 1.7.2 to 1.7.3 ([#371](https://github.com/onecx/onecx-portal-ui-libs/issues/371)) ([ff3d015](https://github.com/onecx/onecx-portal-ui-libs/commit/ff3d0157d5f081c95ae460f560b5c8e30b008b4f))
* **deps:** bump primeng from 17.18.6 to 17.18.8 ([#379](https://github.com/onecx/onecx-portal-ui-libs/issues/379)) ([21d4473](https://github.com/onecx/onecx-portal-ui-libs/commit/21d4473b447b2cd52c649dd884675164ca7d81b5))
* **deps:** bump the angular group across 1 directory with 17 updates ([#405](https://github.com/onecx/onecx-portal-ui-libs/issues/405)) ([749768b](https://github.com/onecx/onecx-portal-ui-libs/commit/749768b4f2c18a72447daadf05cf219a56c5971f))
* **deps:** bump the angular group with 17 updates ([#380](https://github.com/onecx/onecx-portal-ui-libs/issues/380)) ([0626afe](https://github.com/onecx/onecx-portal-ui-libs/commit/0626afed19557a58f10ea262e47e3ff0a2602a0b))
* **deps:** bump zone.js from 0.14.8 to 0.14.10 ([#386](https://github.com/onecx/onecx-portal-ui-libs/issues/386)) ([3e888a4](https://github.com/onecx/onecx-portal-ui-libs/commit/3e888a4864c6de9b20182e7b51155d1cb7df8b21))

## [5.3.2](https://github.com/onecx/onecx-portal-ui-libs/compare/v5.3.1...v5.3.2) (2024-08-08)

### Bug Fixes
Expand Down
2 changes: 1 addition & 1 deletion libs/accelerator/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@onecx/accelerator",
"version": "5.3.2",
"version": "5.4.0",
"peerDependencies": {
"tslib": "^2.6.3",
"rxjs": "7.8.1"
Expand Down
2 changes: 1 addition & 1 deletion libs/angular-accelerator/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@onecx/angular-accelerator",
"version": "5.3.2",
"version": "5.4.0",
"peerDependencies": {
"@angular/common": "^18.0.5",
"@angular/core": "^18.0.5",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
[attr.manual]="manualBreadcrumbs"
></p-breadcrumb>
</ng-container>
<div class="title-bar flex flex-row md:justify-content-between p-2 md:p-3">
<div class="title-bar flex flex-row md:justify-content-between p-3">
<div class="title-wrap">
<div class="figure flex h-2rem w-2rem md:h-3rem md:w-3rem" *ngIf="showFigure">
<div #previewImage class="figure-image absolute top-0 left-0 right-0 bottom-0">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
:host(.p-button-label) {
font-weight: 400;
}
:host ::ng-deep .action-button {
padding: 0.5rem 0.5rem;
font-weight: 400;
}
.onecx-page-header {
display: flex;
flex-flow: column;
Expand Down Expand Up @@ -76,9 +72,6 @@
gap: 0.5rem;
align-items: center;
justify-content: space-between;
button {
padding: 0.5rem;
}
}
}
.object-panel {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,33 +18,35 @@
<ng-template #additionalToolbarContent>
<ng-container *ngIf="_additionalToolbarContent" [ngTemplateOutlet]="_additionalToolbarContent"></ng-container>
</ng-template>
<div class="search-criteria-container">
<div #searchParameterFields>
<ng-content></ng-content>
<div class="search-criteria-buttons">
<p-button
id="resetButton"
*ngIf="resetted.observed"
(onClick)="onResetClicked()"
label="{{ 'OCX_SEARCH_HEADER.RESET_BUTTON.TEXT' | translate }}"
icon="pi pi-eraser"
[attr.aria-label]="'OCX_SEARCH_HEADER.RESET_BUTTON.DETAIL' | translate"
title="{{ 'OCX_SEARCH_HEADER.RESET_BUTTON.DETAIL' | translate }}"
[disabled]="resetButtonDisabled"
>
</p-button>

<p-button
id="searchButton"
(onClick)="onSearchClicked()"
label="{{ 'OCX_SEARCH_HEADER.SEARCH_BUTTON.TEXT' | translate }}"
icon="pi pi-search"
[attr.aria-label]="'OCX_SEARCH_HEADER.SEARCH_BUTTON.DETAIL' | translate"
title="{{ 'OCX_SEARCH_HEADER.SEARCH_BUTTON.DETAIL' | translate }}"
[disabled]="searchButtonDisabled"
>
</p-button>
<div class="flex row-gap-3 column-gap-6 flex-wrap align-items-center">
<div>
<div #searchParameterFields>
<ng-content></ng-content>
</div>
</div>
<div class="flex flex-wrap gap-2">
<p-button
id="resetButton"
*ngIf="resetted.observed"
(onClick)="onResetClicked()"
label="{{ 'OCX_SEARCH_HEADER.RESET_BUTTON.TEXT' | translate }}"
icon="pi pi-eraser"
[attr.aria-label]="'OCX_SEARCH_HEADER.RESET_BUTTON.DETAIL' | translate"
title="{{ 'OCX_SEARCH_HEADER.RESET_BUTTON.DETAIL' | translate }}"
[disabled]="resetButtonDisabled"
>
</p-button>

<p-button
id="searchButton"
(onClick)="onSearchClicked()"
label="{{ 'OCX_SEARCH_HEADER.SEARCH_BUTTON.TEXT' | translate }}"
icon="pi pi-search"
[attr.aria-label]="'OCX_SEARCH_HEADER.SEARCH_BUTTON.DETAIL' | translate"
title="{{ 'OCX_SEARCH_HEADER.SEARCH_BUTTON.DETAIL' | translate }}"
[disabled]="searchButtonDisabled"
>
</p-button>
</div>
</div>
</ocx-page-header>

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import { DataTableColumn } from '../../model/data-table-column.model'
@Component({
selector: 'ocx-search-header',
templateUrl: './search-header.component.html',
styleUrls: ['./search-header.component.scss'],
providers: [{ provide: SLOT_SERVICE, useExisting: SlotService }],
})
export class SearchHeaderComponent implements AfterViewInit {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,126 @@
import { importProvidersFrom } from '@angular/core'
import { ReactiveFormsModule } from '@angular/forms'
import { BrowserModule } from '@angular/platform-browser'
import { BrowserAnimationsModule } from '@angular/platform-browser/animations'
import { RouterModule } from '@angular/router'
import { Meta, StoryFn, applicationConfig, moduleMetadata } from '@storybook/angular'
import { BreadcrumbModule } from 'primeng/breadcrumb'
import { ButtonModule } from 'primeng/button'
import { DropdownModule } from 'primeng/dropdown'
import { InputTextModule } from 'primeng/inputtext'
import { MenuModule } from 'primeng/menu'
import { SkeletonModule } from 'primeng/skeleton'
import { DynamicPipe } from '../../pipes/dynamic.pipe'
import { StorybookTranslateModule } from '../../storybook-translate.module'
import { PageHeaderComponent } from '../page-header/page-header.component'
import { SearchConfigComponent } from '../search-config/search-config.component'
import { StorybookBreadcrumbModule } from './../../storybook-breadcrumb.module'
import { SearchHeaderComponent } from './search-header.component'

export default {
title: 'SearchHeaderComponent',
component: SearchHeaderComponent,
decorators: [
applicationConfig({
providers: [
importProvidersFrom(BrowserModule),
importProvidersFrom(BrowserAnimationsModule),
importProvidersFrom(RouterModule.forRoot([], { useHash: true })),
],
}),
moduleMetadata({
declarations: [SearchHeaderComponent, DynamicPipe, PageHeaderComponent, SearchConfigComponent],
imports: [
MenuModule,
InputTextModule,
BreadcrumbModule,
ButtonModule,
DropdownModule,
ReactiveFormsModule,
SkeletonModule,
StorybookTranslateModule,
StorybookBreadcrumbModule.init([
{ label: 'Level 1', routerLink: ['/something'] },
{ label: 'Level 2', url: '/' },
]),
],
}),
],
} as Meta<SearchHeaderComponent>

const Template: StoryFn<SearchHeaderComponent> = (args) => ({
props: args,
})

export const Basic = {
render: Template,

args: {
header: 'My title',
},
}

const BasicSearchHeader: StoryFn<SearchHeaderComponent> = (args) => ({
props: args,
template: `
<ocx-search-header [header]="header" (resetted)="resetted">
<form>
<div class="flex flex-wrap gap-3">
<span class="p-float-label">
<input
id="name"
pInputText
type="text"
class="w-18rem"
[pTooltip]="'Name'"
tooltipPosition="top"
tooltipEvent="hover"
/>
<label for="name" style="white-space: nowrap">
Name
</label>
</span>
<span class="p-float-label">
<input
id="name"
pInputText
type="text"
class="w-18rem"
[pTooltip]="'Name'"
tooltipPosition="top"
tooltipEvent="hover"
/>
<label for="name" style="white-space: nowrap">
Name
</label>
</span>
<span class="p-float-label">
<input
id="name"
pInputText
type="text"
class="w-18rem"
[pTooltip]="'Name'"
tooltipPosition="top"
tooltipEvent="hover"
/>
<label for="name" style="white-space: nowrap">
Name
</label>
</span>
</div>
</form>
</ocx-search-header>
`,
})

export const WithCustomTemplates = {
render: BasicSearchHeader,
argTypes: {
resetted: { action: 'resetted' },
},
args: {
header: 'My title',
resetted: ($event: any) => console.log($event),
},
}
2 changes: 1 addition & 1 deletion libs/angular-auth/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@onecx/angular-auth",
"version": "5.3.2",
"version": "5.4.0",
"peerDependencies": {
"@angular-architects/module-federation": "18.0.4",
"@angular/common": "^18.0.5",
Expand Down
2 changes: 1 addition & 1 deletion libs/angular-integration-interface/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@onecx/angular-integration-interface",
"version": "5.3.2",
"version": "5.4.0",
"peerDependencies": {
"@angular/core": "^18.0.5",
"@onecx/integration-interface": "~5",
Expand Down
2 changes: 1 addition & 1 deletion libs/angular-remote-components/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@onecx/angular-remote-components",
"version": "5.3.2",
"version": "5.4.0",
"peerDependencies": {
"@angular/common": "^18.0.5",
"@angular/core": "^18.0.5",
Expand Down
Loading

0 comments on commit 63fc40c

Please sign in to comment.