Fixed CF-filtering

Author: mrvisscher

activity_browser/bwutils/multilca.py

@@ -648,15 +648,14 @@ def _build_inventory(
         data.columns = Contributions.get_labels(columns, max_length=30)
 
         data = pd.merge(
-            AB_metadata.dataframe[fields + ["id"]], data, right_index=True, left_on="id", how="right"
+            AB_metadata.dataframe[fields], data, right_index=True, left_on="id", how="right"
         )
         data.reset_index(inplace=True, drop=True)
-        data.drop(columns="id", inplace=True)
 
         return data
 
     def inventory_df(
-        self, inventory_type: str, columns: set = {"name", "database", "code"}
+        self, inventory_type: str, columns: set = {"name", "database", "code", "id"}
     ) -> pd.DataFrame:
         """Return an inventory dataframe with metadata of the given type."""
         try:

activity_browser/layouts/pages/lca_results/LCA_results.py

@@ -613,9 +613,7 @@ def elementary_flows_contributing_to_IA_methods(
             flows = (
                 set(self.parent.contributions.inventory_data["biosphere"][1].values())
             ).difference(incl_flows)
-        new_flows = [flow[1] for flow in flows]
-
-        return data.loc[data["code"].isin(new_flows)]
+        return data.loc[data["id"].isin(flows)]
 
     def update_table(self):
         """Update the table."""
@@ -661,9 +659,9 @@ def clear_tables(self) -> None:
         """Set the biosphere and technosphere to None."""
         self.df_biosphere, self.df_technosphere = None, None
 
-    def _update_table(self, table: pd.DataFrame, drop: str = "code"):
+    def _update_table(self, table: pd.DataFrame, drop: tuple = ("code", "id")):
         """Update the table."""
-        self.table.model.sync((table.drop(drop, axis=1)).reset_index(drop=True))
+        self.table.model.sync((table.drop(list(drop), axis=1)).reset_index(drop=True))
 
 
 class LCAResultsTab(NewAnalysisTab):