diff --git a/app/Console/Commands/GeneratePropertiesJson.php b/app/Console/Commands/GeneratePropertiesJson.php index 71bd75a5..bcbf7f96 100644 --- a/app/Console/Commands/GeneratePropertiesJson.php +++ b/app/Console/Commands/GeneratePropertiesJson.php @@ -113,6 +113,7 @@ public function handle() // Determine the key for the JSON output $key = $invertedFilterMap[$column] ?? $column; + $columnData['key'] = $key; // Add the column data using the determined key $jsonOutput[$key] = $columnData; diff --git a/app/Helper.php b/app/Helper.php index 6866e47a..d86404c0 100644 --- a/app/Helper.php +++ b/app/Helper.php @@ -441,25 +441,30 @@ function getFilterMap() return [ 'mf' => 'molecular_formula', 'mw' => 'molecular_weight', + 'emw' => 'exact_molecular_weight', 'hac' => 'heavy_atom_count', 'tac' => 'total_atom_count', - 'arc' => 'aromatic_ring_count', + 'arc' => 'aromatic_rings_count', 'rbc' => 'rotatable_bond_count', - 'mrc' => 'minimal_number_of_rings', + 'mrc' => 'number_of_minimal_rings', 'fc' => 'formal_charge', 'cs' => 'contains_sugar', 'crs' => 'contains_ring_sugars', 'cls' => 'contains_linear_sugars', - 'npl' => 'np_likeness_score', + 'np' => 'np_likeness', + 'qed' => 'qed_drug_likeliness', 'alogp' => 'alogp', - 'topopsa' => 'topo_psa', - 'fsp3' => 'fsp3', - 'hba' => 'h_bond_acceptor_count', - 'hbd' => 'h_bond_donor_count', + 'topopsa' => 'topological_polar_surface_area', + 'fcsp3' => 'fractioncsp3', + 'fragments' => 'fragments', + 'fws' => 'fragments_with_sugar', + 'hba' => 'hydrogen_bond_acceptors', + 'hbd' => 'hydrogen_bond_donors', 'ro5v' => 'rule_of_5_violations', - 'lhba' => 'lipinski_h_bond_acceptor_count', - 'lhbd' => 'lipinski_h_bond_donor_count', - 'lro5v' => 'lipinski_rule_of_5_violations', + 'lhba' => 'hydrogen_bond_acceptors_lipinski', + 'lhbd' => 'hydrogen_bond_donors_lipinski', + 'lro5v' => 'lipinski_rule_of_five_violations', + 'vdwv' => 'van_der_walls_volume', 'ds' => 'found_in_databases', 'class' => 'chemical_class', 'subclass' => 'chemical_sub_class', diff --git a/public/assets/properties_metadata.json b/public/assets/properties_metadata.json index c50d27ba..f6be33b2 100644 --- a/public/assets/properties_metadata.json +++ b/public/assets/properties_metadata.json @@ -5,7 +5,8 @@ "range": { "min": 1, "max": 1071 - } + }, + "key": "tac" }, "hac": { "type": "range", @@ -13,7 +14,8 @@ "range": { "min": 0, "max": 551 - } + }, + "key": "hac" }, "mw": { "type": "range", @@ -21,15 +23,17 @@ "range": { "min": "1.01", "max": "7860.71" - } + }, + "key": "mw" }, - "exact_molecular_weight": { + "emw": { "type": "range", "label": "Exact molecular weight", "range": { "min": "1.00728", "max": "7855.66038" - } + }, + "key": "emw" }, "alogp": { "type": "range", @@ -37,15 +41,17 @@ "range": { "min": "-83.67", "max": "67.03" - } + }, + "key": "alogp" }, - "topological_polar_surface_area": { + "topopsa": { "type": "range", "label": "Topological polar surface area", "range": { "min": "0.00", "max": "3453.72" - } + }, + "key": "topopsa" }, "rbc": { "type": "range", @@ -53,63 +59,71 @@ "range": { "min": 0, "max": 224 - } + }, + "key": "rbc" }, - "hydrogen_bond_acceptors": { + "hba": { "type": "range", "label": "Hydrogen bond acceptors", "range": { "min": 0, "max": 191 - } + }, + "key": "hba" }, - "hydrogen_bond_donors": { + "hbd": { "type": "range", "label": "Hydrogen bond donors", "range": { "min": 0, "max": 116 - } + }, + "key": "hbd" }, - "hydrogen_bond_acceptors_lipinski": { + "lhba": { "type": "range", "label": "Hydrogen bond acceptors lipinski", "range": { "min": 0, "max": 191 - } + }, + "key": "lhba" }, - "hydrogen_bond_donors_lipinski": { + "lhbd": { "type": "range", "label": "Hydrogen bond donors lipinski", "range": { "min": 0, "max": 116 - } + }, + "key": "lhbd" }, - "lipinski_rule_of_five_violations": { + "lro5v": { "type": "range", "label": "Lipinski rule of five violations", "range": { "min": 0, "max": 4 - } + }, + "key": "lro5v" }, - "aromatic_rings_count": { + "arc": { "type": "range", "label": "Aromatic rings count", "range": { "min": 0, "max": 31 - } + }, + "key": "arc" }, - "qed_drug_likeliness": { + "qed": { "type": "range", "label": "Qed drug likeliness", "range": { "min": "0.00", "max": "0.95" - } + }, + "key": "qed" }, "fc": { "type": "range", @@ -117,31 +131,35 @@ "range": { "min": -8, "max": 7 - } + }, + "key": "fc" }, - "fractioncsp3": { + "fcsp3": { "type": "range", "label": "Fractioncsp3", "range": { "min": "0.00", "max": "1.00" - } + }, + "key": "fcsp3" }, - "number_of_minimal_rings": { + "mrc": { "type": "range", "label": "Number of minimal rings", "range": { "min": 0, "max": 51 - } + }, + "key": "mrc" }, - "van_der_walls_volume": { + "vdwv": { "type": "range", "label": "Van der walls volume", "range": { "min": "10.14", "max": "5177.31" - } + }, + "key": "vdwv" }, "cs": { "type": "boolean", @@ -149,7 +167,8 @@ "values": [ true, false - ] + ], + "key": "cs" }, "crs": { "type": "boolean", @@ -157,7 +176,8 @@ "values": [ true, false - ] + ], + "key": "crs" }, "cls": { "type": "boolean", @@ -165,25 +185,29 @@ "values": [ true, false - ] + ], + "key": "cls" }, "fragments": { "type": "select", "label": "Fragments", - "unique_values": [] + "unique_values": [], + "key": "fragments" }, - "fragments_with_sugar": { + "fws": { "type": "select", "label": "Fragments with sugar", - "unique_values": [] + "unique_values": [], + "key": "fws" }, - "np_likeness": { + "np": { "type": "range", "label": "Np likeness", "range": { "min": "-3.53", "max": "4.12" - } + }, + "key": "np" }, "class": { "type": "select", @@ -653,7 +677,8 @@ "Vobasan alkaloids", "Yohimbine alkaloids", "Yuzurimine-type alkaloids" - ] + ], + "key": "class" }, "subclass": { "type": "select", @@ -1787,7 +1812,8 @@ "Zearalenones", "p-Dioxolo[2,3-g]coumarins", "p-Dioxolo[2,3-h]coumarins" - ] + ], + "key": "subclass" }, "superclass": { "type": "select", @@ -1816,7 +1842,8 @@ "Organophosphorus compounds", "Organosulfur compounds", "Phenylpropanoids and polyketides" - ] + ], + "key": "superclass" }, "parent": { "type": "select", @@ -3957,7 +3984,8 @@ "p-Phthalate esters", "p-Xylenes", "p-Xylenols" - ] + ], + "key": "parent" }, "np_pathway": { "type": "select", @@ -3970,7 +3998,8 @@ "Polyketides", "Shikimates and Phenylpropanoids", "Terpenoids" - ] + ], + "key": "np_pathway" }, "np_superclass": { "type": "select", @@ -3990,7 +4019,9 @@ "Cyclic polyketides", "Diarylheptanoids", "Diazotetronic acids and derivatives", + "Diphenyl ethers (DPEs)", "Diterpenoids", + "Docosanoids", "Eicosanoids", "Fatty Acids and Conjugates", "Fatty acyl glycosides", @@ -3998,8 +4029,10 @@ "Fatty amides", "Fatty esters", "Flavonoids", + "Fluorenes", "Glycerolipids", "Glycerophospholipids", + "Guanidine alkaloids", "Histidine alkaloids", "Isoflavonoids", "Lignans", @@ -4007,9 +4040,11 @@ "Lysine alkaloids", "Macrolides", "Meroterpenoids", + "Miscellaneous alkaloids", "Miscellaneous polyketides", "Mitomycin derivatives", "Monoterpenoids", + "Mycosporine derivatives", "Naphthalenes", "Nicotinic acid alkaloids", "Nucleosides", @@ -4046,12 +4081,14 @@ "Xanthones", "\u03b2-lactams", "\u03b3-lactam-\u03b2-lactones" - ] + ], + "key": "np_superclass" }, "np_class": { "type": "select", "label": "Np classifier class", "unique_values": [ + "12-oxophytodienoic acid metabolites", "2-arylbenzofurans", "2-pyrone derivatives", "3-Decalinoyltetramic acids", @@ -4061,25 +4098,34 @@ "4-pyrone derivatives", "Abeoabietane diterpenoids", "Abeolupane triterpenoids", + "Abeotaxane diterpenoids", "Abietane diterpenoids", "Acetate-derived alkaloids", "Acetogenins", + "Acidic glycosphingolipids", "Acorane sesquiterpenoids", "Acridone alkaloids", "Actinomycins", + "Acutumine alkaloids", + "Acyclic guanidine alkaloids", "Acyclic monoterpenoids", "Acyclic triterpenoids", "Acyl phloroglucinols", "Adianane triterpenoids", + "Aeruginosins", + "Aflatoxins", "Africanane sesquiterpenoids", "Agarofuran sesquiterpenoids", + "Ahp-containing cyclodepsipeptides", "Alliacane sesquiterpenoids", + "Allohimachalane sesquiterpenoids", "Amarylidaceae alkaloids", "Amino cyclitols", "Amino fatty acids", "Aminoacids", "Aminoglycosides", "Aminosugars", + "Amphilectane diterpenoids", "Anabaenopeptins", "Androstane steroids", "Angucyclines", @@ -4090,23 +4136,32 @@ "Anthranillic acid derivatives", "Anthraquinones and anthrones", "Antimycins", + "Aphidicolane diterpenoids", + "Aplysiatoxins", "Apocarotenoids (C30, \u03a8-\u03a8)", "Apocarotenoids (\u03a8-)", "Apocarotenoids (\u03b2-)", "Apocarotenoids(\u03b5-)", "Aporphine alkaloids", "Apotirucallane triterpenoids", + "Aristolane sesquiterpenoids", "Aromadendrane sesquiterpenoids", + "Aromatic polyketides with side chains", "Arteminisin", "Arylnaphthalene and aryltetralin lignans", + "Asbestinane diterpenoids", + "Ascarosides", "Ascomycins and Rapamycins", + "Asperane sesterterpenoids", "Aspidosperma type", "Aspidosperma-Iboga hybrid type (Vinca alkaloids)", + "Asteriscane sesquiterpenoids", "Atisane diterpenoids", "Aurones", "Avermectins", "Azaphilones", "Azo and Azoxy alkaloids", + "Baccharane triterpenoids", "Bactoprenols", "Bafilomycins", "Bagremycins", @@ -4116,19 +4171,31 @@ "Benzophenones", "Benzoquinones", "Bergamotane sesquiterpenoids", + "Betaestacin-type sesterterpenoids", "Betalain alkaloids", "Beyerane diterpenoids", "Biaryl type diarylheptanoids", + "Bicyclic guanidine alkaloids", + "Bicyclogermacrane sesquiterpenoids", + "Bicyclohumulane sesquiterpenoids", "Bisabolane sesquiterpenoids", "Bisnaphthalenes", "Bleomycins", + "Boromycins", + "Botryane sesquiterpenoids", + "Bourbonane sesquiterpenoids", "Branched fatty acids", + "Brasilane sesquiterpenoids", + "Breviane diterpenoids", + "Briarane diterpenoids", + "Bryostatins", "Bufadienolides", "CDP-Glycerols", "Cadinane sesquiterpenoids", "Camphane monoterpenoids", "Campherenane sesquiterpenoids", "Cannabinoids", + "Capnellane sesquiterpenoids", "Capsaicins and Capsaicinoids", "Carabrane sesquiterpenoids", "Carane monoterpenoids", @@ -4175,9 +4242,11 @@ "Cephalotaxus alkaloids", "Cephamycins", "Ceramides", + "Cericerane sesterterpenoids", "Chalcones", "Chamigrane sesquiterpenoids", "Cheilanthane sesterterpenoids", + "Chiloscyphane sesquiterpenoids", "Cholane steroids", "Cholestane steroids", "Chromones", @@ -4185,39 +4254,68 @@ "Cinnamic acids and derivatives", "Cinnamoyl phenols", "Clavams", + "Clavulones", + "Cleistanthane diterpenoids", + "Clovane sesquiterpenoids", "Colensane and Clerodane diterpenoids", "Coloratane sesquiterpenoids", "Copaane sesquiterpenoids", + "Copacamphane sesquiterpenoids", "Corynanthe type", "Coumarinolignans", "Coumaronochromones", "Coumestan", + "Cryptophycins", "Cubebane sesquiterpenoids", "Cucurbitane triterpenoids", + "Cuparane sesquiterpenoids", + "Cyano esters", "Cyanogenic glycosides", "Cyathane diterpenoids", "Cyclic peptides", "Cyclitols", + "Cycloabietane diterpenoids", + "Cycloamphilectane diterpenoids", + "Cycloapotirucallane triterpenoids", "Cycloartane triterpenoids", "Cyclobisabolane sesquiterpenoids", + "Cycloeudesmane sesquiterpenoids", "Cyclofarnesane sesquiterpenoids", + "Cyclolaurane sesquiterpenoids", + "Cyclonerane sesquiterpenoids", "Cyclophytane diterpenoids", + "Cyclopiane diterpenoids", + "Cyclopiazonic acid-tpye tetramate alkaloids", "Cytochalasan alkaloids", + "Cytosporins", + "DKXanthenes and derivatives", + "Dactylomelane diterpenoids", "Dammarane and Protostane triterpenoids", + "Daphnane diterpenoids", "Daucane sesquiterpenoids", + "Decalins with 2-pyrones", "Decalins with side chains", + "Decipiane diterpenoids", "Depsides", "Depsidones", "Depsipeptides", + "Devadarane diterpenoids", "Diacylglycerols", + "Dialkylresorcinols", + "Diarylether type diarylheptanoids", "Dibenzocyclooctadienes lignans", "Dibenzylbutane lignans", "Dibenzylbutyrolactone lignans", "Dicarboxylic acids", "Dihydroflavonols", + "Dimeric phloroglucinols", "Dipeptides", "Disaccharides", + "Dolabellane diterpenoids", + "Dolastane diterpenoids", + "Dolichols", "Drimane sesquiterpenoids", + "Duclauxin and derivatives", "Dunniane sesquiterpenoids", "Ecdysteroids", "Elemane sesquiterpenoids", @@ -4225,29 +4323,43 @@ "Enediynes", "Epothilones", "Epoxy fatty acids", + "Epoxyeicosatrienoic acids", + "Eremane diterpenoids", "Eremophilane sesquiterpenoids", "Ergostane steroids", "Ergot alkaloids", "Ericamycins", "Erythromycins", + "Erythroxylane diterpenoids", "Estrane steroids", "Eudesmane sesquiterpenoids", "Eunicellane diterpenoids", "Farnesane sesquiterpenoids", "Fasamycins and derivatives", + "Fatty acid estolides", "Fatty acyl CoAs", + "Fatty acyl carnitines", "Fatty acyl glycosides of mono- and disaccharides", + "Fatty acyl homoserine lactones", "Fatty alcohols", "Fatty aldehydes", + "Fatty ethers", + "Fatty nitriles", "Fenchane monoterpenoids", "Fernane and Arborinane triterpenoids", + "Filicane triterpenoids", "Flavan-3-ols", "Flavandiols (Leucoanthocyanidins)", "Flavanones", "Flavans", "Flavones", + "Flavonolignans", "Flavonols", + "Flavonostilbenes", "Friedelane triterpenoids", + "Fukinane sesquiterpenoids", + "Fungal DPEs", + "Fungal cyclic polyketides (Miscellaneous)", "Furanoabietane diterpenoids", "Furanoid lignans", "Furans", @@ -4259,28 +4371,50 @@ "Gallotannins", "Gammacerane triterpenoids", "Germacrane sesquiterpenoids", + "Gersemiane diterpenoids", "Gibberellins", "Glucosinolates", + "Glutinane triterpenoids", "Glycerophosphates", "Glycerophosphocholines", "Glycerophosphoethanolamines", + "Glycerophosphoglycerols", + "Glycerophosphoglycerophosphates", + "Glycerophosphoglycerophosphoglycerols", "Glycerophosphoinositol phosphates", "Glycerophosphoinositolglycans", "Glycerophosphoinositols", + "Glycerophosphoserines", "Glycosyldiacylglycerols", "Glycosylglycerophospholipids", + "Glycosylmonoacylglycerols", "Gorgonane sesquiterpenoids", + "Grayanotoxane diterpenoids", "Griseofulvins", "Guaiane sesquiterpenoids", + "Guanacastane diterpenoids", + "Gymnomitrane sesquiterpenoids", "Halimane diterpenoids", "Halogenated hydrocarbons", + "Hamigerane sesquiterpenoids", + "Hapalindole alkaloids", + "Hasubanan alkaloids", + "Hepoxilins", + "Herbertane sesquiterpenoids", + "Heterocyclic fatty acids", "Himachalane sesquiterpenoids", + "Hirsutane sesquiterpenoids", + "Homoerythrina alkaloids", "Homofarnesane sesquiterpenoids", "Hopane and Moretane triterpenoids", + "Humbertiane sesquiterpenoids", "Humulane sesquiterpenoids", "Hydrocarbons", "Hydroperoxy fatty acids", "Hydroxy fatty acids", + "Hydroxy-hydroperoxyeicosapentaenoic acids", + "Hydroxy-hydroperoxyeicosatetraenoic acids", + "Hydroxy-hydroperoxyeicosatrienoic acids", "Iboga type", "Icetexane diterpenoids", "Illudalane sesquiterpenoids", @@ -4294,22 +4428,37 @@ "Ingenane diterpenoids", "Iphionane sesquiterpenoids", "Iridoids monoterpenoids", + "Irregular monoterpenoids", + "Isariotin alkaloids", + "Ishwarane sesquiterpenoids", "Isoaurones", + "Isocomane sesquiterpenoids", "Isocoumarins", "Isodaucane sesquiterpenoids", "Isoflavanones", "Isoflavones", + "Isofurans", + "Isoindole alkaloids", + "Isolactarane sesquiterpenoids", "Isoprostanes", "Isoquinoline alkaloids", + "Ivaxillarane sesquiterpenoids", "Jasmonic acids", + "Jatrophane diterpenoids", + "Jatropholane diterpenoids", "Kaurane and Phyllocladane diterpenoids", "Kavalactones and derivatives", + "Kempane diterpenoids", "Labdane diterpenoids", + "Lactam bearing macrolide lactones", + "Lactarane sesquiterpenoids", "Lactones", "Ladder polyethers", "Lanostane, Tirucallane and Euphane triterpenoids", "Lathyrane diterpenoids", "Laurane sesquiterpenoids", + "Leukotrienes", + "Levuglandins", "Limonoids", "Linear diarylheptanoids", "Linear peptides", @@ -4317,20 +4466,37 @@ "Linear sesterterpenoids", "Linear tetronates", "Lipopeptides", + "Lipoxins", + "Lippifoliane sesquiterpenoids", + "Lobane diterpenoids", + "Long-Chain Bicyclic Phosphotriester", + "Longibornane sesquiterpenoids", "Longifolane sesquiterpenoids", + "Longipinane sesquiterpenoids", "Luminacins and derivatives", "Lupane triterpenoids", "Macrocyclic tetramic acids", "Macrolide lactams", "Macrolide lactones", "Macrotetrolides", + "Malabaricane triterpenoids", + "Mangicol-type sesterterpenoids", + "Marasmane sesquiterpenoids", + "Maresins", + "Marine-bacterial DPEs", "Megastigmanes", + "Melithiazole and Myxothiazole derivatives", "Menthane monoterpenoids", "Merohemiterpenoids", "Meromonoterpenoids", "Merosesquiterpenoids", + "Meroterpenoids with 5- or 6-membered ring", + "Meroterpenoids with bridged ring", + "Methoxy fatty acids", "Methyl xanthones", + "Microcystins", "Minor lignans", + "Miscellaneous alkaloids", "Miscellaneous apocarotenoids", "Miscellaneous meroterpenoids", "Miscellaneous polyketides", @@ -4338,41 +4504,79 @@ "Monacolins and Monacolin derivatives", "Monoacylglycerols", "Monoalkylresorcinols", + "Monocarbocyclic sesterterpenoids", + "Monocyclic guanidine alkaloids", "Monocyclic monoterpenoids", "Monocyclic \u03b2-lactams", "Monomeric stilbenes", "Monosaccharides", "Morphinan alkaloids", + "Mulinane diterpenoids", + "Multiflorane triterpenoids", + "Mycolic acids", + "Mycosporine and Mycosporine-like amino acids", + "Myrsinane diterpenoids", "N-acyl amines", "N-acyl ethanolamines (endocannabinoids)", + "Nagilactone diterpenoids", "Naphthalenes and derivatives", "Naphthalenones", "Naphthoquinones", + "Nardosinane sesquiterpenoids", "Neoflavonoids", "Neohopane triterpenoids", "Neolignans", + "Neuroprostanes", "Neutral glycosphingolipids", + "Nitro fatty acids", + "Nonadrides", + "Norcembrane diterpenoids", + "Noreremophilane sesquiterpenoids", + "Noreudesmane sesquiterpenoids", "Norkaurane diterpenoids", "Norlabdane diterpenoids", "Norpimarane and Norisopimarane diterpenoids", + "Norsesterterpenoids", + "Oblogolides", + "Obtusane diterpenoids", "Oleanane triterpenoids", "Oligomeric phloroglucinols (phlorotannins)", "Oligomeric stibenes", "Oligomycins", + "Onocerane triterpenoids", "Open-chain polyketides", + "Open-chained neoflavonoids", + "Ophiobolane sesterterpenoids", + "Oplopane sesquiterpenoids", + "Oppositane sesquiterpenoids", "Orthosomycins", + "Other Docosanoids", + "Other Eicosanoids", "Other Octadecanoids", "Other indole diketopiperazine alkaloids", + "Other polyketide meroterpenoids", "Oxa-Bridged Macrolides", "Oxasqualenoids", + "Oxazole alkaloids", "Oxidized glycerophospholipids", "Oxo fatty acids", "Oxygenated hydrocarbons", + "Pachydictyane diterpenoids", "Pachysanane triterpenoids", + "Pacifigorgiane sesquiterpenoids", + "Panasinsane sesquiterpenoids", + "Paraconic acids and derivatives", + "Paraliane diterpenoids", + "Parguerane diterpenoids", "Patchoulane sesquiterpenoids", "Paulomycins and derivatives", "Penicillins", + "Pentacyclic guanidine alkaloids", "Pentalenane sesquiterpenoids", + "Pepluane diterpenoids", + "Peptaibols", + "Perforane sesquiterpenoids", + "Phenalens", "Phenanthrenes", "Phenazine alkaloids", "Phenethylisoquinoline alkaloids", @@ -4380,11 +4584,16 @@ "Phenylalanine-derived alkaloids", "Phenylethanoids", "Phenylethylamines", + "Phloroglucinol-terpene hybrids", "Phoslactomycins or Phosphazomycins", + "Phosphosphingolipids", "Phthalide derivatives", "Phytane diterpenoids", + "Phytofurans", + "Phytoprostanes", "Picrotoxane sesquiterpenoids", "Pimarane and Isopimarane diterpenoids", + "Pimprinine alkaloids", "Pinane monoterpenoids", "Pinguisane sesquiterpenoids", "Piperidine alkaloids", @@ -4393,12 +4602,20 @@ "Podocarpane diterpenoids", "Polyamines", "Polyene macrolides", + "Polyesters", "Polyether ionophores", + "Polypodane triterpenoids", + "Polyprenol derivatives", "Polyprenylated cyclic polyketides (Hop meroterpenoids)", "Polysaccharides", + "Pradimicins", "Pregnane steroids", + "Premyrsinane diterpenoids", "Prenyl quinone meroterpenoids", "Prenylated,geranylated phloroglucinols", + "Prenylbisabolane diterpenoids", + "Prenyleudesmane diterpenoids", + "Presilphiperfolane and Probotryane sesquiterpenoids", "Prezizaane sesquiterpenoids", "Primary amides", "Proanthocyanins", @@ -4406,7 +4623,9 @@ "Prostaglandins", "Protoberberine alkaloids", "Protoilludane sesquiterpenoids", + "Protopine alkaloids", "Pseudoguaiane sesquiterpenoids", + "Pseudopterane diterpenoids", "Pterocarpan", "Pulvinones", "Purine alkaloids", @@ -4415,31 +4634,54 @@ "Pyrazine and Piperazine alkaloids", "Pyridine alkaloids", "Pyrimidine nucleos(t)ides", + "Pyrrocidine tetramate alkaloids", "Pyrrole alkaloids", "Pyrrolidine alkaloids", "Pyrrolizidine alkaloids", "Pyrroloindole alkaloids", "Pyrroloquinoline alkaloids", + "Quadrane sesquiterpenoids", "Quassinoids", "Quinazoline alkaloids", "Quinoline alkaloids", "Quinolizidine alkaloids", "Resin glycosides", + "Resolvin Ds", + "Resolvin Es", + "Rhamnofolane diterpenoids", "Rhamnolipids", + "Rhizoxins", + "RiPPs-Amatoxins and Phallotoxins", "RiPPs-Bottromycins", + "RiPPs-Cyanobactins", "RiPPs-Lanthipeptides", "RiPPs-Lasso peptides", + "RiPPs-Microcins", "RiPPs-Thiopeptides", "Rotenoids", "Rotundane sesquiterpenoids", "Sacculatane diterpenoids", "Salinosporamides", "Santalane sesquiterpenoids", + "Saponaceolide triterpenoids", "Sativane sesquiterpenoids", + "Saxitoxins", + "Scalarane sesterterpenoids", + "Secoabietane diterpenoids", + "Secochamigrane sesquiterpenoids", + "Secoeudesmane sesquiterpenoids", + "Secogermacrane sesquiterpenoids", "Secoiridoid monoterpenoids", + "Secokaurane diterpenoids", "Secolabdane diterpenoids", + "Segetane diterpenoids", + "Selaginellins", "Serratane triterpenoids", + "Serrulatane and Biflorane diterpenoids", "Shikimic acids and derivatives", + "Shionane triterpenoids", + "Silphinane sesquiterpenoids", + "Silphiperfolane sesquiterpenoids", "Simple amide alkaloids", "Simple aromatic polyketides", "Simple coumarins", @@ -4449,34 +4691,54 @@ "Simple oxindole alkaloids", "Simple phenolic acids", "Simple tetramate alkaloids", + "Sinularane sesquiterpenoids", + "Sophorolipids", "Sorbicilinoids", + "Sphaerane diterpenoids", + "Sphaeroane diterpenoids", + "Sphenolobane diterpenoids", "Sphingoid bases", + "Spiroaxane sesquiterpenoids", "Spirodioxynaphthalenes", "Spirostane steroids", "Spirotetronate macrolides", "Spirovetivane sesquiterpenoids", "Spongiane diterpenoids", + "Spriromeroterpenoids", + "Stemona alkaloids", "Steroidal alkaloids", + "Sterpurane sesquiterpenoids", + "Stictane triterpenoids", "Stigmastane steroids", + "Stilbenolignans", "Streptothricins and derivatives", + "Strobilurins and derivatives", "Strychnos type", "Taraxerane triterpenoids", "Taxane diterpenoids", "Terpenoid alkaloids", + "Terpenoid tetrahydroisoquinoline alkaloids", "Tetracyclic diterpenoids", "Tetracyclines", "Tetrahydroisoquinoline alkaloids", "Tetraketide meroterpenoids", + "Tetrodotoxins", "Thapsane sesquiterpenoids", "Thia fatty acids", "Thiazole alkaloids", "Thiodiketopiperazine alkaloids", + "Thromboxanes", "Thujane monoterpenoids", + "Thujopsane sesquiterpenoids", "Tigliane diterpenoids", "Totarane diterpenoids", "Trachylobane diterpenoids", + "Tremulane sesquiterpenoids", "Triacylglycerols", "Trichothecane sesquiterpenoids", + "Tricyclic guanidine alkaloids", + "Triketide meroterpenoids", + "Trinervitane diterpenoids", "Tripeptides", "Tropane alkaloids", "Tropolones and derivatives (PKS)", @@ -4485,19 +4747,28 @@ "Unsaturated fatty acids", "Ursane and Taraxastane triterpenoids", "Usnic acid and derivatives", + "Valerane sesquiterpenoids", + "Valerenane sesquiterpenoids", + "Valparane diterpenoids", "Vancomycins and Teicoplanins", + "Verrucosane diterpenoids", "Verticillane diterpenoids", + "Villanovane diterpenoids", + "Viscidane diterpenoids", "Vitamin D2 and derivatives", "Vitamin D3 and derivatives", "Wax diesters", "Wax monoesters", + "Xeniaphyllane diterpenoids", "Xenicane diterpenoids", "Yohimbine-like alkaloids", "Zearalenones", "Zizaane sesquiterpenoids", + "m-Terphenyls", "p-Terphenyls", "pteridine alkaloids" - ] + ], + "key": "np_class" }, "np_glycoside": { "type": "boolean", @@ -4505,6 +4776,7 @@ "values": [ true, false - ] + ], + "key": "np_glycoside" } } \ No newline at end of file diff --git a/resources/views/livewire/advanced-search.blade.php b/resources/views/livewire/advanced-search.blade.php index 3d9c555b..184b9cda 100644 --- a/resources/views/livewire/advanced-search.blade.php +++ b/resources/views/livewire/advanced-search.blade.php @@ -46,14 +46,14 @@ } } else if (config.type === 'select' && Array.isArray(value)) { if (value.length > 0) { - parts.push(`${key}:${value.join('|')}`); + parts.push(`${key}:${value.join('|').replace(/ /g, '+')}`); } } else if (config.type === 'boolean') { if (value !== 'undefined') { - parts.push(`${key}=${value}`); + parts.push(`${key}:${value}`); } } else if (value && value !== config.default) { - parts.push(`${key}:${value}`); + parts.push(`${key}:${value}.replace(/ /g, '+')`); } } }