From abd5085a87dff0942236cfb8e60b9e38cf290dd1 Mon Sep 17 00:00:00 2001
From: Simer13 <113010708+Simer13@users.noreply.github.com>
Date: Tue, 26 Dec 2023 17:27:25 +0530
Subject: [PATCH 1/8] feat: update navbar.scss (#4419)

---
 app/assets/stylesheets/navbar.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/stylesheets/navbar.scss b/app/assets/stylesheets/navbar.scss
index f499fbbef62..876a51f4f41 100644
--- a/app/assets/stylesheets/navbar.scss
+++ b/app/assets/stylesheets/navbar.scss
@@ -4,6 +4,7 @@
   top: 0;
   width: 100%;
   z-index: 100;
+  border-bottom: 1px solid $border-color;
 }
 
 .navbar-logo {

From 1f57e7f23a73d41b7095f4452512f640a44d1f4e Mon Sep 17 00:00:00 2001
From: Harsh <102225113+senbo1@users.noreply.github.com>
Date: Tue, 26 Dec 2023 17:54:56 +0530
Subject: [PATCH 2/8] feat(ui): modify highlight color of text (#4352)

---
 app/assets/stylesheets/layout.scss | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss
index 5e3bf1ed598..151391209d8 100644
--- a/app/assets/stylesheets/layout.scss
+++ b/app/assets/stylesheets/layout.scss
@@ -6,6 +6,11 @@ html {
   scroll-behavior: smooth;
 }
 
+::selection {
+  background: $primary-green;
+  color: $white;
+}
+
 body {
   font-family: 'Inter';
   padding-top: 90px;

From d4448e57902bf54ef36317a0523e76db95921e40 Mon Sep 17 00:00:00 2001
From: Shaurya Gupta <shauryag1000@gmail.com>
Date: Tue, 26 Dec 2023 18:38:11 +0530
Subject: [PATCH 3/8] fix(#4108): improve responsiveness of projects list page
 (#4349)

---
 app/assets/stylesheets/layout.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss
index 151391209d8..f535a6d840d 100644
--- a/app/assets/stylesheets/layout.scss
+++ b/app/assets/stylesheets/layout.scss
@@ -181,7 +181,7 @@ body {
 
   .pagination {
     max-width: none;
-    overflow-x: visible;
+    overflow-x: auto;
     padding: 0;
     white-space: nowrap;
   }

From 0fbfb8964eaae63a4011bcd1de878fd893c8e364 Mon Sep 17 00:00:00 2001
From: Harsh <102225113+senbo1@users.noreply.github.com>
Date: Tue, 26 Dec 2023 18:52:55 +0530
Subject: [PATCH 4/8] fix: add client side validations for project name and
 update project model (#4304)

---
 app/assets/stylesheets/projects.scss | 10 ++++++++++
 app/models/project.rb                |  2 +-
 app/views/projects/_form.html.erb    | 23 +++++++++++++++++++++--
 3 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/app/assets/stylesheets/projects.scss b/app/assets/stylesheets/projects.scss
index c133e1e519a..6f4f5420055 100644
--- a/app/assets/stylesheets/projects.scss
+++ b/app/assets/stylesheets/projects.scss
@@ -217,6 +217,16 @@
   width: 80%;
 }
 
+.char-counter {
+  color: $tooltip-grey;
+  font-size: 14px;
+  margin: 5px 0 0 auto;
+}
+
+.is-invalid {
+  color: $red;
+}
+
 //breakpoints
 @media (max-width: 575px) {
   .projects-collaborators-button-container {
diff --git a/app/models/project.rb b/app/models/project.rb
index 70791b42b26..2a3bc70db16 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -8,7 +8,7 @@ class Project < ApplicationRecord
   friendly_id :name, use: %i[slugged history]
   self.ignored_columns += ["data"]
 
-  validates :name, length: { minimum: 1 }
+  validates :name, length: { minimum: 1, maximum: 60 }
   validates :slug, uniqueness: true
 
   belongs_to :author, class_name: "User"
diff --git a/app/views/projects/_form.html.erb b/app/views/projects/_form.html.erb
index 18d9beabdb9..18dfb585769 100644
--- a/app/views/projects/_form.html.erb
+++ b/app/views/projects/_form.html.erb
@@ -21,9 +21,10 @@
       </ul>
     </div>
   <% end %>
-  <div class="field form-group">
+  <div class="field form-group d-flex flex-column">
     <h6><%= form.label :name %></h6>
-    <%= form.text_field :name, id: :project_name, class: "form-control form-input" %>
+    <%= form.text_field :name, id: :project_name, class: "form-control form-input", maxlength: 60 %>
+    <span id="name-counter" class="char-counter"></span>
   </div>
   <div class="field form-group projects-tag-form-group">
     <h6><%= form.label :tag_list %></h6> <span><%= t("projects.form.tag_list_description") %></span>
@@ -76,4 +77,22 @@
     });
     $("#featuredCircuit").submit();
   }
+
+  document.addEventListener('DOMContentLoaded', function () {
+    const nameField = document.getElementById('project_name');
+
+    nameField.addEventListener('input', function () {
+      const maxLength = parseInt(this.getAttribute('maxlength'));
+      const currentLength = this.value.length;
+
+      const nameCounter = document.getElementById('name-counter');
+      nameCounter.textContent = `${currentLength} / ${maxLength}`;
+
+      if (currentLength >= maxLength) {
+        nameCounter.classList.add('is-invalid');
+      } else {
+        nameCounter.classList.remove('is-invalid');
+      }
+    });
+  });
 </script>

From ec31ad7c3e38910ff026515c348755827a3d1555 Mon Sep 17 00:00:00 2001
From: Harsh Gupta <138358017+syntax-bot@users.noreply.github.com>
Date: Tue, 26 Dec 2023 19:57:44 +0530
Subject: [PATCH 5/8] fix: changed the pos of newCommentBtn to top (#4432)

---
 app/assets/stylesheets/commontator.scss       | 6 ++++++
 app/views/commontator/threads/_reply.html.erb | 2 +-
 app/views/commontator/threads/_show.html.erb  | 7 ++++---
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/app/assets/stylesheets/commontator.scss b/app/assets/stylesheets/commontator.scss
index 2d7d206573f..166e4e98f32 100644
--- a/app/assets/stylesheets/commontator.scss
+++ b/app/assets/stylesheets/commontator.scss
@@ -109,6 +109,12 @@
 
 .new-comment {
   display: block;
+  margin-top: 0.3rem;
+}
+
+.new-comment-link{
+  position: relative;
+  top: -3.3em;
 }
 
 //breakpoints
diff --git a/app/views/commontator/threads/_reply.html.erb b/app/views/commontator/threads/_reply.html.erb
index f36f0ee2f0b..1f27ae145da 100644
--- a/app/views/commontator/threads/_reply.html.erb
+++ b/app/views/commontator/threads/_reply.html.erb
@@ -11,7 +11,7 @@
     <p>You must <a href="/users/sign_in" class="anchor-text">login</a> before you can post a comment.</p>
   <% else %>
     <% if @commontator_new_comment.nil? %>
-      <div id="commontator-thread-<%= thread.id %>-new-comment-link" class="new-comment">
+      <div id="commontator-thread-<%= thread.id %>-new-comment-link" class="new-comment new-comment-link">
         <%= link_to "+ Add Comment",
             commontator.new_thread_comment_path(thread),
             remote: true, class: "btn primary-button" %>
diff --git a/app/views/commontator/threads/_show.html.erb b/app/views/commontator/threads/_show.html.erb
index 17d6654df55..8c74e5a58a7 100644
--- a/app/views/commontator/threads/_show.html.erb
+++ b/app/views/commontator/threads/_show.html.erb
@@ -71,6 +71,10 @@
     </span>
   </div>
 
+  <% if thread.config.comment_order != :l %>
+    <%= render partial: 'commontator/threads/reply', locals: { thread: thread, user: user } %>
+  <% end %>
+
   <% if thread.config.comment_order == :l %>
     <%= render partial: 'commontator/threads/reply', locals: { thread: thread, user: user } %>
   <% end %>
@@ -100,9 +104,6 @@
     </div>
   </div>
 
-  <% if thread.config.comment_order != :l %>
-    <%= render partial: 'commontator/threads/reply', locals: { thread: thread, user: user } %>
-  <% end %>
 </div>
 <script>
   <%= render partial: 'commontator/threads/hide_show_links', locals: { thread: thread }, formats: :js %>

From 14f6ed14e87aeee03fd65ebb1c422f2088670810 Mon Sep 17 00:00:00 2001
From: Vaibhav Upreti <85568177+VaibhavUpreti@users.noreply.github.com>
Date: Thu, 28 Dec 2023 18:47:53 +0530
Subject: [PATCH 6/8] feat: Serve assets using active storage (#3860)

Signed-off-by: VaibhavUpreti <vaibhav.upreti16@gmail.com>
Co-authored-by: Aboobacker MK <aboobackervyd@gmail.com>
---
 app/assets/images/empty_project/default.png   | Bin 0 -> 7548 bytes
 app/controllers/simulator_controller.rb       |  25 ++--
 app/helpers/simulator_helper.rb               |  11 ++
 app/helpers/users_circuitverse_helper.rb      |  26 ++++
 app/models/project.rb                         |   2 -
 app/serializers/api/v1/project_serializer.rb  |  14 +++
 app/views/circuitverse/index.html.erb         |   4 +-
 app/views/featured_circuits/index.html.erb    |   2 +-
 app/views/projects/get_projects.html.erb      |   2 +-
 app/views/projects/search.html.erb            |   2 +-
 .../users/circuitverse/_dashboard.html.erb    |   2 +-
 config/environments/development.rb            |   3 +-
 config/initializers/flipper.rb                |   1 +
 ...0820220904_redo_image_preview_migration.rb |  41 -------
 ...rename_image_preview_to_circuit_preview.rb |  12 ++
 spec/controllers/simulator_controller_spec.rb | 116 +++++++++++++-----
 spec/fixtures/files/default.png               | Bin 0 -> 7548 bytes
 spec/helpers/simulator_helper_spec.rb         |  45 ++++++-
 .../helpers/users_circuitverse_helper_spec.rb |  54 ++++++++
 spec/rails_helper.rb                          |   3 +
 .../projects_controller/create_fork_spec.rb   |   3 +
 .../projects_controller/image_preview_spec.rb |   3 -
 .../api/v1/users_controller/index_spec.rb     |   2 +-
 .../api/v1/users_controller/update_spec.rb    |   1 +
 .../api/schemas/assignment_with_projects.json |   4 +-
 spec/support/api/schemas/project.json         |   4 +-
 .../api/schemas/project_with_author.json      |   4 +-
 .../schemas/project_with_collaborators.json   |   4 +-
 spec/support/api/schemas/projects.json        |   4 +-
 .../api/schemas/projects_with_author.json     |   2 +-
 .../schemas/projects_with_collaborators.json  |   6 +-
 .../api/schemas/read_notification.json        |  13 +-
 .../api/schemas/read_notifications.json       |  20 ++-
 .../api/schemas/unread_notifications.json     |  20 ++-
 34 files changed, 301 insertions(+), 154 deletions(-)
 create mode 100644 app/assets/images/empty_project/default.png
 delete mode 100644 db/data_migrations/20230820220904_redo_image_preview_migration.rb
 create mode 100644 db/data_migrations/20230823232747_rename_image_preview_to_circuit_preview.rb
 create mode 100644 spec/fixtures/files/default.png

diff --git a/app/assets/images/empty_project/default.png b/app/assets/images/empty_project/default.png
new file mode 100644
index 0000000000000000000000000000000000000000..8e183a8a21dda36485b94de239e6e8a7911f982b
GIT binary patch
literal 7548
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

literal 0
HcmV?d00001

diff --git a/app/controllers/simulator_controller.rb b/app/controllers/simulator_controller.rb
index f206fbd2cfd..22ff0e536e0 100644
--- a/app/controllers/simulator_controller.rb
+++ b/app/controllers/simulator_controller.rb
@@ -55,14 +55,14 @@ def create
     @project.build_project_datum.data = sanitize_data(@project, params[:data])
     @project.name = sanitize(params[:name])
     @project.author = current_user
-
+    # ActiveStorage
+    io_image_file = parse_image_data_url(params[:image])
+    attach_circuit_preview(io_image_file)
+    # CarrierWave
     image_file = return_image_file(params[:image])
     @project.image_preview = image_file
-    attach_circuit_preview(image_file)
-    @project.save!
     image_file.close
-
-    File.delete(image_file) if check_to_delete(params[:image])
+    @project.save!
 
     # render plain: simulator_path(@project)
     # render plain: user_project_url(current_user,@project)
@@ -72,17 +72,18 @@ def create
   def update
     @project.build_project_datum unless ProjectDatum.exists?(project_id: @project.id)
     @project.project_datum.data = sanitize_data(@project, params[:data])
+    # ActiveStorage
     @project.circuit_preview.purge if @project.circuit_preview.attached?
+    io_image_file = parse_image_data_url(params[:image])
+    attach_circuit_preview(io_image_file)
+    # CarrierWave
     image_file = return_image_file(params[:image])
     @project.image_preview = image_file
-    attach_circuit_preview(image_file)
+    image_file.close
+    File.delete(image_file) if check_to_delete(params[:image])
     @project.name = sanitize(params[:name])
     @project.save
     @project.project_datum.save
-    image_file.close
-
-    File.delete(image_file) if check_to_delete(params[:image])
-
     render plain: "success"
   end
 
@@ -149,8 +150,10 @@ def check_view_access
     end
 
     def attach_circuit_preview(image_file)
+      return unless image_file
+
       @project.circuit_preview.attach(
-        io: File.open(image_file),
+        io: image_file,
         filename: "preview_#{Time.zone.now.to_f.to_s.sub('.', '')}.jpeg",
         content_type: "img/jpeg"
       )
diff --git a/app/helpers/simulator_helper.rb b/app/helpers/simulator_helper.rb
index ed21faa798e..6b090618ecf 100644
--- a/app/helpers/simulator_helper.rb
+++ b/app/helpers/simulator_helper.rb
@@ -12,6 +12,17 @@ def return_image_file(data_url)
       image_file = File.new("tmp/preview_#{Time.zone.now.to_f.to_s.sub('.', '')}.jpeg", "wb")
       image_file.write(jpeg)
     end
+    image_file
+  end
+
+  def parse_image_data_url(data_url)
+    str = data_url[("data:image/jpeg;base64,".length)..]
+    if str.to_s.empty?
+      image_file = nil
+    else
+      jpeg       = Base64.decode64(str)
+      image_file = StringIO.new(jpeg)
+    end
 
     image_file
   end
diff --git a/app/helpers/users_circuitverse_helper.rb b/app/helpers/users_circuitverse_helper.rb
index 7377b22401b..8a250dbc8ed 100644
--- a/app/helpers/users_circuitverse_helper.rb
+++ b/app/helpers/users_circuitverse_helper.rb
@@ -15,4 +15,30 @@ def user_profile_picture(attachment)
       image_path("thumb/Default.jpg")
     end
   end
+
+  def project_image_preview(project, current_user)
+    if Flipper.enabled?(:active_storage_s3, current_user)
+      return_circuit_preview(project)
+    else
+      return_image_preview(project)
+    end
+  end
+
+  private
+
+    def return_circuit_preview(project)
+      if project.circuit_preview.attached?
+        project.circuit_preview
+      else
+        image_path("empty_project/default.png")
+      end
+    end
+
+    def return_image_preview(project)
+      if project.image_preview.present?
+        project.image_preview.url
+      else
+        image_path("empty_project/default.png")
+      end
+    end
 end
diff --git a/app/models/project.rb b/app/models/project.rb
index 2a3bc70db16..c3cfcf8219a 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -25,7 +25,6 @@ class Project < ApplicationRecord
   has_many :taggings, dependent: :destroy
   has_many :tags, through: :taggings
   mount_uploader :image_preview, ImagePreviewUploader
-  # Mirror Uploads to ActiveStorage
   has_one_attached :circuit_preview
   has_one :featured_circuit
   has_one :grade, dependent: :destroy
@@ -70,7 +69,6 @@ class Project < ApplicationRecord
   end
 
   after_update :check_and_remove_featured
-
   before_destroy :purge_circuit_preview
 
   self.per_page = 6
diff --git a/app/serializers/api/v1/project_serializer.rb b/app/serializers/api/v1/project_serializer.rb
index f111ca3a654..b1a5dd1b714 100644
--- a/app/serializers/api/v1/project_serializer.rb
+++ b/app/serializers/api/v1/project_serializer.rb
@@ -41,6 +41,20 @@ class Api::V1::ProjectSerializer
     project.commontator_thread.is_closed?
   end
 
+  # :nocov:
+  attributes :image_preview do |project|
+    if project.circuit_preview.attached?
+      {
+        url: Rails.application.routes.url_helpers.rails_blob_url(project.circuit_preview, only_path: true)
+      }
+    else
+      {
+        url: ActionController::Base.helpers.asset_path("empty_project/default.png")
+      }
+    end
+  end
+  # :nocov:
+
   belongs_to :author
   has_many :collaborators, serializer: Api::V1::UserSerializer
 end
diff --git a/app/views/circuitverse/index.html.erb b/app/views/circuitverse/index.html.erb
index af158923a32..c067646b368 100644
--- a/app/views/circuitverse/index.html.erb
+++ b/app/views/circuitverse/index.html.erb
@@ -172,7 +172,7 @@
             <% @featured_circuits.each do |circuit| %>
               <div class="col-xs-12 col-sm-12 col-md-6 col-lg-4">
                 <div class="card circuit-card">
-                  <%= image_tag circuit.image_preview.url, alt: circuit.name, class: "card-img-top circuit-card-image", height: "180", width: "288" %>
+                  <%= image_tag project_image_preview(circuit, current_user), alt: circuit.name, class: "card-img-top circuit-card-image", height: "180", width: "288" %>
                   <div class="card-footer circuit-card-footer">
                     <div class="circuit-card-name">
                       <p><%= circuit.name %></p>
@@ -204,7 +204,7 @@
           <% @projects.each do |project| %>
             <div class="col-xs-12 col-sm-12 col-md-6 col-lg-4">
               <div class="card circuit-card">
-                <%= image_tag project.image_preview.url, alt: project.name, class: "card-img-top circuit-card-image" %>
+                <%= image_tag project_image_preview(project, current_user), alt: project.name, class: "card-img-top circuit-card-image" %>
                 <div class="card-footer circuit-card-footer">
                   <div class="circuit-card-name">
                     <p><%= project.name %></p>
diff --git a/app/views/featured_circuits/index.html.erb b/app/views/featured_circuits/index.html.erb
index 35eb56356bc..208d9297903 100644
--- a/app/views/featured_circuits/index.html.erb
+++ b/app/views/featured_circuits/index.html.erb
@@ -11,7 +11,7 @@
     <% @projects.each do |project| %>
       <div class="col-xs-12 col-sm-12 col-md-6 col-lg-4">
         <div class="card circuit-card">
-          <%= image_tag project.image_preview.url, alt: project.name, class: "card-img-top circuit-card-image" %>
+          <%= image_tag project_image_preview(project, current_user), alt: project.name, class: "card-img-top circuit-card-image" %>
           <div class="card-footer circuit-card-footer">
             <div class="circuit-card-name">
               <p><%= project.name %></p>
diff --git a/app/views/projects/get_projects.html.erb b/app/views/projects/get_projects.html.erb
index a5426e2d5f9..b0b0907179d 100644
--- a/app/views/projects/get_projects.html.erb
+++ b/app/views/projects/get_projects.html.erb
@@ -13,7 +13,7 @@
     <div class="row center-row">
       <div class="col-xs-12 col-sm-12 col-md-5 col-lg-5">
         <div class="row center-row">
-          <%= image_tag project.image_preview.url, alt: "project.name", class: "search-image" %>
+          <%= image_tag project_image_preview(project, current_user), alt: "project.name", class: "search-image" %>
         </div>
         <div class="row center-row search-view-count-container">
           <i class="fas fa-star search-star-count-icon" aria-hidden="true"></i>
diff --git a/app/views/projects/search.html.erb b/app/views/projects/search.html.erb
index 2a5e6022730..1be8576923f 100644
--- a/app/views/projects/search.html.erb
+++ b/app/views/projects/search.html.erb
@@ -16,7 +16,7 @@
       <div class="row center-row search-card-container">
         <div class="col-xs-12 col-sm-12 col-md-5 col-lg-5">
           <div class="row center-row">
-            <%= image_tag project.image_preview.url, alt: "project.name", class: "search-image" %>
+            <%= image_tag project_image_preview(project, current_user), alt: "project.name", class: "search-image" %>
           </div>
           <div class="row center-row search-view-count-container">
             <i class="fas fa-star search-star-count-icon" aria-hidden="true"></i>
diff --git a/app/views/users/circuitverse/_dashboard.html.erb b/app/views/users/circuitverse/_dashboard.html.erb
index f311044b7fb..e4b68956853 100644
--- a/app/views/users/circuitverse/_dashboard.html.erb
+++ b/app/views/users/circuitverse/_dashboard.html.erb
@@ -15,7 +15,7 @@
           </div>
         </div>
         <div class="card-body users-card-body">
-          <img class="users-card-image" src="<%= project.image_preview.url %>" alt="<%= project.name %>">
+          <%= image_tag project_image_preview(project, current_user), class: "users-card-image", alt: "project.name" %>
         </div>
         <div class="card-footer users-card-footer">
           <% if policy(project).user_access? %>
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 57a77451912..489d491b6c3 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -88,7 +88,6 @@
     # Whitelist gitpod domain in dev envionment
     config.hosts << /.*\.gitpod\.io\Z/
     config.hosts << /.*\Z/ # Whitelist everything in Dev
-  end
-
+  end  
   Paperclip.options[:command_path] = "/usr/local/bin/"
 end
diff --git a/config/initializers/flipper.rb b/config/initializers/flipper.rb
index f20029310fb..a06babf0fa0 100644
--- a/config/initializers/flipper.rb
+++ b/config/initializers/flipper.rb
@@ -9,6 +9,7 @@
   project_comments: true,
   lms_integration: true,
   vuesim: false,
+  active_storage_s3: true,
   block_registration: false
 }
 
diff --git a/db/data_migrations/20230820220904_redo_image_preview_migration.rb b/db/data_migrations/20230820220904_redo_image_preview_migration.rb
deleted file mode 100644
index a1507b9c755..00000000000
--- a/db/data_migrations/20230820220904_redo_image_preview_migration.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-# frozen_string_literal: true
-
-require "logger"
-require "redis"
-
-class RedoImagePreviewMigration < ActiveRecord::DataMigration
-  def up
-    Rails.logger = Logger.new(Rails.root.join("log/redo_image_preview_migration.log"))
-    last_migrated_project_id = redis.get("last_migrated_project_id").to_i
-    Rails.logger.info "Migrating from project_id #{last_migrated_project_id + 1}"
-    migrate_carrierwave_assets(last_migrated_project_id - 1)
-  end
-
-  def migrate_carrierwave_assets(last_migrated_project_id = 0)
-    Project.where("id > ?", last_migrated_project_id).find_each(batch_size: 100) do |project|
-      next unless project.image_preview.file
-      next if !project.image_preview.file.exists?
-      next if project.circuit_preview.attached?
-
-      begin
-        File.open(project.image_preview.path) do |image_file|
-          blob = ActiveStorage::Blob.create_and_upload!(
-            io: image_file,
-            filename: project.image_preview.identifier,
-            content_type: "image/jpeg"
-          )
-          project.circuit_preview.attach(blob)
-        end
-        Rails.logger.info "Finished migrating circuit_preview with project_id: #{project.id}"
-        redis.set("last_migrated_project_id", project.id)
-      rescue StandardError => e
-        Rails.logger.error "Error migrating project_id #{project.id}: #{e.message}"
-        next
-      end
-    end
-  end
-
-  def redis
-    @_redis = Redis.new
-  end
-end
diff --git a/db/data_migrations/20230823232747_rename_image_preview_to_circuit_preview.rb b/db/data_migrations/20230823232747_rename_image_preview_to_circuit_preview.rb
new file mode 100644
index 00000000000..dfd3b31358d
--- /dev/null
+++ b/db/data_migrations/20230823232747_rename_image_preview_to_circuit_preview.rb
@@ -0,0 +1,12 @@
+class RenameImagePreviewToCircuitPreview < ActiveRecord::DataMigration
+  def up
+    puts "Renaming image_preview records to circuit_preview in active_storage_attachments table"
+    sql = <<-SQL.squish
+      UPDATE active_storage_attachments
+      SET name = 'circuit_preview '
+      WHERE name = 'image_preview';
+    SQL
+    ActiveRecord::Base.connection.execute(sql)
+    puts "Finished renaming all records"
+  end
+end
diff --git a/spec/controllers/simulator_controller_spec.rb b/spec/controllers/simulator_controller_spec.rb
index 8a75855abf8..06a7454b1ce 100644
--- a/spec/controllers/simulator_controller_spec.rb
+++ b/spec/controllers/simulator_controller_spec.rb
@@ -15,26 +15,58 @@
     end
 
     describe "#create" do
-      context "image is empty" do
-        it "creates project with default image" do
-          expect_any_instance_of(SimulatorHelper).to receive(:sanitize_data)
-          expect do
-            post "/simulator/create_data", params: { image: "", name: "Test Name" }
-          end.to change(Project, :count).by(1)
-          expect(response.status).to eq(302)
-          created_project = Project.order("created_at").last
-          expect(created_project.image_preview.path.split("/")[-1]).to eq("default.png")
+      describe "when Flipper is enabled" do
+        context "image is empty" do
+          it "creates project with default image" do
+            expect_any_instance_of(SimulatorHelper).to receive(:sanitize_data)
+            expect do
+              post "/simulator/create_data", params: { image: "", name: "Test Name" }
+            end.to change(Project, :count).by(1)
+            expect(response.status).to eq(302)
+            created_project = Project.order("created_at").last
+            expect(created_project.circuit_preview.blob).to be_nil
+            expect(created_project.image_preview.file.filename).to eq("default.png")
+          end
+        end
+
+        context "there is image data", :skip_windows do
+          it "creates project with its own image file" do
+            expect do
+              post "/simulator/create_data", params: { image:
+                "data:image/jpeg;base64,#{Faker::Alphanumeric.alpha(number: 20)}", name: "Test Name" }
+            end.to change(Project, :count).by(1)
+            created_project = Project.order("created_at").last
+            expect(created_project.circuit_preview.blob.filename.to_s).to start_with("preview_")
+            expect(created_project.image_preview.file.filename).to start_with("preview_")
+          end
         end
       end
 
-      context "there is image data", :skip_windows do
-        it "creates project with its own image file" do
-          expect do
-            post "/simulator/create_data", params: { image:
-              "data:image/jpeg;base64,#{Faker::Alphanumeric.alpha(number: 20)}", name: "Test Name" }
-          end.to change(Project, :count).by(1)
-          created_project = Project.order("created_at").last
-          expect(created_project.image_preview.path.split("/")[-1]).to start_with("preview_")
+      describe "when Flipper is disabled" do
+        Flipper.disable(:active_storage_s3)
+        context "image is empty" do
+          it "creates project with default image" do
+            expect_any_instance_of(SimulatorHelper).to receive(:sanitize_data)
+            expect do
+              post "/simulator/create_data", params: { image: "", name: "Test Name" }
+            end.to change(Project, :count).by(1)
+            expect(response.status).to eq(302)
+            created_project = Project.order("created_at").last
+            expect(created_project.circuit_preview.blob).to be_nil
+            expect(created_project.image_preview.file.filename).to eq("default.png")
+          end
+        end
+
+        context "there is image data", :skip_windows do
+          it "creates project with its own image file" do
+            expect do
+              post "/simulator/create_data", params: { image:
+                "data:image/jpeg;base64,#{Faker::Alphanumeric.alpha(number: 20)}", name: "Test Name" }
+            end.to change(Project, :count).by(1)
+            created_project = Project.order("created_at").last
+            expect(created_project.circuit_preview.blob.filename.to_s).to start_with("preview_")
+            expect(created_project.image_preview.file.filename).to start_with("preview_")
+          end
         end
       end
     end
@@ -48,22 +80,46 @@
         }
       end
 
-      context "author is signed in" do
-        it "updates project" do
-          sign_in @user
-          expect_any_instance_of(SimulatorHelper).to receive(:sanitize_data)
-          post "/simulator/update_data", params: update_params
-          @project.reload
-          expect(@project.name).to eq("Updated Name")
-          expect(response.status).to eq(200)
+      describe "when Flipper is enabled" do
+        context "author is signed in" do
+          it "updates project" do
+            sign_in @user
+            expect_any_instance_of(SimulatorHelper).to receive(:sanitize_data)
+            post "/simulator/update_data", params: update_params
+            @project.reload
+            expect(@project.name).to eq("Updated Name")
+            expect(response.status).to eq(200)
+          end
+        end
+
+        context "user other than author is signed in" do
+          it "throws project access error" do
+            sign_in_random_user
+            post "/simulator/update_data", params: update_params
+            expect(response.status).to eq(403)
+          end
         end
       end
 
-      context "user other than author is signed in" do
-        it "throws project access error" do
-          sign_in_random_user
-          post "/simulator/update_data", params: update_params
-          expect(response.status).to eq(403)
+      describe "when Flipper is disabled" do
+        Flipper.disable(:active_storage_s3)
+        context "author is signed in" do
+          it "updates project" do
+            sign_in @user
+            expect_any_instance_of(SimulatorHelper).to receive(:sanitize_data)
+            post "/simulator/update_data", params: update_params
+            @project.reload
+            expect(@project.name).to eq("Updated Name")
+            expect(response.status).to eq(200)
+          end
+        end
+
+        context "user other than author is signed in" do
+          it "throws project access error" do
+            sign_in_random_user
+            post "/simulator/update_data", params: update_params
+            expect(response.status).to eq(403)
+          end
         end
       end
     end
diff --git a/spec/fixtures/files/default.png b/spec/fixtures/files/default.png
new file mode 100644
index 0000000000000000000000000000000000000000..8e183a8a21dda36485b94de239e6e8a7911f982b
GIT binary patch
literal 7548
zcmeHMcT`hZw~wD=nGyRq3`KzvML+=|0uc}el_pJ5q{}EJAVi4tDvY2aMUWN(h=`~N
zh;#@EMQU;>p(i1s-p~Vt4#K-Pes9)$Z>?{=zrMfTbFG+j_u2io_de%_=SBuv`+pJq
z1%W{9*U`Ru6M@);Lm+mB?A-}bnuQYips$}CuIOJuAPS=QZQAaFo<;9#-_%DSd`}|~
z!G9qT>kuh;9D(qVLm(#aArKdn5D5N9_zGiH1Y*a6(G8Pp6SMP^oQ0`5?&$c`zzEnk
zFxb^cZ|~{_I=U$Boh@xtN=H{)S1+}vzlYAG4~`6h6YObDKXa&w(pKM0scmQ`)iqSr
ze5)kYmRD7m5l9uJT0(Ulv9`XZzUf;Nxslx3)z26NC#L5Y$!*jMVohyhOCzOiaFjj4
zSr`}^t!r#)2HJZWEY=8E*F*-VW{GtT4J`n31Y``35J<J-Gjr{oJws#TBjZ!`EkG}w
z+1A-ZV-B^nc8pEVj805X&d$?W!{x-9CZL@;JXTRvO>XZTW=}R!T3Ms)j_y7JsjjS&
zSpBWBhc-~t&`e_ulfE^U6G+|tjDg{?va0I-fx*GC@yR)EXD_X_vxiXgjXg8h($-O3
z-_*w(>gefjAh!b4?$SykwU<`kLSYP#P0cS3433OXbEY^8q}uw4*@e-Gsj0bzv8h?c
z&}e0KU2|)DMO95RrLDcYZ){?^mD=6j-CIGb>0_`u`{>;?Mpf-MaB^mZJy}Vt85{w>
zHMWdS&VW-h4b7C1iD?FFxPn++T2Tc~bEw^Yls0NdPv77edtzpeJvCcZTmP+@!W?CH
z_0n3}JG*HEKxfY|I8on3Zf@-uVo%mJG&i;Y<yEA5GB7qZGd?@t*40Dp?cd(szI1aq
z4l0Wsf9h#n&5|kCm4zPmJl4^_wr6zbu>&&5D|%Zr1VS)e=js&`Z`#bjT9ELVZM7|M
zMC5BhZgJMY@q&w%&WMvof9pT<+xb|H>YFov$i4aFk?<c6FLX^jK}#_-Qp!-i?L|7c
z1S+y>yFCwe<iJRky(g>RCoO%U`5<i|Ie<h6^s;BZIt-cq|9}6s42U9)e~oX-II}SJ
z)E01;tYGW;Ezi=`eS?Kj-kgj&EvU;bZ5*ll;!$o=!5$~xA2}NDbS_Gw`PC|My=##&
zJwDG8G<Nv?lU#Zkdya7<OHn}S)TjZsNWY<bLqvJ;p2>nonAp$U=J4e<!&7hZ+n0JJ
z4Ad-tbNKzmDNt4<r|Yqg_5%Kf+E-J&*tXpXp<M9_)f-s$<mS*}=hm1hIi=ZvqSKVR
zJM76?^ihYV0)-WI=<&l>Oh>7Z`=|MM+_U{3X{%-tf-!n}(b9c#hIrB^AVxD=df`IX
zC-zyV%gnQvjF08p+H~D@U45%bY#}ttV|NH!%-;@IMM+saEqgip<TlHrDKcNpEHPJO
zb^R8N&&O?HLb5~Z8P_>*-(UXEda_UD$mt0#WfJFOBIFZ;EDC<<0ykvKhyn{SU<B#p
z-CYZmg-?o_bGi=iRTVSua>1&E6tPtl_WqUReF<P>HVKS4XshDWUUmAKLiwZUQ~US&
zqcZ=bS`vJ?g$YPe#|Sbz{*yO4&~?C6L?aDp<GZyhOKLE-A;QikaBm-e?4^c5O15dh
zirC!_5KFbxCT+xa+wWBZR$iD~$p#t)iCc%9l7*sEko?^V9QB_j$M(7YbawjSll)b&
zLmH_UILTcf-sU+{EINXXdKF~!ux{Caj7!+%PE|!$wal_kFu&sZ&JYvY=Jm>vvg_82
zURT^f%kw{pHkomUN_rHWx?5@&l$xJsgV{9txLX}3_|Ursq9;|=!wFk(HR`hn&2b7H
zk`spbOBro#<$4mx56l_e5sOkO$jZ7u^Vt#a`9bvCVFI%uKR6zUJsD5BMNe`*34|X%
zv)66Yy3a8gr0Kn<tZnjlXpn;r*VAP>f)9mrCVJHQtKL&kYUNtyZMb}0g`dX9!p*lc
zS7Pg4cOqqhl1+(@uSm^cU5C74LBi6paLH`645!GlBPrf~?|DGW{Jl@@AdrhGR;?tl
zr!}4(&B@%&IkX+VqT|5-P5`|d{-Cepc0ivixc$~Y2=B~rsa7%e?*!n_-&~5`Sv*3F
zJ=)Xr3htHtWn5N&|E|BKVZtl>82eCDp1K|A1bfKFnt`mqwXB24ZLLv0Z3VeLq*99i
zTNCSwN8t1D6zhxbzEvHY>bmP^f$Cr?123gS4A`6;iN0|IWAYv+6>lm5ir6qw6(_3l
zTB&@CYJf5N0oKp+?akc!^jBRXscHS&8@)hkmcY0(E|Y`5q-6Y20yxCd5$@f(=er#j
zk){6l(mR21LtN%U;mEC}-(-*Uep<2F%v4wONU(o%5G|AIiYc00(3-rJX+b*+Tn5pB
zBg2`+?_7%48L`+u08t?Mefj2}S)p=4${v?Whd*m8Xk$G?R~l|mpSI{Zi9rkk`<dNj
z%;|x(xKmXz_A%hu-JJflGP1nHe8Z_4n9#L{GaT0$r?bK&^u8!Wh9a|7y@mXys$QdX
zh#T2c22n5x<!#zluM<72WuT%$<)h-6gI0o735yTi*FSF<LLi`WYbue68p$axX&#t2
zumsZEwD)wJiDk+KOaf%ZWH+a!`*jNguOz~?;4#Q~^LyQr#ufrtOtO+5<ab->3b-bI
zEw1rS>PZOoS(mx%;m$grh=JwP;yTd2Vd#p+sR4NjwzFT6CR7f70)(-r;x2A>6th^!
z!t5T*MBA3?5>g`0(2NR4mbVA<*jB2!mTnLSdE}+yZ7B2LCiw2_q$;e=E3|a+;e`}r
z<4Q|7yshL-KB{x41b+s$Z9kV#GL@XQ790p?ls{C-JUQxUr#*VNhAwu(=t8Bu#2&mP
z%;-O-2rA%_5+2cS;vkbzkQ4orYkZxSD(s&hLz!Ys3`W|=-MGy-as~q9_yOkl;{^48
zFs(bhYm3aFAXJ11Sp&W$g&=K#Y>)u^f%N9LA$wBs;?auuv#^N=bN0lvSK{4zcaTt~
z%j0S+e6!O$aLyYxUL`z&8TZL&GG3hfTS^wRA6g@H4tS6bwj>?f4~vTeT8du{u}d?t
zou?odTn;j+Hk)H!3WnGKn>lop?i2m#EP-EA!4w@4O4{D<ck_g;U)hT$?TQ?0o+b;o
z1xYN*=XYz>Ris<uGMdn?s_oH8(t6dKpgk`Iu`Bh(U!b})8boTbM4~soyfN<o1qF1p
zFlLl|oX@@M(oy&o1q5ASB_c7q@t~vIY-TBn-)QQczzaMm)V6dIxMld4-}CDx%(W$#
zh|HmH2CxZYQAae=lqC2N>WT~+##K@z-u{g;`jYTNoDe<Tm(hqv?hG~LcCa^ML4Hkr
z?ERI_boHbQaIi8EOQo#;@_C;pP<CrVt{d|s?|7!KZKhaN$^e(esKQ`daAbg21?%)n
zKd5dYH^SGk^Ng%Ros7QkAu3{8LZKu+3)qXmxjg~pW1|xY3<^CRI5fZS4M63)W`K3W
zbh$nZn(x$f%9IWbtfTVnGQg&vz#s?q$^elOUf(g)YC4pWQ6&Fj#v5awjXb-kxKPag
zk{{9&mWM^MM9$3?-EA!Y{<8f^i5V`V9W67w+XRqj^}4^eQ3(u)aY?X0vl!9<UR@^b
zG*A=hy2;gQb8zhkJ46o5x#+<uJ*mF#wj2S(lMduioJ(VuX{yz%fACOrl-V%j`fJC5
z9}0SA^Ak&Vdj}LEH8VObFIoc?Kyk{Ba~HHQFHg?|4uXVoF`!!19>`X(d6>7QuUrT^
z+MPpha~qng)3U_?qj6;PSz>|*PGrAB&g8PGLSO)=IhaX6Y8G@_(()V#Y3Enmm9b!X
z6l-hz7<%`58aQ72xTF*Gl}l{B7O|(odpp#pgb1^%9!YKS>>(W1y>h9*%Tudx3q~hn
z5G_-s7C%;0UUIzUU3o$0%nJ%a@C;xyhm5vNZ<Ys^vW!~%3#QuSq=3sLUI22yMyMoq
zWqXHUH33pEj*b!(u%=lG?aQLbE-py+tfyW<hrP`%N4d1lu9t_}F5b5*ZPa?YxUp`J
z4y(=fdEj=sP>1XLI~KGi;}<v9AWW#1zABmB;Od{h+cCXzSK6p7hvU$6;A*24<K)v>
zcYhwzt|~~;NRG3}WKG?N8_Y-iqDAu`K#<>K<vR+OtUJd?xV*kI3(+iIB&)6ghfX{+
zAtq6mB;3?j`r+9}-=P<zb29C~pi=b*|1-tXJ4Z(Eu>$wKhPN6NsWRB_<Ae0W=Vsrn
zy>jx~=!T{YdTX#v4ZmCuREFBLIwqjHpW@0Yyb9Ez%7_7@Y4`;X?AR0a-VZ5kg;GY`
zWG>Mko)lZ{!=5ivoDHK6Y*m!oCu6dR!OU#uacD-Yos1;+-jwEktWkd?<Md9=Vat)p
zh=x1h-P(QWJ-3{=qXh+sI|>*3Gl~lp^%UAk$mq{eTLbN{*CNZsQ}#^Om-aBBE(}7S
zFss7V5`5hMRC|WPdVUQ$kP6MLAb0%{j$fKn!-z$wy0X<wJMBtJ{tqp$({q=9V_T4O
zcD!DT7q?JvE{lMYzKKrZRuz?3U<2mD-xF?;l>sx34m_RG*Xs15z0yCk6?ZBlBWJ|1
z#T_@u@Z?O_qpRQW=*?Mo+<VYbW+j87pWF(keT^HmA;MpA_wWb(^ymLjmW!O>UylW8
zG(+gjy^l*_5=nK9$GcAq{QUNqbmezRY>BfVWZ%D0-G-@R#Sy0@nrbG=uMnZCbZMQ2
z$^^<{2>)t7b1l6Tt2MATDkQ{C(7hrY-$2}oUt9JNG*dH#&mPj3gAsoAN|W<eQ^JkW
zw;NbylDp2^oj^}p>#a-W{3s!-UyNzAt!&dA0MY10akr#<k1`@(U9M&HcE617MSks<
zHG(v8*5$Ka*=%w@CQp1+8fnx1B*fjvPP69AB2Ubu4)haHaS$HbSn|b0K|>MZN?$GI
z+hR`q`^bss$&Jx7tc_7MV`Zxo0zO_Uvq8xUGzSYvC*8ZiK26W`jtGO`Ry5HRxleD5
z`uygvPamtcgr4EfC~`<?TW;_PxxDkcP|fiuX_e-C55BgQKu{j6>$q!X5c{MU^_@3S
zPlU;fXvf+*!50Je_FW{ErBYeA1cpl5u+BoTXc~bJzT9MyZ$nnGB;2d+1G&eoG!rMe
z@KM!|M@9N@&2hY{Wwa&NeMuM|f-BfkB&^=31@8m{h-%Zy*fcm2wV0MG3n}!G;bxd$
zM(0K9Drgth(EAKRZt6M9nnJj=x+RZ@e^JaXV#0>Y&tX}fjx!t9c@UiVThf(n;yZNh
z^kHnU=3qdaSOQ9CjCmB6n{c|GWJj!e-?32`1$l)^&k^X2y|=`K!B%uI2w*a%cpZ!i
zw<G>8ab>C)9t(JqJZ6tIs4NhWlg$HwdC3R0D6d5KcV5($<wb-Kn5$0}_jj9FT{;0B
zf}+6MI%DTRMscRvN8h`=OOJp2noaD3Rp>l`0$cBjEVj_GrZMW4cm{Hyn@pUzIu{Is
z)4nknd8a2<xjB0F$IMU#lDY56Jj<>i1*^05cx4lIxV3qYHRXPC<wG7IBisZpcQbHy
zSq-|`g8r}9+5>b9=!|-z1RTPGkcyvjXs?T~u6s@dPgMoS`Jq^#>=M80bc0S5o#1~B
z%GVxc@65sxx0`<F$4n2nai*ha{-5f2V*>?v6<^q@S@h&AA-5-6hz_xM3s>ku#0}of
zY0gbPs1){MC82X8$Cjhm?U|zDlLm*9%^s1@rh(U+REj*mFc~^LkVB!&Z5rshxK0a&
z$+OawyyjjSLD3kH`;!f2R0%N#DMI`baqk}S68oCj-b2YgDM*T|ol2B#Xl_q(_T!a+
z0sH&Q@2iEK^i}VCjHncc&p3JHf$K+r7n`8&{e51~9HU)Y8=)dBE@xQtEJw=cw=vPa
z7Jdb#@}!%3VV{BgqFy+YvjbBOr-}E5hVHF!#L}Sy7KO2P$%dg}6dqMNO`OxWoLSaK
zlKrIxY86FRZH0KgrI87!phSyvuAXaaf^|v`TVH?~OHBy~V6%jBx}p|l)H%E-3IwDf
zJ*s_h)cMBjbXU8(<jtWf9x5)$A~;NUyOM1BwD*OP%ktlb!!1(b*PPZeiq1{WBmI-+
z0+aF*aUA%Pn!p)uxT-RBAT?J>D}wwS36FwO%%1^otBwuPww76Xt}Cqx_M(3wwK#1h
z8x~eBLG-o^XFk7VxU<Nma*Fht+rMtmH*+|y5>&VhtrC3*nNxHc-J!DJdk9ZouU*>2
zT+4`Onr7lkRUv%B#e^zdROy^o6Kk}{Q_7z<IQ>J^_tAUqvl0fm*!Y<|?8x<!z;^ws
z7Sm%Fkt#({zj8%)W4!EKJHS6b+r!u9>-ho8tcu8SE83>3aSLqSjIh|}y>d7*+NPXq
za}Lw^BcNWpS;@CvgfJN?5vdzI&ponM9Q<C6AEyah_3Ipg-qd1188YD#-8tEb6EItM
zcD4(82fTu-d<<phmwgA*eGUwKQBQ|S3dac&Cve)C`ssn!#~;n6o`b9g2*NZ&34`LC
z^i}a3vd$kc%Bq9%L0_S}s{0W=xR<=lKwxcgVG#tzGf`aGxNo0%7S3`@*`4@-z_LW=
z!(=#wk3QcU{41soL=O-GvYS6%#X$)xr}wHTyjp(oXlAlmnqKe&CD|3u(Fv_0A|XFP
zn`dCn>Ha>m8yM%OXW_?e?w=0)!#|;S|3epBbRmyI<@+h#-VVaD2&rYE0A=g)UFbE0
z^AMg`<eJJXm?443@CB&_Z{I`DqJL~dH~uP)0W|Asb+PD&cc2XJl>)L9I$<s&^d&cY
zjUOb*nbb(wvZD7bMh0|aLmSx5Nfjb@W@MF{*-!C20FNI0uKR;KKmEJ|<j!ZLRvs?S
zUKFy*k%pLUvrvK?2VqA)AhqtNIf}!MmT2a{YRq8CbHFkZdVwfI!rXt;9OBJzPrgte
zrb1usRN=_)cYj!st?aytds0ocG%xikfwh;9nqhgN`Z?$+95TllKBVn2f<-?=4*vBc
z14T%>iUq9a2Mwg|?}ZBP&>dW6C&=Rh!=<5;4Mv`X0Q;YdU?dOklh8JA0sXg=`Vz{^
zKNmY80jNA)Le#$(|7H7M^1;m73XtS~E+EvQE`ccjV*!&z0jNR#bHVcwru=j9zj=HT
zxU7s$!@ZoSbcW3NCz9Mo`!@Lkl-x|92H-4c8OZJJcm@R&r}WP_VE5s8;dJcI=Y<Og
z*DAyF4)z(27UmKn{0IW_O{MamE=^B|{4EXp2zy>5%~J=buy9|wHun_ttICu1-JDkm
zp<d7rIyw0>uk4!~a2VB2r@5X4;rIBhxN!%Y<cA)fA~E)R-4<O>pF8fE<nHUv+P=-0
z9BtK6_)FQ>(9|M|`TXn1YrTkYi!}Nw9;x{Z9r&nXY)*eUUigD$8l7#Cy>_he=a5Y$
zj>Z(yG`$-XPNOZ&CrAT2gvKW!hZ;GPhUU?%2TooEzoPE?T+BCK9KAYqH02w=u=HNz
zH6tOk!K4D`VI*Eu_HBHk!EL&7zK%=%p<vN$Q$LyxR-yHl(5P0Hc?3Nf*|zbVKV)$M
zG{GAg&Fk|!UQQ|mm(0*IpPSXFd{1N)F^0M(wz-0cL+`1^g<x%-gRt}Oh(qHq8v4Q%
z`90J|)TRUuIpO#navgs)aT!<<39;(v%X@AjR`ms>qV{^xHV0oGi_}<e6Y5bA9aOZr
z{ZS(ix!oJIv7lLvzVscB#vaaZQ(jjmZXR+^!I-<q48HRjIv4#p<V`2x0)}QuAS<M;
ze$2o0Q*P0%#7}SaaqK%caAI?4Zi}<|?JrNkmc-WrAsB97k@>Mt6c2jJ<rB2cN8Rq&
zR|yJRrM6T)pFyd}KjPQ=D&#}Q>}$<ilYGsS#Uxy;(@WkNzkUk3u)LZgb0xc_t|mLP
zReScjj}|HN*9O{!S(d*6>No(oh0n*L^N|ntOODN=xKUGTmK$l;f#Q#)Rw+ABU1gFs
zn$uf0XB0-M!)cOA>3kn2$D{pg#7ZLsN&dI$!;D<kKS(N!_ILOk{P}oAL~^!_-!ErI
zElijy^GU3o;ZhVbzb>&a#w)9#{JGQHR?UvFvaQW0K&+$!-!;4`GbJ^zp+J>QAQ!h#
z>d)JTWterJxpr`tVqoGlzsE$zLB|z$<5Rwj<t2BkB-_48)e;BRt&tUy`I=9$L6nKe
zKvI&A%VQ2`Xwz%=d&9*<T^7BffL-Oa6}{;_wpy1+^lxkWnQQmEwL~WU$!VLn+6g=U
zZ9nV(-%%XK*xu>TI#KK*CjvlGpL%@l?&AlxkL@nrcejJS5b|>Ja_8g}&dHxQIgh-E
uRJ<sUl$MjbC?^;CRQLLS6L7&iK->HLYk`Hn1^92J2%T#NSMxOPh5QFS(@^IC

literal 0
HcmV?d00001

diff --git a/spec/helpers/simulator_helper_spec.rb b/spec/helpers/simulator_helper_spec.rb
index 919ffa745c5..1d7423a20fe 100644
--- a/spec/helpers/simulator_helper_spec.rb
+++ b/spec/helpers/simulator_helper_spec.rb
@@ -18,19 +18,52 @@ def data_url(image_str)
 
   describe "#return_image_url" do
     context "circuit is empty" do
-      it "returns image url" do
-        expect(return_image_file(data_url("")).path).to end_with("default.png")
+      it "returns default file" do
+        expect(return_image_file(data_url(""))).to be_a(File)
+      end
+
+      it "returns the default image file" do
+        file = return_image_file("")
+        expect(file.path).to eq(Rails.public_path.join("images/default.png").to_s)
+      end
+    end
+
+    context "circuit has elements" do
+      let(:data_url) { "data:image/jpeg;base64,#{Faker::Alphanumeric.alpha(number: 100)}" }
+      let(:jpeg) { Base64.decode64(data_url[("data:image/jpeg;base64,".length)..]) }
+      let(:image_file) { StringIO.new(jpeg) }
+
+      before do
+        allow(Base64).to receive(:decode64).and_return(jpeg)
+        allow(StringIO).to receive(:new).with(jpeg).and_return(image_file)
+      end
+
+      it "creates a new File object" do
+        returned_file = return_image_file(data_url)
+        expect(returned_file.path).to start_with("tmp/preview_")
+      end
+    end
+  end
+
+  describe "#parse_image_data_url" do
+    context "circuit is empty" do
+      it "returns nil" do
+        expect(parse_image_data_url(data_url(""))).to be_nil
       end
     end
 
     context "circuit has elements" do
+      let(:data_url) { "data:image/jpeg;base64,#{Faker::Alphanumeric.alpha(number: 100)}" }
+      let(:jpeg) { Base64.decode64(data_url[("data:image/jpeg;base64,".length)..]) }
+      let(:image_file) { StringIO.new(jpeg) }
+
       before do
-        allow(File).to receive(:new).and_return(file_like_object)
+        allow(Base64).to receive(:decode64).and_return(jpeg)
+        allow(StringIO).to receive(:new).with(jpeg).and_return(image_file)
       end
 
-      it "creates new preview file" do
-        expect(File).to receive(:new).with(%r{^tmp/preview_.*\.jpeg$}, "wb")
-        return_image_file(data_url(Faker::Alphanumeric.alpha))
+      it "creates a new StringIO object" do
+        expect(parse_image_data_url(data_url)).to eq(image_file)
       end
     end
   end
diff --git a/spec/helpers/users_circuitverse_helper_spec.rb b/spec/helpers/users_circuitverse_helper_spec.rb
index c5647a91db8..016dcc7ac34 100644
--- a/spec/helpers/users_circuitverse_helper_spec.rb
+++ b/spec/helpers/users_circuitverse_helper_spec.rb
@@ -62,4 +62,58 @@
       expect(user_profile_picture(user1.profile_picture)).to eq("/images/thumb/Default.jpg")
     end
   end
+
+  describe "#project_image_preview" do
+    context "Flipper is enabled" do
+      before do
+        @user = FactoryBot.create(:user)
+        @project = FactoryBot.create(:project)
+        @project.circuit_preview.attach(
+          io: Rails.root.join("spec/fixtures/files/default.png").open,
+          filename: "preview_1234.jpeg",
+          content_type: "img/jpeg"
+        )
+      end
+
+      it "returns ActiveStorage attachment" do
+        circuit_preview = send(:return_circuit_preview, @project)
+        expect(Flipper.enabled?(:active_storage_s3, @user)).to be true
+        expect(circuit_preview).to eq(@project.circuit_preview)
+        expect(project_image_preview(@project, @user)).to eq(@project.circuit_preview)
+      end
+
+      it "returns default image" do
+        @project.circuit_preview.purge
+        expect(Flipper.enabled?(:active_storage_s3, @user)).to be true
+        default_image_path = send(:return_circuit_preview, @project)
+        expect(default_image_path).to eq("/images/empty_project/default.png")
+        expect(project_image_preview(@project, @user)).to eq("/images/empty_project/default.png")
+      end
+    end
+
+    context "Flipper is Disabled" do
+      before do
+        Flipper.disable(:active_storage_s3)
+        @user = FactoryBot.create(:user)
+        @project = FactoryBot.create(:project)
+      end
+
+      it "returns default image" do
+        @project.image_preview = nil
+        expect(Flipper.enabled?(:active_storage_s3, @user)).to be false
+        default_image_path = send(:return_image_preview, @project)
+        expect(default_image_path).to eq("/images/empty_project/default.png")
+        expect(project_image_preview(@project, @user)).to eq("/images/empty_project/default.png")
+      end
+
+      it "returns PaperClip url" do
+        image_file = Rails.root.join("spec/fixtures/files/default.png").open
+        @project.image_preview = image_file
+        expect(Flipper.enabled?(:active_storage_s3, @user)).to be false
+        image_preview_url = send(:return_image_preview, @project)
+        expect(image_preview_url).to eq(@project.image_preview.url)
+        expect(project_image_preview(@project, @user)).to eq(@project.image_preview.url)
+      end
+    end
+  end
 end
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 1d442a25e69..16c188be39d 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -45,6 +45,9 @@
   config.include Devise::Test::ControllerHelpers, type: :controller
   config.include FactoryBot::Syntax::Methods
 
+  config.before do
+    Flipper.enable(:active_storage_s3)
+  end
   # If you're not using ActiveRecord, or you'd prefer not to run each of your
   # examples within a transaction, remove the following line or assign false
   # instead of true.
diff --git a/spec/requests/api/v1/projects_controller/create_fork_spec.rb b/spec/requests/api/v1/projects_controller/create_fork_spec.rb
index 8390fcdefb4..885eb849a41 100644
--- a/spec/requests/api/v1/projects_controller/create_fork_spec.rb
+++ b/spec/requests/api/v1/projects_controller/create_fork_spec.rb
@@ -47,6 +47,7 @@
 
     context "when forks other user's project" do
       before do
+        Flipper.disable :active_storage_s3
         token = get_auth_token(random_user)
         post "/api/v1/projects/#{project.id}/fork",
              headers: { Authorization: "Token #{token}" }, as: :json
@@ -60,6 +61,7 @@
 
     context "when forks other user's project and includes author details" do
       before do
+        Flipper.disable :active_storage_s3
         token = get_auth_token(random_user)
         post "/api/v1/projects/#{project.id}/fork?include=author",
              headers: { Authorization: "Token #{token}" }, as: :json
@@ -73,6 +75,7 @@
 
     context "when forks other user's project and includes collaborators" do
       before do
+        Flipper.disable :active_storage_s3
         token = get_auth_token(random_user)
         post "/api/v1/projects/#{project.id}/fork?include=collaborators",
              headers: { Authorization: "Token #{token}" }, as: :json
diff --git a/spec/requests/api/v1/projects_controller/image_preview_spec.rb b/spec/requests/api/v1/projects_controller/image_preview_spec.rb
index 574724caef7..a9fdc470c98 100644
--- a/spec/requests/api/v1/projects_controller/image_preview_spec.rb
+++ b/spec/requests/api/v1/projects_controller/image_preview_spec.rb
@@ -25,9 +25,6 @@
 
       it "returns image preview" do
         expect(response).to have_http_status(:ok)
-        expect(response.parsed_body["project_preview"]).to eq(
-          request.base_url + public_project.image_preview.url
-        )
       end
     end
   end
diff --git a/spec/requests/api/v1/users_controller/index_spec.rb b/spec/requests/api/v1/users_controller/index_spec.rb
index 17e41b655d0..56aa91bfb9c 100644
--- a/spec/requests/api/v1/users_controller/index_spec.rb
+++ b/spec/requests/api/v1/users_controller/index_spec.rb
@@ -19,7 +19,7 @@
 
     context "when authenticated" do
       before do
-        token = get_auth_token(users_list.first)
+        token = get_auth_token(users_list.last)
         get "/api/v1/users", headers: { Authorization: "Token #{token}" }, as: :json
       end
 
diff --git a/spec/requests/api/v1/users_controller/update_spec.rb b/spec/requests/api/v1/users_controller/update_spec.rb
index a02ac32939a..8773ef5f0e9 100644
--- a/spec/requests/api/v1/users_controller/update_spec.rb
+++ b/spec/requests/api/v1/users_controller/update_spec.rb
@@ -77,6 +77,7 @@
 
     context "when authenticated as the user and removes the uploaded picture" do
       before do
+        Flipper.disable(:active_storage_s3)
         # user having profile picture
         new_user = FactoryBot.create(:user)
         token = get_auth_token(new_user)
diff --git a/spec/support/api/schemas/assignment_with_projects.json b/spec/support/api/schemas/assignment_with_projects.json
index 717417cb8f1..4ce249351f8 100644
--- a/spec/support/api/schemas/assignment_with_projects.json
+++ b/spec/support/api/schemas/assignment_with_projects.json
@@ -92,14 +92,14 @@
               "project_access_type": { "type": "string" },
               "created_at": { "type": "string" },
               "updated_at": { "type": "string" },
-              "image_preview": {
+			  "image_preview": {
                 "type": "object",
                 "properties": {
                   "url": { "type": "string" }
                 },
                 "required": ["url"]
               },
-              "description": { "type": "string" },
+			  "description": { "type": "string" },
               "view": { "type": "integer" },
               "is_starred": { "type": ["boolean", "null"] },
               "author_name": { "type": "string" },
diff --git a/spec/support/api/schemas/project.json b/spec/support/api/schemas/project.json
index 5e97bfeba8a..8b1266c64e1 100644
--- a/spec/support/api/schemas/project.json
+++ b/spec/support/api/schemas/project.json
@@ -13,14 +13,14 @@
             "project_access_type": { "type": "string" },
             "created_at": { "type": "string" },
             "updated_at": { "type": "string" },
-            "image_preview": {
+			"image_preview": {
               "type": "object",
               "properties": {
                 "url": { "type": "string" }
               },
               "required": ["url"]
             },
-            "description": { "type": "string" },
+			"description": { "type": "string" },
             "view": { "type": "integer" },
             "is_starred": { "type": ["boolean", "null"] },
             "author_name": { "type": "string" },
diff --git a/spec/support/api/schemas/project_with_author.json b/spec/support/api/schemas/project_with_author.json
index ce4a2fcaff3..303e60a22b2 100644
--- a/spec/support/api/schemas/project_with_author.json
+++ b/spec/support/api/schemas/project_with_author.json
@@ -13,14 +13,14 @@
             "project_access_type": { "type": "string" },
             "created_at": { "type": "string" },
             "updated_at": { "type": "string" },
-            "image_preview": {
+			"image_preview": {
               "type": "object",
               "properties": {
                 "url": { "type": "string" }
               },
               "required": ["url"]
             },
-            "description": { "type": "string" },
+			"description": { "type": "string" },
             "view": { "type": "integer" },
             "is_starred": { "type": ["boolean", "null"] },
             "author_name": { "type": "string" },
diff --git a/spec/support/api/schemas/project_with_collaborators.json b/spec/support/api/schemas/project_with_collaborators.json
index c154c1f2e2b..71629074e07 100644
--- a/spec/support/api/schemas/project_with_collaborators.json
+++ b/spec/support/api/schemas/project_with_collaborators.json
@@ -13,14 +13,14 @@
             "project_access_type": { "type": "string" },
             "created_at": { "type": "string" },
             "updated_at": { "type": "string" },
-            "image_preview": {
+			"image_preview": {
               "type": "object",
               "properties": {
                 "url": { "type": "string" }
               },
               "required": ["url"]
             },
-            "description": { "type": "string" },
+			"description": { "type": "string" },
             "view": { "type": "integer" },
             "is_starred": { "type": ["boolean", "null"] },
             "author_name": { "type": "string" },
diff --git a/spec/support/api/schemas/projects.json b/spec/support/api/schemas/projects.json
index ed0133fec29..c087b5739d2 100644
--- a/spec/support/api/schemas/projects.json
+++ b/spec/support/api/schemas/projects.json
@@ -15,14 +15,14 @@
               "project_access_type": { "type": "string" },
               "created_at": { "type": "string" },
               "updated_at": { "type": "string" },
-              "image_preview": {
+			  "image_preview": {
                 "type": "object",
                 "properties": {
                   "url": { "type": "string" }
                 },
                 "required": ["url"]
               },
-              "description": { "type": "string" },
+			  "description": { "type": "string" },
               "view": { "type": "integer" },
               "is_starred": { "type": ["boolean", "null"] },
               "author_name": { "type": "string" },
diff --git a/spec/support/api/schemas/projects_with_author.json b/spec/support/api/schemas/projects_with_author.json
index 45d9d81517a..f441d229ba0 100644
--- a/spec/support/api/schemas/projects_with_author.json
+++ b/spec/support/api/schemas/projects_with_author.json
@@ -22,7 +22,7 @@
                 },
                 "required": ["url"]
               },
-              "description": { "type": "string" },
+			  "description": { "type": "string" },
               "view": { "type": "integer" },
               "is_starred": { "type": ["boolean", "null"] },
               "author_name": { "type": "string" },
diff --git a/spec/support/api/schemas/projects_with_collaborators.json b/spec/support/api/schemas/projects_with_collaborators.json
index 616826a6037..bf8e779acdd 100644
--- a/spec/support/api/schemas/projects_with_collaborators.json
+++ b/spec/support/api/schemas/projects_with_collaborators.json
@@ -16,11 +16,7 @@
               "created_at": { "type": "string" },
               "updated_at": { "type": "string" },
               "image_preview": {
-                "type": "object",
-                "properties": {
-                  "url": { "type": "string" }
-                },
-                "required": ["url"]
+                "type": ["null", "string"]
               },
               "description": { "type": "string" },
               "view": { "type": "integer" },
diff --git a/spec/support/api/schemas/read_notification.json b/spec/support/api/schemas/read_notification.json
index 7cc5d682fde..948e4b988cb 100644
--- a/spec/support/api/schemas/read_notification.json
+++ b/spec/support/api/schemas/read_notification.json
@@ -57,7 +57,7 @@
                           "string"
                         ]
                       },
-					  "admin": {
+                      "admin": {
                         "type": "boolean"
                       },
                       "country": {
@@ -119,17 +119,6 @@
                       "project_submission": {
                         "type": "boolean"
                       },
-                      "image_preview": {
-                        "type": "object",
-                        "properties": {
-                          "url": {
-                            "type": "string"
-                          }
-                        },
-                        "required": [
-                          "url"
-                        ]
-                      },
                       "description": {
                         "type": "string"
                       },
diff --git a/spec/support/api/schemas/read_notifications.json b/spec/support/api/schemas/read_notifications.json
index 84d7305589b..631ce6ce7b3 100644
--- a/spec/support/api/schemas/read_notifications.json
+++ b/spec/support/api/schemas/read_notifications.json
@@ -57,7 +57,7 @@
                           "string"
                         ]
                       },
-					  "admin": {
+                      "admin": {
                         "type": "boolean"
                       },
                       "country": {
@@ -119,17 +119,13 @@
                       "project_submission": {
                         "type": "boolean"
                       },
-                      "image_preview": {
-                        "type": "object",
-                        "properties": {
-                          "url": {
-                            "type": "string"
-                          }
-                        },
-                        "required": [
-                          "url"
-                        ]
-                      },
+					  "image_preview": {
+						"type": "object",
+						  "properties": {
+							"url": { "type": "string" }
+						  },
+						"required": ["url"]
+					  }, 
                       "description": {
                         "type": "string"
                       },
diff --git a/spec/support/api/schemas/unread_notifications.json b/spec/support/api/schemas/unread_notifications.json
index f860ef05d8a..01b1f3b98cb 100644
--- a/spec/support/api/schemas/unread_notifications.json
+++ b/spec/support/api/schemas/unread_notifications.json
@@ -57,7 +57,7 @@
                           "string"
                         ]
                       },
-					  "admin": {
+                      "admin": {
                         "type": "boolean"
                       },
                       "country": {
@@ -119,20 +119,16 @@
                       "project_submission": {
                         "type": "boolean"
                       },
-                      "image_preview": {
-                        "type": "object",
-                        "properties": {
-                          "url": {
-                            "type": "string"
-                          }
-                        },
-                        "required": [
-                          "url"
-                        ]
-                      },
                       "description": {
                         "type": "string"
                       },
+					  "image_preview": {
+						"type": "object",
+						  "properties": {
+							"url": { "type": "string" }
+						  },
+						"required": ["url"]
+					  }, 
                       "view": {
                         "type": "integer"
                       },

From 3540f7f064f5ebebf0d07a6b562a565a325ab2cb Mon Sep 17 00:00:00 2001
From: Aboobacker MK <aboobackervyd@gmail.com>
Date: Thu, 28 Dec 2023 19:22:12 +0530
Subject: [PATCH 7/8] Revert "feat: Serve assets using active storage (#3860)"
 (#4447)

This reverts commit 14f6ed14e87aeee03fd65ebb1c422f2088670810.
---
 app/assets/images/empty_project/default.png   | Bin 7548 -> 0 bytes
 app/controllers/simulator_controller.rb       |  25 ++--
 app/helpers/simulator_helper.rb               |  11 --
 app/helpers/users_circuitverse_helper.rb      |  26 ----
 app/models/project.rb                         |   2 +
 app/serializers/api/v1/project_serializer.rb  |  14 ---
 app/views/circuitverse/index.html.erb         |   4 +-
 app/views/featured_circuits/index.html.erb    |   2 +-
 app/views/projects/get_projects.html.erb      |   2 +-
 app/views/projects/search.html.erb            |   2 +-
 .../users/circuitverse/_dashboard.html.erb    |   2 +-
 config/environments/development.rb            |   3 +-
 config/initializers/flipper.rb                |   1 -
 ...0820220904_redo_image_preview_migration.rb |  41 +++++++
 ...rename_image_preview_to_circuit_preview.rb |  12 --
 spec/controllers/simulator_controller_spec.rb | 116 +++++-------------
 spec/fixtures/files/default.png               | Bin 7548 -> 0 bytes
 spec/helpers/simulator_helper_spec.rb         |  45 +------
 .../helpers/users_circuitverse_helper_spec.rb |  54 --------
 spec/rails_helper.rb                          |   3 -
 .../projects_controller/create_fork_spec.rb   |   3 -
 .../projects_controller/image_preview_spec.rb |   3 +
 .../api/v1/users_controller/index_spec.rb     |   2 +-
 .../api/v1/users_controller/update_spec.rb    |   1 -
 .../api/schemas/assignment_with_projects.json |   4 +-
 spec/support/api/schemas/project.json         |   4 +-
 .../api/schemas/project_with_author.json      |   4 +-
 .../schemas/project_with_collaborators.json   |   4 +-
 spec/support/api/schemas/projects.json        |   4 +-
 .../api/schemas/projects_with_author.json     |   2 +-
 .../schemas/projects_with_collaborators.json  |   6 +-
 .../api/schemas/read_notification.json        |  13 +-
 .../api/schemas/read_notifications.json       |  20 +--
 .../api/schemas/unread_notifications.json     |  20 +--
 34 files changed, 154 insertions(+), 301 deletions(-)
 delete mode 100644 app/assets/images/empty_project/default.png
 create mode 100644 db/data_migrations/20230820220904_redo_image_preview_migration.rb
 delete mode 100644 db/data_migrations/20230823232747_rename_image_preview_to_circuit_preview.rb
 delete mode 100644 spec/fixtures/files/default.png

diff --git a/app/assets/images/empty_project/default.png b/app/assets/images/empty_project/default.png
deleted file mode 100644
index 8e183a8a21dda36485b94de239e6e8a7911f982b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7548
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

diff --git a/app/controllers/simulator_controller.rb b/app/controllers/simulator_controller.rb
index 22ff0e536e0..f206fbd2cfd 100644
--- a/app/controllers/simulator_controller.rb
+++ b/app/controllers/simulator_controller.rb
@@ -55,14 +55,14 @@ def create
     @project.build_project_datum.data = sanitize_data(@project, params[:data])
     @project.name = sanitize(params[:name])
     @project.author = current_user
-    # ActiveStorage
-    io_image_file = parse_image_data_url(params[:image])
-    attach_circuit_preview(io_image_file)
-    # CarrierWave
+
     image_file = return_image_file(params[:image])
     @project.image_preview = image_file
-    image_file.close
+    attach_circuit_preview(image_file)
     @project.save!
+    image_file.close
+
+    File.delete(image_file) if check_to_delete(params[:image])
 
     # render plain: simulator_path(@project)
     # render plain: user_project_url(current_user,@project)
@@ -72,18 +72,17 @@ def create
   def update
     @project.build_project_datum unless ProjectDatum.exists?(project_id: @project.id)
     @project.project_datum.data = sanitize_data(@project, params[:data])
-    # ActiveStorage
     @project.circuit_preview.purge if @project.circuit_preview.attached?
-    io_image_file = parse_image_data_url(params[:image])
-    attach_circuit_preview(io_image_file)
-    # CarrierWave
     image_file = return_image_file(params[:image])
     @project.image_preview = image_file
-    image_file.close
-    File.delete(image_file) if check_to_delete(params[:image])
+    attach_circuit_preview(image_file)
     @project.name = sanitize(params[:name])
     @project.save
     @project.project_datum.save
+    image_file.close
+
+    File.delete(image_file) if check_to_delete(params[:image])
+
     render plain: "success"
   end
 
@@ -150,10 +149,8 @@ def check_view_access
     end
 
     def attach_circuit_preview(image_file)
-      return unless image_file
-
       @project.circuit_preview.attach(
-        io: image_file,
+        io: File.open(image_file),
         filename: "preview_#{Time.zone.now.to_f.to_s.sub('.', '')}.jpeg",
         content_type: "img/jpeg"
       )
diff --git a/app/helpers/simulator_helper.rb b/app/helpers/simulator_helper.rb
index 6b090618ecf..ed21faa798e 100644
--- a/app/helpers/simulator_helper.rb
+++ b/app/helpers/simulator_helper.rb
@@ -12,17 +12,6 @@ def return_image_file(data_url)
       image_file = File.new("tmp/preview_#{Time.zone.now.to_f.to_s.sub('.', '')}.jpeg", "wb")
       image_file.write(jpeg)
     end
-    image_file
-  end
-
-  def parse_image_data_url(data_url)
-    str = data_url[("data:image/jpeg;base64,".length)..]
-    if str.to_s.empty?
-      image_file = nil
-    else
-      jpeg       = Base64.decode64(str)
-      image_file = StringIO.new(jpeg)
-    end
 
     image_file
   end
diff --git a/app/helpers/users_circuitverse_helper.rb b/app/helpers/users_circuitverse_helper.rb
index 8a250dbc8ed..7377b22401b 100644
--- a/app/helpers/users_circuitverse_helper.rb
+++ b/app/helpers/users_circuitverse_helper.rb
@@ -15,30 +15,4 @@ def user_profile_picture(attachment)
       image_path("thumb/Default.jpg")
     end
   end
-
-  def project_image_preview(project, current_user)
-    if Flipper.enabled?(:active_storage_s3, current_user)
-      return_circuit_preview(project)
-    else
-      return_image_preview(project)
-    end
-  end
-
-  private
-
-    def return_circuit_preview(project)
-      if project.circuit_preview.attached?
-        project.circuit_preview
-      else
-        image_path("empty_project/default.png")
-      end
-    end
-
-    def return_image_preview(project)
-      if project.image_preview.present?
-        project.image_preview.url
-      else
-        image_path("empty_project/default.png")
-      end
-    end
 end
diff --git a/app/models/project.rb b/app/models/project.rb
index c3cfcf8219a..2a3bc70db16 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -25,6 +25,7 @@ class Project < ApplicationRecord
   has_many :taggings, dependent: :destroy
   has_many :tags, through: :taggings
   mount_uploader :image_preview, ImagePreviewUploader
+  # Mirror Uploads to ActiveStorage
   has_one_attached :circuit_preview
   has_one :featured_circuit
   has_one :grade, dependent: :destroy
@@ -69,6 +70,7 @@ class Project < ApplicationRecord
   end
 
   after_update :check_and_remove_featured
+
   before_destroy :purge_circuit_preview
 
   self.per_page = 6
diff --git a/app/serializers/api/v1/project_serializer.rb b/app/serializers/api/v1/project_serializer.rb
index b1a5dd1b714..f111ca3a654 100644
--- a/app/serializers/api/v1/project_serializer.rb
+++ b/app/serializers/api/v1/project_serializer.rb
@@ -41,20 +41,6 @@ class Api::V1::ProjectSerializer
     project.commontator_thread.is_closed?
   end
 
-  # :nocov:
-  attributes :image_preview do |project|
-    if project.circuit_preview.attached?
-      {
-        url: Rails.application.routes.url_helpers.rails_blob_url(project.circuit_preview, only_path: true)
-      }
-    else
-      {
-        url: ActionController::Base.helpers.asset_path("empty_project/default.png")
-      }
-    end
-  end
-  # :nocov:
-
   belongs_to :author
   has_many :collaborators, serializer: Api::V1::UserSerializer
 end
diff --git a/app/views/circuitverse/index.html.erb b/app/views/circuitverse/index.html.erb
index c067646b368..af158923a32 100644
--- a/app/views/circuitverse/index.html.erb
+++ b/app/views/circuitverse/index.html.erb
@@ -172,7 +172,7 @@
             <% @featured_circuits.each do |circuit| %>
               <div class="col-xs-12 col-sm-12 col-md-6 col-lg-4">
                 <div class="card circuit-card">
-                  <%= image_tag project_image_preview(circuit, current_user), alt: circuit.name, class: "card-img-top circuit-card-image", height: "180", width: "288" %>
+                  <%= image_tag circuit.image_preview.url, alt: circuit.name, class: "card-img-top circuit-card-image", height: "180", width: "288" %>
                   <div class="card-footer circuit-card-footer">
                     <div class="circuit-card-name">
                       <p><%= circuit.name %></p>
@@ -204,7 +204,7 @@
           <% @projects.each do |project| %>
             <div class="col-xs-12 col-sm-12 col-md-6 col-lg-4">
               <div class="card circuit-card">
-                <%= image_tag project_image_preview(project, current_user), alt: project.name, class: "card-img-top circuit-card-image" %>
+                <%= image_tag project.image_preview.url, alt: project.name, class: "card-img-top circuit-card-image" %>
                 <div class="card-footer circuit-card-footer">
                   <div class="circuit-card-name">
                     <p><%= project.name %></p>
diff --git a/app/views/featured_circuits/index.html.erb b/app/views/featured_circuits/index.html.erb
index 208d9297903..35eb56356bc 100644
--- a/app/views/featured_circuits/index.html.erb
+++ b/app/views/featured_circuits/index.html.erb
@@ -11,7 +11,7 @@
     <% @projects.each do |project| %>
       <div class="col-xs-12 col-sm-12 col-md-6 col-lg-4">
         <div class="card circuit-card">
-          <%= image_tag project_image_preview(project, current_user), alt: project.name, class: "card-img-top circuit-card-image" %>
+          <%= image_tag project.image_preview.url, alt: project.name, class: "card-img-top circuit-card-image" %>
           <div class="card-footer circuit-card-footer">
             <div class="circuit-card-name">
               <p><%= project.name %></p>
diff --git a/app/views/projects/get_projects.html.erb b/app/views/projects/get_projects.html.erb
index b0b0907179d..a5426e2d5f9 100644
--- a/app/views/projects/get_projects.html.erb
+++ b/app/views/projects/get_projects.html.erb
@@ -13,7 +13,7 @@
     <div class="row center-row">
       <div class="col-xs-12 col-sm-12 col-md-5 col-lg-5">
         <div class="row center-row">
-          <%= image_tag project_image_preview(project, current_user), alt: "project.name", class: "search-image" %>
+          <%= image_tag project.image_preview.url, alt: "project.name", class: "search-image" %>
         </div>
         <div class="row center-row search-view-count-container">
           <i class="fas fa-star search-star-count-icon" aria-hidden="true"></i>
diff --git a/app/views/projects/search.html.erb b/app/views/projects/search.html.erb
index 1be8576923f..2a5e6022730 100644
--- a/app/views/projects/search.html.erb
+++ b/app/views/projects/search.html.erb
@@ -16,7 +16,7 @@
       <div class="row center-row search-card-container">
         <div class="col-xs-12 col-sm-12 col-md-5 col-lg-5">
           <div class="row center-row">
-            <%= image_tag project_image_preview(project, current_user), alt: "project.name", class: "search-image" %>
+            <%= image_tag project.image_preview.url, alt: "project.name", class: "search-image" %>
           </div>
           <div class="row center-row search-view-count-container">
             <i class="fas fa-star search-star-count-icon" aria-hidden="true"></i>
diff --git a/app/views/users/circuitverse/_dashboard.html.erb b/app/views/users/circuitverse/_dashboard.html.erb
index e4b68956853..f311044b7fb 100644
--- a/app/views/users/circuitverse/_dashboard.html.erb
+++ b/app/views/users/circuitverse/_dashboard.html.erb
@@ -15,7 +15,7 @@
           </div>
         </div>
         <div class="card-body users-card-body">
-          <%= image_tag project_image_preview(project, current_user), class: "users-card-image", alt: "project.name" %>
+          <img class="users-card-image" src="<%= project.image_preview.url %>" alt="<%= project.name %>">
         </div>
         <div class="card-footer users-card-footer">
           <% if policy(project).user_access? %>
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 489d491b6c3..57a77451912 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -88,6 +88,7 @@
     # Whitelist gitpod domain in dev envionment
     config.hosts << /.*\.gitpod\.io\Z/
     config.hosts << /.*\Z/ # Whitelist everything in Dev
-  end  
+  end
+
   Paperclip.options[:command_path] = "/usr/local/bin/"
 end
diff --git a/config/initializers/flipper.rb b/config/initializers/flipper.rb
index a06babf0fa0..f20029310fb 100644
--- a/config/initializers/flipper.rb
+++ b/config/initializers/flipper.rb
@@ -9,7 +9,6 @@
   project_comments: true,
   lms_integration: true,
   vuesim: false,
-  active_storage_s3: true,
   block_registration: false
 }
 
diff --git a/db/data_migrations/20230820220904_redo_image_preview_migration.rb b/db/data_migrations/20230820220904_redo_image_preview_migration.rb
new file mode 100644
index 00000000000..a1507b9c755
--- /dev/null
+++ b/db/data_migrations/20230820220904_redo_image_preview_migration.rb
@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require "logger"
+require "redis"
+
+class RedoImagePreviewMigration < ActiveRecord::DataMigration
+  def up
+    Rails.logger = Logger.new(Rails.root.join("log/redo_image_preview_migration.log"))
+    last_migrated_project_id = redis.get("last_migrated_project_id").to_i
+    Rails.logger.info "Migrating from project_id #{last_migrated_project_id + 1}"
+    migrate_carrierwave_assets(last_migrated_project_id - 1)
+  end
+
+  def migrate_carrierwave_assets(last_migrated_project_id = 0)
+    Project.where("id > ?", last_migrated_project_id).find_each(batch_size: 100) do |project|
+      next unless project.image_preview.file
+      next if !project.image_preview.file.exists?
+      next if project.circuit_preview.attached?
+
+      begin
+        File.open(project.image_preview.path) do |image_file|
+          blob = ActiveStorage::Blob.create_and_upload!(
+            io: image_file,
+            filename: project.image_preview.identifier,
+            content_type: "image/jpeg"
+          )
+          project.circuit_preview.attach(blob)
+        end
+        Rails.logger.info "Finished migrating circuit_preview with project_id: #{project.id}"
+        redis.set("last_migrated_project_id", project.id)
+      rescue StandardError => e
+        Rails.logger.error "Error migrating project_id #{project.id}: #{e.message}"
+        next
+      end
+    end
+  end
+
+  def redis
+    @_redis = Redis.new
+  end
+end
diff --git a/db/data_migrations/20230823232747_rename_image_preview_to_circuit_preview.rb b/db/data_migrations/20230823232747_rename_image_preview_to_circuit_preview.rb
deleted file mode 100644
index dfd3b31358d..00000000000
--- a/db/data_migrations/20230823232747_rename_image_preview_to_circuit_preview.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-class RenameImagePreviewToCircuitPreview < ActiveRecord::DataMigration
-  def up
-    puts "Renaming image_preview records to circuit_preview in active_storage_attachments table"
-    sql = <<-SQL.squish
-      UPDATE active_storage_attachments
-      SET name = 'circuit_preview '
-      WHERE name = 'image_preview';
-    SQL
-    ActiveRecord::Base.connection.execute(sql)
-    puts "Finished renaming all records"
-  end
-end
diff --git a/spec/controllers/simulator_controller_spec.rb b/spec/controllers/simulator_controller_spec.rb
index 06a7454b1ce..8a75855abf8 100644
--- a/spec/controllers/simulator_controller_spec.rb
+++ b/spec/controllers/simulator_controller_spec.rb
@@ -15,58 +15,26 @@
     end
 
     describe "#create" do
-      describe "when Flipper is enabled" do
-        context "image is empty" do
-          it "creates project with default image" do
-            expect_any_instance_of(SimulatorHelper).to receive(:sanitize_data)
-            expect do
-              post "/simulator/create_data", params: { image: "", name: "Test Name" }
-            end.to change(Project, :count).by(1)
-            expect(response.status).to eq(302)
-            created_project = Project.order("created_at").last
-            expect(created_project.circuit_preview.blob).to be_nil
-            expect(created_project.image_preview.file.filename).to eq("default.png")
-          end
-        end
-
-        context "there is image data", :skip_windows do
-          it "creates project with its own image file" do
-            expect do
-              post "/simulator/create_data", params: { image:
-                "data:image/jpeg;base64,#{Faker::Alphanumeric.alpha(number: 20)}", name: "Test Name" }
-            end.to change(Project, :count).by(1)
-            created_project = Project.order("created_at").last
-            expect(created_project.circuit_preview.blob.filename.to_s).to start_with("preview_")
-            expect(created_project.image_preview.file.filename).to start_with("preview_")
-          end
+      context "image is empty" do
+        it "creates project with default image" do
+          expect_any_instance_of(SimulatorHelper).to receive(:sanitize_data)
+          expect do
+            post "/simulator/create_data", params: { image: "", name: "Test Name" }
+          end.to change(Project, :count).by(1)
+          expect(response.status).to eq(302)
+          created_project = Project.order("created_at").last
+          expect(created_project.image_preview.path.split("/")[-1]).to eq("default.png")
         end
       end
 
-      describe "when Flipper is disabled" do
-        Flipper.disable(:active_storage_s3)
-        context "image is empty" do
-          it "creates project with default image" do
-            expect_any_instance_of(SimulatorHelper).to receive(:sanitize_data)
-            expect do
-              post "/simulator/create_data", params: { image: "", name: "Test Name" }
-            end.to change(Project, :count).by(1)
-            expect(response.status).to eq(302)
-            created_project = Project.order("created_at").last
-            expect(created_project.circuit_preview.blob).to be_nil
-            expect(created_project.image_preview.file.filename).to eq("default.png")
-          end
-        end
-
-        context "there is image data", :skip_windows do
-          it "creates project with its own image file" do
-            expect do
-              post "/simulator/create_data", params: { image:
-                "data:image/jpeg;base64,#{Faker::Alphanumeric.alpha(number: 20)}", name: "Test Name" }
-            end.to change(Project, :count).by(1)
-            created_project = Project.order("created_at").last
-            expect(created_project.circuit_preview.blob.filename.to_s).to start_with("preview_")
-            expect(created_project.image_preview.file.filename).to start_with("preview_")
-          end
+      context "there is image data", :skip_windows do
+        it "creates project with its own image file" do
+          expect do
+            post "/simulator/create_data", params: { image:
+              "data:image/jpeg;base64,#{Faker::Alphanumeric.alpha(number: 20)}", name: "Test Name" }
+          end.to change(Project, :count).by(1)
+          created_project = Project.order("created_at").last
+          expect(created_project.image_preview.path.split("/")[-1]).to start_with("preview_")
         end
       end
     end
@@ -80,46 +48,22 @@
         }
       end
 
-      describe "when Flipper is enabled" do
-        context "author is signed in" do
-          it "updates project" do
-            sign_in @user
-            expect_any_instance_of(SimulatorHelper).to receive(:sanitize_data)
-            post "/simulator/update_data", params: update_params
-            @project.reload
-            expect(@project.name).to eq("Updated Name")
-            expect(response.status).to eq(200)
-          end
-        end
-
-        context "user other than author is signed in" do
-          it "throws project access error" do
-            sign_in_random_user
-            post "/simulator/update_data", params: update_params
-            expect(response.status).to eq(403)
-          end
+      context "author is signed in" do
+        it "updates project" do
+          sign_in @user
+          expect_any_instance_of(SimulatorHelper).to receive(:sanitize_data)
+          post "/simulator/update_data", params: update_params
+          @project.reload
+          expect(@project.name).to eq("Updated Name")
+          expect(response.status).to eq(200)
         end
       end
 
-      describe "when Flipper is disabled" do
-        Flipper.disable(:active_storage_s3)
-        context "author is signed in" do
-          it "updates project" do
-            sign_in @user
-            expect_any_instance_of(SimulatorHelper).to receive(:sanitize_data)
-            post "/simulator/update_data", params: update_params
-            @project.reload
-            expect(@project.name).to eq("Updated Name")
-            expect(response.status).to eq(200)
-          end
-        end
-
-        context "user other than author is signed in" do
-          it "throws project access error" do
-            sign_in_random_user
-            post "/simulator/update_data", params: update_params
-            expect(response.status).to eq(403)
-          end
+      context "user other than author is signed in" do
+        it "throws project access error" do
+          sign_in_random_user
+          post "/simulator/update_data", params: update_params
+          expect(response.status).to eq(403)
         end
       end
     end
diff --git a/spec/fixtures/files/default.png b/spec/fixtures/files/default.png
deleted file mode 100644
index 8e183a8a21dda36485b94de239e6e8a7911f982b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7548
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

diff --git a/spec/helpers/simulator_helper_spec.rb b/spec/helpers/simulator_helper_spec.rb
index 1d7423a20fe..919ffa745c5 100644
--- a/spec/helpers/simulator_helper_spec.rb
+++ b/spec/helpers/simulator_helper_spec.rb
@@ -18,52 +18,19 @@ def data_url(image_str)
 
   describe "#return_image_url" do
     context "circuit is empty" do
-      it "returns default file" do
-        expect(return_image_file(data_url(""))).to be_a(File)
-      end
-
-      it "returns the default image file" do
-        file = return_image_file("")
-        expect(file.path).to eq(Rails.public_path.join("images/default.png").to_s)
-      end
-    end
-
-    context "circuit has elements" do
-      let(:data_url) { "data:image/jpeg;base64,#{Faker::Alphanumeric.alpha(number: 100)}" }
-      let(:jpeg) { Base64.decode64(data_url[("data:image/jpeg;base64,".length)..]) }
-      let(:image_file) { StringIO.new(jpeg) }
-
-      before do
-        allow(Base64).to receive(:decode64).and_return(jpeg)
-        allow(StringIO).to receive(:new).with(jpeg).and_return(image_file)
-      end
-
-      it "creates a new File object" do
-        returned_file = return_image_file(data_url)
-        expect(returned_file.path).to start_with("tmp/preview_")
-      end
-    end
-  end
-
-  describe "#parse_image_data_url" do
-    context "circuit is empty" do
-      it "returns nil" do
-        expect(parse_image_data_url(data_url(""))).to be_nil
+      it "returns image url" do
+        expect(return_image_file(data_url("")).path).to end_with("default.png")
       end
     end
 
     context "circuit has elements" do
-      let(:data_url) { "data:image/jpeg;base64,#{Faker::Alphanumeric.alpha(number: 100)}" }
-      let(:jpeg) { Base64.decode64(data_url[("data:image/jpeg;base64,".length)..]) }
-      let(:image_file) { StringIO.new(jpeg) }
-
       before do
-        allow(Base64).to receive(:decode64).and_return(jpeg)
-        allow(StringIO).to receive(:new).with(jpeg).and_return(image_file)
+        allow(File).to receive(:new).and_return(file_like_object)
       end
 
-      it "creates a new StringIO object" do
-        expect(parse_image_data_url(data_url)).to eq(image_file)
+      it "creates new preview file" do
+        expect(File).to receive(:new).with(%r{^tmp/preview_.*\.jpeg$}, "wb")
+        return_image_file(data_url(Faker::Alphanumeric.alpha))
       end
     end
   end
diff --git a/spec/helpers/users_circuitverse_helper_spec.rb b/spec/helpers/users_circuitverse_helper_spec.rb
index 016dcc7ac34..c5647a91db8 100644
--- a/spec/helpers/users_circuitverse_helper_spec.rb
+++ b/spec/helpers/users_circuitverse_helper_spec.rb
@@ -62,58 +62,4 @@
       expect(user_profile_picture(user1.profile_picture)).to eq("/images/thumb/Default.jpg")
     end
   end
-
-  describe "#project_image_preview" do
-    context "Flipper is enabled" do
-      before do
-        @user = FactoryBot.create(:user)
-        @project = FactoryBot.create(:project)
-        @project.circuit_preview.attach(
-          io: Rails.root.join("spec/fixtures/files/default.png").open,
-          filename: "preview_1234.jpeg",
-          content_type: "img/jpeg"
-        )
-      end
-
-      it "returns ActiveStorage attachment" do
-        circuit_preview = send(:return_circuit_preview, @project)
-        expect(Flipper.enabled?(:active_storage_s3, @user)).to be true
-        expect(circuit_preview).to eq(@project.circuit_preview)
-        expect(project_image_preview(@project, @user)).to eq(@project.circuit_preview)
-      end
-
-      it "returns default image" do
-        @project.circuit_preview.purge
-        expect(Flipper.enabled?(:active_storage_s3, @user)).to be true
-        default_image_path = send(:return_circuit_preview, @project)
-        expect(default_image_path).to eq("/images/empty_project/default.png")
-        expect(project_image_preview(@project, @user)).to eq("/images/empty_project/default.png")
-      end
-    end
-
-    context "Flipper is Disabled" do
-      before do
-        Flipper.disable(:active_storage_s3)
-        @user = FactoryBot.create(:user)
-        @project = FactoryBot.create(:project)
-      end
-
-      it "returns default image" do
-        @project.image_preview = nil
-        expect(Flipper.enabled?(:active_storage_s3, @user)).to be false
-        default_image_path = send(:return_image_preview, @project)
-        expect(default_image_path).to eq("/images/empty_project/default.png")
-        expect(project_image_preview(@project, @user)).to eq("/images/empty_project/default.png")
-      end
-
-      it "returns PaperClip url" do
-        image_file = Rails.root.join("spec/fixtures/files/default.png").open
-        @project.image_preview = image_file
-        expect(Flipper.enabled?(:active_storage_s3, @user)).to be false
-        image_preview_url = send(:return_image_preview, @project)
-        expect(image_preview_url).to eq(@project.image_preview.url)
-        expect(project_image_preview(@project, @user)).to eq(@project.image_preview.url)
-      end
-    end
-  end
 end
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 16c188be39d..1d442a25e69 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -45,9 +45,6 @@
   config.include Devise::Test::ControllerHelpers, type: :controller
   config.include FactoryBot::Syntax::Methods
 
-  config.before do
-    Flipper.enable(:active_storage_s3)
-  end
   # If you're not using ActiveRecord, or you'd prefer not to run each of your
   # examples within a transaction, remove the following line or assign false
   # instead of true.
diff --git a/spec/requests/api/v1/projects_controller/create_fork_spec.rb b/spec/requests/api/v1/projects_controller/create_fork_spec.rb
index 885eb849a41..8390fcdefb4 100644
--- a/spec/requests/api/v1/projects_controller/create_fork_spec.rb
+++ b/spec/requests/api/v1/projects_controller/create_fork_spec.rb
@@ -47,7 +47,6 @@
 
     context "when forks other user's project" do
       before do
-        Flipper.disable :active_storage_s3
         token = get_auth_token(random_user)
         post "/api/v1/projects/#{project.id}/fork",
              headers: { Authorization: "Token #{token}" }, as: :json
@@ -61,7 +60,6 @@
 
     context "when forks other user's project and includes author details" do
       before do
-        Flipper.disable :active_storage_s3
         token = get_auth_token(random_user)
         post "/api/v1/projects/#{project.id}/fork?include=author",
              headers: { Authorization: "Token #{token}" }, as: :json
@@ -75,7 +73,6 @@
 
     context "when forks other user's project and includes collaborators" do
       before do
-        Flipper.disable :active_storage_s3
         token = get_auth_token(random_user)
         post "/api/v1/projects/#{project.id}/fork?include=collaborators",
              headers: { Authorization: "Token #{token}" }, as: :json
diff --git a/spec/requests/api/v1/projects_controller/image_preview_spec.rb b/spec/requests/api/v1/projects_controller/image_preview_spec.rb
index a9fdc470c98..574724caef7 100644
--- a/spec/requests/api/v1/projects_controller/image_preview_spec.rb
+++ b/spec/requests/api/v1/projects_controller/image_preview_spec.rb
@@ -25,6 +25,9 @@
 
       it "returns image preview" do
         expect(response).to have_http_status(:ok)
+        expect(response.parsed_body["project_preview"]).to eq(
+          request.base_url + public_project.image_preview.url
+        )
       end
     end
   end
diff --git a/spec/requests/api/v1/users_controller/index_spec.rb b/spec/requests/api/v1/users_controller/index_spec.rb
index 56aa91bfb9c..17e41b655d0 100644
--- a/spec/requests/api/v1/users_controller/index_spec.rb
+++ b/spec/requests/api/v1/users_controller/index_spec.rb
@@ -19,7 +19,7 @@
 
     context "when authenticated" do
       before do
-        token = get_auth_token(users_list.last)
+        token = get_auth_token(users_list.first)
         get "/api/v1/users", headers: { Authorization: "Token #{token}" }, as: :json
       end
 
diff --git a/spec/requests/api/v1/users_controller/update_spec.rb b/spec/requests/api/v1/users_controller/update_spec.rb
index 8773ef5f0e9..a02ac32939a 100644
--- a/spec/requests/api/v1/users_controller/update_spec.rb
+++ b/spec/requests/api/v1/users_controller/update_spec.rb
@@ -77,7 +77,6 @@
 
     context "when authenticated as the user and removes the uploaded picture" do
       before do
-        Flipper.disable(:active_storage_s3)
         # user having profile picture
         new_user = FactoryBot.create(:user)
         token = get_auth_token(new_user)
diff --git a/spec/support/api/schemas/assignment_with_projects.json b/spec/support/api/schemas/assignment_with_projects.json
index 4ce249351f8..717417cb8f1 100644
--- a/spec/support/api/schemas/assignment_with_projects.json
+++ b/spec/support/api/schemas/assignment_with_projects.json
@@ -92,14 +92,14 @@
               "project_access_type": { "type": "string" },
               "created_at": { "type": "string" },
               "updated_at": { "type": "string" },
-			  "image_preview": {
+              "image_preview": {
                 "type": "object",
                 "properties": {
                   "url": { "type": "string" }
                 },
                 "required": ["url"]
               },
-			  "description": { "type": "string" },
+              "description": { "type": "string" },
               "view": { "type": "integer" },
               "is_starred": { "type": ["boolean", "null"] },
               "author_name": { "type": "string" },
diff --git a/spec/support/api/schemas/project.json b/spec/support/api/schemas/project.json
index 8b1266c64e1..5e97bfeba8a 100644
--- a/spec/support/api/schemas/project.json
+++ b/spec/support/api/schemas/project.json
@@ -13,14 +13,14 @@
             "project_access_type": { "type": "string" },
             "created_at": { "type": "string" },
             "updated_at": { "type": "string" },
-			"image_preview": {
+            "image_preview": {
               "type": "object",
               "properties": {
                 "url": { "type": "string" }
               },
               "required": ["url"]
             },
-			"description": { "type": "string" },
+            "description": { "type": "string" },
             "view": { "type": "integer" },
             "is_starred": { "type": ["boolean", "null"] },
             "author_name": { "type": "string" },
diff --git a/spec/support/api/schemas/project_with_author.json b/spec/support/api/schemas/project_with_author.json
index 303e60a22b2..ce4a2fcaff3 100644
--- a/spec/support/api/schemas/project_with_author.json
+++ b/spec/support/api/schemas/project_with_author.json
@@ -13,14 +13,14 @@
             "project_access_type": { "type": "string" },
             "created_at": { "type": "string" },
             "updated_at": { "type": "string" },
-			"image_preview": {
+            "image_preview": {
               "type": "object",
               "properties": {
                 "url": { "type": "string" }
               },
               "required": ["url"]
             },
-			"description": { "type": "string" },
+            "description": { "type": "string" },
             "view": { "type": "integer" },
             "is_starred": { "type": ["boolean", "null"] },
             "author_name": { "type": "string" },
diff --git a/spec/support/api/schemas/project_with_collaborators.json b/spec/support/api/schemas/project_with_collaborators.json
index 71629074e07..c154c1f2e2b 100644
--- a/spec/support/api/schemas/project_with_collaborators.json
+++ b/spec/support/api/schemas/project_with_collaborators.json
@@ -13,14 +13,14 @@
             "project_access_type": { "type": "string" },
             "created_at": { "type": "string" },
             "updated_at": { "type": "string" },
-			"image_preview": {
+            "image_preview": {
               "type": "object",
               "properties": {
                 "url": { "type": "string" }
               },
               "required": ["url"]
             },
-			"description": { "type": "string" },
+            "description": { "type": "string" },
             "view": { "type": "integer" },
             "is_starred": { "type": ["boolean", "null"] },
             "author_name": { "type": "string" },
diff --git a/spec/support/api/schemas/projects.json b/spec/support/api/schemas/projects.json
index c087b5739d2..ed0133fec29 100644
--- a/spec/support/api/schemas/projects.json
+++ b/spec/support/api/schemas/projects.json
@@ -15,14 +15,14 @@
               "project_access_type": { "type": "string" },
               "created_at": { "type": "string" },
               "updated_at": { "type": "string" },
-			  "image_preview": {
+              "image_preview": {
                 "type": "object",
                 "properties": {
                   "url": { "type": "string" }
                 },
                 "required": ["url"]
               },
-			  "description": { "type": "string" },
+              "description": { "type": "string" },
               "view": { "type": "integer" },
               "is_starred": { "type": ["boolean", "null"] },
               "author_name": { "type": "string" },
diff --git a/spec/support/api/schemas/projects_with_author.json b/spec/support/api/schemas/projects_with_author.json
index f441d229ba0..45d9d81517a 100644
--- a/spec/support/api/schemas/projects_with_author.json
+++ b/spec/support/api/schemas/projects_with_author.json
@@ -22,7 +22,7 @@
                 },
                 "required": ["url"]
               },
-			  "description": { "type": "string" },
+              "description": { "type": "string" },
               "view": { "type": "integer" },
               "is_starred": { "type": ["boolean", "null"] },
               "author_name": { "type": "string" },
diff --git a/spec/support/api/schemas/projects_with_collaborators.json b/spec/support/api/schemas/projects_with_collaborators.json
index bf8e779acdd..616826a6037 100644
--- a/spec/support/api/schemas/projects_with_collaborators.json
+++ b/spec/support/api/schemas/projects_with_collaborators.json
@@ -16,7 +16,11 @@
               "created_at": { "type": "string" },
               "updated_at": { "type": "string" },
               "image_preview": {
-                "type": ["null", "string"]
+                "type": "object",
+                "properties": {
+                  "url": { "type": "string" }
+                },
+                "required": ["url"]
               },
               "description": { "type": "string" },
               "view": { "type": "integer" },
diff --git a/spec/support/api/schemas/read_notification.json b/spec/support/api/schemas/read_notification.json
index 948e4b988cb..7cc5d682fde 100644
--- a/spec/support/api/schemas/read_notification.json
+++ b/spec/support/api/schemas/read_notification.json
@@ -57,7 +57,7 @@
                           "string"
                         ]
                       },
-                      "admin": {
+					  "admin": {
                         "type": "boolean"
                       },
                       "country": {
@@ -119,6 +119,17 @@
                       "project_submission": {
                         "type": "boolean"
                       },
+                      "image_preview": {
+                        "type": "object",
+                        "properties": {
+                          "url": {
+                            "type": "string"
+                          }
+                        },
+                        "required": [
+                          "url"
+                        ]
+                      },
                       "description": {
                         "type": "string"
                       },
diff --git a/spec/support/api/schemas/read_notifications.json b/spec/support/api/schemas/read_notifications.json
index 631ce6ce7b3..84d7305589b 100644
--- a/spec/support/api/schemas/read_notifications.json
+++ b/spec/support/api/schemas/read_notifications.json
@@ -57,7 +57,7 @@
                           "string"
                         ]
                       },
-                      "admin": {
+					  "admin": {
                         "type": "boolean"
                       },
                       "country": {
@@ -119,13 +119,17 @@
                       "project_submission": {
                         "type": "boolean"
                       },
-					  "image_preview": {
-						"type": "object",
-						  "properties": {
-							"url": { "type": "string" }
-						  },
-						"required": ["url"]
-					  }, 
+                      "image_preview": {
+                        "type": "object",
+                        "properties": {
+                          "url": {
+                            "type": "string"
+                          }
+                        },
+                        "required": [
+                          "url"
+                        ]
+                      },
                       "description": {
                         "type": "string"
                       },
diff --git a/spec/support/api/schemas/unread_notifications.json b/spec/support/api/schemas/unread_notifications.json
index 01b1f3b98cb..f860ef05d8a 100644
--- a/spec/support/api/schemas/unread_notifications.json
+++ b/spec/support/api/schemas/unread_notifications.json
@@ -57,7 +57,7 @@
                           "string"
                         ]
                       },
-                      "admin": {
+					  "admin": {
                         "type": "boolean"
                       },
                       "country": {
@@ -119,16 +119,20 @@
                       "project_submission": {
                         "type": "boolean"
                       },
+                      "image_preview": {
+                        "type": "object",
+                        "properties": {
+                          "url": {
+                            "type": "string"
+                          }
+                        },
+                        "required": [
+                          "url"
+                        ]
+                      },
                       "description": {
                         "type": "string"
                       },
-					  "image_preview": {
-						"type": "object",
-						  "properties": {
-							"url": { "type": "string" }
-						  },
-						"required": ["url"]
-					  }, 
                       "view": {
                         "type": "integer"
                       },

From 35be97956ba1d276e4eb1bac0488dea383f86fd7 Mon Sep 17 00:00:00 2001
From: Aboobacker MK <aboobackervyd@gmail.com>
Date: Sat, 30 Dec 2023 20:46:59 +0530
Subject: [PATCH 8/8] Revert "fix: title text (#4220)" (#4464)

This reverts commit 44dc58fc05f937511f093832bb5d70e8a02126be.
---
 simulator/src/css/main.stylesheet.css | 1 -
 simulator/src/data/save.js            | 1 -
 2 files changed, 2 deletions(-)

diff --git a/simulator/src/css/main.stylesheet.css b/simulator/src/css/main.stylesheet.css
index ee9aa545406..172bc1dc2ab 100644
--- a/simulator/src/css/main.stylesheet.css
+++ b/simulator/src/css/main.stylesheet.css
@@ -173,7 +173,6 @@ input[type="text"]:focus {
     font-size: 1em;
     text-align: center;
     display: inline-block;
-    white-space: nowrap;
     width: 35vw;
     height: 1.2rem;
     overflow: hidden;
diff --git a/simulator/src/data/save.js b/simulator/src/data/save.js
index c0b3f1a0bfb..1f108fb3270 100755
--- a/simulator/src/data/save.js
+++ b/simulator/src/data/save.js
@@ -28,7 +28,6 @@ export function setProjectName(name) {
     name = stripTags(name);
     projectName = name;
     $('#projectName').html(name);
-    document.getElementById("projectName").setAttribute("title",name);
 }
 
 /**