- Co-creating sustainable research infrastructure
+ Co-creating Sustainable Software-as-a-Service Solutions
- Co-creating sustainable research infrastructure
+ Co-creating Sustainable Software-as-a-Service Solutions
@@ -109,11 +109,14 @@
- Eyra Link
+ Link
- In collaboration with the VU, UvA and SURF, we are developing a sustainable online participant recruitment platform for social sciences and humanities research.
Funded by the PDI-SSH.
+ A participant recruitment software service for Panl, enabling Dutch people to participate in social sciences and humanities research, developed in collaboration with the VU, UvA and SURF.
- In collaboration with the UU and UvA we are working on a tool that enables citizens to easily and safely donate their data from social media platforms like Instagram or Google for research.
Funded by the UU and PDI-SSH.
+ A data donation software service that enables people to donate their digital trace data (e.g. from Google or Instagram) for research, developed in collaboration with the UU and UvA (D3I Consortium).
- A sustainable science dissemination platform that empowers transparent scientific practice and enables everyone to monitor the state-of-the-art in science.
Funded by Eyra.
-
+ A software service for benchmarking that supports the organisation of challenges for the direct comparison of various social sciences models, developed in collaboration with the RUG and ODISSEI.
- ”We work towards a world in which the current state of human knowledge is available to all of humankind, so anyone can learn from and build upon previous knowledge.”
+ ”We work towards a world in which anyone can quickly gain insights from the current state of human knowledge, to contribute to the world in their own unique way.”
@@ -341,7 +391,7 @@
We are part of Apollo 14
- Home for startups that innovate for a better world
+ Home for entrepreneurs who innovate for a better world
- <%= if @entity.document_name do %>
- <%= @entity.document_name %>
+ <%= if @entity.name do %>
+ <%= @entity.name %>
<% else %>
<%= @placeholder %>
<% end %>
- <%= if @entity.document_name do %>
+ <%= if @entity.name do %>
<% else %>
diff --git a/core/systems/document/tool_model.ex b/core/systems/document/tool_model.ex
new file mode 100644
index 000000000..27f411107
--- /dev/null
+++ b/core/systems/document/tool_model.ex
@@ -0,0 +1,69 @@
+defmodule Systems.Document.ToolModel do
+ use Ecto.Schema
+ use Frameworks.Utility.Schema
+
+ import Ecto.Changeset
+ import CoreWeb.Gettext
+
+ schema "document_tools" do
+ field(:name, :string)
+ field(:ref, :string)
+ field(:director, Ecto.Enum, values: [:assignment])
+ belongs_to(:auth_node, Core.Authorization.Node)
+
+ timestamps()
+ end
+
+ @fields ~w(name ref)a
+ @required_fields @fields
+
+ def changeset(model, params) do
+ model
+ |> cast(params, @fields)
+ end
+
+ def validate(changeset) do
+ changeset
+ |> validate_required(@required_fields)
+ end
+
+ def ready?(tool) do
+ changeset =
+ changeset(tool, %{})
+ |> validate()
+
+ changeset.valid?()
+ end
+
+ def preload_graph(:down), do: preload_graph([])
+
+ defimpl Frameworks.Concept.ToolModel do
+ alias Systems.Document
+ def key(_), do: :document
+ def auth_tree(%{auth_node: auth_node}), do: auth_node
+ def apply_label(_), do: dgettext("eyra-document", "apply.cta.title")
+ def open_label(_), do: dgettext("eyra-document", "open.cta.title")
+ def ready?(tool), do: Document.ToolModel.ready?(tool)
+ def form(_), do: Document.ToolForm
+
+ def launcher(%{ref: ref}),
+ do: %{
+ function: &Document.PDFView.pdf_view/1,
+ props: %{url: ref, title: dgettext("eyra-document", "component.title")}
+ }
+
+ def task_labels(_) do
+ %{
+ pending: dgettext("eyra-document", "pending.label"),
+ participated: dgettext("eyra-document", "participated.label")
+ }
+ end
+
+ def attention_list_enabled?(_t), do: false
+ def group_enabled?(_t), do: true
+ end
+
+ defimpl Frameworks.Concept.Directable do
+ def director(%{director: director}), do: Frameworks.Utility.Module.get(director, "Director")
+ end
+end
diff --git a/core/systems/email/signal_handlers.ex b/core/systems/email/signal_handlers.ex
index a99c82570..c6e5c9f67 100644
--- a/core/systems/email/signal_handlers.ex
+++ b/core/systems/email/signal_handlers.ex
@@ -6,7 +6,7 @@ defmodule Core.Mailer.SignalHandlers do
alias Systems.Notification.Box
@impl true
- def dispatch(:new_notification, %{box: box, data: %{title: title}}) do
+ def intercept(:new_notification, %{box: box, data: %{title: title}}) do
if feature_enabled?(:notification_mails) do
for mail <- base_emails(box) do
mail
diff --git a/core/systems/feldspar/_presenter.ex b/core/systems/feldspar/_presenter.ex
new file mode 100644
index 000000000..7ba42cb44
--- /dev/null
+++ b/core/systems/feldspar/_presenter.ex
@@ -0,0 +1,12 @@
+defmodule Systems.Feldspar.Presenter do
+ @behaviour Frameworks.Concept.Presenter
+
+ alias Systems.{
+ Feldspar
+ }
+
+ @impl true
+ def view_model(%Feldspar.ToolModel{} = _tool, _page, _assigns) do
+ %{}
+ end
+end
diff --git a/core/systems/feldspar/_private.ex b/core/systems/feldspar/_private.ex
new file mode 100644
index 000000000..105ec0036
--- /dev/null
+++ b/core/systems/feldspar/_private.ex
@@ -0,0 +1,7 @@
+defmodule Systems.Feldspar.Private do
+ def get_backend do
+ :core
+ |> Application.fetch_env!(:feldspar)
+ |> Access.fetch!(:backend)
+ end
+end
diff --git a/core/systems/feldspar/_public.ex b/core/systems/feldspar/_public.ex
new file mode 100644
index 000000000..a2b305430
--- /dev/null
+++ b/core/systems/feldspar/_public.ex
@@ -0,0 +1,42 @@
+defmodule Systems.Feldspar.Public do
+ import Ecto.Query, warn: false
+ alias Core.Repo
+
+ alias Systems.{
+ Feldspar
+ }
+
+ import Feldspar.Private, only: [get_backend: 0]
+
+ def get_tool!(id, preload \\ []) do
+ from(tool in Feldspar.ToolModel, preload: ^preload)
+ |> Repo.get!(id)
+ end
+
+ def prepare_tool(attrs, auth_node \\ Core.Authorization.prepare_node()) do
+ %Feldspar.ToolModel{}
+ |> Feldspar.ToolModel.changeset(attrs)
+ |> Ecto.Changeset.put_assoc(:auth_node, auth_node)
+ end
+
+ def store(zip_file) do
+ get_backend().store(zip_file)
+ end
+
+ def get_public_url(id) do
+ get_backend().get_public_url(id)
+ end
+
+ def remove(id) do
+ get_backend().remove(id)
+ end
+end
+
+defimpl Core.Persister, for: Systems.Feldspar.ToolModel do
+ def save(_tool, changeset) do
+ case Frameworks.Utility.EctoHelper.update_and_dispatch(changeset, :feldspar_tool) do
+ {:ok, %{feldspar_tool: feldspar_tool}} -> {:ok, feldspar_tool}
+ _ -> {:error, changeset}
+ end
+ end
+end
diff --git a/core/systems/feldspar/_routes.ex b/core/systems/feldspar/_routes.ex
new file mode 100644
index 000000000..883880a55
--- /dev/null
+++ b/core/systems/feldspar/_routes.ex
@@ -0,0 +1,10 @@
+defmodule Systems.Feldspar.Routes do
+ defmacro routes() do
+ quote do
+ scope "/feldspar", Systems.Feldspar do
+ pipe_through([:browser])
+ live("/apps/:id", AppPage)
+ end
+ end
+ end
+end
diff --git a/core/systems/feldspar/app_page.ex b/core/systems/feldspar/app_page.ex
new file mode 100644
index 000000000..6106aeab8
--- /dev/null
+++ b/core/systems/feldspar/app_page.ex
@@ -0,0 +1,52 @@
+defmodule Systems.Feldspar.AppPage do
+ alias Systems.Feldspar
+ use CoreWeb, :live_view
+ use CoreWeb.Layouts.Stripped.Component, :projects
+
+ import Feldspar.AppView
+
+ @impl true
+ def mount(%{"id" => app_id}, _session, socket) do
+ app_url = Feldspar.Public.get_public_url(app_id) <> "/index.html"
+
+ {
+ :ok,
+ socket
+ |> update_menus()
+ |> assign(app_url: app_url, error: nil)
+ }
+ end
+
+ @impl true
+ def render(assigns) do
+ ~H"""
+ <.stripped menus={@menus} footer?={false}>
+ <.app_view url={@app_url} />
+
+ """
+ end
+
+ @impl true
+ def handle_event("app_event", %{"__type__" => type, "json_string" => event}, socket) do
+ {
+ :noreply,
+ socket |> handle(type, event)
+ }
+ end
+
+ @impl true
+ def handle_event("app_event", event, socket) do
+ {
+ :noreply,
+ socket |> handle(nil, inspect(event))
+ }
+ end
+
+ defp handle(socket, "CommandSystemDonate", event) do
+ Frameworks.Pixel.Flash.put_error(socket, "Unsupported donation " <> event)
+ end
+
+ defp handle(socket, _, event) do
+ Frameworks.Pixel.Flash.put_error(socket, "Unsupported " <> event)
+ end
+end
diff --git a/core/systems/feldspar/app_view.ex b/core/systems/feldspar/app_view.ex
new file mode 100644
index 000000000..4ec810bab
--- /dev/null
+++ b/core/systems/feldspar/app_view.ex
@@ -0,0 +1,19 @@
+defmodule Systems.Feldspar.AppView do
+ use CoreWeb, :html
+
+ attr(:url, :string, required: true)
+
+ def app_view(assigns) do
+ ~H"""
+
+ <%!-- Ensure that updates don't alter the hierarchy in front of the iframe.
+ Changing the preceding siblings of the iframe would result in a reload of the iframe
+ due to Morphdom (https://github.com/patrick-steele-idem/morphdom/issues/200).
+ --%>
+
+
+
+
+ """
+ end
+end
diff --git a/core/systems/feldspar/content_page.ex b/core/systems/feldspar/content_page.ex
new file mode 100644
index 000000000..4a08b71b2
--- /dev/null
+++ b/core/systems/feldspar/content_page.ex
@@ -0,0 +1,45 @@
+defmodule Systems.Feldspar.ContentPage do
+ use Systems.Content.Page
+
+ alias Systems.{
+ Feldspar
+ }
+
+ @impl true
+ def get_authorization_context(%{"id" => id}, _session, _socket) do
+ Feldspar.Public.get_tool!(id)
+ end
+
+ @impl true
+ def mount(%{"id" => id, "tab" => initial_tab}, %{"locale" => locale}, socket) do
+ model =
+ Feldspar.Public.get_tool!(String.to_integer(id), Feldspar.ToolModel.preload_graph(:down))
+
+ tabbar_id = "feldspar_content/#{id}"
+
+ {
+ :ok,
+ socket |> initialize(id, model, tabbar_id, initial_tab, locale)
+ }
+ end
+
+ @impl true
+ def render(assigns) do
+ ~H"""
+ <.content_page
+ title={@vm.title}
+ show_errors={@vm.show_errors}
+ tabs={@vm.tabs}
+ menus={@menus}
+ actions={@actions}
+ more_actions={@more_actions}
+ initial_tab={@initial_tab}
+ tabbar_id={@tabbar_id}
+ tabbar_size={@tabbar_size}
+ breakpoint={@breakpoint}
+ popup={@popup}
+ dialog={@dialog}
+ />
+ """
+ end
+end
diff --git a/core/systems/feldspar/content_page_builder.ex b/core/systems/feldspar/content_page_builder.ex
new file mode 100644
index 000000000..7f11a827a
--- /dev/null
+++ b/core/systems/feldspar/content_page_builder.ex
@@ -0,0 +1,20 @@
+defmodule Systems.Feldspar.ContentPageBuilder do
+ import CoreWeb.Gettext
+
+ alias Systems.{
+ Feldspar
+ }
+
+ def view_model(
+ %Feldspar.ToolModel{id: id},
+ _assigns
+ ) do
+ %{
+ id: id,
+ title: dgettext("eyra-feldspar", "content.title"),
+ tabs: [],
+ actions: [],
+ show_errors: false
+ }
+ end
+end
diff --git a/core/systems/feldspar/local_fs.ex b/core/systems/feldspar/local_fs.ex
new file mode 100644
index 000000000..96c168601
--- /dev/null
+++ b/core/systems/feldspar/local_fs.ex
@@ -0,0 +1,37 @@
+defmodule Systems.Feldspar.LocalFS do
+ alias CoreWeb.Endpoint
+
+ def store(zip_file) do
+ id = Ecto.UUID.generate()
+ path = get_path(id)
+ File.mkdir!(path)
+ :zip.unzip(to_charlist(zip_file), cwd: to_charlist(path))
+ id
+ end
+
+ def storage_path(id) do
+ get_path(id)
+ end
+
+ def get_public_url(id) do
+ "#{Endpoint.url()}/#{public_path()}/#{id}"
+ end
+
+ def remove(id) do
+ with {:ok, _} <- File.rm_rf(get_path(id)) do
+ :ok
+ end
+ end
+
+ defp get_path(id) do
+ Path.join(get_root_path(), id)
+ end
+
+ def get_root_path do
+ :core
+ |> Application.get_env(:feldspar, [])
+ |> Access.fetch!(:local_fs_root_path)
+ end
+
+ def public_path, do: "/feldspar/apps"
+end
diff --git a/core/systems/feldspar/plug.ex b/core/systems/feldspar/plug.ex
new file mode 100644
index 000000000..8fd01567d
--- /dev/null
+++ b/core/systems/feldspar/plug.ex
@@ -0,0 +1,33 @@
+defmodule Systems.Feldspar.Plug do
+ @behaviour Plug
+
+ defmacro setup() do
+ quote do
+ plug(Systems.Feldspar.Plug, at: Systems.Feldspar.LocalFS.public_path())
+ end
+ end
+
+ @impl true
+ def init(opts) do
+ opts
+ # Ensure that init works, from will be set dynamically later on
+ |> Keyword.put(:from, {nil, nil})
+ |> Plug.Static.init()
+ end
+
+ @impl true
+ def call(
+ conn,
+ options
+ ) do
+ call(Systems.Feldspar.Private.get_backend(), conn, options)
+ end
+
+ def call(Systems.Feldspar.LocalFS, conn, options) do
+ root_path = Systems.Feldspar.LocalFS.get_root_path()
+ options = Map.put(options, :from, root_path)
+ Plug.Static.call(conn, options)
+ end
+
+ def call(_, conn, _options), do: conn
+end
diff --git a/core/systems/feldspar/s3.ex b/core/systems/feldspar/s3.ex
new file mode 100644
index 000000000..257393cc2
--- /dev/null
+++ b/core/systems/feldspar/s3.ex
@@ -0,0 +1,69 @@
+defmodule Systems.Feldspar.S3 do
+ alias ExAws.S3
+
+ def store(zip_file) do
+ id = Ecto.UUID.generate()
+ :ok = upload_zip_content(zip_file, id)
+ id
+ end
+
+ def get_public_url(id) do
+ settings = s3_settings()
+ public_url = Access.get(settings, :public_url)
+ "#{public_url}/#{object_key(id)}/index.html"
+ end
+
+ def remove(id) do
+ bucket = Access.fetch!(s3_settings(), :bucket)
+
+ objects =
+ S3.list_objects_v2(bucket, prefix: object_key(id))
+ |> backend().request!()
+ |> get_in([:body, :contents])
+ |> Enum.map(&Access.fetch!(&1, :key))
+
+ S3.delete_all_objects(bucket, objects)
+ |> backend().request!()
+
+ :ok
+ end
+
+ defp upload_zip_content(zip_file, target) do
+ settings = s3_settings()
+
+ {:ok, zip_handle} = :zip.zip_open(to_charlist(zip_file), [:memory])
+
+ upload_file = fn file ->
+ {:ok, {_, data}} = :zip.zip_get(file, zip_handle)
+
+ S3.put_object(
+ Access.fetch!(settings, :bucket),
+ "#{object_key(target)}/#{file}",
+ data
+ )
+ |> backend().request!()
+ end
+
+ # Read the zip file names and skip the comment (first item)
+ {:ok, [_ | contents]} = :zip.zip_list_dir(zip_handle)
+
+ contents
+ |> Enum.map(fn {:zip_file, file, _, _, _, _} -> file end)
+ |> Task.async_stream(upload_file, max_concurrency: 10)
+ |> Stream.run()
+ end
+
+ defp object_key(id) do
+ prefix = Access.get(s3_settings(), :prefix, "")
+ "#{prefix}#{id}"
+ end
+
+ defp s3_settings do
+ Application.fetch_env!(:core, :feldspar)
+ end
+
+ defp backend do
+ # Allow mocking
+ Access.get(s3_settings(), :s3_backend, ExAws)
+ end
+end
diff --git a/core/systems/feldspar/tool_form.ex b/core/systems/feldspar/tool_form.ex
new file mode 100644
index 000000000..5342aba47
--- /dev/null
+++ b/core/systems/feldspar/tool_form.ex
@@ -0,0 +1,112 @@
+defmodule Systems.Feldspar.ToolForm do
+ use CoreWeb.LiveForm
+ use CoreWeb.FileUploader, ~w(.zip)
+
+ alias Systems.{
+ Feldspar
+ }
+
+ @impl true
+ def process_file(
+ %{assigns: %{entity: entity}} = socket,
+ {_local_relative_path, local_full_path, remote_file}
+ ) do
+ archive_ref =
+ Feldspar.Public.store(local_full_path)
+ |> Feldspar.Public.get_public_url()
+
+ socket
+ |> save(entity, %{archive_ref: archive_ref, archive_name: remote_file})
+ end
+
+ @impl true
+ def update(
+ %{
+ id: id,
+ entity: entity
+ },
+ socket
+ ) do
+ label = dgettext("eyra-feldspar", "zip-select-label")
+ placeholder = dgettext("eyra-feldspar", "zip-select-placeholder")
+ select_button = dgettext("eyra-feldspar", "zip-select-file-button")
+ replace_button = dgettext("eyra-feldspar", "zip-replace-file-button")
+
+ {
+ :ok,
+ socket
+ |> assign(
+ id: id,
+ label: label,
+ placeholder: placeholder,
+ select_button: select_button,
+ replace_button: replace_button,
+ entity: entity
+ )
+ |> init_file_uploader(:file)
+ }
+ end
+
+ @impl true
+ def handle_event("change", _params, socket) do
+ {:noreply, socket |> handle_upload_error()}
+ end
+
+ defp handle_upload_error(socket) do
+ if has_upload_error(socket) do
+ if has_upload_error(socket, :too_large) do
+ Frameworks.Pixel.Flash.push_error(dgettext("eyra-feldspar", "zip-too-large"))
+ else
+ Frameworks.Pixel.Flash.push_error()
+ end
+ end
+
+ socket
+ end
+
+ defp has_upload_error(%{assigns: %{uploads: %{file: %{errors: [_ | _]}}}}), do: true
+ defp has_upload_error(_), do: false
+
+ defp has_upload_error(%{assigns: %{uploads: %{file: %{errors: errors}}}}, error_type) do
+ Enum.find(errors, fn {_, type} -> type === error_type end) != nil
+ end
+
+ # Saving
+ def save(socket, %Feldspar.ToolModel{} = entity, attrs) do
+ changeset = Feldspar.ToolModel.changeset(entity, attrs)
+
+ socket
+ |> save(changeset)
+ end
+
+ @impl true
+ def render(assigns) do
+ ~H"""
+
+ <% end %>
+
+ <%= if @ordering_enabled? do %>
+ <%= if @relative_position != :bottom do %>
+
+ <% end %>
+ <%= if @relative_position != :top do %>
+
+ <% end %>
+ <% end %>
+
+
+
+ <.live_component {@item_form} />
+ <%= if @tool_form do %>
+ <.live_component {@tool_form} />
+ <.spacing value="XS" />
+ <% end %>
+
+ Advertenties worden op de marktplaats gezet om deelnemers te werven. Bekijk de voorbeeld pagina om te zien hoe deelnemers jouw advertentie pagina zien als ze op jouw marktplaats tegel klikken.
+
+ Opdracht
+
+ Opdracht
+
+ Criteria
+
+
+ Op basis van de geselecteerde criteria, kunnen 0 van de 0 mensen in de pool meedoen aan jouw studie.
+
+
+ Inclusie
+
+ Selecteer hieronder de inclusiecriteria voor je studie. Geen selectie betekend dat iedereen in de pool mee mag doen.
+
+ Geslacht
+
+ M
+
+ V
+
+ X
+
+ Exclusie
+
+ Wil je deelnemers die je in voorgaande campagnes geworven hebt excluderen? Selecteer dan één of meerdere campagnes hieronder.
+
@@ -135,11 +138,14 @@
+ A software service for benchmarking that supports the organisation of challenges for the direct comparison of various social sciences models, developed in collaboration with the RUG and ODISSEI.
+ 
+ 
![{@icon}]({"/images/icons/#{@icon}.svg"}){kind=icon}
+ 
+ 
