Merge branch 'Development' into SIPS-Development

components/search/dnssearchresults.js

@@ -150,7 +150,7 @@ const DNSSearchResults = (props) => {
     };
 
     const [orderByState, setOrderbyState] = useState("createdon");
-    const [fieldSortState, setfieldSortState] = useState("asc");
+    const [fieldSortState, setfieldSortState] = useState("desc");
     const [selectedOption, setSelectedOption] = useState(10);
 
     const cookies = parseCookies();
@@ -1009,7 +1009,14 @@ const DNSSearchResults = (props) => {
                     </div>
                 </div>
             )}
-            {resultsArr.length > 0 ? (
+
+            {!searchLoaded ? (
+                <div className="govuk-grid-row">
+                    <div className="govuk-grid-column-two-thirds">
+                        <h3>Loading...</h3>
+                    </div>
+                </div>
+            ) : resultsArr.length > 0 ? (
                 ResultsView(resultsArr)
             ) : (
                 <div className="govuk-grid-row">
@@ -1018,6 +1025,16 @@ const DNSSearchResults = (props) => {
                     </div>
                 </div>
             )}
+
+            {/* {resultsArr.length > 0 ? (
+                ResultsView(resultsArr)
+            ) : (
+                <div className="govuk-grid-row">
+                    <div className="govuk-grid-column-two-thirds">
+                        <h3>{t("search:searchresults-no-records-label")}</h3>
+                    </div>
+                </div>
+            )} */}
         </>
     );
 };