Merge branch 'main' into 11-25-backend_endpoints_for_instance_creatio…

…n_and_dataelement_operations
Altinn · Dec 5, 2024 · b3d7e4e · b3d7e4e
2 parents a5fba66 + b13bf2d
commit b3d7e4e
Show file tree

Hide file tree

Showing 48 changed files with 705 additions and 392 deletions.
diff --git a/.github/workflows/template-flux-config-push.yaml b/.github/workflows/template-flux-config-push.yaml
@@ -72,7 +72,7 @@ jobs:
                                 --password-stdin
 
       - name: Setup Flux CLI
-        uses: fluxcd/flux2/action@v2.3.0
+        uses: fluxcd/flux2/action@v2.4.0
 
       - name: Generate cofiguration file
         run: |

diff --git a/...pp-development/features/dataModelling/SchemaEditorWithToolbar/LandingPagePanel.module.css b/...pp-development/features/dataModelling/SchemaEditorWithToolbar/LandingPagePanel.module.css
@@ -1,9 +1,9 @@
 .buttonWrapper {
   display: flex;
   flex-direction: row;
-  gap: var(--ds-spacing-3);
-  padding-top: var(--ds-spacing-3);
-  padding-bottom: var(--ds-spacing-3);
+  gap: var(--fds-spacing-3);
+  padding-top: var(--fds-spacing-3);
+  padding-bottom: var(--fds-spacing-3);
   align-items: center;
 }
 
@@ -13,7 +13,7 @@
   background-color: var(--fds-semantic-surface-info-subtle);
   box-shadow: 1px 1px 3px 2px rgb(0 0 0 / 25%);
   padding: var(--fds-spacing-10);
-  gap: var(--ds-spacing-8);
+  gap: var(--fds-spacing-8);
   width: 40%;
   height: fit-content;
   margin-top: var(--fds-spacing-10);

diff --git a/...pp-development/features/dataModelling/SchemaEditorWithToolbar/SchemaEditorWithToolbar.tsx b/...pp-development/features/dataModelling/SchemaEditorWithToolbar/SchemaEditorWithToolbar.tsx
@@ -18,7 +18,7 @@ export const SchemaEditorWithToolbar = ({
   createPathOption,
   dataModels,
 }: SchemaEditorWithToolbarProps) => {
-  const [createNewOpen, setCreateNewOpen] = useState<boolean>(false);
+  const [isCreateNewOpen, setIsCreateNewOpen] = useState<boolean>(false);
   const [selectedOption, setSelectedOption] = useState<MetadataOption | undefined>(undefined);
   const [schemaGenerationErrorMessages, setSchemaGenerationErrorMessages] = useState<string[]>([]);
   const { mutate: addXsdFromRepo } = useAddXsdMutation();
@@ -41,11 +41,11 @@ export const SchemaEditorWithToolbar = ({
   return (
     <div className={classes.root}>
       <TopToolbar
-        createNewOpen={createNewOpen}
+        isCreateNewOpen={isCreateNewOpen}
         createPathOption={createPathOption}
         dataModels={dataModels}
         selectedOption={existingSelectedOption}
-        setCreateNewOpen={setCreateNewOpen}
+        setIsCreateNewOpen={setIsCreateNewOpen}
         setSelectedOption={setSelectedOption}
         onSetSchemaGenerationErrorMessages={(errorMessages: string[]) =>
           setSchemaGenerationErrorMessages(errorMessages)
@@ -58,7 +58,7 @@ export const SchemaEditorWithToolbar = ({
         />
       )}
       <main className={classes.main}>
-        {!dataModels.length && <LandingPagePanel openCreateNew={() => setCreateNewOpen(true)} />}
+        {!dataModels.length && <LandingPagePanel openCreateNew={() => setIsCreateNewOpen(true)} />}
         {modelPath && <SelectedSchemaEditor modelPath={modelPath} />}
       </main>
     </div>

diff --git a/...ent/features/dataModelling/SchemaEditorWithToolbar/TopToolbar/CreateNewWrapper.module.css b/...ent/features/dataModelling/SchemaEditorWithToolbar/TopToolbar/CreateNewWrapper.module.css
diff --git a/...pment/features/dataModelling/SchemaEditorWithToolbar/TopToolbar/CreateNewWrapper.test.tsx b/...pment/features/dataModelling/SchemaEditorWithToolbar/TopToolbar/CreateNewWrapper.test.tsx
diff --git a/...evelopment/features/dataModelling/SchemaEditorWithToolbar/TopToolbar/CreateNewWrapper.tsx b/...evelopment/features/dataModelling/SchemaEditorWithToolbar/TopToolbar/CreateNewWrapper.tsx
diff --git a/...Modelling/SchemaEditorWithToolbar/TopToolbar/CreateNewWrapper/CreateNewWrapper.module.css b/...Modelling/SchemaEditorWithToolbar/TopToolbar/CreateNewWrapper/CreateNewWrapper.module.css
@@ -0,0 +1,8 @@
+.popover {
+  display: flex;
+  flex-direction: column;
+  gap: var(--fds-spacing-3);
+
+  /* This is so that popovers goes above the header which has an z-index of 2000 */
+  z-index: 2001;
+}