Update phoenix

Author: vtm9

services/app/apps/codebattle/assets/js/widgets/components/InvitesContainer.jsx

@@ -1,33 +1,33 @@
-import React, { useEffect, useCallback } from 'react';
+import React, { useEffect, useCallback } from "react";
 
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import Button from 'react-bootstrap/Button';
-import OverlayTrigger from 'react-bootstrap/OverlayTrigger';
-import Popover from 'react-bootstrap/Popover';
-import { useDispatch, useSelector } from 'react-redux';
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import Button from "react-bootstrap/Button";
+import OverlayTrigger from "react-bootstrap/OverlayTrigger";
+import Popover from "react-bootstrap/Popover";
+import { useDispatch, useSelector } from "react-redux";
 
-import { unfollowUser, followUser } from '@/middlewares/Main';
+import { unfollowUser, followUser } from "@/middlewares/Main";
 
-import i18n from '../../i18n';
-import {
-  initInvites,
-} from '../middlewares/Invite';
-import initPresence from '../middlewares/Main';
-import * as selectors from '../selectors';
-import { actions } from '../slices';
-import { selectors as invitesSelectors } from '../slices/invites';
-import { isSafari } from '../utils/browser';
+import i18n from "../../i18n";
+import { initInvites } from "../middlewares/Invite";
+import initPresence from "../middlewares/Main";
+import * as selectors from "../selectors";
+import { actions } from "../slices";
+import { selectors as invitesSelectors } from "../slices/invites";
+import { isSafari } from "../utils/browser";
 
