Merge pull request #1833 from terrestris/code-smells

Fix several code smells detected by SonarQube
terrestris · Feb 5, 2025 · 7380a37 · 7380a37
2 parents 6ccea15 + 8512706
commit 7380a37
Show file tree

Hide file tree

Showing 17 changed files with 30 additions and 29 deletions.
diff --git a/src/bootstrap.tsx b/src/bootstrap.tsx
@@ -150,7 +150,7 @@ enum LoadingErrorCode {
 }
 
 const client = ClientConfiguration.shogunBase !== false ? new SHOGunAPIClient({
-  url: ClientConfiguration.shogunBase || '/'
+  url: ClientConfiguration.shogunBase ?? '/'
 }) : undefined;
 
 const parser = new SHOGunApplicationUtil({

diff --git a/src/components/ApplicationInfo/index.tsx b/src/components/ApplicationInfo/index.tsx
@@ -39,10 +39,10 @@ export const ApplicationInfo: React.FC<ApplicationInfoProps> = ({
   const logoPath = useAppSelector(state => state.logoPath);
   const appDescription = useAppSelector(state => state.description);
 
-  const [isVisible, setVisible] = useState<boolean>(false);
+  const [isVisible, setIsVisible] = useState<boolean>(false);
 
   const toggleVisibility = () => {
-    setVisible(!isVisible);
+    setIsVisible(!isVisible);
   };
 
   let Opener;

diff --git a/src/components/EditFeatureDrawer/EditFeatureForm/index.tsx b/src/components/EditFeatureDrawer/EditFeatureForm/index.tsx
@@ -118,15 +118,15 @@ export const EditFeatureForm: React.FC<EditFeatureFormProps> = ({
         if (Array.isArray(e)) {
           return e;
         }
-        return e && e.fileList;
+        return e?.fileList;
       };
     }
 
     return (
       <Form.Item
         key={fieldCfg.propertyName}
         name={fieldCfg.propertyName}
-        label={fieldCfg.displayName || fieldCfg.propertyName}
+        label={fieldCfg.displayName ?? fieldCfg.propertyName}
         {...formItemProps}
       >
         {field}

diff --git a/src/components/EditFeatureDrawer/EditReferenceTable/index.tsx b/src/components/EditFeatureDrawer/EditReferenceTable/index.tsx
@@ -96,7 +96,7 @@ export const EditReferenceTable: React.FC<EditReferenceTableProps> = ({
 
   const resolvePlaceholder = (record: EditReferenceDataType): string | number => {
     if (!tablePropertyName) {
-      return record[defaultPropertyName] || '';
+      return record[defaultPropertyName] ?? '';
     }
 
     const regex = /{{(.*?)}}/g;

diff --git a/src/components/Footer/index.tsx b/src/components/Footer/index.tsx
@@ -50,7 +50,7 @@ export const Footer: React.FC<FooterProps> = ({
           wrappedComponent: WrappedPluginComponent
         } = plugin;
 
-        items.splice(plugin.integration?.insertionIndex || 0, 0,
+        items.splice(plugin.integration?.insertionIndex ?? 0, 0,
           <WrappedPluginComponent
             key={key}
           />

diff --git a/src/components/Header/index.tsx b/src/components/Header/index.tsx
@@ -39,7 +39,7 @@ export const Header: React.FC<HeaderProps> = ({
           wrappedComponent: WrappedPluginComponent
         } = plugin;
 
-        items.splice(plugin.integration?.insertionIndex || 0, 0,
+        items.splice(plugin.integration?.insertionIndex ?? 0, 0,
           <WrappedPluginComponent
             key={key}
           />

diff --git a/src/components/MapToolbar/index.tsx b/src/components/MapToolbar/index.tsx
@@ -32,7 +32,7 @@ import Toolbar, { ToolbarProps } from '../Toolbar';
 
 import './index.less';
 
-export type MapToolbarProps = React.HTMLAttributes<HTMLDivElement> & ToolbarProps & {};
+export type MapToolbarProps = React.HTMLAttributes<HTMLDivElement> & ToolbarProps;
 
 export const MapToolbar: React.FC = (): JSX.Element => {
   const {

diff --git a/src/components/PrintForm/index.tsx b/src/components/PrintForm/index.tsx
@@ -186,7 +186,7 @@ export const PrintForm: React.FC<PrintFormProps> = ({
       return;
     }
     let pManagerOpts: MapFishPrintV3ManagerOpts = {
-      url: ClientConfiguration.print?.url || '/print',
+      url: ClientConfiguration.print?.url ?? '/print',
       map,
       customPrintScales: map
         ?.getView()

diff --git a/src/components/ToolMenu/Draw/Attributions/index.tsx b/src/components/ToolMenu/Draw/Attributions/index.tsx
@@ -60,7 +60,7 @@ const AttributionDrawer: React.FC<AttributionDrawerProps> = ({
   selectedFeature,
   ...passThroughProps
 }) => {
-  const [isFormValid, setIsFormIsValid] = useState(true);
+  const [isFormValid, setIsFormValid] = useState(true);
   const [availableFeatureCollectionAttributes, setAvailableFeatureCollectionAttributes] = useState<string[]>([]);
   const [availableFeatureAttributes, setAvailableFeatureAttributes] = useState<string[]>([]);
   const [, contextHolder] = notification.useNotification();
@@ -156,9 +156,9 @@ const AttributionDrawer: React.FC<AttributionDrawerProps> = ({
   const onChange = async () => {
     try {
       await form.validateFields();
-      setIsFormIsValid(true);
+      setIsFormValid(true);
     } catch (error) {
-      setIsFormIsValid(false);
+      setIsFormValid(false);
       Logger.error(error);
     }
   };

diff --git a/src/components/ToolMenu/FeatureInfo/FeatureInfoForm/index.tsx b/src/components/ToolMenu/FeatureInfo/FeatureInfoForm/index.tsx
@@ -44,10 +44,10 @@ export const FeatureInfoForm: React.FC<FeatureInfoFormProps> = ({
       <Form.Item
         key={fieldCfg.propertyName}
         name={fieldCfg.propertyName}
-        label={fieldCfg.displayName || fieldCfg.propertyName}
+        label={fieldCfg.displayName ?? fieldCfg.propertyName}
       >
         <DisplayField
-          label={fieldCfg.displayName || fieldCfg.propertyName}
+          label={fieldCfg.displayName ?? fieldCfg.propertyName}
           {...fieldCfg.fieldProps}
         />
       </Form.Item>

diff --git a/src/components/ToolMenu/index.tsx b/src/components/ToolMenu/index.tsx
@@ -239,7 +239,7 @@ export const ToolMenu: React.FC<ToolMenuProps> = ({
             children: <WrappedPluginComponent />
           };
 
-          panels.splice(insertionIndex || 0, 0, newItem);
+          panels.splice(insertionIndex ?? 0, 0, newItem);
         }
       });
     }

diff --git a/src/components/UploadDataModal/index.tsx b/src/components/UploadDataModal/index.tsx
@@ -145,7 +145,7 @@ export const UploadDataModal: React.FC<UploadDataModalProps> = ({
   };
 
   const onBeforeFileUpload = (file: RcFile) => {
-    const maxSize = ClientConfiguration.geoserver?.upload?.limit || 200000000;
+    const maxSize = ClientConfiguration.geoserver?.upload?.limit ?? 200000000;
     const fileType = file.type;
     const fileSize = file.size;
 
@@ -338,8 +338,8 @@ export const UploadDataModal: React.FC<UploadDataModalProps> = ({
 
     const splittedFileName = (file as RcFile).name.split('.');
     const fileType = (file as RcFile).type;
-    const geoServerBaseUrl = ClientConfiguration.geoserver?.base || '/geoserver';
-    const workspace = ClientConfiguration.geoserver?.upload?.workspace || 'SHOGUN';
+    const geoServerBaseUrl = ClientConfiguration.geoserver?.base ?? '/geoserver';
+    const workspace = ClientConfiguration.geoserver?.upload?.workspace ?? 'SHOGUN';
     const layerName = `${splittedFileName[0]}_${Date.now()}`.toUpperCase();
 
     const uploadData = {

diff --git a/src/components/UserMenu/index.tsx b/src/components/UserMenu/index.tsx
@@ -93,15 +93,15 @@ export const UserMenu: React.FC = (): JSX.Element => {
             className="item-username"
           >
             {
-              user.providerDetails?.username || user.authProviderId
+              user.providerDetails?.username ?? user.authProviderId
             }
           </span>
           <br />
           <span
             className="item-fullname"
           >
             {
-              `${user.providerDetails?.firstName || ''} ${user.providerDetails?.lastName || ''}`
+              `${user.providerDetails?.firstName ?? ''} ${user.providerDetails?.lastName ?? ''}`
             }
           </span>
         </div>
@@ -189,7 +189,7 @@ export const UserMenu: React.FC = (): JSX.Element => {
         <UserChip
           size="small"
           imageSrc={getGravatarUrl({
-            email: user.providerDetails?.email || '',
+            email: user.providerDetails?.email ?? '',
             size: 28
           })}
           userName={

diff --git a/src/hooks/searchEngines/useNominatimSearchEngine.ts b/src/hooks/searchEngines/useNominatimSearchEngine.ts
@@ -42,7 +42,7 @@ export const useNominatimSearchEngine = () => {
       bounded: viewBox ? 1 : undefined,
       viewBox: viewBox ? viewBox?.toString() : undefined,
       countryCodes: '',
-      nominatimBaseUrl: ClientConfiguration.search?.nominatimUrl || 'https://nominatim.openstreetmap.org/search?'
+      nominatimBaseUrl: ClientConfiguration.search?.nominatimUrl ?? 'https://nominatim.openstreetmap.org/search?'
     });
 
     const response = await executeNominatimSearch(value);

diff --git a/src/hooks/useConvertImageUrl.ts b/src/hooks/useConvertImageUrl.ts
@@ -15,7 +15,7 @@ export const useConvertImageUrl = () => {
 
   const imageUrlToBase64 = useCallback(async (url: string) => {
     if (_isNil(url)) {
-      return Promise.reject();
+      return Promise.reject(new Error(`Passed url '${url}' is null or undefined`));
     }
 
     const response = await fetch(url, {

diff --git a/src/hooks/useWriteWfsTransaction.ts b/src/hooks/useWriteWfsTransaction.ts
@@ -151,8 +151,9 @@ export const useWriteWfsTransaction = () => {
         const geometry = feature.getGeometry()?.clone();
 
         if (geometry && !isEmpty(geometry.getExtent()) && allowedEditMode?.includes('EDIT_GEOMETRY')) {
-          feat.set(geomProperty?.name || 'geom', geometry);
-          feat.setGeometryName(geomProperty?.name || 'geom');
+          const geomPropName = geomProperty?.name ?? 'geom';
+          feat.set(geomPropName, geometry);
+          feat.setGeometryName(geomPropName);
         }
 
         if (opts.form) {

diff --git a/src/store/legal/index.ts b/src/store/legal/index.ts
@@ -20,9 +20,9 @@ export const slice = createSlice({
   reducers: {
     setLegal: (state, action: PayloadAction<Legal>) => {
       return {
-        contact: action.payload.contact || initialState.contact,
-        imprint: action.payload.imprint || initialState.imprint,
-        privacy: action.payload.privacy || initialState.privacy
+        contact: action.payload.contact ?? initialState.contact,
+        imprint: action.payload.imprint ?? initialState.imprint,
+        privacy: action.payload.privacy ?? initialState.privacy
       };
     }
   }
-Original file line number
+Diff line change
@@ Expand Up / @@ -239,7 +239,7 @@ export const ToolMenu: React.FC<ToolMenuProps> = ({ @@
                 children: <WrappedPluginComponent />
               };
-              panels.splice(insertionIndex || 0, 0, newItem);
+              panels.splice(insertionIndex ?? 0, 0, newItem);
             }
           });
         }
@@ Expand Down @@