+
{{outlet}}
diff --git a/assets/stylesheets/common/wizard-admin.scss b/assets/stylesheets/common/wizard-admin.scss
index 75cddd97..9794fba7 100644
--- a/assets/stylesheets/common/wizard-admin.scss
+++ b/assets/stylesheets/common/wizard-admin.scss
@@ -2,14 +2,26 @@
@import 'wizard-transfer';
@import 'wizard-api';
-body.admin-wizard {
- .admin-container > .row {
+.admin-wizard-container {
+ .row {
display: flex;
+
+ > .content {
+ flex: 1;
+ margin-top: 10px;
+ margin-left: 30px;
+
+ table {
+ margin-top: 0;
+ min-width: 100%;
+ width: auto;
+ }
+ }
}
-
- .boxed.white {
- background-color: initial;
- }
+}
+
+.wizard-submissions {
+ overflow: scroll;
}
.wizard-list {
@@ -97,11 +109,21 @@ body.admin-wizard {
min-height: 31px;
margin-bottom: 30px;
display: flex;
+ justify-content: space-between;
input {
margin-bottom: 0;
width: 350px;
}
+
+ label {
+ margin-bottom: 0;
+ }
+
+ .download-link {
+ font-size: 1rem;
+ line-height: 20px;
+ }
}
&.medium {
@@ -138,8 +160,6 @@ body.admin-wizard {
}
.admin-wizard.settings {
- margin-top: 10px;
- margin-left: 30px;
[class~='setting'] {
display: inline-flex;
@@ -410,16 +430,6 @@ body.admin-wizard {
}
}
-.admin-contents .wizard-submissions {
- width: 100%;
- margin-top: 10px;
- margin-left: 30px;
-
- table {
- margin-top: 0;
- }
-}
-
.wizard-field-composer textarea {
width: 100%;
min-height: 150px;
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 1b62de49..4214e5a7 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -7,12 +7,10 @@ en:
admin:
wizard:
label: "Wizard"
- nav: "Wizards"
+ nav_label: "Wizards"
new: "New"
- custom_label: "Custom"
- submissions_label: "Submissions"
name: "Name"
- name_placeholder: "name"
+ name_placeholder: "wizard name"
background: "Background"
background_placeholder: "#hex"
save_submissions: "Save"
@@ -197,6 +195,11 @@ en:
select_an_endpoint: "Select an endpoint"
body: "Body"
body_placeholder: "JSON"
+
+ submissions:
+ nav_label: "Submissions"
+ title: "{{name}} Submissions"
+ download: "Download"
api:
label: "API"
diff --git a/config/routes.rb b/config/routes.rb
index 764c4e42..b586e55b 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -17,10 +17,12 @@ Discourse::Application.routes.append do
get 'admin/wizards/custom/new' => 'admin#index'
get 'admin/wizards/custom/all' => 'admin#custom_wizards'
get 'admin/wizards/custom/:wizard_id' => 'admin#find_wizard'
+ get 'admin/wizards/custom/:wizard_id' => 'admin#find_wizard'
put 'admin/wizards/custom/save' => 'admin#save'
delete 'admin/wizards/custom/remove' => 'admin#remove'
get 'admin/wizards/submissions' => 'admin#index'
get 'admin/wizards/submissions/:wizard_id' => 'admin#submissions'
+ get 'admin/wizards/submissions/:wizard_id/download' => 'admin#download_submissions'
get 'admin/wizards/apis' => 'api#list'
get 'admin/wizards/apis/new' => 'api#index'
get 'admin/wizards/apis/:name' => 'api#find'
diff --git a/controllers/custom_wizard/admin.rb b/controllers/custom_wizard/admin.rb
index 5cbdf737..01df5167 100644
--- a/controllers/custom_wizard/admin.rb
+++ b/controllers/custom_wizard/admin.rb
@@ -1,5 +1,5 @@
-class CustomWizard::AdminController < ::ApplicationController
- before_action :ensure_logged_in
+class CustomWizard::AdminController < ::Admin::AdminController
+ skip_before_action :check_xhr, only: [:download_submissions]
before_action :ensure_admin
def index
@@ -55,38 +55,42 @@ class CustomWizard::AdminController < ::ApplicationController
def find_wizard
params.require(:wizard_id)
-
wizard = PluginStore.get('custom_wizard', params[:wizard_id].underscore)
-
render json: success_json.merge(wizard: wizard)
end
def custom_wizards
rows = PluginStoreRow.where(plugin_name: 'custom_wizard').order(:id)
-
wizards = [*rows].map { |r| CustomWizard::Template.new(r.value) }
-
render json: success_json.merge(wizards: wizards)
end
def submissions
params.require(:wizard_id)
-
- rows = PluginStoreRow.where(plugin_name: "#{params[:wizard_id]}_submissions").order('id DESC')
-
- all_submissions = [*rows].map do |r|
- submissions = ::JSON.parse(r.value)
-
- if user = User.find_by(id: r.key)
- username = user.username
- else
- username = I18n.t('admin.wizard.submissions.no_user', id: r.key)
- end
-
- submissions.map { |s| { username: username }.merge!(s.except("redirect_to")) }
- end.flatten
-
- render json: success_json.merge(submissions: all_submissions)
+
+ wizard_id = params[:wizard_id].underscore
+ wizard = PluginStore.get('custom_wizard', wizard_id)
+
+ if wizard.present?
+ render json: success_json.merge(
+ submissions: build_submissions(wizard_id),
+ wizard: wizard.slice(:id, :name)
+ )
+ else
+ head :ok
+ end
+ end
+
+ def download_submissions
+ params.require(:wizard_id)
+ wizard_id = params[:wizard_id].underscore
+
+ wizard = PluginStore.get('custom_wizard', wizard_id)
+ submissions = build_submissions(wizard_id).to_json
+
+ send_data submissions,
+ filename: "#{Discourse.current_hostname}-wizard-submissions-#{wizard['name']}.json",
+ content_type: "application/json"
end
private
@@ -244,4 +248,24 @@ class CustomWizard::AdminController < ::ApplicationController
result
end
+
+ def build_submissions(wizard_id)
+ rows = PluginStoreRow.where(plugin_name: "#{wizard_id}_submissions").order('id DESC')
+
+ submissions = [*rows].map do |row|
+ value = ::JSON.parse(row.value)
+
+ if user = User.find_by(id: row.key)
+ username = user.username
+ else
+ username = I18n.t('admin.wizard.submissions.no_user', id: row.key)
+ end
+
+ value.map do |submission|
+ {
+ username: username
+ }.merge!(submission.except("redirect_to"))
+ end
+ end.flatten
+ end
end