From 458717e9b85bf9ef00c3ac0316da98f88fcfe7e0 Mon Sep 17 00:00:00 2001
From: =?utf8?q?M=C3=A1rk=20M=C3=A9r=C3=A9sz?= <USER\mark.meresz>
Date: Fri, 20 Jul 2018 10:58:45 +0000
Subject: [PATCH] git-tfs-id:
 [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C31201

---
 server/-configuration/scheduledjobs.json      |  6 +-
 .../jobtemplates/retrieve-ondemand.xml        | 16 ++++
 .../server/steps/TSMExtendedRetrieveStep.java | 82 ++++++++++++++----
 .../server/steps/TSMRestoreStep.java          | 17 ++--
 .../pages/searchitems.zul                     | 35 ++++----
 .../user/jobengine/zk/model/SearchModel.java  | 84 +++++++++++++++----
 .../user/jobengine/zk/util/SessionUtil.java   | 50 ++++++++++-
 7 files changed, 230 insertions(+), 60 deletions(-)

diff --git a/server/-configuration/scheduledjobs.json b/server/-configuration/scheduledjobs.json
index 8368e843..b39af791 100644
--- a/server/-configuration/scheduledjobs.json
+++ b/server/-configuration/scheduledjobs.json
@@ -25,7 +25,11 @@
       	{"name": "octopusOutputFolder", "value": "OCTOPUS", "type": "java.lang.String"},
       	{"name": "genericOutputFolder", "value": "ARCHIVE_RESTORE", "type": "java.lang.String"},
       	{"name": "onlineOutputFolder", "value": "ONLINE", "type": "java.lang.String"},
-      	{"name": "killDateDays", "value": 7, "type": "java.lang.Integer"}
+      	{"name": "killDateDays", "value": 7, "type": "java.lang.Integer"},
+      	{"name": "nexioAgency", "value": "ARCHIVE_RESTORE", "type": "java.lang.String"},
+      	{"name": "nexioPort", "value": 2098, "type": "java.lang.Integer"},
+      	{"name": "nexioUserName", "value": "administrator", "type": "java.lang.String"},
+      	{"name": "nexioPassword", "value": "system", "type": "java.lang.String"}
       ]
 	},
 	{
diff --git a/server/user.jobengine.executors/jobtemplates/retrieve-ondemand.xml b/server/user.jobengine.executors/jobtemplates/retrieve-ondemand.xml
index be4d957a..79756820 100644
--- a/server/user.jobengine.executors/jobtemplates/retrieve-ondemand.xml
+++ b/server/user.jobengine.executors/jobtemplates/retrieve-ondemand.xml
@@ -15,6 +15,10 @@
 			<parameter name="successRecipient" type="java.lang.String" />
 			<parameter name="targetPathType" type="java.lang.String" />
 			<parameter name="killDateDays" type="java.lang.Integer"/>
+			<parameter name="nexioAgency" type="java.lang.String"/>
+			<parameter name="nexioPort" type="java.lang.Integer"/>
+			<parameter name="nexioUserName" type="java.lang.String"/>
+			<parameter name="nexioPassword" type="java.lang.String"/>
 		</parameters>
 		<variables>
 			<variable name="targetPath" type="java.lang.String" />
@@ -91,6 +95,18 @@
 				<input>
 					<variable name="useNexioTarget" />
 				</input>
+				<input>
+					<parameter name="nexioAgency" />
+				</input>
+				<input>
+					<parameter name="nexioPort" />
+				</input>
+				<input>
+					<parameter name="nexioUserName" />
+				</input>
+				<input>
+					<parameter name="nexioPassword" />
+				</input>
 			</inputs>
 		</calljobstep>
 	</commands>
diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/TSMExtendedRetrieveStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/TSMExtendedRetrieveStep.java
index 9d1d5fd7..b8242447 100644
--- a/server/user.jobengine.executors/src/user/jobengine/server/steps/TSMExtendedRetrieveStep.java
+++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/TSMExtendedRetrieveStep.java
@@ -1,6 +1,14 @@
 package user.jobengine.server.steps;
 
+import java.io.OutputStream;
+import java.util.Calendar;
+import java.util.Date;
+
+import org.apache.commons.net.ftp.FTPClient;
+
+import user.commons.CalendarUtils;
 import user.commons.StoreUri;
+import user.commons.remotestore.FtpDirectoryLister;
 import user.commons.remotestore.RemoteStoreProtocol;
 import user.jobengine.db.IItemManager;
 import user.jobengine.db.Media;
@@ -9,26 +17,46 @@ import user.jobengine.server.IJobRuntime;
 
 public class TSMExtendedRetrieveStep extends TSMRestoreStep {
 	private boolean useNexioTarget;
+	private int nexioPort;
+	private String nexioUserName, nexioPassword;
+	private String nexioHost;
+	private String nexioAgency;
+
+	@Override
+	protected void afterRestore(StoreUri targetUri, String targetPath, int killDateDays, String targetFileName) throws Exception {
+		if (useNexioTarget) {
+			OutputStream outStream = null;
+			try {
+				FTPClient targetFTP = ((FtpDirectoryLister) targetUri.getLister()).connect();
+				Calendar killDate = CalendarUtils.createCalendar(new Date());
+				killDate.add(Calendar.DAY_OF_YEAR, killDateDays);
+				byte[] killDateFile = EscortFiles.createNEXIOKillDateFile(targetFileName, killDate.getTime(), null, nexioAgency);
+				outStream = targetFTP.storeFileStream(targetFileName + ".xml");
+				if (outStream == null) {
+					throw new NullPointerException("Can not open: " + targetFileName + ".xml" + " Reply:" + targetFTP.getReplyString());
+				}
+				outStream.write(killDateFile);
+				outStream.flush();
+			} catch (Exception e) {
+				throw e;
+			} finally {
+				if (outStream != null)
+					outStream.close();
+				targetUri.cleanUp();
+			}
+		}
+	}
+
+	@Override
+	protected void checkTargetPath(String targetPath) {
+		if (!useNexioTarget)
+			super.checkTargetPath(targetPath);
+	}
 
 	@Override
 	protected StoreUri createTargetUri(IItemManager manager, String targetPath) throws NullPointerException {
 		StoreUri result = null;
 		if (useNexioTarget) {
-			String nexioHost = System.getProperty("nexio.host"), nexioPassword = System.getProperty("nexioPassword"),
-					nexioUserName = System.getProperty("nexioUserName");
-			Integer nexioPort = Integer.parseInt(System.getProperty("nexioPort"));
-			if (nexioHost == null) {
-				throw new NullPointerException("Missing system property on 'nexio.host' name");
-			}
-			if (nexioPassword == null) {
-				throw new NullPointerException("Missing system property on 'nexioPassword' name");
-			}
-			if (nexioPort == 0) {
-				throw new NullPointerException("Missing system property on 'nexioPort' name");
-			}
-			if (nexioUserName == null) {
-				throw new NullPointerException("Missing system property on 'nexioUserName' name");
-			}
 			result = manager.createStoreUri(RemoteStoreProtocol.FTP, nexioHost);
 			result.setPortNumber(nexioPort);
 			result.setUserName(nexioUserName);
@@ -41,8 +69,30 @@ public class TSMExtendedRetrieveStep extends TSMRestoreStep {
 
 	@StepEntry
 	public Object[] execute(Media mediaCubeMedia, String targetPath, String targetNamePattern, String successRecipient, int killDateDays,
-			String localRetrievePath, String globalRetrievePath, boolean useNexioTarget, IJobEngine jobEngine, IJobRuntime jobRuntime) throws Exception {
+			String localRetrievePath, String globalRetrievePath, boolean useNexioTarget, String nexioAgency, Integer nexioPort, String nexioUserName,
+			String nexioPassword, IJobEngine jobEngine, IJobRuntime jobRuntime) throws Exception {
 		this.useNexioTarget = useNexioTarget;
+		this.nexioAgency = nexioAgency;
+		this.nexioPort = nexioPort;
+		this.nexioUserName = nexioUserName;
+		this.nexioPassword = nexioPassword;
+		nexioHost = System.getProperty("nexio.host");
+
+		if (nexioHost == null) {
+			throw new NullPointerException("Missing system property on 'nexio.host' name");
+		}
+		if (nexioPort == 0) {
+			throw new NullPointerException("System is not configured properly, 'nexioPort' input parameter missing.");
+		}
+		if (nexioUserName == null) {
+			throw new NullPointerException("System is not configured properly, 'nexioUserName' input parameter missing.");
+		}
+		if (nexioPassword == null) {
+			throw new NullPointerException("System is not configured properly, 'nexioPassword' input parameter missing.");
+		}
+		if (nexioAgency == null) {
+			throw new NullPointerException("System is not configured properly, 'nexioAgency' input parameter missing.");
+		}
 		return super.execute(mediaCubeMedia, targetPath, targetNamePattern, successRecipient, killDateDays, localRetrievePath, globalRetrievePath, jobEngine,
 				jobRuntime);
 	}
diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/TSMRestoreStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/TSMRestoreStep.java
index 98a956ac..9b81e0e7 100644
--- a/server/user.jobengine.executors/src/user/jobengine/server/steps/TSMRestoreStep.java
+++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/TSMRestoreStep.java
@@ -34,11 +34,18 @@ public class TSMRestoreStep extends JobStep {
 	private String sourceFileName;
 	private Marker marker;
 
-	protected void afterRestore(String targetPath, int killDateDays, String targetFileName) throws IOException {
+	protected void afterRestore(StoreUri targetUri, String targetPath, int killDateDays, String targetFileName) throws IOException, Exception {
 		if (killDateDays > 0)
 			EscortFiles.createUNCKillDate(targetPath, targetFileName, killDateDays, marker);
 	}
 
+	protected void checkTargetPath(String targetPath) {
+		if (StringUtils.isBlank(targetPath)) {
+			logger.error(marker, "A folyamat 'targetPath' bemeneti paramétere üres.");
+			throw new NullPointerException("System is not configured properly, 'targetPath' input parameter missing.");
+		}
+	}
+
 	protected StoreUri createTargetUri(IItemManager manager, String targetPath) {
 		return manager.createStoreUri(RemoteStoreProtocol.LOCAL, targetPath);
 	}
@@ -76,8 +83,7 @@ public class TSMRestoreStep extends JobStep {
 			if (StringUtils.isNotBlank(successRecipient))
 				logger.info(new MediaCubeMarker(successRecipient), msg);
 			logger.info(marker, msg);
-
-			afterRestore(targetPath, killDateDays, targetFileName);
+			afterRestore(targetUri, targetPath, killDateDays, targetFileName);
 
 		} catch (Exception e) {
 			Message msg = LogUtils.format("Az '{}' állomány visszatöltése sikertelen. A rendszer hibaüzenete: {}", sourceFileName, e.getMessage());
@@ -116,10 +122,7 @@ public class TSMRestoreStep extends JobStep {
 			logger.error(marker, "A folyamat 'mediaCubeMedia' bemeneti paramétere üres.");
 			throw new NullPointerException("System is not configured properly, 'mediaCubeMedia' input parameter missing.");
 		}
-		if (StringUtils.isBlank(targetPath)) {
-			logger.error(marker, "A folyamat 'targetPath' bemeneti paramétere üres.");
-			throw new NullPointerException("System is not configured properly, 'targetPath' input parameter missing.");
-		}
+		checkTargetPath(targetPath);
 		if (StringUtils.isBlank(targetNamePattern)) {
 			logger.error(marker, "A folyamat 'targetNamePattern' bemeneti paramétere üres.");
 			throw new NullPointerException("System is not configured properly, 'targetNamePattern' input parameter missing.");
diff --git a/server/user.jobengine.osgi.server/pages/searchitems.zul b/server/user.jobengine.osgi.server/pages/searchitems.zul
index 933ee50b..d0cb6670 100644
--- a/server/user.jobengine.osgi.server/pages/searchitems.zul
+++ b/server/user.jobengine.osgi.server/pages/searchitems.zul
@@ -16,26 +16,35 @@
 
 		.z-row:hover > .z-row-inner, .z-row:hover > .z-cell { background: none; } .z-row:hover>.z-row-inner>.z-row-content{ text-color: black; }
 
-		.RED100 { border-color: #FFCDD2; }
+		.RED100.type-inlist { border-color: #FFCDD2!important; }
 
 		.RED100 .z-toolbarbutton-content { background: #FFCDD2; }
-
+	
+		.RED200.type-inlist { border-color: #EF9A9A!important; }
 		.RED200 .z-toolbarbutton-content { background: #EF9A9A; border-color: #EF9A9A;; }
 
+		.BROWN100.type-inlist {  border-color: #D7CCC8!important; }
 		.BROWN100 .z-toolbarbutton-content { background: #D7CCC8; border-color: #D7CCC8; }
 
+		.YELLOW200.type-inlist {  border-color: #FFF59D!important; }
 		.YELLOW200 .z-toolbarbutton-content { background: #FFF59D; }
 
+		.INDIGO100.type-inlist {  border-color: #C5CAE9!important; }
 		.INDIGO100 .z-toolbarbutton-content { background: #C5CAE9; }
-
+		
+		.INDIGO200.type-inlist {  border-color: #9FA8DA!important; }
 		.INDIGO200 .z-toolbarbutton-content { background: #9FA8DA; }
-
+		
+		.BLUE100.type-inlist {  border-color: #BBDEFB!important; }
 		.BLUE100 .z-toolbarbutton-content { background: #BBDEFB; }
-
+		
+		.BLUE200.type-inlist {  border-color: #90CAF9!important; }
 		.BLUE200 .z-toolbarbutton-content { background: #90CAF9; }
-
+		
+		.TEAL100.type-inlist {  border-color: #B2DFDB!important; }
 		.TEAL100 .z-toolbarbutton-content { background: #B2DFDB; }
-
+		
+		.TEAL200.type-inlist {  border-color: #80CBC4!important; }
 		.TEAL200 .z-toolbarbutton-content { background: #80CBC4; }
 
 		.z-toolbarbutton-content { text-shadow: none; background: transparent; border: 1px solid transparent; border-radius: 3px; margin: 1px; }
@@ -99,7 +108,7 @@
 							<button hflex="min" image="/img/ic_search_black_18dp.png" onClick="@command('doSearch')" />
 							<button dir="reverse" image="/img/baseline_expand_more_black_18dp.png" popup="searchSettings, after_start" iconSclass="caret">
 							</button>
-							<menupopup id="searchSettings">
+							<menupopup id="searchSettings" >
 								<menuitem label="10 találat oldalanként" value="10" checked="true" onClick="@command('setPageSize', source=self)" />
 								<menuitem label="25 találat oldalanként" value="25" checked="true" onClick="@command('setPageSize', source=self)" />
 								<menuitem label="50 találat oldalanként" value="50" checked="true" onClick="@command('setPageSize', source=self)" />
@@ -121,15 +130,15 @@
 						<grid id="itemsGrid" sizedByContent="false" span="true" vflex="true" hflex="true" mold="paging" autopaging="false"
 							model="@load(vm.searchResult)" emptyMessage="Nincs találat!" pageSize="50" onAfterRender="@command('onAfterRenderGrid')"
 							style="border: none; background: white !important;" oddRowSclass="listbox-odd-style">
-							<columns>
+							<columns id="orderColumns">
 								<column hflex="min">
 									<checkbox checked="@bind(vm.rowsExpanded)" />
 								</column>
 								<column hflex="min">
 									<checkbox checked="@bind(vm.allSelected)" />
 								</column>
-								<column label="ID" sort="auto" hflex="1" align="left" />
-								<column label="Cím" sort="auto" hflex="2" align="left" />
+								<column label="ID" sort="auto" hflex="1" align="left"/>
+								<column label="Cím" sort="auto" hflex="2" align="left"/>
 								<column label="Fájlnév" sort="auto" hflex="5" align="left" />
 								<column label="Hossz" sort="auto" hflex="2" align="right" />
 								<!-- 								<column width="20px" align="right" style="cursor: pointer" popup="sortOther" /> -->
@@ -145,7 +154,7 @@
 													onClick="@command('selectMediaArchive', selectedObject=each)" />
 												<div sclass="details">
 													<hlayout>
-														<div class="RED100 type-inlist">
+														<div class="${c:cat(vm.typeFilters[each.media.itemType.name].color,' type-inlist')}">
 															<label style="font-size: 10px;" value="@load(each.media.itemType.name)" />
 														</div>
 														<label style="font:20px Century Gothic; color:#008AC8;" value="@load(each.item.title)" />
@@ -188,9 +197,7 @@
 			</west>
 			<!-- media player -->
 			<center border="none">
-
 				<borderlayout height="100%" width="100%">
-
 					<north border="none" size="60%" splittable="true" minsize="250" collapsible="true">
 						<div align="center" height="100%" width="100%">
 							<iframe id="mediaPlayer" height="100%" width="100%" autohide="false" src="@load(vm.lowresMediaFilePath)"></iframe>
diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java
index 36579edd..155790d0 100644
--- a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java
+++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java
@@ -1,11 +1,9 @@
 package user.jobengine.zk.model;
 
-import java.awt.Toolkit;
-import java.awt.datatransfer.Clipboard;
-import java.awt.datatransfer.StringSelection;
 import java.net.URL;
 import java.nio.file.Paths;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -52,12 +50,13 @@ import user.commons.StoreUri;
 import user.commons.remotestore.RemoteStoreProtocol;
 import user.jobengine.db.ArchivedMedia;
 import user.jobengine.db.IItemManager;
-import user.jobengine.db.ItemManager;
 import user.jobengine.db.MediaFile;
 import user.jobengine.db.Store;
 import user.jobengine.zk.util.SessionUtil;
 
 public class SearchModel extends AsyncBaseModel {
+
+	private static final String GENERIC_ORIGINAL = "Generic";
 	private static final String ARG = "arg";
 	private static final String MEDIA_ID = "showMediaID";
 	private static final String GENERIC = "Egyéb";
@@ -94,23 +93,23 @@ public class SearchModel extends AsyncBaseModel {
 	Button backToVideoButton;
 	@Wire
 	Combobox search;
+
 	@Wire
 	Menupopup searchSettings;
 	@Wire
 	Div mediaDetails;
-
 	private String orderBy;
-	private boolean orderAscending;
 
+	private boolean orderAscending;
 	private Map<String, String> topColorClasses;
 	private int selectedRowIndex = -1;
 	private volatile boolean preventAfterRender;
 	private int positionToScroll = -1;
 	private ListModelList<String> searchHistory;
 
-	public SearchModel() {
-		this.itemManager = ItemManager.getInstance();
+	private Map<String, String> columnOrder;
 
+	public SearchModel() {
 		typeFilters = new LinkedHashMap<>();
 		addTypeFilter(TypeFilter.as(NEWS_MATERIAL, "RED200", "ic_language_black_18dp.png"));
 		addTypeFilter(TypeFilter.as(RAW_NEWS_MATERIAL, "RED100", "ic_perm_camera_mic_black_18dp.png"));
@@ -122,6 +121,7 @@ public class SearchModel extends AsyncBaseModel {
 		addTypeFilter(TypeFilter.as(RAW_AD, "BLUE100", "ic_settings_brightness_black_18dp.png"));
 		addTypeFilter(TypeFilter.as(RECORDING, "BROWN100", "ic_group_work_black_18dp.png"));
 		addTypeFilter(TypeFilter.as(GENERIC, "YELLOW200", "ic_view_quilt_black_18dp.png"));
+		addTypeFilter(TypeFilter.as(GENERIC_ORIGINAL, "YELLOW200", "ic_view_quilt_black_18dp.png"));
 		topTypeFilterNames = new String[] { NEWS_MATERIAL, RAW_NEWS_MATERIAL, RECORDING, GENERIC };
 		bottomTypeFilterNames = new String[] { MATERIAL, RAW_MATERIAL, PROMO, RAW_PROMO, AD, RAW_AD };
 
@@ -161,6 +161,10 @@ public class SearchModel extends AsyncBaseModel {
 				}
 			}
 		};
+
+		searchHistory = new ListModelList<>(SessionUtil.getUserSearchHistory());
+		setColumnOrder();
+		setUserSelectedFilters();
 	}
 
 	private void addTypeFilter(TypeFilter typeFilter) {
@@ -173,10 +177,16 @@ public class SearchModel extends AsyncBaseModel {
 		Selectors.wireEventListeners(view, this);
 		configureSearchResultGrid();
 		showExternalMediaID();
-
 		searchHistory = new ListModelList<>(SessionUtil.getUserSearchHistory());
+		if (SessionUtil.getUserPageSize() != 0)
+			itemsGrid.setPageSize(SessionUtil.getUserPageSize());
 		setSettingsPageSize(itemsGrid.getPageSize());
-		//TODO rendezés
+	}
+
+	private void clearAllFilters() {
+		for (String filter : typeFilters.keySet()) {
+			typeFilters.get(filter).setChecked(false);
+		}
 	}
 
 	@Command
@@ -192,6 +202,9 @@ public class SearchModel extends AsyncBaseModel {
 
 		for (Component child : itemsGrid.getColumns().getChildren()) {
 			Column column = (Column) child;
+			if (columnOrder != null)
+				if (column.getLabel().equals(columnOrder.entrySet().iterator().next().getKey()))
+					column.setSortDirection(columnOrder.entrySet().iterator().next().getValue());
 			column.addEventListener("onSort", evt -> doSort(evt));
 		}
 	}
@@ -202,11 +215,11 @@ public class SearchModel extends AsyncBaseModel {
 		String baseURL = Executions.getCurrent().getScheme() + "://" + Executions.getCurrent().getServerName() + port
 				+ Executions.getCurrent().getContextPath();
 		String url = String.format("%s/?%s=%d", baseURL, MEDIA_ID, selectedObject.getMedia().getId());
-		Toolkit toolkit = Toolkit.getDefaultToolkit();
-		Clipboard clipboard = toolkit.getSystemClipboard();
-		StringSelection strSel = new StringSelection(url);
-		clipboard.setContents(strSel, null);
 		String email = String.format("mailto:?subject=Média címe: %s &body=A média itt tekinthető meg: %s", selectedObject.getMedia().getTitle(), url);
+		// Toolkit toolkit = Toolkit.getDefaultToolkit();
+		// Clipboard clipboard = toolkit.getSystemClipboard();
+		// StringSelection strSel = new StringSelection(url);
+		// clipboard.setContents(strSel, null);
 		// Messagebox.show("A médiához szükséges URL a vágólapra másolva, az URL a következő:\n" + email, "", Messagebox.OK, Messagebox.NONE);
 		Executions.getCurrent().sendRedirect(email);
 	}
@@ -215,7 +228,6 @@ public class SearchModel extends AsyncBaseModel {
 	@NotifyChange({ "searchResult", "selectedObject", "hasTSMMediaFile", "hasLowresMediaFile", "lowresMediaFilePath" })
 	public void doSearch() {
 		try {
-
 			searchResult = null;
 			itemsGrid.setActivePage(0);
 			searchValue = search.getText();
@@ -224,13 +236,21 @@ public class SearchModel extends AsyncBaseModel {
 				throw new Exception("Legalább 3 karakter megadása kötelező!");
 
 			List<String> searchFilters = getSelectedFilters();
+			if (SessionUtil.getUserColumnOrder() != null) {
+				orderBy = columnHeaders.get(columnOrder.entrySet().iterator().next().getKey());
+				orderAscending = columnOrder.entrySet().iterator().next().getValue().equals("ascending");
+			}
+
 			searchResult = new CachedListModel(searchValue, searchFilters, orderBy, orderAscending);
+			setSelectedObject(null);
 
 			if (!searchHistory.contains(searchValue)) {
 				searchHistory.add(0, searchValue);
 				SessionUtil.putUserSearchHistory(searchHistory);
 			}
 
+			SessionUtil.putUserSearchFilter(searchFilters);
+
 		} catch (Exception e) {
 			Messagebox.show(e.getMessage(), "Hiba", Messagebox.OK, Messagebox.ERROR);
 			logger.catching(e);
@@ -244,11 +264,14 @@ public class SearchModel extends AsyncBaseModel {
 		column.setSortDirection(evt.isAscending() ? "ascending" : "descending");
 		logger.info("{} {}", column.getLabel(), evt.isAscending());
 
+		columnOrder = new HashMap<>();
+		columnOrder.put(column.getLabel(), column.getSortDirection());
+		SessionUtil.putUserColumnOrder(columnOrder);
+
 		orderBy = columnHeaders.get(column.getLabel());
 		orderAscending = evt.isAscending();
 		doSearch();
 		notifyChange("searchResult", "selectedObject", "hasLowresMediaFile", "lowresMediaFilePath");
-
 		evt.stopPropagation();
 	}
 
@@ -442,6 +465,7 @@ public class SearchModel extends AsyncBaseModel {
 			return;
 		preventAfterRender = true;
 		logger.info("onAfterRenderGrid");
+
 		if (positionToScroll != -1) {
 			ensureVisible(positionToScroll);
 		} else
@@ -480,7 +504,6 @@ public class SearchModel extends AsyncBaseModel {
 		setSelectedObject(selectedObject);
 		highlight(this.selectedObject, true);
 		Clients.scrollIntoView(mediaDetails.getFirstChild());
-
 		logger.info("Media was selected. Selected media archive:{}", selectedObject.getMedia().getId());
 	}
 
@@ -515,6 +538,14 @@ public class SearchModel extends AsyncBaseModel {
 
 	}
 
+	private void setColumnOrder() {
+		if (SessionUtil.getUserColumnOrder() != null) {
+			columnOrder = new HashMap<>();
+			columnOrder.put(SessionUtil.getUserColumnOrder().entrySet().iterator().next().getKey(),
+					(String) SessionUtil.getUserColumnOrder().entrySet().iterator().next().getValue());
+		}
+	}
+
 	public void setItemSelected(boolean itemSelected) {
 		this.itemSelected = itemSelected;
 	}
@@ -531,6 +562,7 @@ public class SearchModel extends AsyncBaseModel {
 		setSettingsPageSize(pageSize);
 		itemsGrid.setPageSize(pageSize);
 		itemsGrid.setActivePage(0);
+		SessionUtil.putUserPageSize(pageSize);
 	}
 
 	public void setRowsExpanded(boolean rowsExpanded) {
@@ -543,11 +575,11 @@ public class SearchModel extends AsyncBaseModel {
 
 	@NotifyChange({ "selectedObject", "hasLowresMediaFile", "hasTSMMediaFile", "lowresMediaFilePath" })
 	public void setSelectedObject(ArchivedMedia selectedObject) {
+		this.selectedObject = selectedObject;
 		if (selectedObject != null) {
 			selectedObject.setMedia(itemManager.getMedia(selectedObject.getMedia().getId()));
 			selectedObject.setItem(itemManager.getItem(selectedObject.getMedia().getItemId()));
 		}
-		this.selectedObject = selectedObject;
 	}
 
 	private void setSettingsPageSize(int pageSize) {
@@ -564,6 +596,22 @@ public class SearchModel extends AsyncBaseModel {
 		}
 	}
 
+	private void setUserSelectedFilters() {
+		List<String> selectedFilters = SessionUtil.getUserSearchFilter();
+		if (selectedFilters != null) {
+			clearAllFilters();
+			for (String filter : selectedFilters) {
+				if (typeFilters.containsKey(filter)) {
+					TypeFilter typeFilter = typeFilters.get(filter);
+					typeFilter.setChecked(true);
+					typeFilters.put(filter, typeFilter);
+				}
+			}
+			if (typeFilters.size() != selectedFilters.size())
+				allChecked = false;
+		}
+	}
+
 	private void showExternalMediaID() {
 		String mediaID = SessionUtil.getQueryParameter(MEDIA_ID);
 		if (mediaID != null)
diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/util/SessionUtil.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/util/SessionUtil.java
index 6b9ec0cb..32a96217 100644
--- a/server/user.jobengine.osgi.server/src/user/jobengine/zk/util/SessionUtil.java
+++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/util/SessionUtil.java
@@ -28,6 +28,9 @@ import user.jobengine.server.JobEngine;
 import user.jobengine.zk.model.IndexModel;
 
 public class SessionUtil {
+	private static final String SEARCH_FILTER = "searchFilter";
+	private static final String COLUMN_ORDERS = "columnOrders";
+	private static final String PAGE_SIZE = "pageSize";
 	private static final String SEARCH_HISTORY = "searchHistory";
 	private static final String USER_NAME = "userName";
 	private static final String USER_SETTINGS = "userSettings";
@@ -61,8 +64,8 @@ public class SessionUtil {
 			JobEngine.getInstance().removeJobChangedEventListener(listener);
 			setAttribute(SessionUtil.JOBLISTENER, null);
 		}
-		//setAttribute(SessionUtil.MENUMODEL, null);
-		//setAttribute(SessionUtil.USERPRINCIPAL, null);
+		// setAttribute(SessionUtil.MENUMODEL, null);
+		// setAttribute(SessionUtil.USERPRINCIPAL, null);
 	}
 
 	static public void dumpQueryString() {
@@ -71,7 +74,7 @@ public class SessionUtil {
 	}
 
 	static public Object getAttribute(String name) {
-		//HttpSession session = (HttpSession) (Executions.getCurrent()).getDesktop().getSession().getNativeSession();
+		// HttpSession session = (HttpSession) (Executions.getCurrent()).getDesktop().getSession().getNativeSession();
 		Session zkSession = Sessions.getCurrent();
 		if (zkSession == null)
 			return null;
@@ -132,10 +135,25 @@ public class SessionUtil {
 		return result;
 	}
 
+	public static Map<String, Object> getUserColumnOrder() {
+		BasicDBObject userSettings = getUserSettings();
+		return (Map<String, Object>) userSettings.get(COLUMN_ORDERS);
+	}
+
+	public static int getUserPageSize() {
+		BasicDBObject userSettings = getUserSettings();
+		return userSettings.get(PAGE_SIZE) == null ? 0 : (int) userSettings.get(PAGE_SIZE);
+	}
+
 	static public UserPrincipal getUserPrincipal() {
 		return (UserPrincipal) getAttribute(USERPRINCIPAL);
 	}
 
+	public static List<String> getUserSearchFilter() {
+		BasicDBObject userSettings = getUserSettings();
+		return (List<String>) userSettings.get(SEARCH_FILTER);
+	}
+
 	public static List<String> getUserSearchHistory() {
 		BasicDBObject userSettings = getUserSettings();
 		BasicDBList history = (BasicDBList) userSettings.get(SEARCH_HISTORY);
@@ -220,6 +238,30 @@ public class SessionUtil {
 		history.add(new BasicDBObject("action", action).append("query", query));
 	}
 
+	public static void putUserColumnOrder(Map<String, String> columnOrder) {
+		BasicDBObject userSettings = getUserSettings();
+		userSettings.put(COLUMN_ORDERS, columnOrder);
+		putUserSettings();
+	}
+
+	public static void putUserPageSize(int size) {
+		BasicDBObject userSettings = getUserSettings();
+		userSettings.put(PAGE_SIZE, size);
+		putUserSettings();
+	}
+
+	public static void putUserSearchFilter(List<String> searchFilter) {
+		BasicDBObject userSettings = getUserSettings();
+		if (searchFilter != null) {
+			BasicDBList filter = new BasicDBList();
+			filter.addAll(searchFilter);
+			userSettings.put(SEARCH_FILTER, filter);
+		} else
+			userSettings.put(SEARCH_FILTER, null);
+
+		putUserSettings();
+	}
+
 	public static void putUserSearchHistory(List<String> searchHistory) {
 		BasicDBObject userSettings = getUserSettings();
 		BasicDBList history = new BasicDBList();
@@ -246,7 +288,7 @@ public class SessionUtil {
 	}
 
 	static public void setAttribute(String name, Object obj) {
-		//HttpSession session = (HttpSession) (Executions.getCurrent()).getDesktop().getSession().getNativeSession();
+		// HttpSession session = (HttpSession) (Executions.getCurrent()).getDesktop().getSession().getNativeSession();
 		Session zkSession = Sessions.getCurrent();
 		if (zkSession == null)
 			return;
-- 
2.54.0