You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@whimsical.apache.org by se...@apache.org on 2024/09/10 18:37:36 UTC
(whimsy) branch master updated: Add withdrawal request processing
This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git
The following commit(s) were added to refs/heads/master by this push:
new 04838568 Add withdrawal request processing
04838568 is described below
commit 04838568d371edb8cee6c3e80c5e9e7adf6c2b95
Author: Sebb <se...@apache.org>
AuthorDate: Tue Sep 10 19:36:44 2024 +0100
Add withdrawal request processing
---
lib/whimsy/asf/documents.rb | 23 +++++-
repository.yml | 4 +
www/secretary/workbench/public/secmail.css | 4 +-
www/secretary/workbench/server.rb | 15 ++++
.../views/actions/withdrawal-request.json.rb | 76 ++++++++++++++++++
www/secretary/workbench/views/app.js.rb | 1 +
.../workbench/views/forms/withdrawal-request.js.rb | 90 ++++++++++++++++++++++
www/secretary/workbench/views/index.js.rb | 4 +-
www/secretary/workbench/views/parts.js.rb | 6 ++
9 files changed, 215 insertions(+), 8 deletions(-)
diff --git a/lib/whimsy/asf/documents.rb b/lib/whimsy/asf/documents.rb
index 183c4bd8..0e87ef23 100644
--- a/lib/whimsy/asf/documents.rb
+++ b/lib/whimsy/asf/documents.rb
@@ -28,14 +28,14 @@ module ASF
# N.B. must check :cache config each time to allow for test overrides
# create/update cache file
- def self.update_cache(type, env, cache_dir: ASF::Config.get(:cache))
- _cache_dir, stale, file, age = check_cache(type, cache_dir: cache_dir, warn: false)
- if stale
+ def self.update_cache(type, env, cache_dir: ASF::Config.get(:cache), storedates: false, force: false)
+ cache_dir, stale, file, age = check_cache(type, cache_dir: cache_dir, warn: false)
+ if stale or force
require 'whimsy/asf/rack'
ASF::Auth.decode(env)
# TODO: Downdate to info
Wunderbar.warn "Updating listing #{file} #{age} as #{env.user}"
- filerev, svnrev = ASF::SVN.updatelisting(type, env.user, env.password, false, cache_dir)
+ filerev, svnrev = ASF::SVN.updatelisting(type, env.user, env.password, storedates, cache_dir)
if filerev && svnrev # it worked
FileUtils.touch file # last time it was checked
else
@@ -43,6 +43,7 @@ module ASF
Wunderbar.warn("User #{env.user}: failed to update #{type}: #{svnrev}")
end
end
+ cache_dir
end
end
@@ -255,4 +256,18 @@ module ASF
@base = 'conflict-of-interest'
end
+ class WithdrawalRequestFiles
+
+ STEM = 'withdrawn-pending'
+
+ def self.listnames(storedates, env)
+ cache_dir = ASF::DocumentUtils.update_cache(STEM, env, storedates: storedates)
+ _, list = ASF::SVN.getlisting(STEM, nil, true, storedates, cache_dir)
+ list
+ end
+
+ def self.refreshnames(storedates, env)
+ ASF::DocumentUtils.update_cache(STEM, env, storedates: storedates, force: true)
+ end
+ end
end
diff --git a/repository.yml b/repository.yml
index 3b3fc7b0..a4af4012 100644
--- a/repository.yml
+++ b/repository.yml
@@ -201,3 +201,7 @@
withdrawn:
url: private/documents/withdrawn
depth: skip
+
+ withdrawn-pending:
+ url: private/documents/withdrawn/pending
+ depth: skip
diff --git a/www/secretary/workbench/public/secmail.css b/www/secretary/workbench/public/secmail.css
index 0010ac9f..f3eed5c7 100644
--- a/www/secretary/workbench/public/secmail.css
+++ b/www/secretary/workbench/public/secmail.css
@@ -19,11 +19,11 @@ header h1, header h3 {
background-color: yellow;
}
-.emeritusPending {
+.emeritusPending, .withdrawalPending {
background-color: none;
}
-.emeritusReady {
+.emeritusReady, .withdrawalReady {
background-color: greenyellow;
}
diff --git a/www/secretary/workbench/server.rb b/www/secretary/workbench/server.rb
index bf75bf10..a54a8281 100644
--- a/www/secretary/workbench/server.rb
+++ b/www/secretary/workbench/server.rb
@@ -87,6 +87,21 @@ get '/' do
}
end
+ # Show outstanding emeritus requests
+ ASF::WithdrawalRequestFiles.listnames(true, env).each do |epoch, file|
+ days = (((Time.now.to_i - epoch.to_i).to_f / SECS_TO_DAYS)).round(1)
+ id = File.basename(file, '.*')
+ @messages << {
+ date: Time.at(epoch.to_i).gmtime.asctime,
+ time: Time.at(epoch.to_i).gmtime.iso8601,
+ href: "/roster/committer/#{id}",
+ href2: ASF::SVN.svnpath!('withdrawn-pending', file),
+ from: ASF::Person.find(id).cn,
+ subject: "Pending withdrawal request - #{days} days old",
+ status: days < 10.0 ? :withdrawalPending : :withdrawalReady
+ }
+ end
+
@cssmtime = File.mtime('public/secmail.css').to_i
@appmtime = Wunderbar::Asset.convert(File.join(settings.views, 'app.js.rb')).mtime.to_i
_html :index
diff --git a/www/secretary/workbench/views/actions/withdrawal-request.json.rb b/www/secretary/workbench/views/actions/withdrawal-request.json.rb
new file mode 100644
index 00000000..416c4530
--- /dev/null
+++ b/www/secretary/workbench/views/actions/withdrawal-request.json.rb
@@ -0,0 +1,76 @@
+#
+# Files a member withdrawal request
+# - add files to documents/withdrawn/pending/
+# - respond to original email
+#
+
+# extract message
+message = Mailbox.find(@message)
+
+# extract file extension
+fileext = File.extname(@selected).downcase if @signature.empty?
+
+# verify that a membership withdrawal request under that name stem doesn't already exist
+withdrawal_request = "#{@filename}#{fileext}"
+if @filename =~ /\A[a-z][-a-z0-9]+\z/ # check name is valid as availid
+ withdrawal_pending = ASF::SVN.svnpath!('withdrawn-pending')
+ list, err = ASF::SVN.listnames(withdrawal_pending)
+ unless list
+ _warn err
+ list = []
+ end
+ names = list.select{|x| x.start_with? "#{@filename}."}
+ if names.size > 0
+ _warn "#{withdrawal_pending}/#{names.first} already exists"
+ end
+else
+ _warn "#{withdrawal_request} is not a valid file name (must be valid as an availid)"
+end
+
+# obtain per-user information
+_personalize_email(env.user)
+
+member = ASF::Person.find(@availid)
+@name = member.public_name
+summary = "Emeritus Request from #{@name}"
+
+# file the withdrawal request in svn
+task "svn commit #{withdrawal_pending}/#{withdrawal_request}" do
+ form do
+ _input name: 'selected', value: @selected
+ unless @signature.empty?
+ _input name: 'signature', value: @signature
+ end
+ end
+
+ complete do |dir|
+ # checkout empty directory
+ svn! 'checkout', [withdrawal_pending, dir], {depth: 'empty'}
+
+ # extract the attachments and add to the workspace
+ message.write_svn(dir, @filename, @selected, @signature)
+
+ svn! 'status', dir
+ svn! 'commit', dir, {msg: summary}
+ ASF::WithdrawalRequestFiles.refreshnames(true, env) # update the listing
+ end
+end
+
+# respond to the member with acknowledgement
+task "email #{message.from}" do
+ mail = message.reply(
+ subject: summary,
+ from: @from,
+ to: "#{@name.inspect} <#{message.from}>",
+ cc: 'secretary@apache.org',
+ body: template('withdrawal-request.erb')
+ )
+
+ form do
+ _message mail.to_s
+ end
+
+ complete do
+ mail.deliver!
+ end
+end
diff --git a/www/secretary/workbench/views/app.js.rb b/www/secretary/workbench/views/app.js.rb
index d5b70cf1..0c0dd6a2 100644
--- a/www/secretary/workbench/views/app.js.rb
+++ b/www/secretary/workbench/views/app.js.rb
@@ -17,3 +17,4 @@ require_relative 'forms/memapp'
require_relative 'forms/nda'
require_relative 'forms/note'
require_relative 'forms/emeritus-request'
+require_relative 'forms/withdrawal-request'
diff --git a/www/secretary/workbench/views/forms/withdrawal-request.js.rb b/www/secretary/workbench/views/forms/withdrawal-request.js.rb
new file mode 100644
index 00000000..91bc8a22
--- /dev/null
+++ b/www/secretary/workbench/views/forms/withdrawal-request.js.rb
@@ -0,0 +1,90 @@
+class WithdrawalRequest < Vue
+ def initialize
+ # TODO: update @filed = true on submit and related reset
+ @filed = false
+ @filename = ''
+ @disabled = false
+ @search = ''
+ @members = []
+ @availid = ''
+ end
+
+ def mounted
+ jQuery('input[name=selected]').val(decodeURIComponent(@@selected))
+ jQuery('input[name=message]').val(window.parent.location.pathname)
+ if not @members.empty?
+ @disabled = false
+ else
+ @disabled = true
+ fetch('../../members.json', {method: 'get', credentials: 'include', headers: {accept: 'application/json'}})
+ .then do |response|
+ response.json().then do |json|
+ @members = json
+ @disabled = true
+ end
+ end
+ end
+
+ name = @@headers.name || ''
+ # reorder name if there is a single comma present
+ parts = name.split(',')
+ if parts.length == 2 and parts[1] !~ /^\s*(jr|ph\.d)\.?$/i
+ name = "#{parts[1].strip()} #{parts[0]}"
+ end
+ @search = name
+ end
+
+ def render
+ _h4 'Member Withdrawl Request'
+
+ _form.form do
+ _h5 'Search'
+ _table.form do
+ _tr do
+ _input value: @search
+ end
+ end
+ end
+
+ if @search.length >= 3 and not @members.empty?
+ search = @search.downcase().split(' ')
+ _ul.icla_search do
+ @members.each do |member|
+ availid = member.id
+ name = member.name
+ names = name.downcase().split(' ') # N.B. split parameter is required by JavaScript
+ if search.any? { |part| names.include? part or availid == part}
+ _li do
+ _input type: :radio, name: 'search', id: availid, onClick: lambda {
+ @availid = availid
+ @filename = availid
+ @disabled = false
+ }
+ _label name + " (#{availid})", for: availid
+ end
+ end
+ end
+ end
+ end
+
+ _form method: 'post', action: '../../tasklist/withdrawal-request', target: 'content' do
+ _input type: :hidden, name: 'message'
+ _input type: :hidden, name: 'selected'
+ _input type: :hidden, name: 'signature', value: @@signature
+ _input type: :hidden, name: 'availid', value: @availid
+
+ _table.form do
+ _tr do
+ _th 'ASF id (used for file name)'
+ _td do
+ _input type: :text, name: 'filename', value: @filename, required: true, disabled: @filed || @availid.empty?,
+ pattern: '[a-zA-Z][-\w]+(\.[a-z]+)?'
+ end
+ end
+ end
+
+ _input.btn.btn_primary value: 'File', type: :submit, disabled: @disabled
+ end
+ end
+
+end
diff --git a/www/secretary/workbench/views/index.js.rb b/www/secretary/workbench/views/index.js.rb
index 4ccb8ad7..86322421 100644
--- a/www/secretary/workbench/views/index.js.rb
+++ b/www/secretary/workbench/views/index.js.rb
@@ -53,14 +53,14 @@ class Index < Vue
_tr row_options do
_td do
- if %i[emeritusReady emeritusPending].include? message.status
+ if %i[emeritusReady emeritusPending withdrawalReady withdrawalPending].include? message.status
_a message.date, href: message.href, title: message.time, target: '_blank'
else
_a message.date, href: message.href, title: message.time
end
end
_td _crop(message.from, 40)
- if %i[emeritusReady emeritusPending].include? message.status
+ if %i[emeritusReady emeritusPending withdrawalReady withdrawalPending].include? message.status
_td do
_a message.subject, class: message.status, href: message.href2, target: '_blank'
end
diff --git a/www/secretary/workbench/views/parts.js.rb b/www/secretary/workbench/views/parts.js.rb
index cf443491..212d24c5 100644
--- a/www/secretary/workbench/views/parts.js.rb
+++ b/www/secretary/workbench/views/parts.js.rb
@@ -174,6 +174,12 @@ class Parts < Vue
_span 'emeritus request'
end
+ _label do
+ _input type: :radio, name: 'doctype', value: 'withdrawal-request',
+ onClick: -> {@form = WithdrawalRequest}
+ _span 'withdrawal request'
+ end
+
_hr
_label do