fix(orga): fix some styles + orga spaces import

bimdata · Oct 29, 2021 · 452e1e1 · 452e1e1
1 parent b05ffcf
commit 452e1e1
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 13 deletions.
diff --git a/...anizations/organizations-manager/organization-spaces-import/OrganizationSpacesImport.scss b/...anizations/organizations-manager/organization-spaces-import/OrganizationSpacesImport.scss
@@ -13,6 +13,7 @@
     }
 
     .list-container {
+      flex-grow: 1;
       display: flex;
       flex-direction: column;
       padding-bottom: calc(var(--spacing-unit) / 2);

diff --git a/...ganizations/organizations-manager/organization-spaces-import/OrganizationSpacesImport.vue b/...ganizations/organizations-manager/organization-spaces-import/OrganizationSpacesImport.vue
@@ -7,9 +7,20 @@
 
       <template v-else>
         <div class="organization-spaces-import__content">
+          <BIMDataButton
+            color="primary"
+            fill
+            radius
+            :disabled="selection.size < 1"
+            @click="submit"
+          >
+            {{ $t("OrganizationSpacesImport.submitButtonText") }}
+          </BIMDataButton>
+
           <div class="list-title">
             {{ $t("OrganizationSpacesImport.spaceListTitle") }}
           </div>
+
           <div class="list-container">
             <div class="list-item" v-for="space of spaces" :key="space.id">
               <BIMDataCheckbox
@@ -37,17 +48,6 @@
           <div class="list-placeholder" v-if="spaces.length === 0">
             {{ $t("OrganizationSpacesImport.spaceListPlaceholder") }}
           </div>
-
-          <BIMDataButton
-            v-else
-            color="primary"
-            fill
-            radius
-            :disabled="selection.size < 1"
-            @click="submit"
-          >
-            {{ $t("OrganizationSpacesImport.submitButtonText") }}
-          </BIMDataButton>
         </div>
       </template>
     </transition>

diff --git a/.../organizations/organizations-manager/organization-spaces-list/OrganizationSpacesList.scss b/.../organizations/organizations-manager/organization-spaces-list/OrganizationSpacesList.scss
@@ -23,6 +23,7 @@
   }
 
   &__container {
+    flex-grow: 1;
     display: flex;
     flex-direction: column;
     padding-bottom: calc(var(--spacing-unit) / 2);

diff --git a/...ts/specific/organizations/organizations-manager/organizations-list/OrganizationsList.scss b/...ts/specific/organizations/organizations-manager/organizations-list/OrganizationsList.scss
@@ -14,6 +14,7 @@
   }
 
   .list-container {
+    flex-grow: 1;
     display: flex;
     flex-direction: column;
     padding-bottom: calc(var(--spacing-unit) / 2);

diff --git a/src/state/organizations.js b/src/state/organizations.js
@@ -8,7 +8,7 @@ const state = reactive({
 
 const resetState = () => {
   state.userOrganizations = [];
-  state.organizationSpaces = {};
+  state.organizationsSpaces = {};
 };
 
 const retrieveUserOrganizations = async () => {
@@ -60,7 +60,12 @@ const importOrganizationSpaces = async (organization, spaces) => {
       OrganizationService.updateSpaceOrganization(space, organization)
     )
   );
-  await retrieveOrganizationSpaces(organization);
+  const updatedOrganizations = [organization].concat(
+    spaces.map(space => space.organization)
+  );
+  await Promise.all(
+    updatedOrganizations.map(orga => retrieveOrganizationSpaces(orga))
+  );
   return importedSpaces;
 };