removed fields from MetaDataColumn

kontor-api/src/db/models/metadata.py

@@ -19,17 +19,15 @@ class MetaDataTable(Base, BaseMixin):
 class MetaDataColumn(Base, BaseMixin):
     __tablename__ = 'meta_data_column'
     column_name = Column(String, nullable=False)
-    column_sync_name = Column(String)
     column_type = Column(String)
-    column_modifier = Column(String, nullable=True)
     column_order = Column(Integer)
+    is_shown = Column(Boolean)
+    column_label = Column(String)
+    show_filter = Column(Boolean)
+    filter_label = Column(String)
+    ref_column = Column(String, nullable=True)
     table_id = Column(String, ForeignKey('meta_data_table.id'))
     table = relationship("MetaDataTable", back_populates="table_columns")
-    column_label = Column(String)
-    filter_label = Column(String)
-    is_shown = Column(Boolean)
-    show_filter = Column(Boolean)
-    ref_column = Column(String, nullable=True)
 
     def __repr__(self):
         if self.column_name is None:

kontor-api/src/db/repository/metadata.py

@@ -18,9 +18,7 @@ def get_columns(columns: List[MetaDataColumn]) -> List[MetaDataColumnResponse]:
             id=column.id,
             table_name=column.table.table_name,
             column_name=column.column_name,
-            column_sync_name=column.column_sync_name,
             column_type=column.column_type,
-            column_modifier=column.column_modifier,
             column_order=column.column_order,
             is_shown=column.is_shown,
             column_label=column.column_label,

kontor-api/src/templates/components/metadatatable_cards.html

@@ -4,9 +4,7 @@
     <table class="table table-hover">
       <thead><tr>
         <th scope="col">Column Name</th>
-        <th scope="col">Column Sync Name</th>
         <th scope="col">Column Type</th>
-        <th scope="col">Column Modifier</th>
         <th scope="col">Column Order</th>
         <th scope="col">Is Shown</th>
         <th scope="col">Column Label</th>
@@ -18,9 +16,7 @@
         {% for column in obj.table_columns %}
         <tr>
            <th scope="row"><a href="/admin/metadata/{{column.id}}">{{column.column_name}}</a></th>
-           <td>{{column.column_sync_name}}</td>
            <td>{{column.column_type}}</td>
-           <td>{{column.column_modifier}}</td>
            <td>{{column.column_order}}</td>
            <td>{% with check=column.is_shown %}{% include "components/check.html" %}{% endwith %}</td>
            <td>{{column.column_label}}</td>

kontor-scripts/db/models/metadata.py

@@ -27,17 +27,15 @@ class MetaDataTable(Base, BaseMixin):
 class MetaDataColumn(Base, BaseMixin):
     __tablename__ = 'meta_data_column'
     column_name = Column(String, nullable=False)
-    column_sync_name = Column(String)
     column_type = Column(String)
-    column_modifier = Column(String, nullable=True)
     column_order = Column(Integer)
+    is_shown = Column(Boolean)
+    column_label = Column(String)
+    show_filter = Column(Boolean)
+    filter_label = Column(String)
+    ref_column = Column(String, nullable=True)
     table_id = Column(String, ForeignKey('meta_data_table.id'))
     table = relationship("MetaDataTable", back_populates="table_columns")
-    column_label = Column(String)
-    filter_label = Column(String)
-    is_shown = Column(Boolean)
-    show_filter = Column(Boolean)
-    ref_column = Column(String, nullable=True)
 
     def __repr__(self):
         if self.column_name is None:
@@ -54,13 +52,11 @@ class MetaDataColumn(Base, BaseMixin):
         self.last_modified_date = import_data['last_modified_date']
         self.version = import_data['version']
         self.column_name = import_data['column_name']
-        self.column_sync_name = import_data['column_sync_name']
         self.column_type = import_data['column_type']
-        self.column_modifier = import_data['column_modifier']
         self.column_order = import_data['column_order']
         self.table_id = import_data['table_id']