-import InvitesList from './InvitesList';
+import InvitesList from "./InvitesList";
 
 function InvitesContainer() {
   const dispatch = useDispatch();
 
-  const followId = useSelector(state => state.gameUI.followId);
-  const followPaused = useSelector(state => state.gameUI.followPaused);
+  const followId = useSelector((state) => state.gameUI.followId);
+  const followPaused = useSelector((state) => state.gameUI.followPaused);
   const currentUserId = useSelector(selectors.currentUserIdSelector);
-  const checkInvitePlayers = ({ creatorId, recipientId }) => creatorId === currentUserId || recipientId === currentUserId;
-  const filterInvites = invite => invite.state === 'pending' && checkInvitePlayers(invite);
+  const checkInvitePlayers = ({ creatorId, recipientId }) =>
+    creatorId === currentUserId || recipientId === currentUserId;
+  const filterInvites = (invite) =>
+    invite.state === "pending" && checkInvitePlayers(invite);
   const invites = useSelector(invitesSelectors.selectAll).filter(filterInvites);
 
   const handleUnfollowClick = useCallback(() => {
@@ -65,41 +65,51 @@ function InvitesContainer() {
   //   return () => invitesCountElement.classList.remove(...inviteClasses.split(' '));
   // }, [invites.length, followId]);
 
+  const defaultShow = invites.length !== 0 || undefined;
+
   return (
     <>
       <OverlayTrigger
-        trigger={isSafari() ? 'click' : 'focus'}
+        trigger={isSafari() ? "click" : "focus"}
         key="codebattle-invites"
-        placement={invites.length === 0 ? 'bottom-end' : 'bottom'}
-        overlay={(
-          <Popover id="popover-invites" className="cb-bg-panel cb-border-color cb-text cb-rounded" show={invites.length !== 0}>
+        placement={invites.length === 0 ? "bottom-end" : "bottom"}
+        show={defaultShow}
+        overlay={
+          <Popover
+            id="popover-invites"
+            className="cb-bg-panel cb-border-color cb-text cb-rounded"
+          >
             {followId && (
               <div className="d-flex justify-content-center align-items-center p-2">
-                {i18n.t('You are following ID: %{followId}', { followId })}
+                {i18n.t("You are following ID: %{followId}", { followId })}
                 <button
                   type="button"
                   className="btn btn-sm btn-outline-secondary cb-btn-outline-secondary cb-rounded mx-1"
                   onClick={togglePausedfollowClick}
                 >
                   <FontAwesomeIcon
-                    icon={followPaused ? 'play' : 'pause'}
+                    icon={followPaused ? "play" : "pause"}
                     className="mr-1"
                   />
-                  {followPaused ? i18n.t('Unpause') : i18n.t('Pause')}
+                  {followPaused ? i18n.t("Unpause") : i18n.t("Pause")}
                 </button>
                 <button
                   type="button"
                   className="btn btn-sm btn-outline-danger cb-rounded mx-1"
                   onClick={handleUnfollowClick}
                 >
                   <FontAwesomeIcon icon="binoculars" className="mr-1" />
-                  {i18n.t('Unfollow')}
+                  {i18n.t("Unfollow")}
                 </button>
               </div>
             )}
-            <InvitesList followId={followId} list={invites} currentUserId={currentUserId} />
+            <InvitesList
+              followId={followId}
+              list={invites}
+              currentUserId={currentUserId}
+            />
           </Popover>
-        )}
+        }
       >
         {({ ref, ...triggerHandler }) => (
           <Button
@@ -110,14 +120,14 @@ function InvitesContainer() {
               ref={ref}
               alt="invites"
               src="/assets/images/fight.svg"
-              style={{ width: '46px', height: '46px' }}
+              style={{ width: "46px", height: "46px" }}
             />
             {followId && (
               <span
                 className="position-absolute badge badge-danger"
-                style={{ top: '74%' }}
+                style={{ top: "74%" }}
               >
-                <FontAwesomeIcon icon={followPaused ? 'pause' : 'binoculars'} />
+                <FontAwesomeIcon icon={followPaused ? "pause" : "binoculars"} />
               </span>
             )}
             {invites.length !== 0 ? (

services/app/apps/codebattle/lib/codebattle/code_check/output_parser_v2.ex

@@ -163,7 +163,8 @@ defmodule Codebattle.CodeCheck.OutputParser.V2 do
             result: safe_encode(solution_result["value"]),
             status:
               if solution_result["type"] == "result" and
-                   AtomizedMap.atomize(solution_result["value"]) == AtomizedMap.atomize(assert_item.expected) do
+                   AtomizedMap.atomize(solution_result["value"]) ==
+                     AtomizedMap.atomize(assert_item.expected) do
                 "success"
               else
                 "failure"

services/app/apps/codebattle/lib/codebattle/game/player.ex

@@ -46,7 +46,18 @@ defmodule Codebattle.Game.Player do
     field(:achievements, {:array, :string}, default: [])
     field(:avatar_url, :string)
     # CodeCheck.Result.t() | CodeCheck.Result.V2.t()
-    field(:check_result, AtomizedMap, default: %CodeCheck.Result{})
+    field(:check_result, AtomizedMap,
+      default: %{
+        exit_code: 0,
+        success_count: 0,
+        asserts_count: 1,
+        status: "initial",
+        output_error: "",
+        version: 2,
+        asserts: []
+      }
+    )
+
     field(:creator, :boolean, default: false)
     field(:editor_lang, :string, default: "js")
     field(:editor_text, :string, default: @default_editor_text)

services/app/apps/codebattle/lib/codebattle/season_cache.ex

@@ -18,7 +18,7 @@ defmodule Codebattle.SeasonCache do
       end
     end)
     |> case do
-      {:commit, season, _params} -> season
+      {:commit, season} -> season
       {:ok, season} -> season
       {:ignore, nil} -> nil
       {:error, _} -> nil

services/app/apps/codebattle/lib/codebattle/task_pack.ex

@@ -56,7 +56,10 @@ defmodule Codebattle.TaskPack do
   def get_tasks(%__MODULE__{} = task_pack) do
     query = from(t in Task, where: t.id in ^task_pack.task_ids)
     tasks = Repo.all(query)
-    task_pack.task_ids |> Enum.map(fn task_id -> Enum.find(tasks, &(&1.id == task_id)) end) |> Enum.filter(& &1)
+
+    task_pack.task_ids
+    |> Enum.map(fn task_id -> Enum.find(tasks, &(&1.id == task_id)) end)
+    |> Enum.filter(& &1)
   end
 
   def can_see_task_pack?(%{visibility: "public"}, _user), do: true

services/app/apps/codebattle/lib/codebattle_web.ex

@@ -28,7 +28,7 @@ defmodule CodebattleWeb do
 
   def controller do
     quote do
-      use Phoenix.Controller, namespace: CodebattleWeb
+      use Phoenix.Controller, formats: [:html, :json]
       use PhoenixMetaTags.TagController
       use Gettext, backend: CodebattleWeb.Gettext
 
@@ -52,12 +52,12 @@ defmodule CodebattleWeb do
         namespace: CodebattleWeb
 
       use PhoenixMetaTags.TagView
-      use Phoenix.HTML
       use Gettext, backend: CodebattleWeb.Gettext
 
       import CodebattleWeb.ErrorHelpers
       import CodebattleWeb.FormHelpers
       import Phoenix.Controller, only: [view_module: 1]
+      import Phoenix.HTML
       import Phoenix.HTML.Form
 
       alias CodebattleWeb.Router.Helpers, as: Routes
@@ -71,24 +71,24 @@ defmodule CodebattleWeb do
 
   def live_view do
     quote do
+      use PhoenixHTMLHelpers
+
       use Phoenix.LiveView,
         root: "lib/codebattle_web/templates",
         namespace: CodebattleWeb
 
       use PhoenixMetaTags.TagView
-      use Phoenix.HTML
       use Gettext, backend: CodebattleWeb.Gettext
 
       import CodebattleWeb.ErrorHelpers
+      import Phoenix.Controller, only: [view_module: 1]
+      import Phoenix.HTML
+      import Phoenix.HTML.Form
+      import PhoenixHTMLHelpers.Tag
 
       # Import convenience functions from controllers
-      import Phoenix.Controller, only: [view_module: 1]
 
       # Use all HTML functionality (forms, tags, etc)
-      import Phoenix.HTML.Form
-      import Phoenix.HTML.Format
-      import Phoenix.HTML.Link
-      import Phoenix.HTML.Tag
 
       unquote(view_helpers())
     end
@@ -112,12 +112,14 @@ defmodule CodebattleWeb do
 
   defp view_helpers do
     quote do
-      use Phoenix.HTML
+      use PhoenixHTMLHelpers
+
+      import Phoenix.HTML
+      import Phoenix.HTML.Form
+      import PhoenixHTMLHelpers.Tag
 
       alias CodebattleWeb.Router.Helpers, as: Routes
       alias Phoenix.LiveView.JS
-      # Import basic rendering functionality (render, render_layout, etc)
-      # import Phoenix.View
     end
   end
 

services/app/apps/codebattle/lib/codebattle_web/controllers/event_controller.ex

@@ -12,7 +12,10 @@ defmodule CodebattleWeb.EventController do
   end
 
   def new(conn, _params) do
-    render(conn, "new.html", changeset: Event.changeset(%Event{}), user: conn.assigns.current_user)
+    render(conn, "new.html",
+      changeset: Event.changeset(%Event{}),
+      user: conn.assigns.current_user
+    )
   end
 
   def show(conn, %{"id" => id}) do
@@ -27,7 +30,7 @@ defmodule CodebattleWeb.EventController do
     user = conn.assigns.current_user
     params = Map.put(event_params, "user_id", user.id)
 
-    # Handle stages JSON if present
+    # Handle stages Jason if present
     params = process_stages_json(params)
 
     case Event.create(params) do
@@ -44,7 +47,7 @@ defmodule CodebattleWeb.EventController do
   def update(conn, %{"id" => id, "event" => event_params}) do
     event = Event.get!(id)
 
-    # Handle stages JSON if present
+    # Handle stages Jason if present
     event_params = process_stages_json(event_params)
 
     case Event.update(
@@ -57,7 +60,11 @@ defmodule CodebattleWeb.EventController do
         |> redirect(to: Routes.event_path(conn, :show, event))
 
       {:error, %Ecto.Changeset{} = changeset} ->
-        render(conn, "edit.html", event: event, changeset: changeset, user: conn.assigns.current_user)
+        render(conn, "edit.html",
+          event: event,
+          changeset: changeset,
+          user: conn.assigns.current_user
+        )
     end
   end
 
@@ -78,7 +85,7 @@ defmodule CodebattleWeb.EventController do
     |> redirect(to: Routes.event_path(conn, :index))
   end
 
-  # Process stages JSON data from form
+  # Process stages Jason data from form
   defp process_stages_json(%{"stages_json" => stages_json} = params) when is_binary(stages_json) and stages_json != "" do
     with {:ok, stages_data} <- Jason.decode(stages_json),
          true <- is_list(stages_data) do
@@ -94,7 +101,7 @@ defmodule CodebattleWeb.EventController do
       |> Map.put("stages", stages)
     else
       _ ->
-        # Invalid format - not a list or invalid JSON
+        # Invalid format - not a list or invalid Jason
         params
     end
   end

services/app/apps/codebattle/lib/codebattle_web/controllers/ext_api/tourtnament_controller.ex

@@ -54,12 +54,12 @@ defmodule CodebattleWeb.ExtApi.TournamentController do
       {:ok, %{status: status}} ->
         conn
         |> put_status(:bad_gateway)
-        |> json(%{error: "Failed to retrieve JSON", status: status})
+        |> json(%{error: "Failed to retrieve Jason", status: status})
 
       {:error, reason} ->
         conn
         |> put_status(:internal_server_error)
-        |> json(%{error: "Error fetching JSON: #{inspect(reason)}"})
+        |> json(%{error: "Error fetching Jason: #{inspect(reason)}"})
     end
   end
 

services/app/apps/codebattle/lib/codebattle_web/controllers/feedback_controller.ex

@@ -1,6 +1,8 @@
 defmodule CodebattleWeb.FeedbackController do
   use CodebattleWeb, :controller
 
+  plug(:put_view, CodebattleWeb.FeedbackView)
+
   def index(conn, _params) do
     conn
     |> put_meta_tags(%{

services/app/apps/codebattle/lib/codebattle_web/controllers/game/image_controller.ex

@@ -5,6 +5,8 @@ defmodule CodebattleWeb.Game.ImageController do
   alias Codebattle.Game.Context
   alias CodebattleWeb.HtmlImage
 
+  plug :put_layout, html: false
+
   def show(conn, %{"game_id" => id}) do
     case Context.fetch_game(id) do
       {:ok, game} ->