-
Notifications
You must be signed in to change notification settings - Fork 192
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
* feat(#3135): Extend asset view with labels and type * Remove stylesheet * Fix dependency issue * Remove comment
- Loading branch information
1 parent
f423069
commit aea863e
Showing
37 changed files
with
1,047 additions
and
275 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
50 changes: 50 additions & 0 deletions
50
ui/projects/streampipes/platform-services/src/lib/services/isa95-type.service.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| * | ||
| */ | ||
|
|
||
| import { Injectable } from '@angular/core'; | ||
| import { Isa95Type, Isa95TypeDesc } from '../model/assets/asset.model'; | ||
|
|
||
| @Injectable({ providedIn: 'root' }) | ||
| export class Isa95TypeService { | ||
| isa95Types: Isa95Type[] = [ | ||
| 'PROCESS_CELL', | ||
| 'PRODUCTION_UNIT', | ||
| 'PRODUCTION_LINE', | ||
| 'STORAGE_ZONE', | ||
| 'UNIT', | ||
| 'WORK_CELL', | ||
| 'STORAGE_UNIT', | ||
| 'OTHER', | ||
| ]; | ||
|
|
||
| getTypeDescriptions(): Isa95TypeDesc[] { | ||
| return this.isa95Types.map(type => { | ||
| return { | ||
| type, | ||
| label: this.toLabel(type), | ||
| }; | ||
| }); | ||
| } | ||
|
|
||
| toLabel(type: Isa95Type): string { | ||
| return type | ||
| .toLocaleLowerCase() | ||
| .replace(/_/g, ' ') | ||
| .replace(/\b\w/g, char => char.toUpperCase()); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
32 changes: 32 additions & 0 deletions
32
...ared-ui/src/lib/components/basic-field-description/basic-field-description.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| <!-- | ||
| ~ Licensed to the Apache Software Foundation (ASF) under one or more | ||
| ~ contributor license agreements. See the NOTICE file distributed with | ||
| ~ this work for additional information regarding copyright ownership. | ||
| ~ The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| ~ (the "License"); you may not use this file except in compliance with | ||
| ~ the License. You may obtain a copy of the License at | ||
| ~ | ||
| ~ http://www.apache.org/licenses/LICENSE-2.0 | ||
| ~ | ||
| ~ Unless required by applicable law or agreed to in writing, software | ||
| ~ distributed under the License is distributed on an "AS IS" BASIS, | ||
| ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| ~ See the License for the specific language governing permissions and | ||
| ~ limitations under the License. | ||
| ~ | ||
| --> | ||
|
|
||
| <div | ||
| fxFlex="100" | ||
| fxLayout="row" | ||
| fxLayoutAlign="start center" | ||
| class="field-description-outer" | ||
| > | ||
| <div [fxFlex]="descriptionPanelWidth" fxLayout="column"> | ||
| <div class="field-description-label">{{ label }}</div> | ||
| <div class="field-description">{{ description }}</div> | ||
| </div> | ||
| <div fxFlex fxLayoutAlign="start center"> | ||
| <ng-content></ng-content> | ||
| </div> | ||
| </div> |
29 changes: 29 additions & 0 deletions
29
...ared-ui/src/lib/components/basic-field-description/basic-field-description.component.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| /*! | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| * | ||
| */ | ||
|
|
||
| .field-description-label { | ||
| font-weight: bold; | ||
| } | ||
|
|
||
| .field-description { | ||
| font-size: smaller; | ||
| } | ||
|
|
||
| .field-description-outer { | ||
| margin-bottom: 10px; | ||
| } |
35 changes: 35 additions & 0 deletions
35
...shared-ui/src/lib/components/basic-field-description/basic-field-description.component.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| * | ||
| */ | ||
|
|
||
| import { Component, Input, OnInit } from '@angular/core'; | ||
|
|
||
| @Component({ | ||
| selector: 'sp-basic-field-description', | ||
| templateUrl: './basic-field-description.component.html', | ||
| styleUrls: ['./basic-field-description.component.scss'], | ||
| }) | ||
| export class SpBasicFieldDescriptionComponent { | ||
| @Input() | ||
| label: string; | ||
|
|
||
| @Input() | ||
| description: string; | ||
|
|
||
| @Input() | ||
| descriptionPanelWidth: string = '30'; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
31 changes: 31 additions & 0 deletions
31
ui/projects/streampipes/shared-ui/src/lib/services/colorization.service.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| * | ||
| */ | ||
|
|
||
| import { Injectable } from '@angular/core'; | ||
|
|
||
| @Injectable({ providedIn: 'root' }) | ||
| export class SpColorizationService { | ||
| generateContrastColor(bgColor: string) { | ||
| const color = | ||
| bgColor.charAt(0) === '#' ? bgColor.substring(1, 7) : bgColor; | ||
| const r = parseInt(color.substring(0, 2), 16); | ||
| const g = parseInt(color.substring(2, 4), 16); | ||
| const b = parseInt(color.substring(4, 6), 16); | ||
| return r * 0.299 + g * 0.587 + b * 0.114 > 186 ? '#000' : '#FFF'; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.