-        self.column_label = import_data['column_label']
-        self.filter_label = import_data['filter_label']
         self.is_shown = import_data['is_shown']
+        self.column_label = import_data['column_label']
         self.show_filter = import_data['show_filter']
+        self.filter_label = import_data['filter_label']
         self.ref_column = import_data['ref_column']

kontor-spring/src/main/java/de/thpeetz/kontor/admin/data/MetaDataColumn.java

@@ -21,13 +21,8 @@ public class MetaDataColumn extends AbstractEntity {
     @NotNull
     private String columnName;
 
-    private String columnSyncName;
-
     private String columnType;
 
-    @Nullable
-    private String columnModifier;
-
     private Integer columnOrder;
 
     private Boolean isShown;
@@ -38,6 +33,7 @@ public class MetaDataColumn extends AbstractEntity {
 
     private String filterLabel;
 
+    @Nullable
     private String refColumn;
 
     @ManyToOne
@@ -58,15 +54,6 @@ public class MetaDataColumn extends AbstractEntity {
         return "no changes for " + this.getId() + "\n";
     }
 
-    public String updateColumnSyncName(String value) {
-        if (!this.getColumnSyncName().equals(value)) {
-            this.setColumnSyncName(value);
-            log.info("update columnSyncName");
-            return "updated " + this.getId() + " with " + value + "\n";
-        }
-        return "no changes for " + this.getId() + "\n";
-    }
-
     @Override
     public String toString() {
         return "MetaDataColumn{id=" + getId() + ", columnName=" + columnName + ", table=" + table.getTableName() +'}';

kontor-spring/src/main/java/de/thpeetz/kontor/admin/services/MetaDataService.java

@@ -63,28 +63,20 @@ public class MetaDataService {
         }
     }
 
-    public void getColumn(MetaDataTable table, String columnName, String columnSyncName, String columnType, String columnModifier, Integer columnOrder, Boolean isShown, String columnLabel, Boolean showFilter, String filterLabel) {
+    public void getColumn(MetaDataTable table, String columnName, String columnType, Integer columnOrder, Boolean isShown, String columnLabel, Boolean showFilter, String filterLabel) {
-        this.getColumn(table, columnName, columnSyncName, columnType, columnModifier, columnOrder, isShown, columnLabel, showFilter, filterLabel, null);
+        this.getColumn(table, columnName, columnType, columnOrder, isShown, columnLabel, showFilter, filterLabel, null);
     }
 
-    public void checkColumnValues(MetaDataTable table, MetaDataColumn column, String columnName, String columnSyncName, String columnType, String columnModifier, Integer columnOrder, Boolean isShown, String columnLabel, Boolean showFilter, String filterLabel, String refColumn) {
+    public void checkColumnValues(MetaDataTable table, MetaDataColumn column, String columnName, String columnType, Integer columnOrder, Boolean isShown, String columnLabel, Boolean showFilter, String filterLabel, String refColumn) {
         log.debug("Column {}  with name {} of table {} found, check Values", columnOrder, columnName, table.getTableName());
         if (!column.getColumnName().equals(columnName)) {
             log.debug("columnName has to be changed to {}", columnName);
             column.setColumnName(columnName);
         }
-        if (!column.getColumnSyncName().equals(columnSyncName)) {
-            log.debug("columnSyncName has to be changed to {}", columnSyncName);
-            column.setColumnSyncName(columnSyncName);
-        }
         if (!column.getColumnType().equals(columnType)) {
             log.debug("columnType has to be changed to {}", columnType);
             column.setColumnType(columnType);
         }
-        if (columnModifier != null && !columnModifier.equals(column.getColumnModifier())) {
-            log.debug("columnModifier has to be changed to {}", columnModifier);
-            column.setColumnModifier(columnModifier);
-        }
         if (isShown != null && !isShown.equals(column.getIsShown())) {
             log.debug("isShown has to be change to {}}", isShown);
             column.setIsShown(isShown);
@@ -108,7 +100,7 @@ public class MetaDataService {
         saveMetaDataColumn(column);
     }
 
-    public void getColumn(MetaDataTable table, String columnName, String columnSyncName, String columnType, String columnModifier, Integer columnOrder, Boolean isShown, String columnLabel, Boolean showFilter, String filterLabel, String refColumn) {
+    public void getColumn(MetaDataTable table, String columnName, String columnType, Integer columnOrder, Boolean isShown, String columnLabel, Boolean showFilter, String filterLabel, String refColumn) {
         log.info("check if column {} of table {} exists", columnName, table.getTableName());
         boolean columnNameExists = table.getTableColumns().stream().anyMatch(column -> column.getColumnName().equals(columnName));
         boolean columnOrderExists = table.getTableColumns().get(columnOrder-1) != null;
@@ -116,20 +108,18 @@ public class MetaDataService {
         log.debug("column found: name: {}, order: {}:  table.columns: {}", columnNameExists, columnOrderExists, metaDataColumns);
         if (columnOrderExists) {
             MetaDataColumn column = table.getTableColumns().get(columnOrder-1);
-            checkColumnValues(table, column, columnName, columnSyncName, columnType, columnModifier, columnOrder, isShown, columnLabel, showFilter, filterLabel, refColumn);
+            checkColumnValues(table, column, columnName, columnType, columnOrder, isShown, columnLabel, showFilter, filterLabel, refColumn);
         } else {
             log.info("Column {} of table {} not found, will create it", columnName, table.getTableName());
-            addColumn(table,columnName,columnSyncName,columnType,columnModifier,columnOrder,isShown, refColumn);
+            addColumn(table, columnName, columnType, columnOrder, isShown, refColumn);
         }
     }
 
-    private void addColumn(MetaDataTable table, String columnName, String columnSyncName, String columnType, String columnModifier, Integer columnOrder, Boolean isShown, String refColumn) {
+    private void addColumn(MetaDataTable table, String columnName, String columnType, Integer columnOrder, Boolean isShown, String refColumn) {
         MetaDataColumn column = new MetaDataColumn();
         column.setTable(table);
         column.setColumnName(columnName);
-        column.setColumnSyncName(columnSyncName);
         column.setColumnType(columnType);
-        column.setColumnModifier(columnModifier);
         column.setColumnOrder(columnOrder);
         column.setIsShown(isShown);
         column.setRefColumn(refColumn);
@@ -202,7 +192,6 @@ public class MetaDataService {
             MetaDataColumn metaDataColumn = new MetaDataColumn();
             metaDataColumn.setId(id);
             metaDataColumn.setColumnName(fields.get("column_name"));
-            metaDataColumn.setColumnSyncName(fields.get("column_sync_name"));
             metaDataColumn.setColumnType(fields.get("column_type"));
             metaDataColumnRepository.save(metaDataColumn);
         } else {
@@ -227,9 +216,6 @@ public class MetaDataService {
                 case "column_name":
                     status.append(metaDataColumn.updateColumnName(value));
                     break;
-                case "column_sync_name":
-                    status.append(metaDataColumn.updateColumnSyncName(value));
-                    break;
                 default:
                     log.info("field {} is unknown for table {}", key, tableName);
             }

kontor-spring/src/main/java/de/thpeetz/kontor/admin/views/MetaDataForm.java

@@ -15,6 +15,7 @@ import com.vaadin.flow.data.binder.BeanValidationBinder;
 import com.vaadin.flow.data.binder.Binder;
 import de.thpeetz.kontor.admin.data.MetaDataColumn;
 import de.thpeetz.kontor.admin.data.MetaDataTable;
+import lombok.*;
 
 import java.util.List;
 
@@ -22,8 +23,6 @@ public class MetaDataForm extends FormLayout {
 
     ComboBox<MetaDataTable> table = new ComboBox<>("Table");
     TextField columnName = new TextField("Column Name");
-    TextField columnSyncName = new TextField("Column Sync Name");
-    TextField columnModifier = new TextField("Column Modifier");
     IntegerField columnOrder = new IntegerField("Column Order");
     Checkbox isShown = new Checkbox("Is Shown");
     TextField columnLabel = new TextField("Column Label");
@@ -43,7 +42,7 @@ public class MetaDataForm extends FormLayout {
 
         table.setItems(tables);
         table.setItemLabelGenerator(MetaDataTable::getTableName);
-        add(table, columnName, columnSyncName, columnModifier, columnOrder);
+        add(table, columnName, columnOrder);
         add(isShown, columnLabel);
         isShown.addClickListener(click -> columnLabel.setEnabled(isShown.getValue()));
         add(showFilter, filterLabel);
@@ -78,17 +77,15 @@ public class MetaDataForm extends FormLayout {
         binder.setBean(metaDataColumn);
     }
 
+    @Getter
     public abstract static class MetaDataFormEvent extends ComponentEvent<MetaDataForm> {
-        private MetaDataColumn metaDataColumn;
+        private final MetaDataColumn metaDataColumn;
 
         protected MetaDataFormEvent(MetaDataForm source, MetaDataColumn metaDataColumn) {
             super(source, false);
             this.metaDataColumn = metaDataColumn;
         }
 
-        public MetaDataColumn getMetaDataColumn() {
-            return metaDataColumn;
-        }
     }
 
     public static class SaveEvent extends MetaDataForm.MetaDataFormEvent {

kontor-spring/src/main/java/de/thpeetz/kontor/admin/views/MetaDataView.java

@@ -3,8 +3,6 @@ package de.thpeetz.kontor.admin.views;
 import com.vaadin.flow.component.Component;
 import com.vaadin.flow.component.button.Button;
 import com.vaadin.flow.component.button.ButtonVariant;
-import com.vaadin.flow.component.contextmenu.ContextMenu;
-import com.vaadin.flow.component.contextmenu.MenuItem;
 import com.vaadin.flow.component.grid.Grid;
 import com.vaadin.flow.component.grid.GridSortOrder;
 import com.vaadin.flow.component.icon.Icon;
@@ -52,12 +50,8 @@ public class MetaDataView extends VerticalLayout {
             .setHeader("Table").setResizable(true).setSortable(true);
     Grid.Column<MetaDataColumn> columnNameColumn = grid.addColumn(MetaDataColumn::getColumnName)
             .setHeader("Column Name").setResizable(true).setSortable(true);
-    Grid.Column<MetaDataColumn> columnSyncNameColumn = grid.addColumn(MetaDataColumn::getColumnSyncName)
-            .setHeader("Column Sync Name").setResizable(true).setSortable(true);
     Grid.Column<MetaDataColumn> columnTypeColumn = grid.addColumn(MetaDataColumn::getColumnType)
             .setHeader("Column Type").setResizable(true).setSortable(true);
-    Grid.Column<MetaDataColumn> columnModifierColumn = grid.addColumn(MetaDataColumn::getColumnModifier)
-            .setHeader("Column Modifier").setResizable(true).setSortable(true);
     Grid.Column<MetaDataColumn> columnOrderColumn = grid.addColumn(MetaDataColumn::getColumnOrder)
             .setHeader("Column Order").setResizable(true).setSortable(true);
     Grid.Column<MetaDataColumn> isShownColumn = grid.addComponentColumn(metaDataColumn -> StatusIcon.create(metaDataColumn.getIsShown())).
@@ -139,9 +133,7 @@ public class MetaDataView extends VerticalLayout {
         columnToggleContextMenu.addColumnToggleItem(versionColumn);
         columnToggleContextMenu.addColumnToggleItem(tableColumn);
         columnToggleContextMenu.addColumnToggleItem(columnNameColumn);
-        columnToggleContextMenu.addColumnToggleItem(columnSyncNameColumn);
         columnToggleContextMenu.addColumnToggleItem(columnTypeColumn);
-        columnToggleContextMenu.addColumnToggleItem(columnModifierColumn);
         columnToggleContextMenu.addColumnToggleItem(columnOrderColumn);
         columnToggleContextMenu.addColumnToggleItem(isShownColumn);
         columnToggleContextMenu.addColumnToggleItem(columnLabelColumn);