Skip to content

Commit

Permalink
Merge branch 'main' into feature/dev-2490-refactor-sessionservice-to-…
Browse files Browse the repository at this point in the history
…return-true-observables-that-also

* main:
  fix(advanced search link): Add route constant (#1238)
  feat: restore previous advanced search that user executed (#1226)
  refactor(routing): apply route constants (#1227)
  chore(main): release 10.24.2 (#1234)
  fix(date-picker): fix YYYY-MM-dd formatting (#1235)
  chore: Reconfigure all "zio" endpoints to use the original address (#1222)
  fix(project): host listener triggers when user types in an input or textarea (#1233)
  fix(gravsearch-service): incorrect gravsearch generated when searching for a linked property (#1232)
  chore(main): release 10.24.1 (#1225)
  fix(advanced-search): generate correct gravsearch for linked resources with property values (#1229)
  refactor(string literal component): move app string literal component into shared lib (#1209)
  chore(main): release 10.24.0 (#1218)
  chore: update dsp-js to v8.3.6 (#1224)
  feat: dev-2557-update-the-documentation-1 (#1221)
  • Loading branch information
irmastnt committed Oct 30, 2023
2 parents 5c864c6 + e5cfebe commit 7cb3467
Show file tree
Hide file tree
Showing 7 changed files with 88 additions and 19 deletions.
26 changes: 26 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,31 @@
# Changelog

## [11.0.0](https://github.com/dasch-swiss/dsp-das/compare/v10.24.2...v11.0.0) (2023-10-27)


### ⚠ BREAKING CHANGES

* **deps:** bump js-lib to 9.0.0 ([#1241](https://github.com/dasch-swiss/dsp-das/issues/1241))

### Enhancements

* **advanced-search:** make list menu resemble a dropdown ([#1243](https://github.com/dasch-swiss/dsp-das/issues/1243)) ([96eab7f](https://github.com/dasch-swiss/dsp-das/commit/96eab7fb1021eb7a0c5671773497412332aa1361))
* restore previous advanced search that user executed ([#1226](https://github.com/dasch-swiss/dsp-das/issues/1226)) ([8c5eec9](https://github.com/dasch-swiss/dsp-das/commit/8c5eec97354365a945c9de5cffb74d68712e9af3))


### Bug Fixes

* **advanced search link:** Add route constant ([#1238](https://github.com/dasch-swiss/dsp-das/issues/1238)) ([db3e22a](https://github.com/dasch-swiss/dsp-das/commit/db3e22a4186e0c86f346c84401b3dbc8d501d86d))


### Maintenance

* cleanup routes and unused components ([#1239](https://github.com/dasch-swiss/dsp-das/issues/1239)) ([2ce9065](https://github.com/dasch-swiss/dsp-das/commit/2ce9065b568bf023bba030a2b2f080adb298abd4))
* **deps:** bump js-lib to 9.0.0 ([#1241](https://github.com/dasch-swiss/dsp-das/issues/1241)) ([94b7f26](https://github.com/dasch-swiss/dsp-das/commit/94b7f267b18ce75621e0a790395f5cc8e34b7ce7))
* **deps:** bump js-lib to 9.0.1 ([#1244](https://github.com/dasch-swiss/dsp-das/issues/1244)) ([4fc6a40](https://github.com/dasch-swiss/dsp-das/commit/4fc6a40f463845bfa95ed6310aa858d49d3a7a05))
* **routing:** apply route constants ([#1227](https://github.com/dasch-swiss/dsp-das/issues/1227)) ([0b0dff5](https://github.com/dasch-swiss/dsp-das/commit/0b0dff586da77200bdd33ecd865b74e6c40a43fb))
* **routing:** cleanup unused routes ([#1240](https://github.com/dasch-swiss/dsp-das/issues/1240)) ([caa1819](https://github.com/dasch-swiss/dsp-das/commit/caa181998e2ae5cbae77c11ee10934feda52093d))

## [10.24.2](https://github.com/dasch-swiss/dsp-das/compare/v10.24.1...v10.24.2) (2023-10-20)


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1121,8 +1121,9 @@ export class AdvancedSearchStoreService extends ComponentStore<AdvancedSearchSta
);

private _isOrderByItemDisabled(data: PropertyData | undefined): boolean {
if (!data) return true;
if (data.objectType === Constants.UriValue) return true;
if (!data) {
return true;
}
return !(
data.objectType === ResourceLabel ||
data.objectType?.includes(Constants.KnoraApiV2)
Expand All @@ -1142,7 +1143,9 @@ export class AdvancedSearchStoreService extends ComponentStore<AdvancedSearchSta
const propertiesOrderByList = this.get(
(state) => state.propertiesOrderByList
);
const filteredProperties = this.get((state) => state.filteredProperties);
const filteredProperties = this.get(
(state) => state.filteredProperties
);

const snapshot: AdvancedSearchStateSnapshot = {
ontologies,
Expand All @@ -1156,6 +1159,9 @@ export class AdvancedSearchStoreService extends ComponentStore<AdvancedSearchSta
filteredProperties,
};

localStorage.setItem('advanced-search-previous-search', JSON.stringify(snapshot));
localStorage.setItem(
'advanced-search-previous-search',
JSON.stringify(snapshot)
);
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
<button class="menu-button" mat-button [matMenuTriggerFor]="rootMenu">
<span>{{ selectedItem ? selectedItem : 'Select list value' }}</span>
</button>
<div class="header">
Select a list value
</div>
<div class="dropdown" [matMenuTriggerFor]="rootMenu">
<div class="container">
<div class="label">{{ selectedItem ? selectedItem : 'Select a value' }}</div>
<div class="icon">
<mat-icon>arrow_drop_down</mat-icon>
</div>
</div>
<div class="line"></div>
</div>
<mat-menu #rootMenu="matMenu">
<span *ngFor="let child of list?.children">
<span *ngIf="child.children && child.children.length > 0">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,31 @@
.menu-button {
border: 1px solid;
padding: 0% 2%;
.header {
font-size: 14px;
}

.dropdown {
width: 44.2%;
cursor: pointer;
color: #737373;

.container {
display: inline-flex;
align-items: center;
box-sizing: border-box;
width: 100%;
padding: 16px 16px;

.label {
width: 100%;
color: rgba(32, 32, 32, 0.87);
}

.icon {
display: inline-flex;
width: 17px;
}
}

.line {
border-bottom: 1px solid;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,12 @@ import { MatButtonModule } from '@angular/material/button';
import { MatMenuModule } from '@angular/material/menu';
import { ListItemComponent } from './list-item/list-item.component';
import { PropertyFormItem } from '../../../data-access/advanced-search-store/advanced-search-store.service';
import { MatIconModule } from '@angular/material/icon';

@Component({
selector: 'dasch-swiss-property-form-list-value',
standalone: true,
imports: [CommonModule, MatButtonModule, MatMenuModule, ListItemComponent],
imports: [CommonModule, MatButtonModule, MatIconModule, MatMenuModule, ListItemComponent],
templateUrl: './property-form-list-value.component.html',
styleUrls: ['./property-form-list-value.component.scss'],
})
Expand Down
12 changes: 6 additions & 6 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "dsp-app",
"version": "10.24.2",
"version": "11.0.0",
"repository": {
"type": "git",
"url": "https://github.com/dasch-swiss/dsp-app.git"
Expand Down Expand Up @@ -40,7 +40,7 @@
"@angular/platform-browser-dynamic": "^16.1.5",
"@angular/router": "^16.1.5",
"@ckeditor/ckeditor5-angular": "^5.2.0",
"@dasch-swiss/dsp-js": "^9.0.0",
"@dasch-swiss/dsp-js": "^9.0.1",
"@datadog/browser-logs": "^4.42.2",
"@datadog/browser-rum": "^4.42.2",
"@ngrx/component-store": "^16.1.0",
Expand Down

0 comments on commit 7cb3467

Please sign in to comment.