fix: move shared atoms to common namespace

CSCfi · Nov 4, 2024 · 68ea7cf · 68ea7cf
1 parent 6c5a820
commit 68ea7cf
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 9 deletions.
diff --git a/src/cljc/rems/common/atoms.cljc b/src/cljc/rems/common/atoms.cljc
@@ -0,0 +1,5 @@
+(ns rems.common.atoms)
+
+(def nbsp "\u00A0") ; non breaking space
+(def nbhy "\u2011") ; non breaking hyphen
+(def hamburger "\u2630") ; the hamburger menu icon
diff --git a/src/cljs/rems/administration/create_license.cljs b/src/cljs/rems/administration/create_license.cljs
@@ -3,8 +3,9 @@
             [re-frame.core :as rf]
             [rems.administration.administration :as administration]
             [rems.administration.components :refer [localized-text-field localized-textarea-autosize organization-field radio-button-group]]
-            [rems.atoms :as atoms :refer [document-title failure-symbol file-download nbsp]]
+            [rems.atoms :as atoms :refer [document-title failure-symbol file-download]]
             [rems.collapsible :as collapsible]
+            [rems.common.atoms :refer [nbsp]]
             [rems.common.attachment-util :as attachment-util]
             [rems.config]
             [rems.globals]

diff --git a/src/cljs/rems/application.cljs b/src/cljs/rems/application.cljs
@@ -35,7 +35,8 @@
             [rems.administration.duo :refer [duo-field duo-info-field]]
             [rems.common.application-util :refer [accepted-licenses? can-see-everything? form-fields-editable? get-member-name is-handler? is-handling-user?]]
             [rems.common.attachment-util :as attachment-util]
-            [rems.atoms :as atoms :refer [document-title external-link file-download info-field make-empty-symbol nbsp readonly-checkbox success-symbol]]
+            [rems.atoms :as atoms :refer [document-title external-link file-download info-field make-empty-symbol readonly-checkbox success-symbol]]
+            [rems.common.atoms :refer [nbsp]]
             [rems.common.catalogue-util :refer [catalogue-item-more-info-url]]
             [rems.collapsible :as collapsible]
             [rems.common.form :as form]

diff --git a/src/cljs/rems/atoms.cljs b/src/cljs/rems/atoms.cljs
@@ -8,10 +8,6 @@
             [rems.text :refer [text text-format localized localize-attachment]]
             [rems.util :refer [class-names]]))
 
-(def nbsp "\u00A0") ; non breaking space
-(def nbhy "\u2011") ; non breaking hyphen
-(def hamburger "\u2630") ; the hamburger menu icon
-
 (defn external-link []
   [:i {:class "fa fa-external-link-alt"}
    [:span.sr-only (text :t.link/opens-in-new-window)]])

diff --git a/src/cljs/rems/navbar.cljs b/src/cljs/rems/navbar.cljs
@@ -3,6 +3,7 @@
             [re-frame.core :as rf]
             [rems.ajax]
             [rems.atoms :as atoms]
+            [rems.common.atoms :refer [hamburger]]
             [rems.common.util :refer [getx]]
             [rems.common.roles :as roles]
             [rems.config]
@@ -105,7 +106,7 @@
    [:div.navbar.navbar-expand-sm.flex-fill
     [:button.navbar-toggler
      {:type :button :data-toggle "collapse" :data-target "#small-navbar"}
-     atoms/hamburger]
+     hamburger]
     (when (rems.theme/use-navbar-logo?)
       [:div.navbar-brand.logo-menu
        [:div.img]])

diff --git a/src/cljs/rems/phase.cljs b/src/cljs/rems/phase.cljs
@@ -1,5 +1,5 @@
 (ns rems.phase
-  (:require [rems.atoms :refer [nbsp]]
+  (:require [rems.common.atoms :refer [nbsp]]
             [rems.guide-util :refer [component-info example]]
             [rems.text :refer [text]]))
 

diff --git a/test/clj/rems/application/test_model.clj b/test/clj/rems/application/test_model.clj
@@ -7,7 +7,7 @@
             [rems.api.schema :as schema]
             [rems.application.events :as events]
             [rems.application.model :as model]
-            [rems.atoms :refer [nbsp nbhy]]
+            [rems.common.atoms :refer [nbsp nbhy]]
             [rems.common.application-util :as application-util]
             [rems.common.util :refer [deep-merge]]
             [rems.permissions :as permissions]