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.

Sign up for GitHub

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

Jump to bottom

Port #389 to MORYX 8 #390

Merged
merged 4 commits into from
Mar 5, 2024
Merged

Port #389 to MORYX 8 #390

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5c360a9
Merge pull request #384 from PHOENIXCONTACT/fix/product-base-type
Toxantron Feb 20, 2024
456e27a
Merge pull request #382 from PHOENIXCONTACT/fix/proxy-null-reference
Toxantron Feb 20, 2024
38dfd36
Merge pull request #375 from jsonBackup/update/react-router-dependency
1nf0rmagician Feb 23, 2024
a77e9c7
Update `bootstrap` to `5.3.3`
jsonBackup Feb 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/Moryx.AbstractionLayer.Products.Endpoints/ProductConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,22 @@ public ProductConverter(IProductManagement productManagement)
{
_productManagement = productManagement;
}

public ProductDefinitionModel ConvertProductType(Type productType)
{
var baseType = productType.BaseType;
var baseTypeName = baseType == typeof(ProductType)
? string.Empty : baseType.FullName;

return new()
{
Name = productType.FullName,
DisplayName = productType.GetDisplayName() ?? productType.Name,
BaseDefinition = productType.BaseType?.Name,
BaseDefinition = baseTypeName,
Properties = EntryConvert.EncodeClass(productType, ProductSerialization)
};
}

public RecipeDefinitionModel ConvertRecipeType(Type recipeType)
{
return new()
Expand Down
4 changes: 2 additions & 2 deletions src/Moryx.CommandCenter.Web/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"@types/react-dom": "^18.2.19",
"@types/react-redux": "^7.1.33",
"@types/uuid": "^9.0.8",
"bootstrap": "4.6.2",
"bootstrap": "5.3.3",
"bootstrap5-toggle": "^5.0.6",
"moment": "^2.30.1",
"query-string": "^8.2.0",
Expand All @@ -30,7 +30,7 @@
"react-router-dom": "^6.22.0",
"react-router-redux": "^4.0.8",
"react-toastify": "^10.0.4",
"reactstrap": "^8.10.1",
"reactstrap": "^9.2.2",
"redux": "^5.0.1",
"ts-loader": "^9.5.1",
"uuid": "^9.0.1"
Expand Down
2 changes: 1 addition & 1 deletion src/Moryx.CommandCenter.Web/src/common/components/ModuleHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ export class ModuleHeader extends React.Component<ModulePropModel & ModuleDispat

public render(): React.ReactNode {
return (
<Navbar className="navbar-default" expand="md">
<Navbar className="navbar-default" expand="md" container={false}>
<Nav className="navbar-left" navbar={true}>
<NavItem>
<NavLink end={true} to={`/modules/${this.props.ModuleName}`} className="navbar-nav-link">
Expand Down
8 changes: 7 additions & 1 deletion src/Moryx.CommandCenter.Web/src/common/scss/Form.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@
height: 1.95rem !important;
}

.form-control,
.form-select {
border: 1px solid #ced4da;
color: #495057;
}

.log-menu {
padding: 0px;
}
Expand All @@ -12,7 +18,7 @@
-webkit-appearance: none;
-moz-appearance: none;
appearance: none;
border:none;
border: none;
border-radius: 0;
font-size: 1em;
background-repeat: no-repeat;
Expand Down
4 changes: 4 additions & 0 deletions src/Moryx.CommandCenter.Web/src/common/scss/Menu.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,11 @@
cursor: pointer;
line-height: 1.15;
font-size: 11pt;
border-bottom: 1px solid rgba(0, 0, 0, 0.125);
border-left: 0px;
border-right: 0px;
border-top: 0px;
padding: .75rem 1.25rem;
}

.menu-item:hover {
Expand All @@ -14,6 +17,7 @@

.menu-item a {
color: $black;
text-decoration: none;
}

.menu-item a:hover {
Expand Down
Loading
Loading