From e2eb57174a516c0d8ad0b521f960378fb0832866 Mon Sep 17 00:00:00 2001 From: HazelGrant Date: Thu, 2 Nov 2023 13:24:30 -0400 Subject: [PATCH 01/15] Adds favorites column to path_selector modal --- .../session_contexts/_path_selector.html.erb | 58 ++++++++++++------- 1 file changed, 38 insertions(+), 20 deletions(-) diff --git a/apps/dashboard/app/views/batch_connect/session_contexts/_path_selector.html.erb b/apps/dashboard/app/views/batch_connect/session_contexts/_path_selector.html.erb index 0677f6ab2b..e2899f6c2c 100644 --- a/apps/dashboard/app/views/batch_connect/session_contexts/_path_selector.html.erb +++ b/apps/dashboard/app/views/batch_connect/session_contexts/_path_selector.html.erb @@ -39,30 +39,48 @@ -
-
- +
+ +
+
+
+
+
Favorites
+
+ +   + Favorite Item + +
+
+
+ + +
+ - + -
-
- - - - - - - - - -
TypeName
From fb2ee819059cf8861adc798d1a6c25ebcf4569c0 Mon Sep 17 00:00:00 2001 From: HazelGrant Date: Fri, 3 Nov 2023 10:10:07 -0400 Subject: [PATCH 02/15] Lists filePickerFavorites in Favorites section of path selector --- .../javascript/path_selector/path_selector.js | 19 +++--- .../path_selector/path_selector_data_table.js | 61 ++++++++++++------- .../session_contexts/_path_selector.html.erb | 8 +-- 3 files changed, 53 insertions(+), 35 deletions(-) diff --git a/apps/dashboard/app/javascript/path_selector/path_selector.js b/apps/dashboard/app/javascript/path_selector/path_selector.js index a02368b68c..c81f4d3f31 100644 --- a/apps/dashboard/app/javascript/path_selector/path_selector.js +++ b/apps/dashboard/app/javascript/path_selector/path_selector.js @@ -23,15 +23,16 @@ function makeTable(element) { function getPathSelectorOptions(element) { options = {}; - options.filesPath = element.dataset['filesPath']; - options.initialDirectory = element.dataset['initialDirectory']; - options.tableId = element.dataset['tableId']; - options.breadcrumbId = element.dataset['breadcrumbId']; - options.selectButtonId = element.dataset['selectButtonId']; - options.inputFieldId = element.dataset['inputFieldId']; - options.showFiles = element.dataset['showFiles']; - options.showHidden = element.dataset['showHidden']; - options.modalId = element.id; + options.filesPath = element.dataset['filesPath']; + options.initialDirectory = element.dataset['initialDirectory']; + options.tableId = element.dataset['tableId']; + options.breadcrumbId = element.dataset['breadcrumbId']; + options.selectButtonId = element.dataset['selectButtonId']; + options.inputFieldId = element.dataset['inputFieldId']; + options.showFiles = element.dataset['showFiles']; + options.showHidden = element.dataset['showHidden']; + options.modalId = element.id; + options.filePickerFavorites = element.dataset['filePickerFavorites']; return options; } diff --git a/apps/dashboard/app/javascript/path_selector/path_selector_data_table.js b/apps/dashboard/app/javascript/path_selector/path_selector_data_table.js index 420c0502be..c5e84ce621 100644 --- a/apps/dashboard/app/javascript/path_selector/path_selector_data_table.js +++ b/apps/dashboard/app/javascript/path_selector/path_selector_data_table.js @@ -3,26 +3,28 @@ export class PathSelectorTable { _table = null; // input data that should be passed into the constructor - tableId = undefined; - filesPath = undefined; - breadcrumbId = undefined; - initialDirectory = undefined; - selectButtonId = undefined; - inputFieldId = undefined; - modalId = undefined; - showHidden = undefined; - showFiles = undefined; + tableId = undefined; + filesPath = undefined; + breadcrumbId = undefined; + initialDirectory = undefined; + selectButtonId = undefined; + inputFieldId = undefined; + modalId = undefined; + showHidden = undefined; + showFiles = undefined; + filePickerFavorites = undefined; constructor(options) { - this.tableId = options.tableId; - this.filesPath = options.filesPath; - this.breadcrumbId = options.breadcrumbId; - this.initialDirectory = options.initialDirectory; - this.selectButtonId = options.selectButtonId; - this.inputFieldId = options.inputFieldId; - this.modalId = options.modalId; - this.showHidden = options.showHidden === 'true'; - this.showFiles = options.showFiles === 'true'; + this.tableId = options.tableId; + this.filesPath = options.filesPath; + this.breadcrumbId = options.breadcrumbId; + this.initialDirectory = options.initialDirectory; + this.selectButtonId = options.selectButtonId; + this.inputFieldId = options.inputFieldId; + this.modalId = options.modalId; + this.showHidden = options.showHidden === 'true'; + this.showFiles = options.showFiles === 'true'; + this.filePickerFavorites = options.filePickerFavorites; this.initDataTable(); this.reloadTable(this.initialUrl()); @@ -33,6 +35,8 @@ export class PathSelectorTable { } initDataTable() { + // FAVORITES + $('#favorites').append(this.favoritesList()); this._table = $(`#${this.tableId}`).DataTable({ autoWidth: false, @@ -54,7 +58,7 @@ export class PathSelectorTable { // https://datatables.net/reference/option/dom // dom: '', dataTables_info nowrap // - // put breadcrmbs below filter!!! + // put breadcrumbs below filter!!! dom: "<'row'<'col-sm-12'f>>" + // normally <'row'<'col-sm-6'l><'col-sm-6'f>> but we disabled pagination so l is not needed (dropdown for selecting # rows) "<'row'<'col-sm-12'<'dt-status-bar'<'datatables-status float-right'><'transfers-status'>>>>" + "<'row'<'col-sm-12'tr>>", // normally this is <'row'<'col-sm-5'i><'col-sm-7'p>> but we disabled pagination so have info take whole row @@ -81,6 +85,21 @@ export class PathSelectorTable { }); } + favoritesList() { + var favorites = ""; + const filePickerFavorites = JSON.parse(this.filePickerFavorites); + + for (var file in filePickerFavorites) { + favorites = favorites.concat( + " " + + filePickerFavorites[file].title + + "" + ) + }; + + return favorites; + } + async reloadTable(url) { try { $(this.tableWrapper()).hide(); @@ -159,7 +178,7 @@ export class PathSelectorTable { // note that this is storing the file system path, not the path of the URL // i.e., '/home/annie' not '/pun/sys/dashboard/files/fs/home/annie' getLastVisited() { - const lastVisited = localStorage.getItem(this.storageKey()); + const lastVisited = null; // localStorage.getItem(this.storageKey()); if(lastVisited === null) { return this.initialDirectory; } else { @@ -201,4 +220,4 @@ export class PathSelectorTable { data.files = filteredFiles; return data; } -} +} \ No newline at end of file diff --git a/apps/dashboard/app/views/batch_connect/session_contexts/_path_selector.html.erb b/apps/dashboard/app/views/batch_connect/session_contexts/_path_selector.html.erb index e2899f6c2c..21f2b3fc57 100644 --- a/apps/dashboard/app/views/batch_connect/session_contexts/_path_selector.html.erb +++ b/apps/dashboard/app/views/batch_connect/session_contexts/_path_selector.html.erb @@ -2,6 +2,7 @@ show_hidden = field_options.fetch(:show_hidden, false) show_files = field_options.fetch(:show_files, true) inital_directory = field_options.fetch(:directory, CurrentUser.home) + file_picker_favorites = field_options.fetch(:file_picker_favorites, []) input_field_id = "#{form.object_name}_#{attrib.id}" path_selector_id = "#{input_field_id}_path_selector" @@ -24,6 +25,7 @@ data-show-files="<%= show_files %>" data-show-hidden="<%= show_hidden %>" data-initial-directory="<%= inital_directory %>" + data-file-picker-favorites="<%= file_picker_favorites %>" data-files-path="<%= files_path %>" data-table-id="<%= table_id %>" data-breadcrumb-id="<%= breadcrumb_id %>" @@ -46,11 +48,7 @@
Favorites
-
- -   - Favorite Item - +
From f0656cdbb0a7a56ae97cc24dc91778ca4b3d20fa Mon Sep 17 00:00:00 2001 From: HazelGrant Date: Tue, 7 Nov 2023 14:42:12 -0500 Subject: [PATCH 03/15] Makes favorites work with filePickerFavorites - rough --- .../javascript/path_selector/path_selector_data_table.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/apps/dashboard/app/javascript/path_selector/path_selector_data_table.js b/apps/dashboard/app/javascript/path_selector/path_selector_data_table.js index c5e84ce621..000019e34d 100644 --- a/apps/dashboard/app/javascript/path_selector/path_selector_data_table.js +++ b/apps/dashboard/app/javascript/path_selector/path_selector_data_table.js @@ -30,6 +30,7 @@ export class PathSelectorTable { this.reloadTable(this.initialUrl()); $(`#${this.tableId} tbody`).on('click', 'tr', (event) => { this.clickRow(event) }); + $('#favorites').on('click', 'span', (event) => { this.clickRow(event) }); $(`#${this.breadcrumbId}`).on('click', 'li', (event) => { this.clickBreadcrumb(event) }); $(`#${this.selectButtonId}`).on('click', (event) => { this.selectPath(event) }); } @@ -91,9 +92,7 @@ export class PathSelectorTable { for (var file in filePickerFavorites) { favorites = favorites.concat( - " " + - filePickerFavorites[file].title + - "" + ` ${filePickerFavorites[file].title}` ) }; @@ -140,7 +139,7 @@ export class PathSelectorTable { } clickRow(event) { - const row = $(event.target).closest('tr').get(0); + const row = $(event.target).closest('tr').get(0) || event.target; const url = row.dataset['apiUrl']; const pathType = row.dataset['pathType']; From 47fea703dbab0182b029c5293343fca35cd482e2 Mon Sep 17 00:00:00 2001 From: HazelGrant Date: Wed, 8 Nov 2023 09:17:48 -0500 Subject: [PATCH 04/15] Adds list of favorites as defined by OodFilesApp --- .../batch_connect/session_contexts/_path_selector.html.erb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/apps/dashboard/app/views/batch_connect/session_contexts/_path_selector.html.erb b/apps/dashboard/app/views/batch_connect/session_contexts/_path_selector.html.erb index 21f2b3fc57..2337fda5bc 100644 --- a/apps/dashboard/app/views/batch_connect/session_contexts/_path_selector.html.erb +++ b/apps/dashboard/app/views/batch_connect/session_contexts/_path_selector.html.erb @@ -49,6 +49,11 @@
Favorites
+ <% OodFilesApp.new.favorite_paths.each do |path| %> + +  <%= path.title %> + + <% end %>
From bf5399437dbb2e2e0227f62c3219128b86e6bca4 Mon Sep 17 00:00:00 2001 From: HazelGrant Date: Wed, 8 Nov 2023 09:31:29 -0500 Subject: [PATCH 05/15] Removes debug cruft --- .../app/javascript/path_selector/path_selector_data_table.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/dashboard/app/javascript/path_selector/path_selector_data_table.js b/apps/dashboard/app/javascript/path_selector/path_selector_data_table.js index 000019e34d..bc16a2c09a 100644 --- a/apps/dashboard/app/javascript/path_selector/path_selector_data_table.js +++ b/apps/dashboard/app/javascript/path_selector/path_selector_data_table.js @@ -177,7 +177,7 @@ export class PathSelectorTable { // note that this is storing the file system path, not the path of the URL // i.e., '/home/annie' not '/pun/sys/dashboard/files/fs/home/annie' getLastVisited() { - const lastVisited = null; // localStorage.getItem(this.storageKey()); + const lastVisited = localStorage.getItem(this.storageKey()); if(lastVisited === null) { return this.initialDirectory; } else { From 92c70528024df1235b06ca99e44651c51cabcf3f Mon Sep 17 00:00:00 2001 From: HazelGrant Date: Wed, 15 Nov 2023 13:55:42 -0500 Subject: [PATCH 06/15] Uses partial for favorites in path_selector --- .../batch_connect/session_contexts_helper.rb | 8 +++++++ .../javascript/path_selector/path_selector.js | 1 - .../path_selector/path_selector_data_table.js | 24 ++++--------------- .../session_contexts/_favorites.html.erb | 5 ++++ .../session_contexts/_path_selector.html.erb | 9 ++----- 5 files changed, 20 insertions(+), 27 deletions(-) create mode 100644 apps/dashboard/app/views/batch_connect/session_contexts/_favorites.html.erb diff --git a/apps/dashboard/app/helpers/batch_connect/session_contexts_helper.rb b/apps/dashboard/app/helpers/batch_connect/session_contexts_helper.rb index 85c6590ecc..503169c768 100644 --- a/apps/dashboard/app/helpers/batch_connect/session_contexts_helper.rb +++ b/apps/dashboard/app/helpers/batch_connect/session_contexts_helper.rb @@ -136,4 +136,12 @@ def resolution_field(form, id, opts = {}) ) end end + + def parse_favorites(favorites) + if favorites.is_a?(String) + JSON.parse(favorites).map do |f| + FavoritePath.new(f["href"], title: f["title"]) + end + end + end end diff --git a/apps/dashboard/app/javascript/path_selector/path_selector.js b/apps/dashboard/app/javascript/path_selector/path_selector.js index c81f4d3f31..9d604deef4 100644 --- a/apps/dashboard/app/javascript/path_selector/path_selector.js +++ b/apps/dashboard/app/javascript/path_selector/path_selector.js @@ -32,7 +32,6 @@ function getPathSelectorOptions(element) { options.showFiles = element.dataset['showFiles']; options.showHidden = element.dataset['showHidden']; options.modalId = element.id; - options.filePickerFavorites = element.dataset['filePickerFavorites']; return options; } diff --git a/apps/dashboard/app/javascript/path_selector/path_selector_data_table.js b/apps/dashboard/app/javascript/path_selector/path_selector_data_table.js index bc16a2c09a..640c2a5cfe 100644 --- a/apps/dashboard/app/javascript/path_selector/path_selector_data_table.js +++ b/apps/dashboard/app/javascript/path_selector/path_selector_data_table.js @@ -12,7 +12,6 @@ export class PathSelectorTable { modalId = undefined; showHidden = undefined; showFiles = undefined; - filePickerFavorites = undefined; constructor(options) { this.tableId = options.tableId; @@ -24,7 +23,6 @@ export class PathSelectorTable { this.modalId = options.modalId; this.showHidden = options.showHidden === 'true'; this.showFiles = options.showFiles === 'true'; - this.filePickerFavorites = options.filePickerFavorites; this.initDataTable(); this.reloadTable(this.initialUrl()); @@ -36,9 +34,6 @@ export class PathSelectorTable { } initDataTable() { - // FAVORITES - $('#favorites').append(this.favoritesList()); - this._table = $(`#${this.tableId}`).DataTable({ autoWidth: false, language: { @@ -86,19 +81,6 @@ export class PathSelectorTable { }); } - favoritesList() { - var favorites = ""; - const filePickerFavorites = JSON.parse(this.filePickerFavorites); - - for (var file in filePickerFavorites) { - favorites = favorites.concat( - ` ${filePickerFavorites[file].title}` - ) - }; - - return favorites; - } - async reloadTable(url) { try { $(this.tableWrapper()).hide(); @@ -140,9 +122,13 @@ export class PathSelectorTable { clickRow(event) { const row = $(event.target).closest('tr').get(0) || event.target; - const url = row.dataset['apiUrl']; + var url = row.dataset['apiUrl']; const pathType = row.dataset['pathType']; + if (!url.match(this.filesPath)) { + url = `${this.filesPath}${url}` + } + // only reload table for directories. and correct last visited // if it's a file. if(pathType == 'f') { diff --git a/apps/dashboard/app/views/batch_connect/session_contexts/_favorites.html.erb b/apps/dashboard/app/views/batch_connect/session_contexts/_favorites.html.erb new file mode 100644 index 0000000000..513c010c1f --- /dev/null +++ b/apps/dashboard/app/views/batch_connect/session_contexts/_favorites.html.erb @@ -0,0 +1,5 @@ +> +  <%= path.title || path.path %> + \ No newline at end of file diff --git a/apps/dashboard/app/views/batch_connect/session_contexts/_path_selector.html.erb b/apps/dashboard/app/views/batch_connect/session_contexts/_path_selector.html.erb index 2337fda5bc..1cb61bf886 100644 --- a/apps/dashboard/app/views/batch_connect/session_contexts/_path_selector.html.erb +++ b/apps/dashboard/app/views/batch_connect/session_contexts/_path_selector.html.erb @@ -2,7 +2,7 @@ show_hidden = field_options.fetch(:show_hidden, false) show_files = field_options.fetch(:show_files, true) inital_directory = field_options.fetch(:directory, CurrentUser.home) - file_picker_favorites = field_options.fetch(:file_picker_favorites, []) + file_picker_favorites = field_options.fetch(:file_picker_favorites, OodFilesApp.new.favorite_paths) input_field_id = "#{form.object_name}_#{attrib.id}" path_selector_id = "#{input_field_id}_path_selector" @@ -25,7 +25,6 @@ data-show-files="<%= show_files %>" data-show-hidden="<%= show_hidden %>" data-initial-directory="<%= inital_directory %>" - data-file-picker-favorites="<%= file_picker_favorites %>" data-files-path="<%= files_path %>" data-table-id="<%= table_id %>" data-breadcrumb-id="<%= breadcrumb_id %>" @@ -49,11 +48,7 @@
Favorites
- <% OodFilesApp.new.favorite_paths.each do |path| %> - -  <%= path.title %> - - <% end %> + <%= render partial: 'favorites', collection: parse_favorites(file_picker_favorites), as: :path %>
From 2bb8b5c7ec1a65af2f7c4fb3495a1ab32921e082 Mon Sep 17 00:00:00 2001 From: HazelGrant Date: Thu, 16 Nov 2023 15:18:12 -0500 Subject: [PATCH 07/15] Changes interface expectation for favorites, uses files_path helper --- .../helpers/batch_connect/session_contexts_helper.rb | 7 ++----- .../path_selector/path_selector_data_table.js | 6 +----- .../batch_connect/session_contexts/_favorites.html.erb | 10 +++++----- .../session_contexts/_path_selector.html.erb | 8 ++++---- 4 files changed, 12 insertions(+), 19 deletions(-) diff --git a/apps/dashboard/app/helpers/batch_connect/session_contexts_helper.rb b/apps/dashboard/app/helpers/batch_connect/session_contexts_helper.rb index 503169c768..09f4654805 100644 --- a/apps/dashboard/app/helpers/batch_connect/session_contexts_helper.rb +++ b/apps/dashboard/app/helpers/batch_connect/session_contexts_helper.rb @@ -138,10 +138,7 @@ def resolution_field(form, id, opts = {}) end def parse_favorites(favorites) - if favorites.is_a?(String) - JSON.parse(favorites).map do |f| - FavoritePath.new(f["href"], title: f["title"]) - end - end + return favorites if favorites.any? { |f| f.is_a?(FavoritePath) } + favorites.map { |f| FavoritePath.new(f) } end end diff --git a/apps/dashboard/app/javascript/path_selector/path_selector_data_table.js b/apps/dashboard/app/javascript/path_selector/path_selector_data_table.js index 640c2a5cfe..ae9834b3a1 100644 --- a/apps/dashboard/app/javascript/path_selector/path_selector_data_table.js +++ b/apps/dashboard/app/javascript/path_selector/path_selector_data_table.js @@ -28,7 +28,7 @@ export class PathSelectorTable { this.reloadTable(this.initialUrl()); $(`#${this.tableId} tbody`).on('click', 'tr', (event) => { this.clickRow(event) }); - $('#favorites').on('click', 'span', (event) => { this.clickRow(event) }); + $('#favorites').on('click', 'li', (event) => { this.clickRow(event) }); $(`#${this.breadcrumbId}`).on('click', 'li', (event) => { this.clickBreadcrumb(event) }); $(`#${this.selectButtonId}`).on('click', (event) => { this.selectPath(event) }); } @@ -125,10 +125,6 @@ export class PathSelectorTable { var url = row.dataset['apiUrl']; const pathType = row.dataset['pathType']; - if (!url.match(this.filesPath)) { - url = `${this.filesPath}${url}` - } - // only reload table for directories. and correct last visited // if it's a file. if(pathType == 'f') { diff --git a/apps/dashboard/app/views/batch_connect/session_contexts/_favorites.html.erb b/apps/dashboard/app/views/batch_connect/session_contexts/_favorites.html.erb index 513c010c1f..5274a382df 100644 --- a/apps/dashboard/app/views/batch_connect/session_contexts/_favorites.html.erb +++ b/apps/dashboard/app/views/batch_connect/session_contexts/_favorites.html.erb @@ -1,5 +1,5 @@ -> -  <%= path.title || path.path %> - \ No newline at end of file +
  • > +  <%= path %> +
    • \ No newline at end of file diff --git a/apps/dashboard/app/views/batch_connect/session_contexts/_path_selector.html.erb b/apps/dashboard/app/views/batch_connect/session_contexts/_path_selector.html.erb index 1cb61bf886..85c25b95fd 100644 --- a/apps/dashboard/app/views/batch_connect/session_contexts/_path_selector.html.erb +++ b/apps/dashboard/app/views/batch_connect/session_contexts/_path_selector.html.erb @@ -2,7 +2,7 @@ show_hidden = field_options.fetch(:show_hidden, false) show_files = field_options.fetch(:show_files, true) inital_directory = field_options.fetch(:directory, CurrentUser.home) - file_picker_favorites = field_options.fetch(:file_picker_favorites, OodFilesApp.new.favorite_paths) + favorites = field_options.fetch(:favorites, OodFilesApp.new.favorite_paths) input_field_id = "#{form.object_name}_#{attrib.id}" path_selector_id = "#{input_field_id}_path_selector" @@ -47,9 +47,9 @@
    Favorites
    -
    - <%= render partial: 'favorites', collection: parse_favorites(file_picker_favorites), as: :path %> -
    +
      + <%= render partial: 'favorites', collection: parse_favorites(favorites), as: :path %> +
    From 72668f15e70d702421f2d3c1e048b7c5eefe7e53 Mon Sep 17 00:00:00 2001 From: HazelGrant Date: Thu, 16 Nov 2023 15:19:50 -0500 Subject: [PATCH 08/15] Fixes variable declaration in js --- .../app/javascript/path_selector/path_selector_data_table.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/dashboard/app/javascript/path_selector/path_selector_data_table.js b/apps/dashboard/app/javascript/path_selector/path_selector_data_table.js index ae9834b3a1..fa4c70117a 100644 --- a/apps/dashboard/app/javascript/path_selector/path_selector_data_table.js +++ b/apps/dashboard/app/javascript/path_selector/path_selector_data_table.js @@ -122,7 +122,7 @@ export class PathSelectorTable { clickRow(event) { const row = $(event.target).closest('tr').get(0) || event.target; - var url = row.dataset['apiUrl']; + const url = row.dataset['apiUrl']; const pathType = row.dataset['pathType']; // only reload table for directories. and correct last visited From 4e0bf3314e8fe26e22a7b20a9617caf275110cc0 Mon Sep 17 00:00:00 2001 From: HazelGrant Date: Thu, 16 Nov 2023 15:22:51 -0500 Subject: [PATCH 09/15] Removes unnecessary fs fallback in view --- .../views/batch_connect/session_contexts/_favorites.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/dashboard/app/views/batch_connect/session_contexts/_favorites.html.erb b/apps/dashboard/app/views/batch_connect/session_contexts/_favorites.html.erb index 5274a382df..f5e915e490 100644 --- a/apps/dashboard/app/views/batch_connect/session_contexts/_favorites.html.erb +++ b/apps/dashboard/app/views/batch_connect/session_contexts/_favorites.html.erb @@ -1,5 +1,5 @@
  • > + data-api-url=<%= files_path(path.to_s, fs: path.filesystem) %>>  <%= path %>
    • \ No newline at end of file From 240acf26934ba391ed61b3642e2fd94496e8a56b Mon Sep 17 00:00:00 2001 From: HazelGrant Date: Thu, 16 Nov 2023 15:24:26 -0500 Subject: [PATCH 10/15] Accepts 'favorites: false' or undefined favorites --- .../batch_connect/session_contexts/_path_selector.html.erb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apps/dashboard/app/views/batch_connect/session_contexts/_path_selector.html.erb b/apps/dashboard/app/views/batch_connect/session_contexts/_path_selector.html.erb index 85c25b95fd..67c23a74c4 100644 --- a/apps/dashboard/app/views/batch_connect/session_contexts/_path_selector.html.erb +++ b/apps/dashboard/app/views/batch_connect/session_contexts/_path_selector.html.erb @@ -44,6 +44,7 @@
    + <% if favorites %>
    Favorites
    @@ -52,6 +53,7 @@
    + <% end %>
    From aa5a3d5788b563c9e4902132e3bab6b76101f511 Mon Sep 17 00:00:00 2001 From: HazelGrant Date: Fri, 17 Nov 2023 09:11:28 -0500 Subject: [PATCH 11/15] Moves logic for defining favorites to helper --- .../app/helpers/batch_connect/session_contexts_helper.rb | 9 ++++++--- .../session_contexts/_path_selector.html.erb | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/apps/dashboard/app/helpers/batch_connect/session_contexts_helper.rb b/apps/dashboard/app/helpers/batch_connect/session_contexts_helper.rb index 09f4654805..1c5850c5ee 100644 --- a/apps/dashboard/app/helpers/batch_connect/session_contexts_helper.rb +++ b/apps/dashboard/app/helpers/batch_connect/session_contexts_helper.rb @@ -137,8 +137,11 @@ def resolution_field(form, id, opts = {}) end end - def parse_favorites(favorites) - return favorites if favorites.any? { |f| f.is_a?(FavoritePath) } - favorites.map { |f| FavoritePath.new(f) } + def pathselector_favorites(favorites) + if favorites.empty? + OodFilesApp.new.favorite_paths.reject(&:remote?) + else + favorites.map { |f| FavoritePath.new(f) } + end end end diff --git a/apps/dashboard/app/views/batch_connect/session_contexts/_path_selector.html.erb b/apps/dashboard/app/views/batch_connect/session_contexts/_path_selector.html.erb index 67c23a74c4..13e89439c7 100644 --- a/apps/dashboard/app/views/batch_connect/session_contexts/_path_selector.html.erb +++ b/apps/dashboard/app/views/batch_connect/session_contexts/_path_selector.html.erb @@ -2,7 +2,7 @@ show_hidden = field_options.fetch(:show_hidden, false) show_files = field_options.fetch(:show_files, true) inital_directory = field_options.fetch(:directory, CurrentUser.home) - favorites = field_options.fetch(:favorites, OodFilesApp.new.favorite_paths) + favorites = pathselector_favorites(field_options.fetch(:favorites, [])) input_field_id = "#{form.object_name}_#{attrib.id}" path_selector_id = "#{input_field_id}_path_selector" @@ -49,7 +49,7 @@
    Favorites
      - <%= render partial: 'favorites', collection: parse_favorites(favorites), as: :path %> + <%= render partial: 'favorites', collection: favorites, as: :path %>
    From 8ef0a429cd452341fa66bf1d946990cfc0aee833 Mon Sep 17 00:00:00 2001 From: HazelGrant Date: Fri, 17 Nov 2023 09:16:43 -0500 Subject: [PATCH 12/15] Allow for favorites: false to hide favorites entirely --- .../app/helpers/batch_connect/session_contexts_helper.rb | 2 +- .../batch_connect/session_contexts/_path_selector.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/dashboard/app/helpers/batch_connect/session_contexts_helper.rb b/apps/dashboard/app/helpers/batch_connect/session_contexts_helper.rb index 1c5850c5ee..c9a2e4e7b6 100644 --- a/apps/dashboard/app/helpers/batch_connect/session_contexts_helper.rb +++ b/apps/dashboard/app/helpers/batch_connect/session_contexts_helper.rb @@ -138,7 +138,7 @@ def resolution_field(form, id, opts = {}) end def pathselector_favorites(favorites) - if favorites.empty? + if favorites.nil? OodFilesApp.new.favorite_paths.reject(&:remote?) else favorites.map { |f| FavoritePath.new(f) } diff --git a/apps/dashboard/app/views/batch_connect/session_contexts/_path_selector.html.erb b/apps/dashboard/app/views/batch_connect/session_contexts/_path_selector.html.erb index 13e89439c7..9c07ae9f34 100644 --- a/apps/dashboard/app/views/batch_connect/session_contexts/_path_selector.html.erb +++ b/apps/dashboard/app/views/batch_connect/session_contexts/_path_selector.html.erb @@ -2,7 +2,7 @@ show_hidden = field_options.fetch(:show_hidden, false) show_files = field_options.fetch(:show_files, true) inital_directory = field_options.fetch(:directory, CurrentUser.home) - favorites = pathselector_favorites(field_options.fetch(:favorites, [])) + favorites = pathselector_favorites(field_options.fetch(:favorites)) input_field_id = "#{form.object_name}_#{attrib.id}" path_selector_id = "#{input_field_id}_path_selector" From d6e6da6687679304366235b887ae17379f2281b7 Mon Sep 17 00:00:00 2001 From: HazelGrant Date: Fri, 17 Nov 2023 09:32:49 -0500 Subject: [PATCH 13/15] Changes .fetch to .try so we can differentiate 'false' from 'nil' for favorites --- .../batch_connect/session_contexts/_path_selector.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/dashboard/app/views/batch_connect/session_contexts/_path_selector.html.erb b/apps/dashboard/app/views/batch_connect/session_contexts/_path_selector.html.erb index 9c07ae9f34..846b42c35e 100644 --- a/apps/dashboard/app/views/batch_connect/session_contexts/_path_selector.html.erb +++ b/apps/dashboard/app/views/batch_connect/session_contexts/_path_selector.html.erb @@ -2,7 +2,7 @@ show_hidden = field_options.fetch(:show_hidden, false) show_files = field_options.fetch(:show_files, true) inital_directory = field_options.fetch(:directory, CurrentUser.home) - favorites = pathselector_favorites(field_options.fetch(:favorites)) + favorites = pathselector_favorites(field_options.try(:favorites)) input_field_id = "#{form.object_name}_#{attrib.id}" path_selector_id = "#{input_field_id}_path_selector" From 91217ca9bafeed7c8c452da818d1ee85c3637f93 Mon Sep 17 00:00:00 2001 From: HazelGrant Date: Fri, 17 Nov 2023 09:37:04 -0500 Subject: [PATCH 14/15] Fixes try method call --- .../batch_connect/session_contexts/_path_selector.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/dashboard/app/views/batch_connect/session_contexts/_path_selector.html.erb b/apps/dashboard/app/views/batch_connect/session_contexts/_path_selector.html.erb index 846b42c35e..bde96350a2 100644 --- a/apps/dashboard/app/views/batch_connect/session_contexts/_path_selector.html.erb +++ b/apps/dashboard/app/views/batch_connect/session_contexts/_path_selector.html.erb @@ -2,7 +2,7 @@ show_hidden = field_options.fetch(:show_hidden, false) show_files = field_options.fetch(:show_files, true) inital_directory = field_options.fetch(:directory, CurrentUser.home) - favorites = pathselector_favorites(field_options.try(:favorites)) + favorites = pathselector_favorites(field_options.try(:[], :favorites)) input_field_id = "#{form.object_name}_#{attrib.id}" path_selector_id = "#{input_field_id}_path_selector" From f7ab009f9eac2dd6812a1ba9956a16c85b36ecba Mon Sep 17 00:00:00 2001 From: HazelGrant Date: Fri, 17 Nov 2023 09:45:22 -0500 Subject: [PATCH 15/15] Fixes logic in helper, fixes styling --- .../app/helpers/batch_connect/session_contexts_helper.rb | 3 ++- .../batch_connect/session_contexts/_path_selector.html.erb | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/apps/dashboard/app/helpers/batch_connect/session_contexts_helper.rb b/apps/dashboard/app/helpers/batch_connect/session_contexts_helper.rb index c9a2e4e7b6..8760c49d33 100644 --- a/apps/dashboard/app/helpers/batch_connect/session_contexts_helper.rb +++ b/apps/dashboard/app/helpers/batch_connect/session_contexts_helper.rb @@ -138,9 +138,10 @@ def resolution_field(form, id, opts = {}) end def pathselector_favorites(favorites) + # If favorites is false, return nil if favorites.nil? OodFilesApp.new.favorite_paths.reject(&:remote?) - else + elsif favorites favorites.map { |f| FavoritePath.new(f) } end end diff --git a/apps/dashboard/app/views/batch_connect/session_contexts/_path_selector.html.erb b/apps/dashboard/app/views/batch_connect/session_contexts/_path_selector.html.erb index bde96350a2..8478e34542 100644 --- a/apps/dashboard/app/views/batch_connect/session_contexts/_path_selector.html.erb +++ b/apps/dashboard/app/views/batch_connect/session_contexts/_path_selector.html.erb @@ -56,7 +56,7 @@ <% end %> -
    +